Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1c0daceb8fa2f9c1b4a458817aaab0c3ab3926f3 https://github.com/galaxyproject/galaxy/commit/1c0daceb8fa2f9c1b4a458817aaab... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2015-07-29 (Wed, 29 Jul 2015)
Changed paths: M lib/tool_shed/metadata/metadata_generator.py
Log Message: ----------- Recursively look for package elements within tool_dependencies.xml, otherwise packages needed for install, but specified within install/actions/actions groups with not be installed.
Commit: 86a39cb20c79ce42fe208e5d748a536c4fa4dbbd https://github.com/galaxyproject/galaxy/commit/86a39cb20c79ce42fe208e5d748a5... Author: Dannon Baker dannon.baker@gmail.com Date: 2015-07-29 (Wed, 29 Jul 2015)
Changed paths: M lib/tool_shed/metadata/metadata_generator.py
Log Message: ----------- Cleanup in metadata_generator.py
Commit: 6eb9c155857d3c85d847ce33b1e962f5fc092330 https://github.com/galaxyproject/galaxy/commit/6eb9c155857d3c85d847ce33b1e96... Author: Dannon Baker dannon.baker@gmail.com Date: 2015-07-29 (Wed, 29 Jul 2015)
Changed paths: M lib/tool_shed/metadata/metadata_generator.py
Log Message: ----------- Composition of error messages in toolshed metadata stuff.
Commit: dde800b54f30fe875039507949f7ab5737b241d9 https://github.com/galaxyproject/galaxy/commit/dde800b54f30fe875039507949f7a... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2015-07-30 (Thu, 30 Jul 2015)
Changed paths: M lib/tool_shed/metadata/metadata_generator.py
Log Message: ----------- Merge pull request #2 from dannon/recurse-toolshed-changeset
Collect error messages (which fixes the current travis build), some other cleanup for sanity.
Commit: 30bb209e8db52455992320f3e02c62c28afb7770 https://github.com/galaxyproject/galaxy/commit/30bb209e8db52455992320f3e02c6... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2015-08-24 (Mon, 24 Aug 2015)
Changed paths: M lib/tool_shed/metadata/metadata_generator.py
Log Message: ----------- During installation, make invalid repository dependency definitions non-fatal errors.
Commit: dc6700eec50f679f5d344eeaf8c0641f8869c6c4 https://github.com/galaxyproject/galaxy/commit/dc6700eec50f679f5d344eeaf8c06... Author: John Chilton jmchilton@gmail.com Date: 2015-08-25 (Tue, 25 Aug 2015)
Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py
Log Message: ----------- Fix yield statements at the top level of macros.
Fixes #647.
Commit: a3a209b8a001b8a841ea9a03ca206346bbcab439 https://github.com/galaxyproject/galaxy/commit/a3a209b8a001b8a841ea9a03ca206... Author: Martin Cech cech.marten@gmail.com Date: 2015-08-25 (Tue, 25 Aug 2015)
Changed paths: M lib/tool_shed/metadata/metadata_generator.py
Log Message: ----------- Merge pull request #528 from blankenberg/recurse-toolshed-changeset
[15.07] Recursively look for package elements within tool_dependencies.xml when setting metadata,
Commit: 71125326f842860b163b889b514cf10036915ca7 https://github.com/galaxyproject/galaxy/commit/71125326f842860b163b889b514cf... Author: Eric Rasche rasche.eric@gmail.com Date: 2015-08-25 (Tue, 25 Aug 2015)
Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py
Log Message: ----------- Merge pull request #649 from jmchilton/yield_at_top_level
[15.07] Fix yield statements at the top level of macros.
Commit: 224c20d4b2cf0d24605f0956fe2c742bef1d6ae7 https://github.com/galaxyproject/galaxy/commit/224c20d4b2cf0d24605f0956fe2c7... Author: Dannon Baker dannon.baker@gmail.com Date: 2015-08-26 (Wed, 26 Aug 2015)
Changed paths: M lib/galaxy/util/xml_macros.py M lib/tool_shed/metadata/metadata_generator.py M test/unit/tools/test_tool_loader.py
Log Message: ----------- Merge branch 'release_15.07'
Commit: e9580412552299d82d3e627fcf3bde45d5e95a26 https://github.com/galaxyproject/galaxy/commit/e9580412552299d82d3e627fcf3bd... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths: M lib/galaxy/util/xml_macros.py M lib/tool_shed/metadata/metadata_generator.py M test/unit/tools/test_tool_loader.py
Log Message: ----------- Merge branch 'master' into dev
Conflicts: lib/tool_shed/metadata/metadata_generator.py
Compare: https://github.com/galaxyproject/galaxy/compare/4a4ed87f11c8...e95804125522