Branch: refs/heads/release_17.01 Home: https://github.com/galaxyproject/galaxy Commit: 31725972ef9342145effa6ad24d912022afb278c https://github.com/galaxyproject/galaxy/commit/31725972ef9342145effa6ad24d91... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Fix conda resolver when conda_auto_init = True and install = False Conda dependencies were being prematurely installed during installation of repositories from the ToolShed (at the point where we are just trying to list already installed dependencies). Commit: 0ce7f6897fe7a037ae9ff9a79c082c56fec0e929 https://github.com/galaxyproject/galaxy/commit/0ce7f6897fe7a037ae9ff9a79c082... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- add comments from @mvdbeek Commit: 961efb4d9af9ea17fbd0f80b7f07158f2cb971ad https://github.com/galaxyproject/galaxy/commit/961efb4d9af9ea17fbd0f80b7f071... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #3536 from blankenberg/17.01-conda-fix [17.01] Fix conda resolver when conda_auto_install = True and install = False Compare: https://github.com/galaxyproject/galaxy/compare/f1062afa55c4...961efb4d9af9