Skip to content

Commit e98f949

Browse files
committed
Rebase....
1 parent 87ab9e6 commit e98f949

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

lib/galaxy/tool_util/parameters/convert.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
DataCollectionParameterModel,
2020
DataCollectionRequest,
2121
DataColumnParameterModel,
22+
DataInternalJson,
2223
DataParameterModel,
2324
DataRequestCollectionUri,
2425
DataRequestHda,
26+
DataRequestInternalDereferenced,
2527
DataRequestInternalHda,
2628
DataRequestInternalHdca,
2729
DataRequestUri,
28-
DataRequestInternalDereferenced,
29-
DataInternalJson,
3030
DiscriminatorType,
3131
DrillDownParameterModel,
3232
FloatParameterModel,
@@ -292,7 +292,7 @@ def encode_callback(parameter: ToolParameterT, value: Any):
292292
test_collection = cast(JsonTestCollectionDefDict, value)
293293
return adapt_collections(test_collection).model_dump()
294294
elif isinstance(parameter, SelectParameterModel):
295-
if parameter.multiple and value is not None and isinstance(value, (str,)):
295+
if parameter.multiple and value is not None and isinstance(value, (str,)):
296296
return [v.strip() for v in value.split(",")]
297297
else:
298298
return VISITOR_NO_REPLACEMENT

lib/galaxy_test/api/test_tool_execute.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -686,15 +686,11 @@ def test_select_multiple_does_default_to_select_values_marked_as_selected(
686686
required_tool: RequiredTool, tool_input_format: DescribeToolInputs
687687
):
688688
empty = tool_input_format.when.any({})
689-
required_tool.execute.with_inputs(empty).assert_has_single_job.with_output("output").with_contents_stripped(
690-
"--ex3"
691-
)
689+
required_tool.execute.with_inputs(empty).assert_has_single_job.with_output("output").with_contents_stripped("--ex3")
692690

693691

694692
@requires_tool_id("gx_select_multiple_one_default_user")
695-
def test_select_multiple_does_default_to_select_values_marked_as_selected_user(
696-
required_tool: list[RequiredTool]
697-
):
693+
def test_select_multiple_does_default_to_select_values_marked_as_selected_user(required_tool: list[RequiredTool]):
698694
required_tool.execute.with_request({}).assert_has_single_job.with_output("output").with_contents_stripped(
699695
'["--ex3"]'
700696
)

0 commit comments

Comments
 (0)