Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move modules config import #3301

Merged
merged 4 commits into from
Nov 28, 2024
+6 −5
Merged

Move modules config import #3301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d33739
Move modules config import after base.config
LouisLeNezet Nov 28, 2024
85338c9
Merge branch 'dev' into LouisLeNezet-config
LouisLeNezet Nov 28, 2024
c8f22cf
Update CHANGELOG.md
LouisLeNezet Nov 28, 2024
aacc24d
Merge branch 'dev' into LouisLeNezet-config
LouisLeNezet Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- Add resource limits to Gitpod profile([#3255](https://github.com/nf-core/tools/pull/3255))
- Fix a typo ([#3268](https://github.com/nf-core/tools/pull/3268))
- Remove `def` from `nextflow.config` and add `trace_report_suffix` param ([#3296](https://github.com/nf-core/tools/pull/3296))
- Move `includeConfig 'conf/modules.config'` next to `includeConfig 'conf/base.config'` to not overwrite tests profiles configurations ([#3301](https://github.com/nf-core/tools/pull/3301))

### Download

Expand Down
10 changes: 5 additions & 5 deletions nf_core/pipeline-template/nextflow.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ 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 }
Expand Down Expand Up @@ -316,8 +321,3 @@ validation {
}{% endif %}
}
{%- endif %}

{% if modules -%}
// Load modules.config for DSL2 module specific options
includeConfig 'conf/modules.config'
{%- endif %}
Loading