Merge pull request #16133 from mvdbeek/implicit_converter_fix

[23.0] Fix implicit converters with optional parameters
This commit is contained in:
Marius van den Beek
2023-05-24 14:44:48 +02:00
committed by GitHub
3 changed files with 26 additions and 0 deletions
+2
View File
@@ -133,6 +133,8 @@ def get_params_and_input_name(
params[value.name] = deps[value.name]
elif value.type == "data":
input_name = key
elif value.optional:
params[value.name] = None
# add potentially required/common internal tool parameters e.g. '__job_resource'
if target_context:
@@ -0,0 +1,23 @@
<tool id="implicit_conversion_optional_param" name="Test Implicit Conversion" version="0.1" profile="22.01">
<!-- test that optional parameter in bigwig to wig converter can be left unset -->
<command><![CDATA[cp '$input' '$output']]></command>
<inputs>
<param name="input" type="data" format="wig" label="Biom1 file" />
</inputs>
<outputs>
<data name="output" format="wig" />
</outputs>
<tests>
<!-- bigwig file for wig input triggers bigwig to wig conversion -->
<test>
<param name="input" ftype="bigwig" value="2.bigwig" />
<output name="output" ftype="wig">
<assert_contents>
<has_text text="variableStep chrom" />
</assert_contents>
</output>
</test>
</tests>
<help>
</help>
</tool>
@@ -153,6 +153,7 @@
<tool file="validation_empty_dataset.xml" />
<tool file="implicit_conversion.xml" />
<tool file="implicit_conversion_format_input.xml" />
<tool file="implicit_conversion_optional_param.xml" />
<tool file="implicit_collection_conversion.xml" />
<tool file="implicit_nested_list_conversion.xml" />
<tool file="explicit_conversion.xml" />