opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_17.05' into dev

Browse Source 
Conflicts:
	lib/galaxy/model/tool_shed_install/__init__.py
This commit is contained in:
Nicola Soranzo
2017-08-15 16:24:32 +01:00
parent 44548f8f2f 7f78ee7b18
commit 07a3049999
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/workflow/modules.py
+3 -1
View File
@@ -573,7 +573,9 @@ class ToolModule( WorkflowModule ):
tool_id = d.get( 'content_id' ) or d.get( 'tool_id' )
if tool_id is None:
raise exceptions.RequestParameterInvalidException( "No tool id could be located for step [%s]." % d )
tool_version = str( d.get( 'tool_version' ) )
tool_version = d.get( 'tool_version' )
if tool_version:
tool_version = str(tool_version)
module = super( ToolModule, Class ).from_dict( trans, d, tool_id=tool_id, tool_version=tool_version, exact_tools=exact_tools )
module.post_job_actions = d.get( 'post_job_actions', {} )
module.workflow_outputs = d.get( 'workflow_outputs', [] )