Skip to content

Commit 4afe0e4

Browse files
authored
Merge pull request #436 from ftabaro/fix-multiqc-shared-mem-error
Fix multiqc shared mem error
2 parents 5908238 + a650203 commit 4afe0e4

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
### Enhancements & fixes
99

10+
- [[#428](https://github.com/nf-core/chipseq/issues/428)] - Bump MultiQC version to 1.25.1
1011
- [[PR #434](https://github.com/nf-core/chipseq/pull/434)] - Prevent pipeline fails from erroneous param validation when igenomes is used.
1112
- [[#432](https://github.com/nf-core/chipseq/issues/432)] - Fix `GFFREAD` call to have the two expected input channels.
1213
- [[PR #444](https://github.com/nf-core/chipseq/pull/444)] - Add empty map to ch_gff so that when provided by the user `GFFREAD` works.

modules/local/multiqc.nf

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,69 @@
11
process MULTIQC {
22
label 'process_medium'
3-
4-
conda "bioconda::multiqc=1.23"
5-
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
6-
'https://depot.galaxyproject.org/singularity/multiqc:1.23--pyhdfd78af_0' :
7-
'biocontainers/multiqc:1.23--pyhdfd78af_0' }"
3+
conda "bioconda::multiqc=1.25.1"
4+
container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container
5+
? 'https://depot.galaxyproject.org/singularity/multiqc:1.25.1--pyhdfd78af_0'
6+
: 'biocontainers/multiqc:1.25.1--pyhdfd78af_0'}"
87

98
input:
109
path workflow_summary
1110
path multiqc_config
1211
path mqc_custom_config
1312
path logo
1413

15-
path ('fastqc/*')
16-
path ('trimgalore/fastqc/*')
17-
path ('trimgalore/*')
14+
path "fastqc/*"
15+
path "trimgalore/fastqc/*"
16+
path "trimgalore/*"
1817

19-
path ('alignment/library/*')
20-
path ('alignment/library/*')
21-
path ('alignment/library/*')
18+
path "alignment/library/*"
19+
path "alignment/library/*"
20+
path "alignment/library/*"
2221

23-
path ('alignment/merged_library/unfiltered/*')
24-
path ('alignment/merged_library/unfiltered/*')
25-
path ('alignment/merged_library/unfiltered/*')
26-
path ('alignment/merged_library/unfiltered/picard_metrics/*')
22+
path "alignment/merged_library/unfiltered/*"
23+
path "alignment/merged_library/unfiltered/*"
24+
path "alignment/merged_library/unfiltered/*"
25+
path "alignment/merged_library/unfiltered/picard_metrics/*"
2726

28-
path ('alignment/merged_library/filtered/*')
29-
path ('alignment/merged_library/filtered/*')
30-
path ('alignment/merged_library/filtered/*')
31-
path ('alignment/merged_library/filtered/picard_metrics/*')
27+
path "alignment/merged_library/filtered/*"
28+
path "alignment/merged_library/filtered/*"
29+
path "alignment/merged_library/filtered/*"
30+
path "alignment/merged_library/filtered/picard_metrics/*"
3231

33-
path ('preseq/*')
32+
path "preseq/*"
3433

35-
path ('deeptools/*')
36-
path ('deeptools/*')
34+
path "deeptools/*"
35+
path "deeptools/*"
3736

38-
path ('phantompeakqualtools/*')
39-
path ('phantompeakqualtools/*')
40-
path ('phantompeakqualtools/*')
41-
path ('phantompeakqualtools/*')
37+
path "phantompeakqualtools/*"
38+
path "phantompeakqualtools/*"
39+
path "phantompeakqualtools/*"
40+
path "phantompeakqualtools/*"
4241

43-
path ('macs3/peaks/*')
44-
path ('macs3/peaks/*')
45-
path ('macs3/annotation/*')
46-
path ('macs3/featurecounts/*')
42+
path "macs3/peaks/*"
43+
path "macs3/peaks/*"
44+
path "macs3/annotation/*"
45+
path "macs3/featurecounts/*"
4746

48-
path ('deseq2/*')
49-
path ('deseq2/*')
47+
path "deseq2/*"
48+
path "deseq2/*"
5049

5150
output:
5251
path "*multiqc_report.html", emit: report
5352
path "*_data" , emit: data
54-
path "*_plots" , optional:true, emit: plots
53+
path "*_plots" , optional: true, emit: plots
5554
path "versions.yml" , emit: versions
5655

5756
when:
5857
task.ext.when == null || task.ext.when
5958

6059
script:
6160
def args = task.ext.args ?: ''
62-
def custom_config = params.multiqc_config ? "--config $mqc_custom_config" : ''
61+
def custom_config = params.multiqc_config ? "--config ${mqc_custom_config}" : ''
6362
"""
6463
multiqc \\
6564
-f \\
66-
$args \\
67-
$custom_config \\
65+
${args} \\
66+
${custom_config} \\
6867
.
6968
7069
cat <<-END_VERSIONS > versions.yml

0 commit comments

Comments
 (0)