Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 99cb27557ff66726fa3ffc578f80fe78422e5674 https://github.com/galaxyproject/galaxy/commit/99cb27557ff66726fa3ffc578f80f... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-04-05 (Tue, 05 Apr 2016)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- Fix reversed workflow upgrade message

Commit: 9b7be814b34494a4705cb19c44ce2039931f610f https://github.com/galaxyproject/galaxy/commit/9b7be814b34494a4705cb19c44ce2... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-04-05 (Tue, 05 Apr 2016)

Changed paths: M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/lineages/factory.py

Log Message: ----------- Build tool lineage for versionless toolshed tool_ids

The tool_id for a toolshed tool contains the version as last element (<toolshed>/<name>/<owner>/<id>/<version>). This means that looking up a tool lineage using a tools' tool_id does not work if the tool is installed in a different version than referenced by the tool_id. To allow this, we register the tool_lineage also under a tool_id that is stripped of the version.

Commit: ab264ebeb4c0153e7c914df3e3f2c60d6ae149cb https://github.com/galaxyproject/galaxy/commit/ab264ebeb4c0153e7c914df3e3f2c... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-04-05 (Tue, 05 Apr 2016)

Changed paths: M lib/galaxy/tools/toolbox/lineages/factory.py

Log Message: ----------- Remove version by slicing tool_id before last slash

As pointed out by @nsoranzo, this may avoid conflicts when the version string appears more than once in tool_id.

Commit: 204627c9351b6bce00bbe6c75a7fcc7d8f0f96c4 https://github.com/galaxyproject/galaxy/commit/204627c9351b6bce00bbe6c75a7fc... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-06 (Wed, 06 Apr 2016)

Changed paths: M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/lineages/factory.py M lib/galaxy/workflow/modules.py

Log Message: ----------- Merge pull request #2082 from mvdbeek/tool_lineage_map

tool lineage for versionless toolshed tool_ids

Compare: https://github.com/galaxyproject/galaxy/compare/5523d8060fdf...204627c9351b