Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: cd1c38c527e54b8f7b0817eda5ac9aa0c68dc349 https://github.com/galaxyproject/galaxy/commit/cd1c38c527e54b8f7b0817eda5ac9... Author: John Chilton jmchilton@gmail.com Date: 2017-08-31 (Thu, 31 Aug 2017)

Changed paths: M test/base/populators.py

Log Message: ----------- Break up populator methods for greater composibility and reuse.

All of these changes are needed for various downstream enhancements I'm working on for things like CWL support and extra file testing - but I think they should all be okay refactorings on their own.

Commit: 5a7a15d161bececf0a3cd93714e15768b329d95f https://github.com/galaxyproject/galaxy/commit/5a7a15d161bececf0a3cd93714e15... Author: John Chilton jmchilton@gmail.com Date: 2017-08-31 (Thu, 31 Aug 2017)

Changed paths: M lib/galaxy/tools/xsd/galaxy.xsd M test/api/test_tools.py M test/base/interactor.py M test/base/populators.py M test/functional/tools/composite.xml M test/functional/tools/composite_output.xml M test/functional/tools/composite_output_tests.xml M test/functional/tools/metadata.xml M tools/sr_assembly/velvetg.xml

Log Message: ----------- Test and clarifications for composite uploads.

- Add an API test for datatype-defined composite uploads - including exercising newline conversion and the space_to_tab parameter. - Add a test decorator skip_without_datatype to mirror skip_without_tool for this test, improve both decorators. - The ftype parameter in the composite test tools does nothing - drop it and drop it from the XSD spec. - Slightly improve the documentation for these composite_data elements in the XSD.

Commit: 9b4cd096e1e9cbbd86aafb384e5b7773abf585ab https://github.com/galaxyproject/galaxy/commit/9b4cd096e1e9cbbd86aafb384e5b7... Author: Martin Cech marten@bx.psu.edu Date: 2017-09-04 (Mon, 04 Sep 2017)

Changed paths: M lib/galaxy/tools/xsd/galaxy.xsd M test/api/test_tools.py M test/base/interactor.py M test/base/populators.py M test/functional/tools/composite.xml M test/functional/tools/composite_output.xml M test/functional/tools/composite_output_tests.xml M test/functional/tools/metadata.xml M tools/sr_assembly/velvetg.xml

Log Message: ----------- Merge pull request #4505 from jmchilton/composite_upload_refine

Tests and clarifications for composite uploads.

Compare: https://github.com/galaxyproject/galaxy/compare/003344ac2f0e...9b4cd096e1e9