Skip to content

Commit

Permalink
Rebase...
Browse files Browse the repository at this point in the history
  • Loading branch information
jmchilton committed Feb 18, 2024
1 parent 26f5f51 commit 5380655
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
9 changes: 2 additions & 7 deletions lib/galaxy/tool_util/verify/interactor.py
Original file line number Diff line number Diff line change
Expand Up @@ -1463,12 +1463,7 @@ def verify_tool(
if not use_legacy_api:
structured_inputs = galaxy_interactor.get_tool_inputs(tool_id, tool_version=tool_version)
assert structured_inputs
testdef = ToolTestDescription.from_dict(
tool_test_dict,
tool_id,
test_index,
maxseconds
)
testdef = ToolTestDescription.from_dict(tool_test_dict, tool_id, test_index, maxseconds)
_handle_def_errors(testdef)

created_history = False
Expand Down Expand Up @@ -1842,7 +1837,7 @@ def from_dict(raw_dict: ToolTestDescriptionDict, tool_id: str, test_index: int,
test_index=raw_dict.get("test_index") or test_index,
inputs=raw_dict["inputs"],
exception=exception,
maxseconds=maxseconds
maxseconds=maxseconds,
)
else:
processed_test_dict = ValidToolTestDict(
Expand Down
4 changes: 3 additions & 1 deletion lib/galaxy/tool_util/verify/script.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,9 @@ def build_case_references(
test_references.append(test_reference)
else:
assert tool_id
tool_test_dicts: List[ToolTestDescriptionDict] = galaxy_interactor.get_tool_tests(tool_id, tool_version=tool_version)
tool_test_dicts: List[ToolTestDescriptionDict] = galaxy_interactor.get_tool_tests(
tool_id, tool_version=tool_version
)
for i, tool_test_dict in enumerate(tool_test_dicts):
this_tool_version = tool_test_dict.get("tool_version") or tool_version
this_test_index = i
Expand Down
4 changes: 1 addition & 3 deletions lib/galaxy/webapps/galaxy/api/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,7 @@ def outputs(
for association in associations:
output_associations.append(JobOutputAssociation(name=association.name, dataset=association.dataset))

output_associations.extend(
self.service.dictify_output_collection_associations(trans, job)
)
output_associations.extend(self.service.dictify_output_collection_associations(trans, job))
return output_associations

@router.get(
Expand Down

0 comments on commit 5380655

Please sign in to comment.