Skip to content

Commit dabf1ef

Browse files
authored
Merge pull request #3310 from mirpedrol/template-monochrome-logs
Use params.monochrome_logs in the template and update nf-core components
2 parents 800fd8d + 22ff44b commit dabf1ef

File tree

12 files changed

+26
-140
lines changed

12 files changed

+26
-140
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- Fix a typo ([#3268](https://github.com/nf-core/tools/pull/3268))
1313
- Remove `def` from `nextflow.config` and add `trace_report_suffix` param ([#3296](https://github.com/nf-core/tools/pull/3296))
1414
- 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))
15+
- Use `params.monochrome_logs` in the template and update nf-core components ([#3310](https://github.com/nf-core/tools/pull/3310))
1516

1617
### Download
1718

nf_core/pipeline-template/modules.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{%- if fastqc %}
99
"fastqc": {
1010
"branch": "master",
11-
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
11+
"git_sha": "dc94b6ee04a05ddb9f7ae050712ff30a13149164",
1212
"installed_by": ["modules"]
1313
}{% endif %}{%- if multiqc %}{% if fastqc %},{% endif %}
1414
"multiqc": {
@@ -23,17 +23,17 @@
2323
"nf-core": {
2424
"utils_nextflow_pipeline": {
2525
"branch": "master",
26-
"git_sha": "3aa0aec1d52d492fe241919f0c6100ebf0074082",
26+
"git_sha": "c2b22d85f30a706a3073387f30380704fcae013b",
2727
"installed_by": ["subworkflows"]
2828
},
2929
"utils_nfcore_pipeline": {
3030
"branch": "master",
31-
"git_sha": "1b6b9a3338d011367137808b49b923515080e3ba",
31+
"git_sha": "9a1e8bb6a5d205cf7807dcefca872a3314b2f3e6",
3232
"installed_by": ["subworkflows"]
3333
}{% if nf_schema %},
3434
"utils_nfschema_plugin": {
3535
"branch": "master",
36-
"git_sha": "bbd5a41f4535a8defafe6080e00ea74c45f4f96c",
36+
"git_sha": "2fd2cd6d0e7b273747f32e465fdc6bcc3ae0814e",
3737
"installed_by": ["subworkflows"]
3838
}{% endif %}
3939
}

nf_core/pipeline-template/modules/nf-core/fastqc/main.nf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nf_core/pipeline-template/modules/nf-core/fastqc/meta.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nf_core/pipeline-template/nextflow.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ params {
4141
email_on_fail = null
4242
plaintext_email = false
4343
{%- endif %}
44-
{%- if modules %}
44+
{%- if modules or nf_schema %}
4545
monochrome_logs = false{% endif %}
4646
{%- if slackreport or adaptivecard %}
4747
hook_url = null{% endif %}
@@ -291,6 +291,7 @@ plugins {
291291

292292
validation {
293293
defaultIgnoreParams = ["genomes"]
294+
monochromeLogs = params.monochrome_logs
294295
help {
295296
enabled = true
296297
command = "nextflow run {{ name }} -profile <docker/singularity/.../institute> --input samplesheet.csv --outdir <OUTDIR>"

nf_core/pipeline-template/nextflow_schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
"fa_icon": "fas fa-file-upload",
183183
"hidden": true
184184
},{% endif %}
185-
{%- if modules %}
185+
{%- if modules or nf_schema %}
186186
"monochrome_logs": {
187187
"type": "boolean",
188188
"description": "Do not use coloured log outputs.",

nf_core/pipeline-template/subworkflows/nf-core/utils_nextflow_pipeline/main.nf

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nf_core/pipeline-template/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nf_core/pipeline-template/subworkflows/nf-core/utils_nfcore_pipeline/main.nf

Lines changed: 6 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nf_core/pipeline-template/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test

Lines changed: 0 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)