Skip to content

Commit c2b69b3

Browse files
author
lsterck
committed
update wrapper, mainly replace fastq with fastqsanger
1 parent 7b52294 commit c2b69b3

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

tools/nanocomp/nanocomp.xml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<description>Compare multiple runs of long read sequencing data and alignments</description>
33
<macros>
44
<token name="@TOOL_VERSION@">1.25.6</token>
5-
<token name="@VERSION_SUFFIX@">0</token>
5+
<token name="@VERSION_SUFFIX@">1</token>
66
</macros>
77
<xrefs>
88
<xref type="bio.tools">nanocomp</xref>
@@ -13,14 +13,17 @@
1313
<version_command>NanoComp -v</version_command>
1414
<command detect_errors="exit_code"><![CDATA[
1515
#import re
16-
##link input file with names
16+
17+
##link input files with proper names
18+
#set $linked_files = []
1719
#for $file in $inputs.input_type.input_data
18-
#if '.' in str($file.name)
19-
#set $in_name = re.sub('[\-\:\s]', '_', str($file.name))
20-
#else
21-
#set $in_name = re.sub('[\-\:\s]', '_', str($file.name)) + "." + $file.ext
22-
#end if
23-
ln -sf $file $in_name &&
20+
#if '.' in str($file.name)
21+
#set $in_name = re.sub('[\-\:\s]', '_', str($file.name))
22+
#else
23+
#set $in_name = re.sub('[\-\:\s]', '_', str($file.name)) + "." + $file.ext
24+
#end if
25+
ln -sf '$file' '$in_name' &&
26+
#silent $linked_files.append($in_name)
2427
#end for
2528
2629
##run nanocomp
@@ -51,13 +54,9 @@
5154
--arrow
5255
#end if
5356
54-
#for $file in $inputs.input_type.input_data
55-
#if '.' in str($file.name)
56-
#set $in_name = re.sub('[\-\:\s]', '_', str($file.name))
57-
#else
58-
#set $in_name = re.sub('[\-\:\s]', '_', str($file.name)) + "." + $file.ext
59-
#end if
60-
$in_name
57+
## add the input files
58+
#for $file in $linked_files
59+
'$file'
6160
#end for
6261
6362
##Filter options
@@ -108,10 +107,10 @@
108107
<option value="arrow">ARROW files</option>
109108
</param>
110109
<when value="fastq">
111-
<param name="input_data" type="data" format="fastq,fastq.gz" multiple="true" label="FASTQ input files" help="Data is in (compressed) fastq format" />
110+
<param name="input_data" type="data" format="fastqsanger,fastqsanger.gz" multiple="true" label="FASTQ input files" help="Data is in (compressed) fastq format" />
112111
</when>
113112
<when value="fastq_r">
114-
<param name="input_data" type="data" format="fastq,fastq.gz" multiple="true" label="FASTQ input files" help="Data is in one or more fastq file(s) generated by MinKNOW or guppy with additional information concerning channel and time" />
113+
<param name="input_data" type="data" format="fastqsanger,fastqsanger.gz" multiple="true" label="FASTQ input files" help="Data is in one or more fastq file(s) generated by MinKNOW or guppy with additional information concerning channel and time" />
115114
</when>
116115
<when value="fasta">
117116
<param name="input_data" type="data" format="fasta,fasta.gz" multiple="true" label="FASTA input files" help="Data is in (compressed) fasta format" />
@@ -164,6 +163,7 @@
164163
<data name="html_report" format="html" from_work_dir="NanoComp-report.html" label="${tool.name} on ${on_string}: Html Report"/>
165164
</outputs>
166165
<tests>
166+
<!-- 1) fastq input -->
167167
<test expect_num_outputs="3">
168168
<section name="inputs">
169169
<conditional name="input_type">
@@ -183,6 +183,7 @@
183183
</assert_contents>
184184
</output>
185185
</test>
186+
<!-- 2) bam input -->
186187
<test expect_num_outputs="3">
187188
<section name="inputs">
188189
<conditional name="input_type">
@@ -201,6 +202,7 @@
201202
</assert_contents>
202203
</output>
203204
</test>
205+
<!-- 3) fastq input, tsv output -->
204206
<test expect_num_outputs="3">
205207
<section name="inputs">
206208
<conditional name="input_type">
@@ -217,6 +219,7 @@
217219
</assert_contents>
218220
</output>
219221
</test>
222+
<!-- 4) bam input, box plot output -->
220223
<test expect_num_outputs="3">
221224
<section name="inputs">
222225
<conditional name="input_type">

0 commit comments

Comments
 (0)