Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ephemeris/generate_tool_list_from_ga_workflow_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def translate_workflow_dictionary_to_tool_list(tool_dictionary, panel_label):
tool_list = []
for tool in starting_tool_list:
sub_dic = {'name': tool['name'], 'owner': tool['owner'], 'revisions': [tool['changeset_revision']],
'tool_panel_section_label': panel_label, 'tool_shed_url': 'https://'+tool['tool_shed']}
'tool_panel_section_label': panel_label, 'tool_shed_url': 'https://' + tool['tool_shed']}
tool_list.append(sub_dic)
return tool_list

Expand All @@ -75,10 +75,10 @@ def reduce_tool_list(tool_list):
for tool in tool_list:
if current_tool is tool:
continue
if (tool["name"] == current_tool['name']
and tool['owner'] == current_tool['owner']
and tool['tool_panel_section_label'] == current_tool['tool_panel_section_label']
and tool['tool_shed_url'] == current_tool['tool_shed_url']):
if (tool["name"] == current_tool['name'] and
tool['owner'] == current_tool['owner'] and
tool['tool_panel_section_label'] == current_tool['tool_panel_section_label'] and
tool['tool_shed_url'] == current_tool['tool_shed_url']):
current_tool["revisions"].extend(tool["revisions"])
tool_list.remove(tool)
current_tool['revisions'] = list(set(current_tool['revisions']))
Expand Down
2 changes: 1 addition & 1 deletion ephemeris/shed_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def _parser():
help="This installs tools in Galaxy from the Tool Shed."
"Use shed-tools install --help for more information",
parents=[common_arguments],
)
)
install_command_parser.set_defaults(
update_tools=False
)
Expand Down