Skip to content

Commit bf75a61

Browse files
authored
falco - Update to version 1.3.0 (#7945)
* falco - Update to version 1.3.0, update profile to 25.0, remove .lint_skip, and update tests and test files * Add profile token
1 parent a09b69d commit bf75a61

11 files changed

Lines changed: 9522 additions & 9514 deletions

tools/falco/.lint_skip

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/falco/falco.xml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<tool id="falco" name="Falco" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="21.05">
1+
<tool id="falco" name="Falco" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
22
<description>An alternative, more performant implementation of FastQC for high throughput sequence quality control</description>
33
<macros>
4-
<token name="@TOOL_VERSION@">1.2.4</token>
4+
<token name="@TOOL_VERSION@">1.3.0</token>
55
<token name="@VERSION_SUFFIX@">0</token>
6+
<token name="@PROFILE@">25.0</token>
67
</macros>
78
<xrefs>
89
<xref type="bio.tools">falco</xref>
@@ -79,7 +80,7 @@
7980
<param name="input_file" value="1000trimmed.fastq"/>
8081
<output name="html_file" ftype="html">
8182
<assert_contents>
82-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
83+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
8384
</assert_contents>
8485
</output>
8586
<!-- two lines diff to allow for reported version to change -->
@@ -90,7 +91,7 @@
9091
<param name="input_file" value="1000trimmed.fastq.gz"/>
9192
<output name="html_file" ftype="html">
9293
<assert_contents>
93-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq_gz - report.+"/>
94+
<has_line_matching expression="\s*1000trimmed_fastq_gz - report"/>
9495
</assert_contents>
9596
</output>
9697
<!-- four lines diff to allow for reported version to change; two more to accomodate changed input file name -->
@@ -101,7 +102,7 @@
101102
<param name="input_file" value="hisat_output_1.bam"/>
102103
<output name="html_file" ftype="html">
103104
<assert_contents>
104-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; hisat_output_1_bam - report.+"/>
105+
<has_line_matching expression="\s*hisat_output_1_bam - report"/>
105106
</assert_contents>
106107
</output>
107108
<!-- four lines diff to allow for reported version to change; two more to accomodate changed input file name -->
@@ -113,7 +114,7 @@
113114
<param name="generate_summary" value="true"/>
114115
<output name="html_file" ftype="html">
115116
<assert_contents>
116-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
117+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
117118
</assert_contents>
118119
</output>
119120
<output name="text_file" file="fastqc_data.txt" ftype="txt" lines_diff="2"/>
@@ -124,7 +125,7 @@
124125
<param name="contaminants" value="contaminant_list.txt" ftype="tabular"/>
125126
<output name="html_file" ftype="html">
126127
<assert_contents>
127-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
128+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
128129
</assert_contents>
129130
</output>
130131
<output name="text_file" file="fastqc_data_contaminants.txt" ftype="txt" lines_diff="2"/>
@@ -134,7 +135,7 @@
134135
<param name="adapters" value="adapter_list.txt" ftype="tabular"/>
135136
<output name="html_file" ftype="html">
136137
<assert_contents>
137-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
138+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
138139
</assert_contents>
139140
</output>
140141
<output name="text_file" file="fastqc_data_adapters.txt" ftype="txt" lines_diff="2"/>
@@ -145,7 +146,7 @@
145146
<param name="generate_summary" value="true"/>
146147
<output name="html_file" ftype="html">
147148
<assert_contents>
148-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
149+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
149150
</assert_contents>
150151
</output>
151152
<output name="summary_file" file="fastqc_data_customlimits_summary.txt" ftype="txt"/>
@@ -171,10 +172,10 @@
171172
</test> -->
172173
<test expect_num_outputs="2">
173174
<param name="input_file" value="1000trimmed.fastq" ftype="fastq"/>
174-
<param name="nogroup" value="--nogroup"/>
175+
<param name="nogroup" value="true"/>
175176
<output name="html_file" ftype="html">
176177
<assert_contents>
177-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
178+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
178179
</assert_contents>
179180
</output>
180181
<output name="text_file" file="fastqc_data_nogroup.txt" ftype="txt" lines_diff="2"/>
@@ -185,30 +186,30 @@
185186
<param name="generate_summary" value="true"/>
186187
<output name="html_file" ftype="html">
187188
<assert_contents>
188-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
189+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
189190
</assert_contents>
190191
</output>
191192
<output name="text_file" file="fastqc_report_subsample.txt" ftype="txt" lines_diff="2"/>
192193
<output name="summary_file" file="fastqc_report_subsample_summary.txt" ftype="txt"/>
193194
</test>
194195
<test expect_num_outputs="3">
195196
<param name="input_file" value="1000trimmed.fastq"/>
196-
<param name="bisulfite" value="-bisulfite"/>
197+
<param name="bisulfite" value="true"/>
197198
<param name="generate_summary" value="true"/>
198199
<output name="html_file" ftype="html">
199200
<assert_contents>
200-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
201+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
201202
</assert_contents>
202203
</output>
203204
<output name="text_file" file="fastqc_report_bisulfite.txt" ftype="txt" lines_diff="2"/>
204205
<output name="summary_file" file="fastqc_report_bisulfite_summary.txt" ftype="txt"/>
205206
</test>
206207
<test expect_num_outputs="2">
207208
<param name="input_file" value="1000trimmed.fastq"/>
208-
<param name="reverse_complement" value="-reverse-complement"/>
209+
<param name="reverse_complement" value="true"/>
209210
<output name="html_file" ftype="html">
210211
<assert_contents>
211-
<has_line_matching expression="&lt;html&gt;&lt;head&gt;.+&lt;title&gt; 1000trimmed_fastq - report.+"/>
212+
<has_line_matching expression="\s*1000trimmed_fastq - report"/>
212213
</assert_contents>
213214
</output>
214215
<output name="text_file" file="fastqc_report_reverse_complement.txt" ftype="txt" lines_diff="2"/>

0 commit comments

Comments
 (0)