| Previous changeset 24:288f97432497 (2021-06-02) Next changeset 26:44e2cc14f75b (2021-10-21) |
|
Commit message:
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/cutadapt commit cf6548ab28f5f6b2bdce8b1159cfc7ee472f0af6" |
|
modified:
cutadapt.xml macros.xml |
| b |
| diff -r 288f97432497 -r 4e5056fefd88 cutadapt.xml --- a/cutadapt.xml Wed Jun 02 22:47:34 2021 +0000 +++ b/cutadapt.xml Fri Jul 02 21:20:57 2021 +0000 |
| [ |
| b'@@ -149,9 +149,6 @@\n #if str($read_mod_options.length_tag) != \'\':\n --length-tag=\'$read_mod_options.length_tag\'\n #end if\n-#if str($read_mod_options.cut) != \'0\':\n- --cut=$read_mod_options.cut\n-#end if\n #if str($read_mod_options.rename) != \'\':\n --rename=\'$read_mod_options.rename\'\n #end if\n@@ -237,7 +234,7 @@\n </when>\n <when value="False">\n </when>\n- </conditional> \n+ </conditional>\n <param argument="--max-n" type="float" min="0" optional="True" label="Max N" help="Discard reads with more than this number of \'N\' bases. A number between 0 and 1 is interpreted as a fraction of the read length." />\n <param argument="--pair-filter" type="select" optional="True" label="Pair filter" help="Which of the reads in a paired-end read have to match the filtering criterion in order for the pair to be filtered. Default: any">\n <option value="any" selected="True">Any: a read pair is discarded (or redirected) if one of the reads (R1 or R2) fulfills the filtering criterion. </option>\n@@ -300,7 +297,6 @@\n </sanitizer>\n <validator type="regex">[A-Za-z0-9 {}=_]+</validator>\n </param>\n- <param argument="--cut" label="Remove a fixed number of bases" type="integer" value="0" help="This option allows to unconditionally remove bases from the beginning or end of each read. If the given length is positive, the bases are removed from the beginning of each read. If it is negative, the bases are removed from the end." />\n <param argument="--zero-cap" type="boolean" truevalue="--zero-cap" falsevalue="" checked="False" label="Change negative quality values to zero" />\n </section>\n \n@@ -388,16 +384,28 @@\n <test expect_num_outputs="1">\n <param name="type" value="single" />\n <param name="input_1" ftype="fastq" value="cutadapt_small.fastq" />\n- <param name="adapter_source_list" value="user"/>\n- <param name="adapter" value="AGATCGGAAGAGC"/>\n+ <section name="r1">\n+ <repeat name="adapters">\n+ <conditional name="adapter_source">\n+ <param name="adapter_source_list" value="user"/>\n+ <param name="adapter" value="AGATCGGAAGAGC"/>\n+ </conditional>\n+ </repeat>\n+ </section>\n <output name="out1" file="cutadapt_small.out" ftype="fastq"/>\n </test>\n <!-- Ensure single end fastq.gz works -->\n <test expect_num_outputs="1">\n <param name="type" value="single" />\n <param name="input_1" ftype="fastq.gz" value="bwa-mem-fastq1.fq.gz" />\n- <param name="adapter_source_list" value="user"/>\n- <param name="adapter" value="AGATCGGAAGAGC"/>\n+ <section name="r1">\n+ <repeat name="adapters">\n+ <conditional name="adapter_source">\n+ <param name="adapter_source_list" value="user"/>\n+ <param name="adapter" value="AGATCGGAAGAGC"/>\n+ </conditional>\n+ </repeat>\n+ </section>\n <output name="out1" decompress="True" file="cutadapt_out1.fq.gz" ftype="fastq.gz"/>\n </test>\n <!-- Ensure paired end fastq.gz works -->\n@@ -405,10 +413,22 @@\n <param name="type" value="paired" />\n <param name="input_1" ftype="fastq.gz" value="bwa-mem-fastq1.fq.gz" />\n <param name="input_2" ftype="fastq.gz" value="bwa-mem-fastq2.fq.gz" />\n- <param name="adapter_source_list" value="user"/>\n- <param name="adapter" value="AGATCGGAAGAGC"/>\n- <param name="adapter_source_list2" value="user"/>\n- <param name="adapter2" value="AGATCGGAAGAGC"/>\n+ <section name="r1">\n+ <repeat name="adapters">\n+ <condi'..b'</conditional>\n+ </repeat>\n+ </section>\n <section name="read_mod_options">\n <conditional name="shorten_options">\n <param name="shorten_values" value="True"/>\n@@ -815,8 +1001,14 @@\n <test expect_num_outputs="1">\n <param name="type" value="single" />\n <param name="input_1" ftype="fastq" value="cutadapt_small.fastq" />\n- <param name="adapter_source_list" value="user"/>\n- <param name="adapter" value="AGCGGCTTAGACG"/>\n+ <section name="r1">\n+ <repeat name="adapters">\n+ <conditional name="adapter_source">\n+ <param name="adapter_source_list" value="user"/>\n+ <param name="adapter" value="AGCGGCTTAGACG"/>\n+ </conditional>\n+ </repeat>\n+ </section>\n <section name="filter_options">\n <param name="max_expected_errors" value="10"/>\n </section>\n@@ -826,8 +1018,14 @@\n <test expect_num_outputs="1">\n <param name="type" value="single" />\n <param name="input_1" ftype="fastq" value="cutadapt_small.fastq" />\n- <param name="adapter_source_list" value="user"/>\n- <param name="adapter" value="GAANTAGCTACCAC"/>\n+ <section name="r1">\n+ <repeat name="adapters">\n+ <conditional name="adapter_source">\n+ <param name="adapter_source_list" value="user"/>\n+ <param name="adapter" value="GAANTAGCTACCAC"/>\n+ </conditional>\n+ </repeat>\n+ </section>\n <section name="adapter_options">\n <param name="internal" value="X"/>\n </section>\n@@ -840,10 +1038,22 @@\n <param name="type" value="paired" />\n <param name="input_1" ftype="fastq.gz" value="bwa-mem-fastq1_assimetric.fq.gz" />\n <param name="input_2" ftype="fastq.gz" value="bwa-mem-fastq2_assimetric.fq.gz" />\n- <param name="adapter_source_list" value="user"/>\n- <param name="adapter" value="AGATCGGAAGAGC"/>\n- <param name="adapter_source_list2" value="user"/>\n- <param name="adapter2" value="AGATCGGAAGAGC"/>\n+ <section name="r1">\n+ <repeat name="adapters">\n+ <conditional name="adapter_source">\n+ <param name="adapter_source_list" value="user"/>\n+ <param name="adapter" value="AGATCGGAAGAGC"/>\n+ </conditional>\n+ </repeat>\n+ </section>\n+ <section name="r2">\n+ <repeat name="adapters2">\n+ <conditional name="adapter_source2">\n+ <param name="adapter_source_list2" value="user"/>\n+ <param name="adapter2" value="AGATCGGAAGAGC"/>\n+ </conditional>\n+ </repeat>\n+ </section>\n <section name="adapter_options">\n <param name="internal" value="X"/>\n </section>\n@@ -856,8 +1066,14 @@\n <test expect_num_outputs="1">\n <param name="type" value="single" />\n <param name="input_1" ftype="fastq" value="cutadapt_small.fastq" />\n- <param name="adapter_source_list" value="builtin"/>\n- <param name="adapter" value="TGTAGGCC"/>\n+ <section name="r1">\n+ <repeat name="adapters">\n+ <conditional name="adapter_source">\n+ <param name="adapter_source_list" value="builtin"/>\n+ <param name="adapter" value="TGTAGGCC"/>\n+ </conditional>\n+ </repeat>\n+ </section>\n <section name="adapter_options">\n <param name="internal" value="X"/>\n </section>\n' |
| b |
| diff -r 288f97432497 -r 4e5056fefd88 macros.xml --- a/macros.xml Wed Jun 02 22:47:34 2021 +0000 +++ b/macros.xml Fri Jul 02 21:20:57 2021 +0000 |
| b |
| @@ -1,6 +1,6 @@ <macros> <token name="@TOOL_VERSION@">3.4</token> - <token name="@GALAXY_TOOL_VERSION@">galaxy0</token> + <token name="@GALAXY_TOOL_VERSION@">galaxy1</token> <xml name="edam_ontology"> <edam_topics> <edam_topic>topic_0632</edam_topic> @@ -265,7 +265,7 @@ </conditional> </repeat> - <param name="cut" argument="-u" type="integer" value="0" optional="True" label="Cut bases from reads before adapter trimming" help="Remove bases from each read (first read only if paired). If positive, remove bases from the beginning. If negative, remove bases from the end. This is applied *before* adapter trimming." /> + <param name="cut" argument="--cut" type="integer" value="0" optional="True" label="Cut bases from reads before adapter trimming" help="Remove bases from each read (first read only if paired). If positive, remove bases from the beginning. If negative, remove bases from the end. This is applied *before* adapter trimming." /> </section> |