Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 62ee8e8404fb86155d9893a8eeab1cf58473d795 https://github.com/galaxyproject/galaxy/commit/62ee8e8404fb86155d9893a8eeab1... Author: John Chilton jmchilton@gmail.com Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths: M lib/galaxy/tools/__init__.py
Log Message: ----------- Fix Python environment hack to allow "fixing" tool ids at some version.
This is a less broken alternative to #3620 and something I intended to ultimately do anyway.
sam-to-bam used to be broken but now it isn't, we need to express that. Ideally we would move most of the things from the unversioned list to the versioned list as they are fixed.
xref https://github.com/galaxyproject/galaxy/pull/3620#issuecomment-280674067 xref https://github.com/galaxyproject/galaxy/commit/fe2a1d8ade4fbda158ae035c78133... xref #3351 xref galaxyproject/tools-iuc#1148
Commit: eb6c0e410e600171fa3ce4fffb78bc205aad5292 https://github.com/galaxyproject/galaxy/commit/eb6c0e410e600171fa3ce4fffb78b... Author: John Chilton jmchilton@gmail.com Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths: M lib/galaxy/tools/__init__.py
Log Message: ----------- Rework preserve python environment expression according to :eagle::eyes: suggestion.
https://github.com/galaxyproject/galaxy/pull/3630#discussion_r101798306
Commit: 6733c36318bacce0bbf33a8d266f6a08de3ba019 https://github.com/galaxyproject/galaxy/commit/6733c36318bacce0bbf33a8d266f6... Author: John Chilton jmchilton@gmail.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M lib/galaxy/tools/deps/__init__.py
Log Message: ----------- [17.01] Restore logging statement missing when resolve_all is used.
Broken in #3391.
Commit: 49ef352235f7c998e79ca5423fab9725ea28d8be https://github.com/galaxyproject/galaxy/commit/49ef352235f7c998e79ca5423fab9... Author: Martin Cech cech.marten@gmail.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M lib/galaxy/tools/deps/__init__.py
Log Message: ----------- Merge pull request #3646 from jmchilton/resolve_all_logging
[17.01] Restore logging statement missing when resolve_all is used.
Commit: 9ebe2d2dd6efde7a66c52681aa57c52342ad992d https://github.com/galaxyproject/galaxy/commit/9ebe2d2dd6efde7a66c52681aa57c... Author: Martin Cech cech.marten@gmail.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M lib/galaxy/tools/__init__.py
Log Message: ----------- Merge pull request #3630 from jmchilton/python_hack_scalpel
[17.01] Fix Python environment hack to allow "fixing" tool ids at some version.
Commit: 387805fc1365dbf976e6d3e10ae4a11817e501da https://github.com/galaxyproject/galaxy/commit/387805fc1365dbf976e6d3e10ae4a... Author: Martin Cech cech.marten@gmail.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M client/galaxy/scripts/mvc/history/history-model.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M lib/galaxy/jobs/command_factory.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/mvc/history/history-model.js.map M static/maps/mvc/history/history-view.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-model.js M static/scripts/mvc/history/history-view.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-composite.js A test/functional/tools/mulled_example_multi_incomplete.xml M test/functional/tools/samples_tool_conf.xml
Log Message: ----------- Merge branch 'release_17.01' into dev
Conflicts: client/galaxy/scripts/mvc/tool/tool-form-composite.js preserved the dev version
static/maps/mvc/tool/tool-form-composite.js.map static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/tool/tool-form-composite.js
Commit: d1c9ffb94c06a7a39cff37a38e78f43fd4e0ca10 https://github.com/galaxyproject/galaxy/commit/d1c9ffb94c06a7a39cff37a38e78f... Author: Martin Cech cech.marten@gmail.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-composite.js M static/maps/mvc/tool/tool-form-composite.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form-composite.js
Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Conflicts: client/galaxy/scripts/mvc/tool/tool-form-composite.js preserved dev version
static/maps/mvc/tool/tool-form-composite.js.map static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/tool/tool-form-composite.js
Commit: 90de3f2588a61382e70b6209ea39293c6a3987f1 https://github.com/galaxyproject/galaxy/commit/90de3f2588a61382e70b6209ea392... Author: Martin Cech cech.marten@gmail.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M lib/galaxy/version.py
Log Message: ----------- Update version to 17.01
Commit: c52715fd69fba88746181601e8210eb3cbc8b145 https://github.com/galaxyproject/galaxy/commit/c52715fd69fba88746181601e8210... Author: Martin Cech cech.marten@gmail.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Log Message: ----------- Merge branch 'release_17.01' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/9563a691b05f...c52715fd69fb