| Previous changeset 129:c35ff02652bf (2021-04-04) Next changeset 131:72d190989c68 (2021-04-09) |
|
Commit message:
Uploaded |
|
modified:
toolfactory/rgToolFactory2.py toolfactory/rgToolFactory2.xml |
| b |
| diff -r c35ff02652bf -r e8e8071c9d0c toolfactory/rgToolFactory2.py --- a/toolfactory/rgToolFactory2.py Sun Apr 04 06:36:14 2021 +0000 +++ b/toolfactory/rgToolFactory2.py Tue Apr 06 03:12:56 2021 +0000 |
| b |
| @@ -29,13 +29,15 @@ import time -import galaxyxml.tool as gxt -import galaxyxml.tool.parameters as gxtp -import lxml -import yaml from bioblend import ConnectionError from bioblend import toolshed +import galaxyxml.tool as gxt +import galaxyxml.tool.parameters as gxtp + +import lxml + +import yaml myversion = "V2.2 February 2021" verbose = True @@ -524,7 +526,7 @@ elif newtype == "integer": aparm = gxtp.IntegerParam( newname, - label=newname, + label=newlabel, help=newhelp, value=newval, num_dashes=ndash, @@ -532,7 +534,7 @@ elif newtype == "float": aparm = gxtp.FloatParam( newname, - label=newname, + label=newlabel, help=newhelp, value=newval, num_dashes=ndash, @@ -540,7 +542,7 @@ elif newtype == "boolean": aparm = gxtp.BooleanParam( newname, - label=newname, + label=newlabel, help=newhelp, value=newval, num_dashes=ndash, |
| b |
| diff -r c35ff02652bf -r e8e8071c9d0c toolfactory/rgToolFactory2.xml --- a/toolfactory/rgToolFactory2.xml Sun Apr 04 06:36:14 2021 +0000 +++ b/toolfactory/rgToolFactory2.xml Tue Apr 06 03:12:56 2021 +0000 |
| b |
| @@ -81,7 +81,7 @@ <param name="input_CL" type="text" label="Positional: ordinal integer. Argparse: argument name. STDIN if the executable/script expects it" help="If you will pass positional parameters, enter the integer ordinal for this parameter. If Argparse style, '--' will be prepended or '-' if single character" value=""> </param> - <param name="input_repeat" type="boolean" checked="False" truevalue="1" falsevalue="0" label="Allow user to repeat this input as many times as needed." /> + <param name="input_repeat" type="hidden" checked="False" truevalue="1" falsevalue="0" label="Allow user to repeat this input as many times as needed." /> </repeat> <repeat name="history_outputs" title="one or more new history items output by the executable to appear in the user history after the tool runs" help="The name will become a history item for users of the new tool you are making containing one of it's outputs"> @@ -173,6 +173,7 @@ help="Using positional parameters, enter the integer ordinal for this parameter on the command line. Using Argparse style, '--' will be prepended on the CL" value="" /> <param name="param_CLprefixed" type="text" label="Override the generated default argparse name prefix if not empty - eg ----foo if needed" help="Some targets like Planemo expect an unadorned action like 'test' before --galaxy_root." value="" /> + <param name="param_repeat" type="hidden" checked="False" truevalue="1" falsevalue="0" label="Allow user to repeat this as many times as needed." /> </repeat> </section> </xml> @@ -247,12 +248,12 @@ }' #else: --additional_parameters '{"name": "$apar.param_name", "value": "$apar.ap_type.param_value", "label": "$apar.param_label", "help": "$apar.param_help", -"type": "$apar.ap_type.param_type","CL": "$apar.param_CL","override": "$apar.param_CLprefixed" }' +"type": "$apar.ap_type.param_type","CL": "$apar.param_CL","override": "$apar.param_CLprefixed", "repeat": "$apar.param_repeat"}' #end if #end for #end if #for $intab in $io_param.ppass.io.history_inputs: ---input_files '{"name": "$intab.input_files", "CL": "$intab.input_CL", "format": "$intab.input_formats", "label": "$intab.input_label", "help": "$intab.input_help", "repeat": "$intab.input_repeat"}' +--input_files '{"name": "$intab.input_files", "CL": "$intab.input_CL", "format": "$intab.input_formats", "label": "$intab.input_label", "help": "$intab.input_help"}' #end for #for $otab in $io_param.ppass.io.history_outputs: --output_files '{"name": "$otab.history_name", "format": "$otab.history_format", "CL": "$otab.history_CL", "test": "$otab.history_test"}' |