Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3f93b19ff34bf51d81b353eb5e11e1748fa35df4 https://github.com/galaxyproject/galaxy/commit/3f93b19ff34bf51d81b353eb5e11e... Author: Bjoern Gruening bjoern.gruening@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M lib/galaxy/jobs/runners/condor.py
Log Message: ----------- fix condor containers
Commit: 915b653b91af25bf126125be875bd6ab2d9f320c https://github.com/galaxyproject/galaxy/commit/915b653b91af25bf126125be875bd... Author: Martin Cech cech.marten@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M lib/galaxy/jobs/runners/condor.py
Log Message: ----------- Merge pull request #3463 from jmchilton/16.07_container_fix
[16.07] fix condor containers
Commit: 1c0c378debdee4aeb9699f11ad2b3314323888b6 https://github.com/galaxyproject/galaxy/commit/1c0c378debdee4aeb9699f11ad2b3... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M lib/galaxy/jobs/runners/condor.py
Log Message: ----------- Merge branch 'release_16.07' into release_16.10
Commit: ffa4af0a8e79acb673e90e543d67b7be0be3b631 https://github.com/galaxyproject/galaxy/commit/ffa4af0a8e79acb673e90e543d67b... Author: Martin Cech cech.marten@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M lib/galaxy/version.py
Log Message: ----------- Merge pull request #3466 from jmchilton/version-17.01
[17.01] Update version to 17.01.rc1
Commit: c85b28c6d2c3e39801ea9138d84bfa2a0ded536c https://github.com/galaxyproject/galaxy/commit/c85b28c6d2c3e39801ea9138d84bf... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-01-23 (Mon, 23 Jan 2017)
Log Message: ----------- Merge branch 'release_16.10' into release_17.01
Commit: df8be3add7fc87fc5ad6e4e38217332a57d3915a https://github.com/galaxyproject/galaxy/commit/df8be3add7fc87fc5ad6e4e382173... Author: John Chilton jmchilton@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M lib/galaxy/tools/deps/__init__.py M test/integration/test_resolvers.py
Log Message: ----------- Fix cached dependency manager.
Broken with baf9b82847fc526af56ed8efa7aba4d31d62f400.
Also fix test case that made me think it was okay in the first place.
Commit: 28b7b1faff9420c0010c117b573917741b1974ef https://github.com/galaxyproject/galaxy/commit/28b7b1faff9420c0010c117b57391... Author: John Chilton jmchilton@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt
Log Message: ----------- Upgrade six to 1.10.0.
This is required by the setuptools release released today. So if anything uses setuptools (e.g. it seems we get twill from PyPI instead of wheels.galaxyproject.org) it will fail because we have downgraded six it seems.
Commit: 0bf7efb89a189e14e3b9d85ef2355a3821a498ce https://github.com/galaxyproject/galaxy/commit/0bf7efb89a189e14e3b9d85ef2355... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt
Log Message: ----------- Merge pull request #3471 from jmchilton/17_01_six_upgrade
[17.01] Upgrade six to 1.10.0.
Commit: dc49b1c220bb96b1675ab50bdbccf7eca8d739bc https://github.com/galaxyproject/galaxy/commit/dc49b1c220bb96b1675ab50bdbccf... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths: M lib/galaxy/tools/deps/__init__.py M test/integration/test_resolvers.py
Log Message: ----------- Merge pull request #3470 from jmchilton/cached_dependency_manager_fixes
[17.01] Fix cached dependency manager.
Commit: 10eba9a9990ec093fddb7adebcf0daf8893b374c https://github.com/galaxyproject/galaxy/commit/10eba9a9990ec093fddb7adebcf0d... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/tools/deps/__init__.py M test/integration/test_resolvers.py
Log Message: ----------- Merge branch 'release_17.01' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/0d05b3d089d1...10eba9a9990e
galaxy-commits@lists.galaxyproject.org