Skip to content

Commit

Permalink
cutadapt: add missing arguments and remove unsued test params (#4195)
Browse files Browse the repository at this point in the history
* cutadapt: remove absent read_modification

this was once the select of a conditional which was removed in
9a3d1b1

* same for output_filtering

* add missing arguments to command

--strip-suffix seems absent from the beginning
--discard-cassava was apparently forgotten in #3704

xref #4095
  • Loading branch information
bernt-matthias authored Nov 27, 2021
1 parent c4e0de9 commit 9ec830a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 4 additions & 6 deletions tools/cutadapt/cutadapt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ $filter_options.discard_untrimmed
#if str($filter_options.max_expected_errors):
--max-expected-errors=$filter_options.max_expected_errors
#end if
$filter_options.discard_cassava
#if str($read_mod_options.quality_cutoff) != '0':
--quality-cutoff=$read_mod_options.quality_cutoff
Expand All @@ -143,6 +143,9 @@ $filter_options.discard_untrimmed
--nextseq-trim=$read_mod_options.nextseq_trim
#end if
$read_mod_options.trim_n
#if $read_mod_options.strip_suffix != ''
--strip-suffix $read_mod_options.strip_suffix
#end if
#if str($read_mod_options.shorten_options.shorten_values) == 'True':
#if str($read_mod_options.shorten_options.shorten_end) == '3prime'
--length=$read_mod_options.shorten_options.length
Expand Down Expand Up @@ -505,11 +508,9 @@ $read_mod_options.zero_cap
</conditional>
</repeat>
</section>
<param name="output_filtering" value="filter"/>
<section name="filter_options">
<param name="discard_trimmed" value="True"/>
</section>
<param name="read_modification" value="none"/>
<output name="out1" file="cutadapt_discard.out" ftype="fastq"/>
<assert_command>
<has_text text="--discard-trimmed"/>
Expand All @@ -526,8 +527,6 @@ $read_mod_options.zero_cap
</conditional>
</repeat>
</section>
<param name="output_filtering" value="default"/>
<param name="read_modification" value="none"/>
<param name="output_selector" value="rest_file,json_stats"/>
<output name="out1" file="cutadapt_rest.out" ftype="fasta"/>
<output name="json_stats" file="cutadapt_rest.json" ftype="json"/>
Expand All @@ -545,7 +544,6 @@ $read_mod_options.zero_cap
</conditional>
</repeat>
</section>
<param name="read_modification" value="modify"/>
<param name="nextseq_trim" value="20" />
<output name="out1" decompress="True" file="cutadapt_nextseq_out.fq.gz" ftype="fastq.gz"/>
</test>
Expand Down
2 changes: 1 addition & 1 deletion tools/cutadapt/macros.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<macros>
<token name="@TOOL_VERSION@">3.5</token>
<token name="@VERSION_SUFFIX@">0</token>
<token name="@VERSION_SUFFIX@">1</token>
<token name="@FASTQ_TYPES@">fastq.gz,fastq,fasta</token>
<xml name="edam_ontology">
<edam_topics>
Expand Down

0 comments on commit 9ec830a

Please sign in to comment.