Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e821d469e60959614147bde59163d75681bae266 https://github.com/galaxyproject/galaxy/commit/e821d469e60959614147bde59163d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/views.py Log Message: ----------- Try next dep. resolver if building env failed Otherwise an exception ("Conda dependency seemingly installed but failed to build job environment." comes to mind) would entirely stop the job submission. Ping @bgruening. Commit: c0cf41a15ccf7f9060c4dd891ff4b16814f7ecbc https://github.com/galaxyproject/galaxy/commit/c0cf41a15ccf7f9060c4dd891ff4b... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Avoid duplicate dependency installation The previous commit changed the resolver logic to try all resolvers, so that when building an environment fails, the next resolver can be tried. Since dependency resolution and installation are coupled it would be possible to install dependencies multiple times for different resolvers (e.g for Conda and Conda versionless). To avoid this we stop installation once a set of dependencies has been resolved. Commit: b24217c25b3d7b0ad50b33723515f763a48b99fb https://github.com/galaxyproject/galaxy/commit/b24217c25b3d7b0ad50b33723515f... Author: John Chilton <jmchilton@gmail.com> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/views.py Log Message: ----------- Merge pull request #5036 from mvdbeek/resolver_improvements Try next dep. resolver if building env failed Compare: https://github.com/galaxyproject/galaxy/compare/e79048be5a4f...b24217c25b3d