Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c253436b4a7c646910bdc1f8ce9c2f01fe43f1ff https://github.com/galaxyproject/galaxy/commit/c253436b4a7c646910bdc1f8ce9c2... Author: John Chilton jmchilton@gmail.com Date: 2018-05-18 (Fri, 18 May 2018)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js

Log Message: ----------- Fix append() for ANY_COLLECTION_TYPE type description in WF editor.

Append means take a collection type and extend it by the current type - so appending to list to paired -> list:paired for instance. ANY_COLLECTION_TYPE is a representation of incomplete information - it means this type description might be any kind of collection type (the way we use "input" to mean any kind of datatype in the editor).

This is really a second order approximation of what a correct solution would be - a first order approximation would somehow represent the result of append being at least of "depth" specified (list:* or *:list instead of * for instance). A not approximation would be to do that but use ANY_COLLECTION_TYPE much less frequently by capturing type_source information and propagating it throughout the workflow properly. But these are harder things to do, this incorrect fix will allow many valid workflows to be editted that currently cannot be so I think it is good.

"Fixes" #5205.

Commit: f8fc8232a68dd1b0693ff9b007734cfa087cccdf https://github.com/galaxyproject/galaxy/commit/f8fc8232a68dd1b0693ff9b007734... Author: Dannon dannon.baker@gmail.com Date: 2018-05-19 (Sat, 19 May 2018)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js

Log Message: ----------- Merge pull request #6178 from jmchilton/fix_append_for_any_collection_Type

[18.05] Fix append() for ANY_COLLECTION_TYPE type description in WF editor.

Commit: 872dbfb3c42ec36ffe3c452e164e0dcc2545c3cb https://github.com/galaxyproject/galaxy/commit/872dbfb3c42ec36ffe3c452e164e0... Author: Ubuntu ubuntu@ip-172-31-23-81.ec2.internal Date: 2018-05-21 (Mon, 21 May 2018)

Changed paths: M config/datatypes_conf.xml.sample

Log Message: ----------- adding idat

Commit: 258c4a4d8fddacba64a5cc7ac634910a4839b371 https://github.com/galaxyproject/galaxy/commit/258c4a4d8fddacba64a5cc7ac6349... Author: Martin Cech marten@bx.psu.edu Date: 2018-05-21 (Mon, 21 May 2018)

Changed paths: M config/datatypes_conf.xml.sample

Log Message: ----------- Merge pull request #6179 from kpbioteam/idat

[18.05] add idat datatype

Commit: f56150468984cc96e37fe52cefd33499e5f422b4 https://github.com/galaxyproject/galaxy/commit/f56150468984cc96e37fe52cefd33... Author: John Chilton jmchilton@gmail.com Date: 2018-05-21 (Mon, 21 May 2018)

Changed paths: M lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt

Log Message: ----------- Rev subprocess32 dependency - that older version is not compatible with manylinux.

https://github.com/google/python-subprocess32/issues/12

Commit: f07ba172418bdea209481b56b60980d2c9906823 https://github.com/galaxyproject/galaxy/commit/f07ba172418bdea209481b56b6098... Author: Helena Rasche hxr@hx42.org Date: 2018-05-21 (Mon, 21 May 2018)

Changed paths: M lib/galaxy/tools/errors.py

Log Message: ----------- extraneous self

Commit: 92ebf285088c744cef588a05b941ca6adf7848ee https://github.com/galaxyproject/galaxy/commit/92ebf285088c744cef588a05b941c... Author: Dannon dannon.baker@gmail.com Date: 2018-05-21 (Mon, 21 May 2018)

Changed paths: M lib/galaxy/tools/errors.py

Log Message: ----------- Merge pull request #6184 from erasche/gdpr

[18.05] extraneous self causing bug reporter to fail

Commit: 805854aa6b16eb2b68b6ab5f94b92e84342c2f9e https://github.com/galaxyproject/galaxy/commit/805854aa6b16eb2b68b6ab5f94b92... Author: Martin Cech marten@bx.psu.edu Date: 2018-05-21 (Mon, 21 May 2018)

Changed paths: M lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt

Log Message: ----------- Merge pull request #6183 from jmchilton/subprocess32_rev

[18.05] Rev subprocess32 dependency - that older version is not compatible with manylinux.

Commit: a992637de17d36b9b821dabc5342f636c530e4bc https://github.com/galaxyproject/galaxy/commit/a992637de17d36b9b821dabc5342f... Author: Martin Cech marten@bx.psu.edu Date: 2018-05-21 (Mon, 21 May 2018)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M config/datatypes_conf.xml.sample M lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt M lib/galaxy/tools/errors.py

Log Message: ----------- Merge branch 'release_18.05' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/d0cb1d6f3c1c...a992637de17d **NOTE:** This service 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.