Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1148081435e6eb4075eb62783129299ebbd4d490 https://github.com/galaxyproject/galaxy/commit/1148081435e6eb4075eb627831292... Author: John Chilton jmchilton@gmail.com Date: 2015-12-26 (Sat, 26 Dec 2015)

Changed paths: M config/dependency_resolvers_conf.xml.sample M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py A lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/__init__.py A lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/util/checkers.py M test/unit/jobs/test_job_wrapper.py A test/unit/tools/test_conda_resolution.py

Log Message: ----------- Implement a conda dependency resolver.

Much more information on planemo PR that I used to build a test bed for this:

https://github.com/galaxyproject/planemo/pull/392

Also syncs galaxy with planemo shared library changed.

Commit: 0aa1c5133e029196444ac9c0b32f43489cee3713 https://github.com/galaxyproject/galaxy/commit/0aa1c5133e029196444ac9c0b32f4... Author: Eric Rasche rasche.eric@gmail.com Date: 2015-12-30 (Wed, 30 Dec 2015)

Changed paths: M config/dependency_resolvers_conf.xml.sample M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py A lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/__init__.py A lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/util/checkers.py M test/unit/jobs/test_job_wrapper.py A test/unit/tools/test_conda_resolution.py

Log Message: ----------- Merge pull request #1345 from jmchilton/conda_0

Implement a conda dependency resolver.

Compare: https://github.com/galaxyproject/galaxy/compare/2b2f93d393a4...0aa1c5133e02