Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 39d7e2e7397441fde631b25e4c1e7ec8e1ccc3a6 https://github.com/galaxyproject/galaxy/commit/39d7e2e7397441fde631b25e4c1e7... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-14 (Wed, 14 Mar 2018) Changed paths: M test/api/test_tools_upload.py Log Message: ----------- Close file handles Commit: 67330b2751f58e5c8f0a6ef8d1262c8207c9ea63 https://github.com/galaxyproject/galaxy/commit/67330b2751f58e5c8f0a6ef8d1262... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-14 (Wed, 14 Mar 2018) Changed paths: M test/integration/test_upload_configuration_options.py Log Message: ----------- Fix upload param to specify datatype Also use higher level `tools_post()` method of the dataset populator instead of `_post()`. Commit: b6944c5ad6c542054649e4bdb3df2c35a884fab3 https://github.com/galaxyproject/galaxy/commit/b6944c5ad6c542054649e4bdb3df2... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-14 (Wed, 14 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Remove leftover log statements Commit: 6c3c076ef1d773c156ff6a4b318a4b183ae6ede7 https://github.com/galaxyproject/galaxy/commit/6c3c076ef1d773c156ff6a4b318a4... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-14 (Wed, 14 Mar 2018) Changed paths: M lib/galaxy/tools/data_fetch.py M lib/galaxy/webapps/galaxy/api/_fetch_util.py M test/integration/test_upload_configuration_options.py Log Message: ----------- Sort files and subdirectories when fetching an FTP directory Commit: 0944aee34910b3ecbb65168a45a8e06ca98b4fcc https://github.com/galaxyproject/galaxy/commit/0944aee34910b3ecbb65168a45a8e... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-14 (Wed, 14 Mar 2018) Changed paths: M config/datatypes_conf.xml.sample M test/base/populators.py Log Message: ----------- Add velvet to the datatypes allowed for upload It was already allowed in `test/functional/tools/sample_datatypes_conf.xml` This will stop the skipping of tests requiring the `velvet` datatype, like `ToolsUploadTestCase.test_composite_datatype` in `test/api/test_tools_upload.py` . Commit: 5ae52b7f0616a43a08c5849d118adf152932e42b https://github.com/galaxyproject/galaxy/commit/5ae52b7f0616a43a08c5849d118ad... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-15 (Thu, 15 Mar 2018) Changed paths: M lib/galaxy/tools/parameters/output_collect.py M test/base/populators.py M test/integration/test_upload_configuration_options.py Log Message: ----------- Try to fix occasionally failing integration test See https://jenkins.galaxyproject.org/job/docker-integration/4293/testReport/jun... It seems `get_history_collection_details()` was called before the collection was completely populated. Also small fixes for a typo and class documentation found while researching the origin of the bug. Commit: 16751cd6ab9ddbc8f28b9bddab55b901c4c6576e https://github.com/galaxyproject/galaxy/commit/16751cd6ab9ddbc8f28b9bddab55b... Author: John Chilton <jmchilton@gmail.com> Date: 2018-03-15 (Thu, 15 Mar 2018) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/tools/data_fetch.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/webapps/galaxy/api/_fetch_util.py M lib/galaxy/webapps/galaxy/api/tools.py M test/api/test_tools_upload.py M test/base/populators.py M test/integration/test_upload_configuration_options.py Log Message: ----------- Merge pull request #5691 from nsoranzo/test_fixes Various test fixes Compare: https://github.com/galaxyproject/galaxy/compare/0f3259c4b1f9...16751cd6ab9d