Branch: refs/heads/release_16.07 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: 8b75305c49c3e9fe3fb4665177af977cdfc9a582 https://github.com/galaxyproject/galaxy/commit/8b75305c49c3e9fe3fb4665177af9... Author: Nicola Soranzo <nsoranzo@tiscali.it> 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 #3351 from jmchilton/galaxy_environment_fixes [16.07] Do not allow Conda to replace Galaxy's Python environment for select tools. Compare: https://github.com/galaxyproject/galaxy/compare/22fda449f9d4...8b75305c49c3