Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: fe2a1d8ade4fbda158ae035c78133258d7fec099 https://github.com/galaxyproject/galaxy/commit/fe2a1d8ade4fbda158ae035c78133... Author: John Chilton <jmchilton@gmail.com> Date: 2016-12-21 (Wed, 21 Dec 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Do not replace Galaxy's Python environment for select tools. This has never happened in my testing, but there have been multiple reports of Conda crafting environments for the set metadata tool that include Python. When this happens Galaxy's Python environment is lost and the tool cannot function properly. Fixes #3238. Fixes #3224. Fixes https://biostar.usegalaxy.org/p/20865/. Rebased to add a comment as suggested by @nsoranzo. Commit: 4969c4a308fd5bfc8bc52739b024765147af49e8 https://github.com/galaxyproject/galaxy/commit/4969c4a308fd5bfc8bc52739b0247... Author: John Chilton <jmchilton@gmail.com> Date: 2016-12-21 (Wed, 21 Dec 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge 16.07 conda fix from #3351 into 16.10. Tricky merge - please review. Conflicts: lib/galaxy/tools/deps/resolvers/conda.py Commit: 14549d0f1b202a720dfc2dbb1f6501fc2cd8fd49 https://github.com/galaxyproject/galaxy/commit/14549d0f1b202a720dfc2dbb1f650... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-12-21 (Wed, 21 Dec 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #3354 from jmchilton/1610_conda_fixes [16.10] Merge forward #3351. Compare: https://github.com/galaxyproject/galaxy/compare/5eafa8bae312...14549d0f1b20