Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: aaf09dc99b0dc2896cbba5d21c132e998f5126e7 https://github.com/galaxyproject/galaxy/commit/aaf09dc99b0dc2896cbba5d21c132... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-04-27 (Wed, 27 Apr 2016) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Generate metadata in separate conda environment Galaxy supports generating metadata in a separate command (enable beta_tool_command_isolation). This command has its own dependency resolution, that may interfere with thedependency resolution of the actual tool, if the same environment is being used. With this PR we create a new environment when resolving metadata dependencies with conda, that will be active only for metadata generation. Commit: 5dd9d1bafcc4532fdb48b312a47e2f90b7178d80 https://github.com/galaxyproject/galaxy/commit/5dd9d1bafcc4532fdb48b312a47e2... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-04-27 (Wed, 27 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Fix whitespace and comma use Commit: a7bcd69f9e6b72279772cc9ca003408df830e881 https://github.com/galaxyproject/galaxy/commit/a7bcd69f9e6b72279772cc9ca0034... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-27 (Wed, 27 Apr 2016) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2253 from mvdbeek/conda-metadata-env Generate metadata in separate conda environment Compare: https://github.com/galaxyproject/galaxy/compare/8a3b5d3d3e36...a7bcd69f9e6b