Skip to content

Commit b209c18

Browse files
committed
Patch chromap/chromap module to include read group (otherwise picard/markduplicates erroring)
1 parent cc2b13e commit b209c18

File tree

4 files changed

+196
-47
lines changed

4 files changed

+196
-47
lines changed

conf/modules.config

+1
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ if (params.aligner == 'chromap') {
262262

263263
withName: CHROMAP_CHROMAP {
264264
ext.args = '-l 2000 --low-mem --SAM'
265+
ext.args3 = { meta.read_group ? "-r ${meta.read_group}" : '' }
265266
ext.prefix = { "${meta.id}.Lb" }
266267
publishDir = [
267268
path: { "${params.outdir}/${params.aligner}/library" },

modules.json

+149-45
Original file line numberDiff line numberDiff line change
@@ -8,172 +8,253 @@
88
"bowtie2/align": {
99
"branch": "master",
1010
"git_sha": "9bfc81874554e87740bcb3e5e07acf0a153c9ecb",
11-
"installed_by": ["fastq_align_bowtie2", "modules"]
11+
"installed_by": [
12+
"fastq_align_bowtie2",
13+
"modules"
14+
]
1215
},
1316
"bowtie2/build": {
1417
"branch": "master",
1518
"git_sha": "1fea64f5132a813ec97c1c6d3a74e0aee7142b6d",
16-
"installed_by": ["modules"]
19+
"installed_by": [
20+
"modules"
21+
]
1722
},
1823
"bwa/index": {
1924
"branch": "master",
2025
"git_sha": "e0ff65e1fb313677de09f5f477ae3da30ce19b7b",
21-
"installed_by": ["modules"]
26+
"installed_by": [
27+
"modules"
28+
]
2229
},
2330
"bwa/mem": {
2431
"branch": "master",
2532
"git_sha": "2201e21b09213f083832ac58e33353d410a6fde7",
26-
"installed_by": ["fastq_align_bwa", "modules"]
33+
"installed_by": [
34+
"fastq_align_bwa",
35+
"modules"
36+
]
2737
},
2838
"chromap/chromap": {
2939
"branch": "master",
3040
"git_sha": "8438ab16df8334b8e15526cef7e8eda7f218ea20",
31-
"installed_by": ["fastq_align_chromap", "modules"]
41+
"installed_by": [
42+
"fastq_align_chromap",
43+
"modules"
44+
],
45+
"patch": "modules/nf-core/chromap/chromap/chromap-chromap.diff"
3246
},
3347
"chromap/index": {
3448
"branch": "master",
3549
"git_sha": "8438ab16df8334b8e15526cef7e8eda7f218ea20",
36-
"installed_by": ["modules"]
50+
"installed_by": [
51+
"modules"
52+
]
3753
},
3854
"custom/getchromsizes": {
3955
"branch": "master",
4056
"git_sha": "1ceaa8ba4d0fd886dbca0e545815d905b7407de7",
41-
"installed_by": ["modules"]
57+
"installed_by": [
58+
"modules"
59+
]
4260
},
4361
"deeptools/computematrix": {
4462
"branch": "master",
4563
"git_sha": "dd51244ab3b1e4a30ddeb93ba3c6ef3ce1f02ef8",
46-
"installed_by": ["modules"]
64+
"installed_by": [
65+
"modules"
66+
]
4767
},
4868
"deeptools/plotfingerprint": {
4969
"branch": "master",
5070
"git_sha": "dd51244ab3b1e4a30ddeb93ba3c6ef3ce1f02ef8",
51-
"installed_by": ["modules"]
71+
"installed_by": [
72+
"modules"
73+
]
5274
},
5375
"deeptools/plotheatmap": {
5476
"branch": "master",
5577
"git_sha": "dd51244ab3b1e4a30ddeb93ba3c6ef3ce1f02ef8",
56-
"installed_by": ["modules"]
78+
"installed_by": [
79+
"modules"
80+
]
5781
},
5882
"deeptools/plotprofile": {
5983
"branch": "master",
6084
"git_sha": "dd51244ab3b1e4a30ddeb93ba3c6ef3ce1f02ef8",
61-
"installed_by": ["modules"]
85+
"installed_by": [
86+
"modules"
87+
]
6288
},
6389
"fastqc": {
6490
"branch": "master",
6591
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
66-
"installed_by": ["fastq_fastqc_umitools_trimgalore", "modules"]
92+
"installed_by": [
93+
"fastq_fastqc_umitools_trimgalore",
94+
"modules"
95+
]
6796
},
6897
"gffread": {
6998
"branch": "master",
7099
"git_sha": "6c996d7fbe0816dcbb68ce587ad5f873313682a1",
71-
"installed_by": ["modules"]
100+
"installed_by": [
101+
"modules"
102+
]
72103
},
73104
"gunzip": {
74105
"branch": "master",
75106
"git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d",
76-
"installed_by": ["modules"]
107+
"installed_by": [
108+
"modules"
109+
]
77110
},
78111
"homer/annotatepeaks": {
79112
"branch": "master",
80113
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
81-
"installed_by": ["modules"]
114+
"installed_by": [
115+
"modules"
116+
]
82117
},
83118
"khmer/uniquekmers": {
84119
"branch": "master",
85120
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
86-
"installed_by": ["modules"]
121+
"installed_by": [
122+
"modules"
123+
]
87124
},
88125
"macs3/callpeak": {
89126
"branch": "master",
90127
"git_sha": "3a3f471ed42f640115b2661edee5b258e6a254c1",
91-
"installed_by": ["modules"]
128+
"installed_by": [
129+
"modules"
130+
]
92131
},
93132
"multiqc": {
94133
"branch": "master",
95134
"git_sha": "b80f5fd12ff7c43938f424dd76392a2704fa2396",
96-
"installed_by": ["modules"]
135+
"installed_by": [
136+
"modules"
137+
]
97138
},
98139
"phantompeakqualtools": {
99140
"branch": "master",
100141
"git_sha": "2dfe9afa90fefc70e320140e5f41287f01f324b0",
101-
"installed_by": ["modules"]
142+
"installed_by": [
143+
"modules"
144+
]
102145
},
103146
"picard/collectmultiplemetrics": {
104147
"branch": "master",
105148
"git_sha": "0dee12b56ccecc416d6f7a1ccd85fd571eab3307",
106-
"installed_by": ["modules"]
149+
"installed_by": [
150+
"modules"
151+
]
107152
},
108153
"picard/markduplicates": {
109154
"branch": "master",
110155
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
111-
"installed_by": ["bam_markduplicates_picard", "modules"]
156+
"installed_by": [
157+
"bam_markduplicates_picard",
158+
"modules"
159+
]
112160
},
113161
"picard/mergesamfiles": {
114162
"branch": "master",
115163
"git_sha": "0dee12b56ccecc416d6f7a1ccd85fd571eab3307",
116-
"installed_by": ["modules"]
164+
"installed_by": [
165+
"modules"
166+
]
117167
},
118168
"preseq/lcextrap": {
119169
"branch": "master",
120170
"git_sha": "2c6b1144ed58b6184ad58fc4e6b6a90219b4bf4f",
121-
"installed_by": ["modules"]
171+
"installed_by": [
172+
"modules"
173+
]
122174
},
123175
"samtools/flagstat": {
124176
"branch": "master",
125177
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
126-
"installed_by": ["bam_stats_samtools", "modules"]
178+
"installed_by": [
179+
"bam_stats_samtools",
180+
"modules"
181+
]
127182
},
128183
"samtools/idxstats": {
129184
"branch": "master",
130185
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
131-
"installed_by": ["bam_stats_samtools", "modules"]
186+
"installed_by": [
187+
"bam_stats_samtools",
188+
"modules"
189+
]
132190
},
133191
"samtools/index": {
134192
"branch": "master",
135193
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
136-
"installed_by": ["bam_markduplicates_picard", "bam_sort_stats_samtools", "modules"]
194+
"installed_by": [
195+
"bam_markduplicates_picard",
196+
"bam_sort_stats_samtools",
197+
"modules"
198+
]
137199
},
138200
"samtools/sort": {
139201
"branch": "master",
140202
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
141-
"installed_by": ["bam_sort_stats_samtools", "modules"]
203+
"installed_by": [
204+
"bam_sort_stats_samtools",
205+
"modules"
206+
]
142207
},
143208
"samtools/stats": {
144209
"branch": "master",
145210
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
146-
"installed_by": ["bam_stats_samtools", "modules"]
211+
"installed_by": [
212+
"bam_stats_samtools",
213+
"modules"
214+
]
147215
},
148216
"subread/featurecounts": {
149217
"branch": "master",
150218
"git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1",
151-
"installed_by": ["modules"]
219+
"installed_by": [
220+
"modules"
221+
]
152222
},
153223
"trimgalore": {
154224
"branch": "master",
155225
"git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1",
156-
"installed_by": ["fastq_fastqc_umitools_trimgalore", "modules"]
226+
"installed_by": [
227+
"fastq_fastqc_umitools_trimgalore",
228+
"modules"
229+
]
157230
},
158231
"ucsc/bedgraphtobigwig": {
159232
"branch": "master",
160233
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
161-
"installed_by": ["modules"]
234+
"installed_by": [
235+
"modules"
236+
]
162237
},
163238
"umitools/extract": {
164239
"branch": "master",
165240
"git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1",
166-
"installed_by": ["fastq_fastqc_umitools_trimgalore"]
241+
"installed_by": [
242+
"fastq_fastqc_umitools_trimgalore"
243+
]
167244
},
168245
"untar": {
169246
"branch": "master",
170247
"git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d",
171-
"installed_by": ["modules"]
248+
"installed_by": [
249+
"modules"
250+
]
172251
},
173252
"untarfiles": {
174253
"branch": "master",
175254
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
176-
"installed_by": ["modules"]
255+
"installed_by": [
256+
"modules"
257+
]
177258
}
178259
}
179260
},
@@ -182,55 +263,78 @@
182263
"bam_markduplicates_picard": {
183264
"branch": "master",
184265
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
185-
"installed_by": ["subworkflows"]
266+
"installed_by": [
267+
"subworkflows"
268+
]
186269
},
187270
"bam_sort_stats_samtools": {
188271
"branch": "master",
189272
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
190-
"installed_by": ["fastq_align_bowtie2", "fastq_align_bwa", "fastq_align_chromap"]
273+
"installed_by": [
274+
"fastq_align_bowtie2",
275+
"fastq_align_bwa",
276+
"fastq_align_chromap"
277+
]
191278
},
192279
"bam_stats_samtools": {
193280
"branch": "master",
194281
"git_sha": "0eacd714effe5aac1c1de26593873960b3346cab",
195-
"installed_by": ["bam_markduplicates_picard", "bam_sort_stats_samtools"]
282+
"installed_by": [
283+
"bam_markduplicates_picard",
284+
"bam_sort_stats_samtools"
285+
]
196286
},
197287
"fastq_align_bowtie2": {
198288
"branch": "master",
199289
"git_sha": "0eacd714effe5aac1c1de26593873960b3346cab",
200-
"installed_by": ["subworkflows"]
290+
"installed_by": [
291+
"subworkflows"
292+
]
201293
},
202294
"fastq_align_bwa": {
203295
"branch": "master",
204296
"git_sha": "e0ff65e1fb313677de09f5f477ae3da30ce19b7b",
205-
"installed_by": ["subworkflows"]
297+
"installed_by": [
298+
"subworkflows"
299+
]
206300
},
207301
"fastq_align_chromap": {
208302
"branch": "master",
209303
"git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f",
210-
"installed_by": ["subworkflows"]
304+
"installed_by": [
305+
"subworkflows"
306+
]
211307
},
212308
"fastq_fastqc_umitools_trimgalore": {
213309
"branch": "master",
214310
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
215-
"installed_by": ["subworkflows"]
311+
"installed_by": [
312+
"subworkflows"
313+
]
216314
},
217315
"utils_nextflow_pipeline": {
218316
"branch": "master",
219317
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
220-
"installed_by": ["subworkflows"]
318+
"installed_by": [
319+
"subworkflows"
320+
]
221321
},
222322
"utils_nfcore_pipeline": {
223323
"branch": "master",
224324
"git_sha": "92de218a329bfc9a9033116eb5f65fd270e72ba3",
225-
"installed_by": ["subworkflows"]
325+
"installed_by": [
326+
"subworkflows"
327+
]
226328
},
227329
"utils_nfvalidation_plugin": {
228330
"branch": "master",
229331
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
230-
"installed_by": ["subworkflows"]
332+
"installed_by": [
333+
"subworkflows"
334+
]
231335
}
232336
}
233337
}
234338
}
235339
}
236-
}
340+
}

0 commit comments

Comments
 (0)