Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bf206c870b793edda71aaa5655baeca070e3729a https://github.com/galaxyproject/galaxy/commit/bf206c870b793edda71aaa5655bae... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-20 (Mon, 20 Aug 2018) Changed paths: M lib/galaxy/tools/parameters/meta.py M lib/galaxy/util/permutations.py Log Message: ----------- Reorder inputs before multiplications This should be a stable order. Ideally this would be configurable to the user or tool auther, but for now this is based on the order within which data paramaters appear in tool.inputs, which depends on the order in the XML/YML. If this isn't stable the order of the input combinations may change, and elements will jump in the collection structure. For instance the reverse:forward output for a pair:pair in inputA multiplied by pair:pair in input B may end up in forward:reverse if re-run. Commit: 9138651bdd92e0eb1fe2ea2b2099b5b2f04f655d https://github.com/galaxyproject/galaxy/commit/9138651bdd92e0eb1fe2ea2b2099b... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-20 (Mon, 20 Aug 2018) Changed paths: M lib/galaxy/managers/jobs.py M lib/galaxy/tools/parameters/__init__.py Log Message: ----------- Serialize JobParamters with sort_keys=True This wasn't a bigger issue on python 2 for the same reason that the input ordering in the previous commit didn't matter. I hope it'll make the test_workflow_rerun_with_use_cached_job test that is marked as flakey stable as well. Commit: 2d60d9af0132c4975ae636d161097140b72e6fbc https://github.com/galaxyproject/galaxy/commit/2d60d9af0132c4975ae636d161097... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-20 (Mon, 20 Aug 2018) Changed paths: M test/api/test_workflows.py Log Message: ----------- Wait for first workflow when testing cache That should make the test less flakey. While in theory we should be able to replace scheduled workflow jobs with cached jobs, this is not what we're testing here, and I assume it doesn't work for now. Commit: 7160b7f4e48e0c611758aea890771fea07a059ec https://github.com/galaxyproject/galaxy/commit/7160b7f4e48e0c611758aea890771... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-20 (Mon, 20 Aug 2018) Changed paths: M lib/galaxy/tools/parameters/meta.py Log Message: ----------- No kwargs for rsplit on python 2 Commit: 85f347e1c6597523b0e8718d7a93d4dc27cac2f9 https://github.com/galaxyproject/galaxy/commit/85f347e1c6597523b0e8718d7a93d... Author: John Chilton <jmchilton@gmail.com> Date: 2018-08-20 (Mon, 20 Aug 2018) Changed paths: M lib/galaxy/managers/jobs.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/meta.py M lib/galaxy/util/permutations.py M test/api/test_workflows.py Log Message: ----------- Merge pull request #6609 from mvdbeek/fix_random_implicit_collection_order Order data parameters before unlinked multiplication Compare: https://github.com/galaxyproject/galaxy/compare/f5bd245faaaa...85f347e1c659 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.