Skip to content

Commit bd2e105

Browse files
RZ9082RZ9082
authored
Fix failing weekly tests (galaxyproject#7708)
Bump version suffix and profile
1 parent 7439580 commit bd2e105

2 files changed

Lines changed: 52 additions & 49 deletions

File tree

‎tools/fastq_dl/fastq_dl.xml‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<tool id="fastq_dl" name="fastq-dl" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="22.05">
1+
<tool id="fastq_dl" name="fastq-dl" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
22
<description>Download FASTQ files from ENA</description>
33
<macros>
44
<import>macros.xml</import>
@@ -71,13 +71,13 @@
7171
<element name="DRR011117" decompress="True">
7272
<assert_contents>
7373
<has_text text="@DRR011117.1 HXVJWSB01AD414/4" />
74-
<has_size size="23102" />
74+
<has_text text="@DRR011117" n="104" />
7575
</assert_contents>
7676
</element>
7777
<element name="SRR9678965" decompress="True">
7878
<assert_contents>
7979
<has_text text="@SRR9678965.1 HQCI9RE01A6I97/2" />
80-
<has_size size="2465043" />
80+
<has_text text="@SRR9678965." n="11487" />
8181
</assert_contents>
8282
</element>
8383
</output_collection>
@@ -86,27 +86,27 @@
8686
<element name="forward" decompress="True">
8787
<assert_contents>
8888
<has_text text="@ERR2651925.1 M01945:48:000000000-B9G5G:1:1102:16788:1675/1" />
89-
<has_size size="4977454" />
89+
<has_text text="@ERR2651925" n="49902" />
9090
</assert_contents>
9191
</element>
9292
<element name="reverse" decompress="True">
9393
<assert_contents>
9494
<has_text text="@ERR2651925.1 M01945:48:000000000-B9G5G:1:1102:16788:1675/2" />
95-
<has_size size="6079979" />
95+
<has_text text="@ERR2651925" n="49902" />
9696
</assert_contents>
9797
</element>
9898
</element>
9999
<element name="ERR4319712" decompress="True">
100100
<element name="forward" decompress="True">
101101
<assert_contents>
102102
<has_text text="@ERR4319712.1 M02944:93:000000000-ALWFJ:1:2105:13646:2309/1" />
103-
<has_size size="2104680" />
103+
<has_text text="@ERR4319712" n="16481" />
104104
</assert_contents>
105105
</element>
106106
<element name="reverse" decompress="True">
107107
<assert_contents>
108108
<has_text text="@ERR4319712.1 M02944:93:000000000-ALWFJ:1:2105:13646:2309/2" />
109-
<has_size size="2578613" />
109+
<has_text text="@ERR4319712" n="16481" />
110110
</assert_contents>
111111
</element>
112112
</element>
@@ -125,39 +125,41 @@
125125
<element name="SRR9678965" file="Metadata_files/SRR9678965.tsv" />
126126
</output_collection>
127127
<output_collection name="single_end_collection" type="list" count="2">
128-
<element name="DRR011117">
128+
<element name="DRR011117" decompress="True">
129129
<assert_contents>
130-
<has_size size="23102" />
130+
<has_text text="@DRR011117" n="104" />
131131
</assert_contents>
132132
</element>
133-
<element name="SRR9678965">
133+
<element name="SRR9678965" decompress="True">
134134
<assert_contents>
135-
<has_size size="2465043" />
135+
<has_text text="@SRR9678965." n="11487" />
136136
</assert_contents>
137137
</element>
138138
</output_collection>
139139
<output_collection name="paired_end_collection" type="list:paired" count="2">
140-
<element name="ERR2651925">
141-
<element name="forward">
140+
<element name="ERR2651925" decompress="True">
141+
<element name="forward" decompress="True">
142142
<assert_contents>
143-
<has_size size="4977454" />
143+
<has_text text="@ERR2651925" n="49902" />
144144
</assert_contents>
145145
</element>
146-
<element name="reverse">
146+
<element name="reverse" decompress="True">
147147
<assert_contents>
148-
<has_size size="6079979" />
148+
<has_text text="@ERR2651925" n="49902" />
149149
</assert_contents>
150150
</element>
151151
</element>
152152
<element name="ERR4319712">
153-
<element name="forward">
153+
<element name="forward" decompress="True">
154154
<assert_contents>
155-
<has_size size="2104680" />
155+
<has_text text="@ERR4319712.1 M02944:93:000000000-ALWFJ:1:2105:13646:2309/1" />
156+
<has_text text="@ERR4319712" n="16481" />
156157
</assert_contents>
157158
</element>
158-
<element name="reverse">
159+
<element name="reverse" decompress="True">
159160
<assert_contents>
160-
<has_size size="2578613" />
161+
<has_text text="@ERR4319712.1 M02944:93:000000000-ALWFJ:1:2105:13646:2309/2" />
162+
<has_text text="@ERR4319712" n="16481" />
161163
</assert_contents>
162164
</element>
163165
</element>
@@ -191,39 +193,39 @@
191193
<element name="SRR9678965" file="Metadata_files/SRR9678965.tsv" />
192194
</output_collection>
193195
<output_collection name="single_end_collection" type="list" count="2">
194-
<element name="DRX010073">
196+
<element name="DRX010073" decompress="True">
195197
<assert_contents>
196-
<has_size size="23102" />
198+
<has_text text="@DRR011117" n="104" />
197199
</assert_contents>
198200
</element>
199-
<element name="SRX6439351">
201+
<element name="SRX6439351" decompress="True">
200202
<assert_contents>
201-
<has_size size="2465043" />
203+
<has_text text="@SRR9678965" n="11487" />
202204
</assert_contents>
203205
</element>
204206
</output_collection>
205207
<output_collection name="paired_end_collection" type="list:paired" count="2">
206-
<element name="ERX2668415">
207-
<element name="forward">
208+
<element name="ERX2668415" decompress="True">
209+
<element name="forward" decompress="True">
208210
<assert_contents>
209-
<has_size size="4977454" />
211+
<has_text text="@ERR2651925" n="49902" />
210212
</assert_contents>
211213
</element>
212-
<element name="reverse">
214+
<element name="reverse" decompress="True">
213215
<assert_contents>
214-
<has_size size="6079979" />
216+
<has_text text="@ERR2651925" n="49902" />
215217
</assert_contents>
216218
</element>
217219
</element>
218-
<element name="ERX4268079">
219-
<element name="forward">
220+
<element name="ERX4268079" decompress="True">
221+
<element name="forward" decompress="True">
220222
<assert_contents>
221-
<has_size size="2104680" />
223+
<has_text text="@ERR4319712" n="16481" />
222224
</assert_contents>
223225
</element>
224-
<element name="reverse">
226+
<element name="reverse" decompress="True">
225227
<assert_contents>
226-
<has_size size="2578613" />
228+
<has_text text="@ERR4319712" n="16481" />
227229
</assert_contents>
228230
</element>
229231
</element>
@@ -243,39 +245,39 @@
243245
<element name="SRR9678965" file="Metadata_files/SRR9678965.tsv" />
244246
</output_collection>
245247
<output_collection name="single_end_collection" type="list" count="2">
246-
<element name="SAMD00008419">
248+
<element name="SAMD00008419" decompress="True">
247249
<assert_contents>
248-
<has_size size="23102" />
250+
<has_text text="@DRR011117" n="104" />
249251
</assert_contents>
250252
</element>
251-
<element name="SAMN12272107">
253+
<element name="SAMN12272107" decompress="True">
252254
<assert_contents>
253-
<has_size size="2465043" />
255+
<has_text text="@SRR9678965" n="11487" />
254256
</assert_contents>
255257
</element>
256258
</output_collection>
257259
<output_collection name="paired_end_collection" type="list:paired" count="2">
258-
<element name="SAMEA4724129">
259-
<element name="forward">
260+
<element name="SAMEA4724129" decompress="True">
261+
<element name="forward" decompress="True">
260262
<assert_contents>
261-
<has_size size="4977454" />
263+
<has_text text="@ERR2651925" n="49902" />
262264
</assert_contents>
263265
</element>
264-
<element name="reverse">
266+
<element name="reverse" decompress="True">
265267
<assert_contents>
266-
<has_size size="6079979" />
268+
<has_text text="@ERR2651925" n="49902" />
267269
</assert_contents>
268270
</element>
269271
</element>
270-
<element name="SAMEA7040559">
271-
<element name="forward">
272+
<element name="SAMEA7040559" decompress="True">
273+
<element name="forward" decompress="True">
272274
<assert_contents>
273-
<has_size size="2104680" />
275+
<has_text text="@ERR4319712" n="16481" />
274276
</assert_contents>
275277
</element>
276-
<element name="reverse">
278+
<element name="reverse" decompress="True">
277279
<assert_contents>
278-
<has_size size="2578613" />
280+
<has_text text="@ERR4319712" n="16481" />
279281
</assert_contents>
280282
</element>
281283
</element>

‎tools/fastq_dl/macros.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<macros>
22
<token name="@TOOL_VERSION@">3.0.1</token>
3-
<token name="@VERSION_SUFFIX@">1</token>
3+
<token name="@VERSION_SUFFIX@">2</token>
4+
<token name="@PROFILE@">25.1</token>
45
<xml name="requirements">
56
<requirements>
67
<requirement type="package" version="@TOOL_VERSION@">fastq-dl</requirement>

0 commit comments

Comments
 (0)