Skip to content

Commit a683b97

Browse files
authored
Merge branch 'dev' into documentation
2 parents df3d25d + dabf1ef commit a683b97

File tree

15 files changed

+31
-143
lines changed

15 files changed

+31
-143
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.8.0
3+
rev: v0.8.1
44
hooks:
55
- id: ruff # linter
66
args: [--fix, --exit-non-zero-on-fix] # sort imports and fix

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
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
- Fix some typos and improve writing in `usage.md` and `CONTRIBUTING.md` ([#3302](https://github.com/nf-core/tools/pull/3302))
1617

1718
### Download
1819

1920
- First steps towards fixing [#3179](https://github.com/nf-core/tools/issues/3179): Modify `prioritize_direct_download()` to retain Seqera Singularity https:// Container URIs and hardcode Seqera Containers into `gather_registries()` ([#3244](https://github.com/nf-core/tools/pull/3244)).
21+
- Update dawidd6/action-download-artifact action to v7 ([#3306](https://github.com/nf-core/tools/pull/3306))
2022

2123
### Linting
2224

@@ -50,6 +52,7 @@
5052
- Update codecov/codecov-action action to v5 ([#3283](https://github.com/nf-core/tools/pull/3283))
5153
- Update python:3.12-slim Docker digest to 2a6386a ([#3284](https://github.com/nf-core/tools/pull/3284))
5254
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.8.0 ([#3299](https://github.com/nf-core/tools/pull/3299))
55+
- Update gitpod/workspace-base Docker digest to 12853f7 ([#3309](https://github.com/nf-core/tools/pull/3309))
5356

5457
## [v3.0.2 - Titanium Tapir Patch](https://github.com/nf-core/tools/releases/tag/3.0.2) - [2024-10-11]
5558

nf_core/gitpod/gitpod.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# docker build -t gitpod:test -f nf_core/gitpod/gitpod.Dockerfile .
33

44
# See https://docs.renovatebot.com/docker/#digest-pinning for why a digest is used.
5-
FROM gitpod/workspace-base@sha256:2cc134fe5bd7d8fdbe44cab294925d4bc6d2d178d94624f4c376584a22d1f7b6
5+
FROM gitpod/workspace-base@sha256:12853f7c901eb2b677a549cb112c85f9679d18feb30093bcc63aa252540ecad9
66

77
USER root
88

nf_core/pipeline-template/.github/workflows/linting_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Download lint results
14-
uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
14+
uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed

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.

0 commit comments

Comments
 (0)