Skip to content

Commit 90483dc

Browse files
matthdsmnvnieuwk
andauthored
preprocessing v3.0.1 release (#171)
* Update nf-teams plugin version to 0.1.1 * back to dev * bump modules * add parameter typing * fix lint and bump nextflow * bump nf-test to strict syntax compatible version * fix fastq_to_aligned_cram * don't use params in subworkflows * fix mosdepth env issue on gcp (#166) * fix mosdepth env issue on gcp * fix tests * bump tests * bump mosdepth * bump nf-test * add csi index to unstable keys * update changelog * revert nf-test bump * update snaps --------- Co-authored-by: Matthias De Smet <11850640+matthdsm@users.noreply.github.com> * add pixi env * fix tests * pre-commit * address review comments * recreate lock file for platforms + disable nextflow telemetry * Bump/template (#168) * bump nf-core version * fix files_unchanged * bump modules * drop custom registries in config * fix nf linting * fix nf-core linting * changelog * fix tests * fix nf-core linting * fix available genomes * update plugins and default params * fix falco issues (#170) * changelog * fix snp samples rg * fix falco * fix commented tests * bump version number --------- Co-authored-by: Nicolas Vannieuwkerke <101190534+nvnieuwk@users.noreply.github.com> Co-authored-by: Nicolas Vannieuwkerke <nicolas.vannieuwkerke@ugent.be>
1 parent 253c025 commit 90483dc

154 files changed

Lines changed: 7868 additions & 1529 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
2222
- name: Post PR comment
2323
if: failure()
24-
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
24+
uses: mshick/add-pr-comment@8e4927817251f1ff60c001f04568532b38e0b4a0 # v3
2525
with:
2626
message: |
2727
## This PR is against the `${{github.event.pull_request.base.ref}}` branch :x:

.github/workflows/linting.yml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,50 @@ jobs:
1111
pre-commit:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
14+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1515

16-
- name: Set up Python 3.14
17-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
18-
with:
19-
python-version: "3.14"
20-
21-
- name: Install pre-commit
22-
run: pip install pre-commit
16+
- name: Install Nextflow
17+
uses: nf-core/setup-nextflow@b4ec1bc7c16a94435159de94a05253542fddf6ef # v3
2318

24-
- name: Run pre-commit
25-
run: pre-commit run --all-files
19+
- name: Run prek
20+
uses: j178/prek-action@6ad80277337ad479fe43bd70701c3f7f8aa74db3 # v2
2621

2722
nf-core:
2823
runs-on: ubuntu-latest
2924
steps:
3025
- name: Check out pipeline code
31-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
26+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3227

3328
- name: Install Nextflow
34-
uses: nf-core/setup-nextflow@v2
29+
uses: nf-core/setup-nextflow@b4ec1bc7c16a94435159de94a05253542fddf6ef # v3
3530

36-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
31+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
3732
with:
3833
python-version: "3.14"
3934
architecture: "x64"
4035

36+
- name: Setup uv
37+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
38+
4139
- name: read .nf-core.yml
4240
uses: pietrobolcato/action-read-yaml@9f13718d61111b69f30ab4ac683e67a56d254e1d # 1.1.0
4341
id: read_yml
4442
with:
4543
config: ${{ github.workspace }}/.nf-core.yml
4644

4745
- name: Install dependencies
48-
run: |
49-
python -m pip install --upgrade pip
50-
pip install nf-core==${{ steps.read_yml.outputs['nf_core_version'] }}
46+
run: uv tool install nf-core==${{ steps.read_yml.outputs['nf_core_version'] }}
5147

5248
- name: Run nf-core pipelines lint
53-
if: ${{ github.base_ref != 'master' }}
49+
if: ${{ github.base_ref != 'master' || github.base_ref != 'main' }}
5450
env:
5551
GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
5652
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5753
GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }}
5854
run: nf-core -l lint_log.txt pipelines lint --dir ${GITHUB_WORKSPACE} --markdown lint_results.md
5955

6056
- name: Run nf-core pipelines lint --release
61-
if: ${{ github.base_ref == 'master' }}
57+
if: ${{ github.base_ref == 'master' || github.base_ref == 'main' }}
6258
env:
6359
GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
6460
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -71,7 +67,7 @@ jobs:
7167

7268
- name: Upload linting log file artifact
7369
if: ${{ always() }}
74-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
70+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
7571
with:
7672
name: linting-logs
7773
path: |

.github/workflows/linting_comment.yml

Lines changed: 2 additions & 2 deletions
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@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
14+
uses: dawidd6/action-download-artifact@b6e2e70617bc3265edd6dab6c906732b2f1ae151 # v21
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed
@@ -21,7 +21,7 @@ jobs:
2121
run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT
2222

2323
- name: Post PR comment
24-
uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2
24+
uses: marocchino/sticky-pull-request-comment@70d2764d1a7d5d9560b100cbea0077fc8f633987 # v3
2525
with:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2727
number: ${{ steps.pr_number.outputs.pr_number }}

.github/workflows/nf-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21-
NFT_VER: "0.9.3"
21+
NFT_VER: "0.9.5"
2222
NFT_WORKDIR: "~"
2323
NXF_ANSI_LOG: false
2424
NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
@@ -76,7 +76,7 @@ jobs:
7676
- isMain: false
7777
profile: "singularity"
7878
NXF_VER:
79-
- 25.10.0
79+
- 26.04.0
8080
- latest-everything
8181
env:
8282
NXF_ANSI_LOG: false

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ testing*
99
null/
1010
.nf-test*
1111
test_fc
12+
.lineage/
13+
# pixi environments
14+
.pixi/*
15+
!.pixi/config.toml

.nf-core.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
lint:
22
files_exist:
3-
- CODE_OF_CONDUCT.md
4-
- CITATIONS.md
5-
- assets/nf-core-preprocessing_logo_light.png
6-
- docs/images/nf-core-preprocessing_logo_light.png
7-
- docs/images/nf-core-preprocessing_logo_dark.png
83
- .github/ISSUE_TEMPLATE/config.yml
9-
- .github/workflows/awstest.yml
104
- .github/workflows/awsfulltest.yml
11-
files_unchanged:
5+
- .github/workflows/awstest.yml
6+
- CITATIONS.md
127
- CODE_OF_CONDUCT.md
138
- assets/nf-core-preprocessing_logo_light.png
14-
- docs/images/nf-core-preprocessing_logo_light.png
9+
- docs/CONTRIBUTING.md
1510
- docs/images/nf-core-preprocessing_logo_dark.png
11+
- docs/images/nf-core-preprocessing_logo_light.png
12+
files_unchanged:
1613
- .github/ISSUE_TEMPLATE/bug_report.yml
1714
- .github/PULL_REQUEST_TEMPLATE.md
18-
- docs/README.md
15+
- .gitignore
16+
- CODE_OF_CONDUCT.md
1917
- LICENSE
18+
- assets/nf-core-preprocessing_logo_light.png
19+
- docs/README.md
20+
- docs/images/nf-core-preprocessing_logo_dark.png
21+
- docs/images/nf-core-preprocessing_logo_light.png
2022
merge_markers:
2123
- bin/cmgg_genelists
24+
- .pixi/envs
2225
multiqc_config: false
2326
nextflow_config: false
27+
schema_params: false # TMP
2428
template_strings:
2529
- bin/cmgg_genelists
2630
nf_test_content: false
27-
nf_core_version: 3.5.2
31+
nf_core_version: 4.0.2
2832
repository_type: pipeline
2933
template:
3034
author: Matthias De Smet, Nicolas Vannieuwkerke
@@ -35,4 +39,4 @@ template:
3539
org: nf-cmgg
3640
outdir: .
3741
skip_features: ["fastqc"]
38-
version: 3.0.0
42+
version: 3.0.1

.prettierignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
email_template.html
2-
adaptivecard.json
3-
slackreport.json
42
.nextflow*
53
work/
64
data/

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"markdown.styles": ["public/vscode_markdown.css"]
2+
"markdown.styles": ["public/vscode_markdown.css"],
3+
"nextflow.telemetry.enabled": false
34
}

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6+
## 3.0.1dev
7+
8+
- Add parameter typing to make strict syntax runs work more properly
9+
- Bumped minimal Nextflow version to 26.04.0 to allow for strict syntax and other improvements
10+
- Fix an issue with `mosdepth` environment variables not being correctly set on GCP
11+
- Bump `mosdepth` module to 0.3.14
12+
- Bump nf-core template to v4.0.2
13+
- Fix fastq outputs when aligner is set to `false` or unsupported genome, which were not being correctly emitted in the previous version
14+
- Fix `FALCO` module not being correctly run on fastq samples, which was caused by an issue with the branching logic in the previous version
15+
616
## 3.0.0
717

818
- Add `MultiQC-SAV` module for Illumina Run QC reports

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![GitHub Actions Linting Status](https://github.com/nf-cmgg/preprocessing/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-cmgg/preprocessing/actions/workflows/linting.yml)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)
66
[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
77

8-
[![Nextflow](https://img.shields.io/badge/version-%E2%89%A525.10.0-green?style=flat&logo=nextflow&logoColor=white&color=%230DC09D&link=https%3A%2F%2Fnextflow.io)](https://www.nextflow.io/)
8+
[![Nextflow](https://img.shields.io/badge/version-%E2%89%A526.04.0-green?style=flat&logo=nextflow&logoColor=white&color=%230DC09D&link=https%3A%2F%2Fnextflow.io)](https://www.nextflow.io/)
99
[![nf-core template version](https://img.shields.io/badge/nf--core_template-3.5.1-green?style=flat&logo=nfcore&logoColor=white&color=%2324B064&link=https%3A%2F%2Fnf-co.re)](https://github.com/nf-core/tools/releases/tag/3.5.1)
1010
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
1111
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)
@@ -59,6 +59,16 @@ nextflow run nf-cmgg/preprocessing \
5959
> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_;
6060
> see [docs](https://nf-co.re/usage/configuration#custom-configuration-files).
6161
62+
## Development environment
63+
64+
A [pixi](https://pixi.prefix.dev/latest/) development environment is available for this pipeline. Run the following command to install the environment:
65+
66+
```
67+
pixi install
68+
```
69+
70+
Then run `pixi shell` to enter the environment and start developing.
71+
6272
## Credits
6373

6474
nf-cmgg/preprocessing was originally written by the CMGG ICT team.

0 commit comments

Comments
 (0)