Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6dd1341ae09c73a11ed19b256d1f95da191f004b https://github.com/galaxyproject/galaxy/commit/6dd1341ae09c73a11ed19b256d1f9... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-27 (Fri, 27 Jan 2017) Changed paths: M lib/galaxy/tools/deps/requirements.py Log Message: ----------- Give ToolRequirements a string representation for easier debugging. Commit: ba3b00d1f813298e345c6f47bf6d6db31041c2ed https://github.com/galaxyproject/galaxy/commit/ba3b00d1f813298e345c6f47bf6d6... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-27 (Fri, 27 Jan 2017) Changed paths: M test/integration/test_resolvers.py Log Message: ----------- Fix integration test for default Conda mapping. It worked locally simply because I had R already installed on my system globally. Commit: 4eb770dee58433fa8a1a4008b4204c1ccb464fc6 https://github.com/galaxyproject/galaxy/commit/4eb770dee58433fa8a1a4008b4204... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-01-30 (Mon, 30 Jan 2017) Changed paths: M lib/galaxy/tools/deps/requirements.py M test/integration/test_resolvers.py Log Message: ----------- Merge pull request #3508 from jmchilton/conda_mapping_test_fix Fix integration test for default Conda mapping. Compare: https://github.com/galaxyproject/galaxy/compare/68ab629723fe...4eb770dee584