From 4cf860785d5735d4cd5b026b93653e67533b88c9 Mon Sep 17 00:00:00 2001 From: mirpedrol Date: Fri, 13 Dec 2024 10:36:28 +0100 Subject: [PATCH 1/3] fix including modules.config --- nf_core/pipeline-template/nextflow.config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nf_core/pipeline-template/nextflow.config b/nf_core/pipeline-template/nextflow.config index 36018b1062..05a9599eb4 100644 --- a/nf_core/pipeline-template/nextflow.config +++ b/nf_core/pipeline-template/nextflow.config @@ -77,11 +77,6 @@ params { includeConfig 'conf/base.config' {%- else %} -{% if modules -%} -// Load modules.config for DSL2 module specific options -includeConfig 'conf/modules.config' -{%- endif %} - process { // TODO nf-core: Check the defaults for all processes cpus = { 1 * task.attempt } @@ -94,6 +89,11 @@ process { } {%- endif %} +{% if modules -%} +// Load modules.config for DSL2 module specific options +includeConfig 'conf/modules.config' +{%- endif %} + profiles { debug { dumpHashes = true From eed09ba43a0b85924bb3f8526f02dbdf12d85588 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Fri, 13 Dec 2024 09:38:20 +0000 Subject: [PATCH 2/3] [automated] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bacef3b106..9c9af42a9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ ### Modules +- fix including modules.config ([#3356](https://github.com/nf-core/tools/pull/3356)) + ### Subworkflows ### General From a2c2339d4a2e89215b25e7f549721bc94c23f566 Mon Sep 17 00:00:00 2001 From: mirpedrol Date: Fri, 13 Dec 2024 10:47:18 +0100 Subject: [PATCH 3/3] revert #3301 until we add linting from #2508 --- nf_core/pipeline-template/nextflow.config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nf_core/pipeline-template/nextflow.config b/nf_core/pipeline-template/nextflow.config index 05a9599eb4..9db8f3bfe6 100644 --- a/nf_core/pipeline-template/nextflow.config +++ b/nf_core/pipeline-template/nextflow.config @@ -89,11 +89,6 @@ process { } {%- endif %} -{% if modules -%} -// Load modules.config for DSL2 module specific options -includeConfig 'conf/modules.config' -{%- endif %} - profiles { debug { dumpHashes = true @@ -336,3 +331,8 @@ validation { }{% endif %} } {%- endif %} + +{% if modules -%} +// Load modules.config for DSL2 module specific options +includeConfig 'conf/modules.config' +{%- endif %}