From 5f4f3386c62bb6cb896465922d13a98ebcf6fbdb Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Fri, 12 May 2023 13:36:15 +0000 Subject: [PATCH 01/33] Bump to 2.3.0dev --- CHANGELOG.md | 5 ++++- nextflow.config | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8024dbeb..2a55827c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v2.2.1](https://github.com/nf-core/smrnaseq/releases/tag/2.2.1) - 2023-05-08 +## Current dev + +Nothing yet +## [v2.2.1](https://github.com/nf-core/smrnaseq/releases/tag/2.2.1) - 2023-05-12 ### Enhancements & fixes diff --git a/nextflow.config b/nextflow.config index 2f9dd945..68d6dee4 100644 --- a/nextflow.config +++ b/nextflow.config @@ -259,7 +259,7 @@ manifest { description = """Small RNA-Seq Best Practice Analysis Pipeline.""" mainScript = 'main.nf' nextflowVersion = '!>=22.10.1' - version = '2.2.1' + version = '2.3.0dev' doi = '' } From dd0595f38d4eea49c113ab3425d831f9727344dd Mon Sep 17 00:00:00 2001 From: Adam Talbot Date: Wed, 31 May 2023 11:36:09 +0100 Subject: [PATCH 02/33] Remove glob from process definition when using ECR container --- CHANGELOG.md | 3 ++- conf/public_aws_ecr.config | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a55827c..ba115168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Current dev -Nothing yet +- Remove globs from process alias when using ECR containers + ## [v2.2.1](https://github.com/nf-core/smrnaseq/releases/tag/2.2.1) - 2023-05-12 ### Enhancements & fixes diff --git a/conf/public_aws_ecr.config b/conf/public_aws_ecr.config index 8152e14a..39c8f881 100644 --- a/conf/public_aws_ecr.config +++ b/conf/public_aws_ecr.config @@ -12,19 +12,19 @@ docker.registry = 'public.ecr.aws' podman.registry = 'public.ecr.aws' process { - withName: '.*:SAMPLESHEET_CHECK' { + withName: 'SAMPLESHEET_CHECK' { container = "quay.io/biocontainers/python:3.8.3" } - withName: '.*:BOWTIE_MAP.*' { + withName: 'BOWTIE_MAP' { container = 'quay.io/biocontainers/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:40128b496751b037e2bd85f6789e83d4ff8a4837-0' } - withName: '.*:EDGER_QC' { + withName: 'EDGER_QC' { container = 'quay.io/biocontainers/mulled-v2-419bd7f10b2b902489ac63bbaafc7db76f8e0ae1:709335c37934db1b481054cbec637c6e5b5971cb-0' } - withName: '.*:MIRTOP_QUANT' { + withName: 'MIRTOP_QUANT' { container = 'quay.io/biocontainers/mulled-v2-0c13ef770dd7cc5c76c2ce23ba6669234cf03385:63be019f50581cc5dfe4fc0f73ae50f2d4d661f7-0' } - withName: '.*:TABLE_MERGE' { + withName: 'TABLE_MERGE' { container = 'quay.io/biocontainers/r-data.table:1.12.2' } } From dbe981d2006f679484b8ec3a0c5bd0799d06bb00 Mon Sep 17 00:00:00 2001 From: Adam Talbot Date: Wed, 31 May 2023 11:38:59 +0100 Subject: [PATCH 03/33] fixup --- conf/public_aws_ecr.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/public_aws_ecr.config b/conf/public_aws_ecr.config index 39c8f881..4febe35f 100644 --- a/conf/public_aws_ecr.config +++ b/conf/public_aws_ecr.config @@ -15,7 +15,7 @@ process { withName: 'SAMPLESHEET_CHECK' { container = "quay.io/biocontainers/python:3.8.3" } - withName: 'BOWTIE_MAP' { + withName: 'BOWTIE_MAP.*' { container = 'quay.io/biocontainers/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:40128b496751b037e2bd85f6789e83d4ff8a4837-0' } withName: 'EDGER_QC' { From 0e76821dd3ae4aac9f265b029bfcd8c00a8f2ef4 Mon Sep 17 00:00:00 2001 From: Adam Talbot Date: Wed, 31 May 2023 11:40:23 +0100 Subject: [PATCH 04/33] Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba115168..1dcf9a6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Current dev -- Remove globs from process alias when using ECR containers +- [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers ## [v2.2.1](https://github.com/nf-core/smrnaseq/releases/tag/2.2.1) - 2023-05-12 From f570c385c1364831045fe72332b026f01c40edfd Mon Sep 17 00:00:00 2001 From: Maxime U Garcia Date: Wed, 31 May 2023 16:47:55 +0200 Subject: [PATCH 05/33] Apply suggestions from code review --- CHANGELOG.md | 2 +- nextflow.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dcf9a6a..5553c523 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Current dev +## [v2.2.2](https://github.com/nf-core/smrnaseq/releases/tag/2.2.2) - 2023-06-01``` - [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers diff --git a/nextflow.config b/nextflow.config index 68d6dee4..5a6952df 100644 --- a/nextflow.config +++ b/nextflow.config @@ -259,7 +259,7 @@ manifest { description = """Small RNA-Seq Best Practice Analysis Pipeline.""" mainScript = 'main.nf' nextflowVersion = '!>=22.10.1' - version = '2.3.0dev' + version = '2.2.2' doi = '' } From 16ac6b2611ae686cd4db70356eaa421b281eb438 Mon Sep 17 00:00:00 2001 From: Maxime U Garcia Date: Wed, 31 May 2023 16:48:16 +0200 Subject: [PATCH 06/33] Apply suggestions from code review --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5553c523..c5b5af39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v2.2.2](https://github.com/nf-core/smrnaseq/releases/tag/2.2.2) - 2023-06-01``` +## [v2.2.2](https://github.com/nf-core/smrnaseq/releases/tag/2.2.2) - 2023-06-01 - [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers From dd3e01677061777d3aa4d92839b3814d25330d10 Mon Sep 17 00:00:00 2001 From: Maxime U Garcia Date: Wed, 31 May 2023 16:51:03 +0200 Subject: [PATCH 07/33] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4bd5555..1afd21e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: NXF_VER: - - "22.10.1" + - "23.04.1" - "latest-everything" profile: - "test" From dda769d91c14b79e3a1d922bf2f6bd3ae8cab90b Mon Sep 17 00:00:00 2001 From: Adam Talbot <12817534+adamrtalbot@users.noreply.github.com> Date: Mon, 19 Jun 2023 13:51:11 +0000 Subject: [PATCH 08/33] Remove public_aws_ecr profile --- .github/workflows/awsfulltest.yml | 2 +- .github/workflows/awstest.yml | 2 +- CHANGELOG.md | 4 ++++ conf/public_aws_ecr.config | 30 ------------------------------ nextflow.config | 3 --- 5 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 conf/public_aws_ecr.config diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index f96fb17c..5d00bc97 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -24,7 +24,7 @@ jobs: { "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/smrnaseq/results-${{ github.sha }}" } - profiles: test_full,public_aws_ecr + profiles: test_full - uses: actions/upload-artifact@v3 with: name: Tower debug log file diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml index a1f96d73..7d4c357c 100644 --- a/.github/workflows/awstest.yml +++ b/.github/workflows/awstest.yml @@ -22,7 +22,7 @@ jobs: { "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/smrnaseq/results-test-${{ github.sha }}" } - profiles: test,public_aws_ecr + profiles: test - uses: actions/upload-artifact@v3 with: name: Tower debug log file diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b5af39..2ca1a1cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## dev + +- Remove public_aws_ecr profile + ## [v2.2.2](https://github.com/nf-core/smrnaseq/releases/tag/2.2.2) - 2023-06-01 - [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers diff --git a/conf/public_aws_ecr.config b/conf/public_aws_ecr.config deleted file mode 100644 index 4febe35f..00000000 --- a/conf/public_aws_ecr.config +++ /dev/null @@ -1,30 +0,0 @@ -/* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - AWS ECR Config -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Config to set public AWS ECR images wherever possible - This improves speed when running on AWS infrastructure. - Use this as an example template when using your own private registry. ----------------------------------------------------------------------------------------- -*/ - -docker.registry = 'public.ecr.aws' -podman.registry = 'public.ecr.aws' - -process { - withName: 'SAMPLESHEET_CHECK' { - container = "quay.io/biocontainers/python:3.8.3" - } - withName: 'BOWTIE_MAP.*' { - container = 'quay.io/biocontainers/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:40128b496751b037e2bd85f6789e83d4ff8a4837-0' - } - withName: 'EDGER_QC' { - container = 'quay.io/biocontainers/mulled-v2-419bd7f10b2b902489ac63bbaafc7db76f8e0ae1:709335c37934db1b481054cbec637c6e5b5971cb-0' - } - withName: 'MIRTOP_QUANT' { - container = 'quay.io/biocontainers/mulled-v2-0c13ef770dd7cc5c76c2ce23ba6669234cf03385:63be019f50581cc5dfe4fc0f73ae50f2d4d661f7-0' - } - withName: 'TABLE_MERGE' { - container = 'quay.io/biocontainers/r-data.table:1.12.2' - } -} diff --git a/nextflow.config b/nextflow.config index 5a6952df..ecaa7ccb 100644 --- a/nextflow.config +++ b/nextflow.config @@ -199,9 +199,6 @@ profiles { executor.cpus = 16 executor.memory = 60.GB } - public_aws_ecr { - includeConfig 'conf/public_aws_ecr.config' - } test { includeConfig 'conf/test.config' } test_no_genome { includeConfig 'conf/test_no_genome.config' } test_full { includeConfig 'conf/test_full.config' } From 891ccfaa00bb9496d2f99d8551a5371ed8e6d759 Mon Sep 17 00:00:00 2001 From: Adam Talbot Date: Tue, 27 Jun 2023 09:21:35 +0100 Subject: [PATCH 09/33] Min nextflow test 22.10.1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1afd21e8..c4bd5555 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: NXF_VER: - - "23.04.1" + - "22.10.1" - "latest-everything" profile: - "test" From 7ea85c446f542dae37fb7b960dd37d18b0afb6d3 Mon Sep 17 00:00:00 2001 From: Rob Syme Date: Wed, 23 Aug 2023 12:58:33 -0400 Subject: [PATCH 10/33] Mirbase has changed their URL structure, so we need to update the URLs in the configuration files and docs. Signed-off-by: Rob Syme --- docs/usage.md | 6 +++--- nextflow.config | 4 ++-- nextflow_schema.json | 6 +++--- workflows/smrnaseq.nf | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/usage.md b/docs/usage.md index 1893e2e6..7a01c1fa 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -26,9 +26,9 @@ It should point to the 3-letter species name used by [miRBase](https://www.mirba Different parameters can be set for the two supported databases. By default `miRBase` will be used with the parameters below. -- `mirna_gtf`: If not supplied by the user, then `mirna_gtf` will point to the latest GFF3 file in miRbase: `https://mirbase.org/ftp/CURRENT/genomes/${params.mirtrace_species}.gff3` -- `mature`: points to the FASTA file of mature miRNA sequences. `https://mirbase.org/ftp/CURRENT/mature.fa.gz` -- `hairpin`: points to the FASTA file of precursor miRNA sequences. `https://mirbase.org/ftp/CURRENT/hairpin.fa.gz` +- `mirna_gtf`: If not supplied by the user, then `mirna_gtf` will point to the latest GFF3 file in miRbase: `https://mirbase.org/download/CURRENT/genomes/${params.mirtrace_species}.gff3` +- `mature`: points to the FASTA file of mature miRNA sequences. `https://mirbase.org/download/CURRENT/mature.fa` +- `hairpin`: points to the FASTA file of precursor miRNA sequences. `https://mirbase.org/download/CURRENT/hairpin.fa` If MirGeneDB should be used instead it needs to be specified using `--mirgenedb` and use the parameters below . diff --git a/nextflow.config b/nextflow.config index ecaa7ccb..61114b48 100644 --- a/nextflow.config +++ b/nextflow.config @@ -20,8 +20,8 @@ params { igenomes_base = 's3://ngi-igenomes/igenomes' igenomes_ignore = false mirna_gtf = null - mature = "https://mirbase.org/ftp/CURRENT/mature.fa.gz" - hairpin = "https://mirbase.org/ftp/CURRENT/hairpin.fa.gz" + mature = "https://mirbase.org/download/CURRENT/mature.fa" + hairpin = "https://mirbase.org/download/CURRENT/hairpin.fa" mirgenedb = false mirgenedb_mature = null mirgenedb_hairpin = null diff --git a/nextflow_schema.json b/nextflow_schema.json index 213199c1..48fda3e7 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -87,7 +87,7 @@ "mirna_gtf": { "type": "string", "description": "GFF/GTF file with coordinates positions of precursor and miRNAs.", - "help_text": "miRBase `.gff3` file, typically downloaded from [`https://mirbase.org/ftp/CURRENT/genomes/`](https://mirbase.org/ftp/CURRENT/genomes/)\n\nIf using iGenomes with `--genome` this file will be downloaded from miRBase automatically during the pipeline run.\n\n", + "help_text": "miRBase `.gff3` file, typically downloaded from [`https://mirbase.org/download/CURRENT/genomes/`](https://mirbase.org/download/CURRENT/genomes/)\n\nIf using iGenomes with `--genome` this file will be downloaded from miRBase automatically during the pipeline run.\n\n", "fa_icon": "fas fa-address-book" }, "mirgenedb_gff": { @@ -100,7 +100,7 @@ "description": "Path to FASTA file with mature miRNAs.", "fa_icon": "fas fa-wheelchair", "help_text": "Typically this will be the `mature.fa` file from miRBase. Can be given either as a plain text `.fa` file or a compressed `.gz` file.\n\nDefaults to the current miRBase release URL, from which the file will be downloaded.", - "default": "https://mirbase.org/ftp/CURRENT/mature.fa.gz" + "default": "https://mirbase.org/download/CURRENT/mature.fa" }, "mirgenedb_mature": { "type": "string", @@ -112,7 +112,7 @@ "description": "Path to FASTA file with miRNAs precursors.", "fa_icon": "fab fa-cuttlefish", "help_text": "Typically this will be the `mature.fa` file from miRBase. Can be given either as a plain text `.fa` file or a compressed `.gz` file.\n\nDefaults to the current miRBase release URL, from which the file will be downloaded.", - "default": "https://mirbase.org/ftp/CURRENT/hairpin.fa.gz" + "default": "https://mirbase.org/download/CURRENT/hairpin.fa" }, "mirgenedb_hairpin": { "type": "string", diff --git a/workflows/smrnaseq.nf b/workflows/smrnaseq.nf index ad5ecfef..ed8f87c8 100644 --- a/workflows/smrnaseq.nf +++ b/workflows/smrnaseq.nf @@ -25,7 +25,7 @@ if (!params.mirtrace_species) { } // Genome options -def mirna_gtf_from_species = params.mirtrace_species ? "https://mirbase.org/ftp/CURRENT/genomes/${params.mirtrace_species}.gff3" : false +def mirna_gtf_from_species = params.mirtrace_species ? "https://mirbase.org/download/CURRENT/genomes/${params.mirtrace_species}.gff3" : false def mirna_gtf = params.mirna_gtf ?: mirna_gtf_from_species /* From d3a0df94251016cdb006dcb3521969b2119dcb4e Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 06:57:12 +0000 Subject: [PATCH 11/33] Template merge and modules updates --- .github/CONTRIBUTING.md | 1 - .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/awsfulltest.yml | 9 +- .github/workflows/awstest.yml | 8 +- .github/workflows/ci.yml | 2 +- .gitpod.yml | 5 + CITATIONS.md | 5 + README.md | 6 +- assets/methods_description_template.yml | 10 +- assets/multiqc_config.yml | 4 +- assets/nf-core-smrnaseq_logo_light.png | Bin 11484 -> 74188 bytes assets/slackreport.json | 2 +- docs/usage.md | 6 +- lib/NfcoreSchema.groovy | 530 ------------------------ lib/NfcoreTemplate.groovy | 2 +- lib/WorkflowMain.groovy | 32 -- lib/WorkflowSmrnaseq.groovy | 45 +- main.nf | 16 + nextflow.config | 42 +- nextflow_schema.json | 37 +- workflows/smrnaseq.nf | 17 +- 21 files changed, 174 insertions(+), 607 deletions(-) delete mode 100755 lib/NfcoreSchema.groovy diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b24dd094..33a2c027 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -116,4 +116,3 @@ To get started: Devcontainer specs: - [DevContainer config](.devcontainer/devcontainer.json) -- [Dockerfile](.devcontainer/Dockerfile) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 137da49f..335a06b1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -42,7 +42,7 @@ body: attributes: label: System information description: | - * Nextflow version _(eg. 22.10.1)_ + * Nextflow version _(eg. 23.04.0)_ * Hardware _(eg. HPC, Desktop, Cloud)_ * Executor _(eg. slurm, local, awsbatch)_ * Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud, or Apptainer)_ diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index 5d00bc97..2ac5826b 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -14,18 +14,23 @@ jobs: runs-on: ubuntu-latest steps: - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@v1 + uses: seqeralabs/action-tower-launch@v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} compute_env: ${{ secrets.TOWER_COMPUTE_ENV }} + revision: ${{ github.sha }} workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/smrnaseq/work-${{ github.sha }} parameters: | { + "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}", "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/smrnaseq/results-${{ github.sha }}" } profiles: test_full + - uses: actions/upload-artifact@v3 with: name: Tower debug log file - path: tower_action_*.log + path: | + tower_action_*.log + tower_action_*.json diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml index 7d4c357c..84d22f1c 100644 --- a/.github/workflows/awstest.yml +++ b/.github/workflows/awstest.yml @@ -12,18 +12,22 @@ jobs: steps: # Launch workflow using Tower CLI tool action - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@v1 + uses: seqeralabs/action-tower-launch@v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} compute_env: ${{ secrets.TOWER_COMPUTE_ENV }} + revision: ${{ github.sha }} workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/smrnaseq/work-${{ github.sha }} parameters: | { "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/smrnaseq/results-test-${{ github.sha }}" } profiles: test + - uses: actions/upload-artifact@v3 with: name: Tower debug log file - path: tower_action_*.log + path: | + tower_action_*.log + tower_action_*.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4bd5555..45ad5219 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: NXF_VER: - - "22.10.1" + - "23.04.0" - "latest-everything" profile: - "test" diff --git a/.gitpod.yml b/.gitpod.yml index 85d95ecc..25488dcc 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,9 @@ image: nfcore/gitpod:latest +tasks: + - name: Update Nextflow and setup pre-commit + command: | + pre-commit install --install-hooks + nextflow self-update vscode: extensions: # based on nf-core.nf-core-extensionpack diff --git a/CITATIONS.md b/CITATIONS.md index 11f752b9..67b98c96 100644 --- a/CITATIONS.md +++ b/CITATIONS.md @@ -12,6 +12,8 @@ - [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/) + > Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. Available online https://www.bioinformatics.babraham.ac.uk/projects/fastqc/. + * [trimgalore](https://www.bioinformatics.babraham.ac.uk/projects/trim_galore/) * [samtools](https://pubmed.ncbi.nlm.nih.gov/19505943/) @@ -56,5 +58,8 @@ - [Docker](https://dl.acm.org/doi/10.5555/2600239.2600241) + > Merkel, D. (2014). Docker: lightweight linux containers for consistent development and deployment. Linux Journal, 2014(239), 2. doi: 10.5555/2600239.2600241. + - [Singularity](https://pubmed.ncbi.nlm.nih.gov/28494014/) + > Kurtzer GM, Sochat V, Bauer MW. Singularity: Scientific containers for mobility of compute. PLoS One. 2017 May 11;12(5):e0177459. doi: 10.1371/journal.pone.0177459. eCollection 2017. PubMed PMID: 28494014; PubMed Central PMCID: PMC5426675. diff --git a/README.md b/README.md index 6fb16c5e..24226773 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/smrnaseq/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.3456879-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.3456879) -[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A522.10.1-23aa62.svg)](https://www.nextflow.io/) +[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A523.04.0-23aa62.svg)](https://www.nextflow.io/) [![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/) [![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/) [![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/) @@ -92,11 +92,11 @@ nextflow run nf-core/smrnaseq \ > provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; > see [docs](https://nf-co.re/usage/configuration#custom-configuration-files). -For more details, please refer to the [usage documentation](https://nf-co.re/smrnaseq/usage) and the [parameter documentation](https://nf-co.re/smrnaseq/parameters). +For more details and further functionality, please refer to the [usage documentation](https://nf-co.re/smrnaseq/usage) and the [parameter documentation](https://nf-co.re/smrnaseq/parameters). ## Pipeline output -To see the the results of a test run with a full size dataset refer to the [results](https://nf-co.re/smrnaseq/results) tab on the nf-core website pipeline page. +To see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/smrnaseq/results) tab on the nf-core website pipeline page. For more details about the output files and reports, please refer to the [output documentation](https://nf-co.re/smrnaseq/output). diff --git a/assets/methods_description_template.yml b/assets/methods_description_template.yml index 1f05424e..87cc6194 100644 --- a/assets/methods_description_template.yml +++ b/assets/methods_description_template.yml @@ -5,13 +5,17 @@ section_href: "https://github.com/nf-core/smrnaseq" plot_type: "html" data: |

Methods

-

Data was processed using nf-core/smrnaseq v${workflow.manifest.version} ${doi_text} of the nf-core collection of workflows (Ewels et al., 2020).

+

Data was processed using nf-core/smrnaseq v${workflow.manifest.version} ${doi_text} of the nf-core collection of workflows (Ewels et al., 2020), utilising reproducible software environments from the Bioconda (Grüning et al., 2018) and Biocontainers (da Veiga Leprevost et al., 2017) projects.

The pipeline was executed with Nextflow v${workflow.nextflow.version} (Di Tommaso et al., 2017) with the following command:

${workflow.commandLine}
+

${tool_citations}

References

    -
  • Di Tommaso, P., Chatzou, M., Floden, E. W., Barja, P. P., Palumbo, E., & Notredame, C. (2017). Nextflow enables reproducible computational workflows. Nature Biotechnology, 35(4), 316-319. https://doi.org/10.1038/nbt.3820
    • -
  • Ewels, P. A., Peltzer, A., Fillinger, S., Patel, H., Alneberg, J., Wilm, A., Garcia, M. U., Di Tommaso, P., & Nahnsen, S. (2020). The nf-core framework for community-curated bioinformatics pipelines. Nature Biotechnology, 38(3), 276-278. https://doi.org/10.1038/s41587-020-0439-x
    • +
  • Di Tommaso, P., Chatzou, M., Floden, E. W., Barja, P. P., Palumbo, E., & Notredame, C. (2017). Nextflow enables reproducible computational workflows. Nature Biotechnology, 35(4), 316-319. doi: 10.1038/nbt.3820
    • +
  • Ewels, P. A., Peltzer, A., Fillinger, S., Patel, H., Alneberg, J., Wilm, A., Garcia, M. U., Di Tommaso, P., & Nahnsen, S. (2020). The nf-core framework for community-curated bioinformatics pipelines. Nature Biotechnology, 38(3), 276-278. doi: 10.1038/s41587-020-0439-x
    • +
  • Grüning, B., Dale, R., Sjödin, A., Chapman, B. A., Rowe, J., Tomkins-Tinch, C. H., Valieris, R., Köster, J., & Bioconda Team. (2018). Bioconda: sustainable and comprehensive software distribution for the life sciences. Nature Methods, 15(7), 475–476. doi: 10.1038/s41592-018-0046-7
    • +
  • da Veiga Leprevost, F., Grüning, B. A., Alves Aflitos, S., Röst, H. L., Uszkoreit, J., Barsnes, H., Vaudel, M., Moreno, P., Gatto, L., Weber, J., Bai, M., Jimenez, R. C., Sachsenberg, T., Pfeuffer, J., Vera Alvarez, R., Griss, J., Nesvizhskii, A. I., & Perez-Riverol, Y. (2017). BioContainers: an open-source and community-driven framework for software standardization. Bioinformatics (Oxford, England), 33(16), 2580–2582. doi: 10.1093/bioinformatics/btx192
    • + ${tool_bibliography}
Notes:
diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index df5ec37a..23da1135 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -1,7 +1,7 @@ report_comment: > - This report has been generated by the nf-core/smrnaseq + This report has been generated by the nf-core/smrnaseq analysis pipeline. For information about how to interpret these results, please see the - documentation. + documentation. report_section_order: "nf-core-smrnaseq-methods-description": order: -1000 diff --git a/assets/nf-core-smrnaseq_logo_light.png b/assets/nf-core-smrnaseq_logo_light.png index 2ecc50a7721db40c53d63ab96945b624cdd188ea..262fa1b099eb8b3cbd5f7d838f87a54dc0ec4ebe 100644 GIT binary patch literal 74188 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�ev`Q}H7y#R1zKkC5n?0_OP7^FqWWeXhX0t0pNK z(bt$TL*ehNPtM(;VA@5R9zN!e8~K<~cX3NnUF1p*`5e(DU1F8lRX-)8KbL`E|L`3V zNx2$Zf1S7Do%}yd%DH81m#>ET4sG1bNkca-B!p$@$27Ju`3?2uL@BKov2V<7mu!_y zZ{zyp_2QITSG-eP=P-{N#gu#(3@bdT4+KZJNda3|h8Nf=HS=!63yn&_8xd=3Jkhf$ z!}BGTsS9Rf-o-Z?Q?|cG3CC|q^rGJn>M0i8LCYqr+E3?cMnhr-$;c_-;y3nImk_jg z*SB>)9>F^Z*<}?lDtFvDC)3w(;J|^ymifdvBjSktDB*-0?<&&u_8~@@7`@G>U0<++ z9+SbA7tkuQpQRryewLjRBRYX|j#Qk}?Z|6*YO7K~og$D#s)y)BWmu8L?D||OjOHli z(rd40>4_~TSlT+@@R3Vwl4m533X}aO_w!RFZu2~QpnL7?*4I%LpD*2+wLVo|@%I8{ zzZ*2>_N_CqtE}T$qqCAa_KGgmtQr5qR1iS0X_i)@emeG`q0wmFbyr~nZu(wbqnm8n zm>_weO@nuHR=8~I#88`0`PS5U9d(wcUZTt7AX?2|`@=qRC83w>Mlt@JqGP!z*B~9k zLWkYhn<%5xrfan)FuTkCh{hk_05N^8n#jP+e{_`}<+~B3W?CiNuAua}a_MTdYyUEu zusJz*oM-`=N*{Piw?l43yLb=$GNYte%b+5I@-V7dC>B1^m zR*$`EP?Yr|V3rCL9eeM`ru`w7D!cmZMv3U8-`dIMVpnov@J7;{b@x9^3m-Z3Y{Z&* zD_zX0=I>)SdOkw+&z36W$kA!;9RD64IRcJ9N)qO^ytsAe+9S#M%>(p0L@&TU7Z<6d zXj3LQe0J3d7TseiYm0wOit-x`{PWm{J|RZs<&$+&Hgo2h z5yoyB+HQt44OJ{z%<^Nov&O3L_s`N7xT*-x6tM{ij1IE&RK^F;>C|9s3ZaVQ%s1ZD z&nS+C*X#c67*TD{>-$e&9F_U?(pP^n73=qY;t~6n@8+=ca8aLp%dr}3!iDJCk?<^K z&vypzO3_=}Gj~EnkD5>38d&H~S$*Q#8lks$jjwQi7#*)n;Y=>q4V;``tYFUD_J8e# zh|!nSX8$YmI;3~P|A88khWk?zH-)?If|Hk_xY3dxFKoZ2t zJhyn*p%TVmg-uCC^US3grB{BCe;gjJc~y-@ArHqhvcIIv>?>x{3Ka?IQMYkLr(_(> zW9Yhih|wXG9m5&4$o+&R?gWb^T_Edb8q`Plm^+Gd%I_1>MvGg_x>l(|hG zXL8v{RZZI(QAKaWHr5s{+1W7^G~V*hY!i97m?+bvfBkF?1U{OvO;CKD`v$kh#Mp6S zW}dnS&g=07uy2cfao?kBg`l52EM{x5^{qZ9WVy(?lQ9ObhGymV&M6W5@vZoDNTGn5;{NXx zX<|J~8H=}B&gYFdI$k|n(j)EUEB-F--tzpx?lX!kjav~2haKue-^}@3(<2`l9v*%V zpct`r=&rGCgdyq>V-|xIQ&eFazpBmQxvNAkeJ+~rNaF6(0Q}arT=aY7^=HiHH|9($ z2FqKi7a4zW5&2$7`1++}teA$yJok{Vzq)`Pmy%Nml3Kg-F zXgU?f+Q^T}S6DR=!9a6CFTM63I1qE;!8>bUFzl|a`*)PGkDYY|aNoPCe2S{MV#&TC z!F=~d-rdNg6D;BHXbe@$z9Ddm+VuDVjk-}hr>I}r58#I@|Hf&`?C6on@5rDQ;BtN* zCm#GK9DZNG)n!xr>vw+e68-Re^a17vyB)GrmOgb32YfBAX7Z}B^qsjdl3ZJRYm~<- zu>14DocgGES;E)15;iXQOAcTgE-RVS%WN{_ViKsrj|B?;TuuS3;|dS!u*jwlru ztBk1E6!us{JY>%V92A6y^0s)NzF5~my5ZE6)b0sJz-@?W8pFoHx$16HHPOny-p6#g{Jl;f&|&AJU;;%xQ`;X{=fW1tN4U72f4 zG2cMw-+5+3LoqX^{p5EUUI>9<26SbY{c>rF%o(YY8`tmLVq6s@K1cKBOl@2}*jRT~ zwnF^kOUr9N0z8a!ueni;qm=x6K}x5od!>a{9A3?Y6I!_mV$%j)A(Y*B&e?@v8S-a( zSs!W+gCwB|RuzEbEPOpaAT+ZfMs4{P_i7&;wmSDNBc#h04lydP z5hC|$bEW#=|eu-u>CWszC&qFp66I!fh(Y*Z8a;X4HJEb(E8rIV;uNI`YuH-0LG z_x|L@M;I=omg$aE(ovAcYk2X;oS)P(zTYR)WiNgO zyKe)d4l{1;mgU^sK2|@v0DmngV>`~z-{GLowF<(4%{)|B5!HIprtr|JB(XfNq)F41 zdBg7zqyK>m2|zW_rj-*ODz_K43Ai6K?;X2D^odN@Trxj!?`>nAs;1XPoBi~&g)}9R z%Mk9FZFTg7bZi1w?Ot=Hz}>6#t^$S6^%~71Rd%7%yXx;S_t zt$ev7PH)oT_RV1JM{E6CffG#%%Bw8`QG6>kQr&(jVIfv&iAif$%O5ydUwiap6W<&v z6Fcmpmhs~C*}t_NH&TIG85T<+5v{-jE2d1K8R0F3_wzj=JtlSsiU1_P;jIu^rVt_$ z12*~{@dWX^EGlooFiB*1lh^f3mtR~?6WXJ5B!8FTMy%2r1aV71x1-&JDdv*D$fk(E zVm%|}?A;~_a#xV!!8snvf{hP7d)bjzB}+edZ+|(zqRkJa54CYhAB$vW9i)=5Jb1Td zsKHz4h5CdIc?r6d&$A<`fhL|44`p0}NYs9xL{5hW#nr+3gyFT9ae7LB7N1huo;yjb z&wqUL-Jo$kkm45a9E#{1v?(hCYS$&-Bp%v6bD5a*gN`dT>3kVm>-w&YhaNy*!&?ij985sS&kCNa*JE8-5_j zl*)Ynf_EvK>~Nl0&OdOB-Lk>%-s?G}==9cy*Z4c0bLjG)or+@Iy6*0Mt>7%jftcqU z_udxaRbCWFgPc{vTfq-3ZDye=9>R0)Bi@CaU_mpj1{f~K9QZafW~F|U&y<^Q)&CHq zFo4D-zr(JPUg2U$d;*Q;!ZuHD4D6}d<7)|w^W(gcEkIi(h^Cp!=CPKa!I7uay&pJ8vY}rHdBkJ~S=vi+eT$}~wv;e%L7}&a*03xDe z641-lqNOI{=)U4uT~qf@4QM{Q=j=M%-eZ{#(dJS=iu^w{4uPI2(A91YbOkq5dnMu^ z15m)6Dz4IgZaQj_0FM0W-{F6{QB$+Ehc;Vmu4mC%2G{h-{o+HBkP?7|AROl^&*XlN zc{98Ncz*GL$dj#;uK8Yn9=-%52mw7idF*<#&aI$(UQuEe&OGOBRZcJaVH|)#IH90w zbu(d01*q~5_r>ReULX$yb~x$fg?8DnBhL)Ur!y5BcXn#3)B#SIPF@jTO#X+%}kW$rp4 z3HUieI@rAoBzq4wsev^5inv}1Sydf6MvtALXt@YrrxxtnRhJqC@h{PQq)%?!|2&PT zpP5>5)3pHS*KMqIO&W(WVY_EfVp{Cxd02)`XoJK9h!XVb@0(q4F2# zJ}mNy&+|Bnmlqv1P4hM{I*^EWBi?`d-6?cN$lB^``8zBA%$r;9tA!NF3I$fVIxVhD(!OdjKfxSyz0@J8@s*BK_WI$@|uGw$m!mVLT+5xsx z{KGk7{QTE}Jx58gK}JV44rH?!|6Sc8AJ)Wgapd0HBQ)FW>n>WJ;vmc9Ex!(h$pqqc z8QU$FAE6>prrggQ0J;1iHDkRVI|CX7z+Xi`kvVmn`a8x4e!nt|yE*#)L1tRH72FwP zy}zc8@yNOTAu%*!f}4v0+e|0--z5ooD6v-%V({(K1kI(3Hm*lpE4|pVS;4rleR&L?aN7Kv{&uC*`91Y|dCsl=N?)>V1R&soy^VyDmb4<38D)!4InyyH&6 z0f16w;%OKKXPivp?+|A&o!mWFCBUZO|8%zX^pC0=yn*wtvWC$=-ao&Z+91td6AYAd z!l-jeHRp2*41eHtPKGkGu>*&tXe0PnR3d5W%~sw)$Ql@8vJhADJi-kl%mUo*d9lT8 zdO|NQ3VcSJDtZcmSOat* zd%gvZvK$-FccrVC9p44n&2AF*>TduE);a!3ZvJ$2;kOrUzvKx9m&SqQ!UN^W&SlX+ z_Hcl^&Kr0c z2vJj0bsAlsEv3mQa4tNe+GnM*KG3D{Q6u-#U4aBKIj{YuYvU4kcx;N)(KzJ_={MjAFuLS?R3PHnijg*CMuZ5>*2TkknWmFH2nAKDBSVjNthgj z441SWzajgc%#wb9c|*XjDC@+^q1o~Vlsx-%@yuDGtMxmaxH4MIRjAOva6YW< zFzABA!sNW}3mFRe+N-*g+!j?W@*&}0ItKAZ)+U!^?=F6e$Ue;R>Y}Z+=M``$sRg*X z9$@rO*o*(H{6N!|M=q5ABL$mP{Yh>C$9-$4KFZ$y)1!4et}IvZ0*zuhK_@)7;<(0tx5Cm_Jqrzhea(H>C6xM|;cjg@1w zuhx7IF^WgVevuFJ96L?gU2apvTk)CZr*?qQ0T>mo@y@AFigJ|DC6+=ZF1>);wJ#Cu zDa?V5@}Slt@1I~fKZ#UZR_hF6Yx$E1Q;krj-qL{*Dcz1rXXlpGW8$14M)cyxf&+86 zb*Tj>$~LRK_QxFY6Hb~b5oSkV5zY@{Jq_yE{tzZJQm%6JAS#yb&kA8{GXB0jbBM@+ zZ-sfD+rX?hr|H;u2ge6bu>%Jfg6}b_?6b%wEAyYV2h7wQtU*A5!NroL-j;1`xMFXl zSIF@ao{GJz(ymN%m&LQ_-=mTq*Y&xolD`)q0IyOuhKmz0DmK-x?U?ez%3%;&B#Y{S zcKR?(;6!&T+oz`g-5p!NRnzvJ6bzS72tE*=SBRT1B(eV_cWQj_)tsbu+pee*w$Jyt zRxwb!*;1R4{axORv&G?Db8yEHS>c3Nrx=?IqPE^|29fmMJMR9n$Ws#wzY1@%hl{Me zuGwB}y&sGyjixIdegma38z|1h&!9G$bc@^0?E2B9rCdj+sHEFr^(c06LKYQpZMio= z76r-X?~#%*%On(P#i*>Itgrc}#_nA)Z+(Sb|M3cE_KU1Bq~yw?3QE%!Ve8I z9KS)gws75Rc>?g|TG-=@N6W~{#?UmcP!q$slAzUy+*sozSkNX+A83(}7TO4(!uk=9 z6Va5j?R6NedEbwrGJ0r_1||=l28w=M_x-k9VG9n6&^?A#^Z4V4!Jvb%UYl;`opV4| z;Z1V^!i5d;YOIR%0~g^wrmm@n+sVsiG`f6x8kvy1M}m&KHhD$QV>bF&@P?OfaBbW* zxC}sWl=Du-BRX~mTduC%3r-Ub)*q5Be2=qg>HmW=_D4LO-pQbvta6x_UG5C>KBJ-hc}&vz zZ?nwzsH)wou7?;C7=js7Y?7NI*=tx=u?=#zFkCg+SJMYG01Dn zo%MX{qLuA=X@pPb$z?@^;@3Ope7MJ1t2@9nbhOCgCt?bRQ_wPD-e}3QosK=x7I`@6u*Y&)f*YmpW*O8rQDj_T- z@}h93a%r@n4-iJLCjaHc3#jMD1SXhc+xbu3*;h{e`x*=6qom#zvWJ(#VRL)Mwh5FD zA0d`5DcpW``T@6y6l!V5ZR^l;J}ey_*!gm4(E^kZCR_v6K-n{-9Et|1+Lt*&ziqBQ$XXl>)uE;ekq^JE{zl2xhx>V^#t*KS+K zP0(&@ExRQ?$zXr$n%Dj#=U@Uz?nRyL=HXx`y4PR$SGem;yYr-~-?)EOog~+FoJ9S! z^}+KTC^n_Om%rQps2kVDz7Uj}>*sq300^hGGECx5S4OgZFRLSaA!}pE*q3yI3#(9Rwg zftY|o_2f243lz7s_IJkF&Y(}!ocZ|lN`{4U@K+-xfF@Axau+YY$CebSMlT85x3iTz6X+C|GlUiRiaRrN50`ZGJoy6g(1VHJP#d@Y%C0_2v zeYdcGU4|6zDE%cm!D{w4ai~PwHdO55>o4ybp>NxXRH^@{QnUNOWCB8!qO7Z$VqlOW zNasf1dlf(7u?<}0-|N+PPrsxK%R}dMt#wXIJ?7yJFwIe&*6ct5cq>Lx?JcV_@!1{5 zxQbJ)?BL5ZN@}2fTBX#POz(p`#V@-&1#e4weCz*<|E{ISg{KUPtp!_k}9@K1@mB7?>dG`_Z5$0R*ozIiaia!mt8GUhq z$~EQA9U*yf>BGuLPvX+Nw}Pz%q-T)V;^sF5ss~VD zy(CckI%aWcUnxOK?KOdRL_cF%NM6DF>OnbFKnx7&sH1Oa-U2g%&U+c!W{%+fc|@ZG zC4(%NFXpT@8&G^Sczd)3|3bNxP89@WTy0DehHRe*kQdMvQ_?#%_3v1zbOlB&+#4n^Bg7TZuyFk@ec%HdtcvOyuuyy_98 z1PLHr`$^>|ztey~!)%SAfT}ZiL3!FB2_vRVRpq1)N5sK|07RG#oIm)D_~ze2iXy3G=N#aGe$H}bppmCMKC15urD zBYDNQzvwY8e425y&2uCm)}6k=6p`>XSWXF~5a^BTO{bq#+6H+A{qeP@6X&}5nAUNN zu#wG1-AjyIyfBOrU-5N3DVgPM z3?=KCa-{Ojnx35U%-EKTxru8&E)k9df36s%fJ!BD+8tlXH;z1b(E6P8j_&lu1UG#3 ziZ8MVA<1mE}kilZE7d-S>a7_8p1orxsQgIJ+HwbBgyuar`a415jpG?foKE=+Qi zH>gOEyM)rngbbfAs~q2F`i1cmdLq)-MqBZ%tTP;?n==}492R#!+*R%jtSj!lOF9w2 zc4kh5HvcqN0Stt3%=2$3O1;sIOWl7K7v-z*1_DR`k4D~9+SBRYjmHZK)JkY*{l&gF zghnKz|6Y#^4qHzZl5Zzv@i{V&%lH{rgsg{nRRMju4Jq}g9vostXa33?lm!U5zCHOo z&cJS+b>H$hWH@>g>YV=g7?GF@ogKeFu0s`Zt~pibL;h%{eQl?}S8J#7HJix_NC^gz zh6GiYtN(!a`*wesFswSDd9&X1Gru=7&HAXRgqd>P$-TWrd_{zh>c>jmOHMD@DY0cY z)O0(8iAw+`u6?|trmC#XT)~0 zqwlp9+cAU$BJC2qb>>T1FQflL6m)rc9u{Mli6NR{^ap(cWgKTpfFc=!WSsg2v~0L8 zi^j_z1#;p=lss3d2tl(sOU;h=K|{vWk=Iycyv^Bs8&VrTM_;t*QGVc2#r)#}RwssE zi!PocnX4lDe;U56iSUWna@tQaj<$co+iO2N=*daUEbNQX=wYq4ga)f>ETQ1O10w} z8$$isCm3D;Kx~$^!0e{l=ZMk*FmFOi^}rucr?(R@7PLJvx@5!maM};SWbp2*(G{UC zxGvTTSP%>q%k~L)+uldo*MzpAy3^^vVl|1Zi~eh``Z_$W1~2#!7afz|c9p3!wdVwr z0HncX!lya*7wIA4Y0j!j#hZ9`wQu)ZQ8BpmH|Raw{9>unZ`((JOkwc;xrNo(Y^r)v z5EMJob?M@XiSsYrw;ZMW8@Lt3JjFhwmDzcIi2bSl;P4WM(i;0@%aEfe72l|3l*g3t zXaWcGr22~jgPPJ1yVEw%Nik-GWC}egHFHN{c5)tBPc^j*)935%%%7D(Jpu1M87GB` z&I$uYmhLO;gA6yCiOeHf^O*7o#%OK! z&qg`>1%9l^TZA1Ee2OBqU7ZSj!5J_01=AJy>agDL+(OK9-}Qd zDy*aLP4MgZ-Rz3YweCfbCSeql3lES(5cYCWckWFWzhGVoqYwS~BK~bQqs!eW5CM8(&Zj zxg=~lFlwE+$wJi8MzmJb=NYb@P4jInnsIGy<4OJ2*xusTj*}|em|{l)$zXzM%O3BA zZ%w^~0q(8Hy0g1X8!kBKPwI(0zIdSh5T#3Y@pGOYS$ed!9@)kB6}eKyI2NO?NGUo7 z!WtM#kV?j@{c8b-;aIZc?g>7~@PhOlPO5q783-N(xeNAs!OdcE;tu}e=tLDg-UBk{ zI5@Qg(P}d12!m$+8oiyKcmk=tJ2>)v_lPLHwby+gCc03JQ;WM-dF*e*x0zrQ6S{Ze zo9p8-bi!*mfVdfN_=c3IAG%+IwC|3idF|u)M%Tux{a75CME{NOZTx&`<7+!`Ea>j2!4}ZP zlt%a*35=!pk0h@>r?=2<*^r{@8OsMv=?PcwSEyA1gy`*fIf>DBB*V{-iX9 zPg!-H-RnV30eQQ97F^viW#E}A)xyx0F7ELxiybA;iq$`UXD+sF>kZW6FYOnG_ zfWim=M^6?Xp_ca8Q)x`&+m&l?e|VP7b~P}*5QtMhss3|lhRPsV_uX5-mG&q<_ak5V zOzV=Jy~O0GH@#s77@x`2m9A1i`S4gY<;dM;Vd4vrsa{DsCC;RF7nXUl+qpUTkb)*7 zKTdq-Qt(#6!uV-!jLr{d62?4(m8O|+E4B#p3qudh6;#Z6G*`>rz2C<+jyK<5^b@NY ztzr1ZzUcyx?Bly>%HWB*Z806YB~q2&HZ9t2Nf#ipwV~trE!Uyw>ZmUa>$BUWI#Mz- z`h^t*u}-8Y!iY(CZ;uPk|ZX(5ZB^t`IQfO-e)uXQ+0C|ztXd8hYu=Z z{bXBWYX|#Z#$E`Z;`a)tSqM!Z-aMoUdxLu!fZuQv}SUI!Pyc%^@K!ES@c~@-~fT&+GK3MR#{`ZMxJe za0)Iq6gxFz+gB9M+au=-MMfLA-)y+lTTM5xv+Pb_+pW8tIja1(7X8F?Rl8CBk8}?v z!^+z$$zE`o+3LuM$v;aoY}R)7l8(fK*Wql_sLA9+;mP zGgs;m|9DZLqWXh9Xtpx(;Z$xE24y~}WmeH%6-5{16sZ|x>M2Igwl?%lrZz0k;69Gd zgr1_kl+wuPHh!e^(oILs{h?AvpGME6Crkyyk z?O7B0&V4b;FxRE3a_M(lhFBP#@RtB1MVA-1#r=$okm)#NX=8I^iBR(n&uj zIhw_cxr9?@#db`v?h#shxK8?lC#~9*Lj1@%p+D1rN2Pji-+#hAhivOqtI4_k(@+QK zRw>iV#zU7}Sab~WQZc2f?G`>IfGiupBzSlBK0cvwDyu|3gKUfGE#k^Amr4!)5#VuR}%HzxIn)&=tSj*{!GC77J9w%G1?x9}J`2UhRs3 z0{zJ|?BbM9JAMP|rF(vMJ$|ezguidRfa>$S3D$1aG^$fYHGOp;%#*G8PT9Gj>5!fJ zD3`@8ok*3LOO{dQ$jNxzOTp36l>D{iClB{p{G0CApGahSTFE~#j$sfU>^Br{uZ$_qsv*vtZZJxC+_{ zsS34kSPtmFKEyNJ6b5k)N#^CL4*_QO(lcl>HwNLUjTR2!qXh{%THEjLc z^?^I+M5_8}#rZEoeLL}Q$xL#Kx=_m`F2mu+u%@sds72m;mknKDg>nk@o6LpH39nUHP!sCv1Tu_@k z%dD)njLcUtIgNdvve}Tt~%S~&z2ldUoj2ACMql5qgn#V{O zKXdZ_lYJ4mzhZhrxX-;zy+3AGw4s@o{8bshtC*ESA$&x5zyG5vDsbj_?$-Ldd}hN3 zCO!oj+nl~*uX4jTfoMvOBRT^1Ahen@@2a=C>SU1fD0{KF*%YyLul(?Dxq!AYikI5A zQ!2rLJC>W)p0BouFKcF<#`0_PeBn@d0&gDwVjA08xW9<><3lzvE4PWqDg|_<{TkZ2+u8gD!dVu7akbNQ+2itVA%5pH;ocR5OtTz5bYBo# zRuEoLTbZS?ch?$Wr=Xn6Ubka3tJLqyp|dX)p8BHfd`16My1}L`WDgPJ-}tEpkp`e~ z2hdTtq~OQ_m9*A!&#H;@@RA_YaC+Bxp4<5K;m3$4;7?zv(pS0^m#<=D_&JxLl1JmE z5YapS=RFUH@u(D!M0ZaQ(dV=UPAu=M zS+a5Wmt}}dl>RAwC+X>iR54RfNn7YbjZb1KFK?V^rwxcV5%UCm;qi|lcQHV5`eIIdyWcuEX|NxMzk5b@IgYakiJr5bGBPu%dt zm6r}GPa1#|BDe&k*mvZosws42DrK! zM*BJzH!Z3klBOQL+SFK8C3jo%LECDTyT8hw$LhvNSfo(|>n;r$yMp9cuiNAwWY{aP zg1zOJtJtOS@zcUfn|y-#W@c`~T8Dl=hf!06=s+#a2VA-jahL30C)zbq$1D+p98~8$ zOFIQ=q9g{0|L!=v{0NRqqjWE@@d-uOsa=#%Q?(zB#`bLByKESn@fVVxhAPQ-{R^9N zTkpF`spJBg`E~qFg>GelrqYop4+ZI{O{d%^5mB}C-x>X9MNp_W=6Tb0uj7BVv+mKP zT(PNV5UgO>Gm_~^!*QH@yo;v zYfIyaWv?o8cuUW5a(H+d=bq))%*NqlEF!f2u)&#Zs`L_?Jc9#C_^RU7ZIz=H#}e)9 zAh|`6Q7NE$QQPdI1$5R4K0b|0A|Le0I$nMg+Xc^}Ym!noE!UMhVD)lV>sbq3C2t?0 z7F+i1F0mPUJbJKct}?VL9EfON&Yrm0YZe$X`qa%|#XN?Jp)wbTTO)5!n6Cxw^kjd# z95jO&3!cPYv?och%QqXD&!(Dxu(`S>V7zp(#xVQ?&e+VsUy)gRlMn<*oopnn=N-^H zdXV3JceP;snrVB1a)Qt?sUY{E#Z%YMN?YZ4zryE(T@xB|abb|$d>5LY#izmucSwlf zmf=C{!Z;?5PlfkSD%)O}>1Vz0`SX1J-h;8baggmI1D zq`*{VlbB})JHOqW#`Xs?;6T^Dv7UZ;qs|Vm1J8;b6t;l}<#eAQ3mJw2@&w!}xu^-l zfdnHa|6NR=o@K^&+ezhM`U7NO?A>N3_U+H}lPOISlUs33QkYdTe?D~v7LHWv z@=%qjy%giJ+V^Vx=2GBfuvQ&9)(n|*Er;oY;h_}~YNQ!xj_UhH_+h%!$WElU90_nx zp6?^|HgWnjHyd0$<7XMaUGvLfkdeM}`;Jre_ z@RwC~HT%CYEP|^IEq(U1eP3F%FsAWXx;Oi6G*=s2#Okfg;v2M8krrMe1z{fk!2NIX zrGLM=m!-UQ-kT8$vd6(h_+npscuAb;-6tp?Z|*P9Z3z!m=GZ&T^5F@O2i&LiZ6v@C z?LqHk+|M)0!#|On;lp%k<*oYbaoI)9S)!^9O0DKzqV?Jl6>1}N3F_0sr=3?{r%OUU9P-p z(lgc*X?xv^CS5WB@I`Z)+Acqlb?N?LG;>?ls>7bWzMOBC=$Lo_)#a)~{xAR^(5SU^UdBP%kEhDthlQ&|rJ$UP)WyN|L zhBc?|7@4Nz%?^c^jyVZaEI1v#Y12T6P*LT1=uL{fU#7LJ_fJ)|bKx)w(P8b5AUOc`~cnUA*?OAp5iI=;!P&v|g~g3Vf(dNKn@=jdpn%yZ@47a9djS?dEsJp~c;$T?w~}V8bCa=8ww>T@D-g zm;8zoo`&^b#)qU-a%cSSnD?Gu2%Q1!Xijrhng6O7CjSk|c`sbX-JO-oTHjZZ_4Iif zq%qv+sJ8EMo84ED^OXwMaA#_kSq>doD2w~7X&dYeLn9RL*DHMHKr46D?YT|hFo{9GSbOCU$c_3fl#;h6Wu{k)LaQ(;qusA>QMOvLn zKhdRc*#?wz;l?6cV)nviBFOV@`@FRV-K!pX>bO-!suumoC;q|9pdrM+U3N|-r#1Mv zxjN9Wn2r02k3v+&!nl~=a!sinq502tOKDHuMsgZSNyWWv5dl5Hi z6{pspRvk(Hqv|!ub*F>fCkNUY3+h+g%*;2m#PZn;#|4&~#U}H(p-g8mHbzbVu*K%} zCDm8N*$lvppuzf~2y{Ma#2F3>Kei z<}Yg!u9u4MG+}VpB5f|HS{RS0NsT7zMv-a8-=8REJwqGzmQSIcvG%rf`oXhyZlx19 zQ_s+Ld9bnUO^jN4KENvf8qj_U3oXG%;-k{9_lHljgQ06jD`=;rHdBt5En``I0q!)P zbxHgGJx2+klL=IKN~mxduQxF1Dbrky6GeSqw2Z_* z_aM~>A3V7cz1$mIJ~%pQ$ye9F$n9~op`Lc`+a_F=y4|>vIaqNDq@=tGTF<%lLKzd@ z`}oo#@oW3vk1aMzk`+{C!+4p@`&mj9{QeJ}BY0t{CK8q)5Pg^~p1<{hj3G`<852Pl zep*mk{YT&~d$Z7vBfHY1e=vXJh%j$fcTza-=3lH+so$$y*wUPvzqz=8>?cFs z<*U2QLFbF3a;}KIEcqJi;daXABYrZU^q=QS{KE&R`C&eN$q$>F?7_9?GMT7k z-V>?Cb>OX6EbTV=sGJ}?qSs>5unV(Ry-z-Xb?#%o^J-_wDPcW-Prp3iCE1#EE~ll+ zH5_}C<50trknp<#wUCyr56<)Tz>PdJw#OsZqEh!wP}I34Q2UwK&Nv4(6>fxSz3Sn;E80Tt;Hm>z|-y9W`7JoXh5Si9Q<>3-Fj0SGl-0GQq6&CLhNvxW- z=ih95pjG-+B@Ry=s38Spyie05ONXv@FOiwf^vu^QE62I*B|f(iXlhT-yj0zfmoj

)bNtXB<>| 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 literal 11484 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 diff --git a/assets/slackreport.json b/assets/slackreport.json index 043d02f2..214c7fa9 100644 --- a/assets/slackreport.json +++ b/assets/slackreport.json @@ -3,7 +3,7 @@ { "fallback": "Plain-text summary of the attachment.", "color": "<% if (success) { %>good<% } else { %>danger<%} %>", - "author_name": "sanger-tol/readmapping v${version} - ${runName}", + "author_name": "nf-core/smrnaseq v${version} - ${runName}", "author_icon": "https://www.nextflow.io/docs/latest/_static/favicon.ico", "text": "<% if (success) { %>Pipeline completed successfully!<% } else { %>Pipeline completed with errors<% } %>", "fields": [ diff --git a/docs/usage.md b/docs/usage.md index 1893e2e6..f7810e59 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -104,7 +104,7 @@ An [example samplesheet](../assets/samplesheet.csv) has been provided with the p The typical command for running the pipeline is as follows: ```bash -nextflow run nf-core/smrnaseq --input samplesheet.csv --outdir --genome GRCh37 -profile docker +nextflow run nf-core/smrnaseq --input ./samplesheet.csv --outdir ./results --genome GRCh37 -profile docker ``` This will launch the pipeline with the `docker` configuration profile. See below for more information about profiles. @@ -123,7 +123,8 @@ If you wish to repeatedly use the same parameters for multiple runs, rather than Pipeline settings can be provided in a `yaml` or `json` file via `-params-file `. > ⚠️ Do not use `-c ` to specify parameters as this will result in errors. Custom config files specified with `-c` must only be used for [tuning process resource specifications](https://nf-co.re/docs/usage/configuration#tuning-workflow-resources), other infrastructural tweaks (such as output directories), or module arguments (args). -> The above pipeline run specified with a params file in yaml format: + +The above pipeline run specified with a params file in yaml format: ```bash nextflow run nf-core/smrnaseq -profile docker -params-file params.yaml @@ -135,7 +136,6 @@ with `params.yaml` containing: input: './samplesheet.csv' outdir: './results/' genome: 'GRCh37' -input: 'data' <...> ``` diff --git a/lib/NfcoreSchema.groovy b/lib/NfcoreSchema.groovy deleted file mode 100755 index 9b34804d..00000000 --- a/lib/NfcoreSchema.groovy +++ /dev/null @@ -1,530 +0,0 @@ -// -// This file holds several functions used to perform JSON parameter validation, help and summary rendering for the nf-core pipeline template. -// - -import nextflow.Nextflow -import org.everit.json.schema.Schema -import org.everit.json.schema.loader.SchemaLoader -import org.everit.json.schema.ValidationException -import org.json.JSONObject -import org.json.JSONTokener -import org.json.JSONArray -import groovy.json.JsonSlurper -import groovy.json.JsonBuilder - -class NfcoreSchema { - - // - // Resolve Schema path relative to main workflow directory - // - public static String getSchemaPath(workflow, schema_filename='nextflow_schema.json') { - return "${workflow.projectDir}/${schema_filename}" - } - - // - // Function to loop over all parameters defined in schema and check - // whether the given parameters adhere to the specifications - // - /* groovylint-disable-next-line UnusedPrivateMethodParameter */ - public static void validateParameters(workflow, params, log, schema_filename='nextflow_schema.json') { - def has_error = false - //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// - // Check for nextflow core params and unexpected params - def json = new File(getSchemaPath(workflow, schema_filename=schema_filename)).text - def Map schemaParams = (Map) new JsonSlurper().parseText(json).get('definitions') - def nf_params = [ - // Options for base `nextflow` command - 'bg', - 'c', - 'C', - 'config', - 'd', - 'D', - 'dockerize', - 'h', - 'log', - 'q', - 'quiet', - 'syslog', - 'v', - - // Options for `nextflow run` command - 'ansi', - 'ansi-log', - 'bg', - 'bucket-dir', - 'c', - 'cache', - 'config', - 'dsl2', - 'dump-channels', - 'dump-hashes', - 'E', - 'entry', - 'latest', - 'lib', - 'main-script', - 'N', - 'name', - 'offline', - 'params-file', - 'pi', - 'plugins', - 'poll-interval', - 'pool-size', - 'profile', - 'ps', - 'qs', - 'queue-size', - 'r', - 'resume', - 'revision', - 'stdin', - 'stub', - 'stub-run', - 'test', - 'w', - 'with-apptainer', - 'with-charliecloud', - 'with-conda', - 'with-dag', - 'with-docker', - 'with-mpi', - 'with-notification', - 'with-podman', - 'with-report', - 'with-singularity', - 'with-timeline', - 'with-tower', - 'with-trace', - 'with-weblog', - 'without-docker', - 'without-podman', - 'work-dir' - ] - def unexpectedParams = [] - - // Collect expected parameters from the schema - def expectedParams = [] - def enums = [:] - for (group in schemaParams) { - for (p in group.value['properties']) { - expectedParams.push(p.key) - if (group.value['properties'][p.key].containsKey('enum')) { - enums[p.key] = group.value['properties'][p.key]['enum'] - } - } - } - - for (specifiedParam in params.keySet()) { - // nextflow params - if (nf_params.contains(specifiedParam)) { - log.error "ERROR: You used a core Nextflow option with two hyphens: '--${specifiedParam}'. Please resubmit with '-${specifiedParam}'" - has_error = true - } - // unexpected params - def params_ignore = params.schema_ignore_params.split(',') + 'schema_ignore_params' - def expectedParamsLowerCase = expectedParams.collect{ it.replace("-", "").toLowerCase() } - def specifiedParamLowerCase = specifiedParam.replace("-", "").toLowerCase() - def isCamelCaseBug = (specifiedParam.contains("-") && !expectedParams.contains(specifiedParam) && expectedParamsLowerCase.contains(specifiedParamLowerCase)) - if (!expectedParams.contains(specifiedParam) && !params_ignore.contains(specifiedParam) && !isCamelCaseBug) { - // Temporarily remove camelCase/camel-case params #1035 - def unexpectedParamsLowerCase = unexpectedParams.collect{ it.replace("-", "").toLowerCase()} - if (!unexpectedParamsLowerCase.contains(specifiedParamLowerCase)){ - unexpectedParams.push(specifiedParam) - } - } - } - - //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// - // Validate parameters against the schema - InputStream input_stream = new File(getSchemaPath(workflow, schema_filename=schema_filename)).newInputStream() - JSONObject raw_schema = new JSONObject(new JSONTokener(input_stream)) - - // Remove anything that's in params.schema_ignore_params - raw_schema = removeIgnoredParams(raw_schema, params) - - Schema schema = SchemaLoader.load(raw_schema) - - // Clean the parameters - def cleanedParams = cleanParameters(params) - - // Convert to JSONObject - def jsonParams = new JsonBuilder(cleanedParams) - JSONObject params_json = new JSONObject(jsonParams.toString()) - - // Validate - try { - schema.validate(params_json) - } catch (ValidationException e) { - println '' - log.error 'ERROR: Validation of pipeline parameters failed!' - JSONObject exceptionJSON = e.toJSON() - printExceptions(exceptionJSON, params_json, log, enums) - println '' - has_error = true - } - - // Check for unexpected parameters - if (unexpectedParams.size() > 0) { - Map colors = NfcoreTemplate.logColours(params.monochrome_logs) - println '' - def warn_msg = 'Found unexpected parameters:' - for (unexpectedParam in unexpectedParams) { - warn_msg = warn_msg + "\n* --${unexpectedParam}: ${params[unexpectedParam].toString()}" - } - log.warn warn_msg - log.info "- ${colors.dim}Ignore this warning: params.schema_ignore_params = \"${unexpectedParams.join(',')}\" ${colors.reset}" - println '' - } - - if (has_error) { - Nextflow.error('Exiting!') - } - } - - // - // Beautify parameters for --help - // - public static String paramsHelp(workflow, params, command, schema_filename='nextflow_schema.json') { - Map colors = NfcoreTemplate.logColours(params.monochrome_logs) - Integer num_hidden = 0 - String output = '' - output += 'Typical pipeline command:\n\n' - output += " ${colors.cyan}${command}${colors.reset}\n\n" - Map params_map = paramsLoad(getSchemaPath(workflow, schema_filename=schema_filename)) - Integer max_chars = paramsMaxChars(params_map) + 1 - Integer desc_indent = max_chars + 14 - Integer dec_linewidth = 160 - desc_indent - for (group in params_map.keySet()) { - Integer num_params = 0 - String group_output = colors.underlined + colors.bold + group + colors.reset + '\n' - def group_params = params_map.get(group) // This gets the parameters of that particular group - for (param in group_params.keySet()) { - if (group_params.get(param).hidden && !params.show_hidden_params) { - num_hidden += 1 - continue; - } - def type = '[' + group_params.get(param).type + ']' - def description = group_params.get(param).description - def defaultValue = group_params.get(param).default != null ? " [default: " + group_params.get(param).default.toString() + "]" : '' - def description_default = description + colors.dim + defaultValue + colors.reset - // Wrap long description texts - // Loosely based on https://dzone.com/articles/groovy-plain-text-word-wrap - if (description_default.length() > dec_linewidth){ - List olines = [] - String oline = "" // " " * indent - description_default.split(" ").each() { wrd -> - if ((oline.size() + wrd.size()) <= dec_linewidth) { - oline += wrd + " " - } else { - olines += oline - oline = wrd + " " - } - } - olines += oline - description_default = olines.join("\n" + " " * desc_indent) - } - group_output += " --" + param.padRight(max_chars) + colors.dim + type.padRight(10) + colors.reset + description_default + '\n' - num_params += 1 - } - group_output += '\n' - if (num_params > 0){ - output += group_output - } - } - if (num_hidden > 0){ - output += colors.dim + "!! Hiding $num_hidden params, use --show_hidden_params to show them !!\n" + colors.reset - } - output += NfcoreTemplate.dashedLine(params.monochrome_logs) - return output - } - - // - // Groovy Map summarising parameters/workflow options used by the pipeline - // - public static LinkedHashMap paramsSummaryMap(workflow, params, schema_filename='nextflow_schema.json') { - // Get a selection of core Nextflow workflow options - def Map workflow_summary = [:] - if (workflow.revision) { - workflow_summary['revision'] = workflow.revision - } - workflow_summary['runName'] = workflow.runName - if (workflow.containerEngine) { - workflow_summary['containerEngine'] = workflow.containerEngine - } - if (workflow.container) { - workflow_summary['container'] = workflow.container - } - workflow_summary['launchDir'] = workflow.launchDir - workflow_summary['workDir'] = workflow.workDir - workflow_summary['projectDir'] = workflow.projectDir - workflow_summary['userName'] = workflow.userName - workflow_summary['profile'] = workflow.profile - workflow_summary['configFiles'] = workflow.configFiles.join(', ') - - // Get pipeline parameters defined in JSON Schema - def Map params_summary = [:] - def params_map = paramsLoad(getSchemaPath(workflow, schema_filename=schema_filename)) - for (group in params_map.keySet()) { - def sub_params = new LinkedHashMap() - def group_params = params_map.get(group) // This gets the parameters of that particular group - for (param in group_params.keySet()) { - if (params.containsKey(param)) { - def params_value = params.get(param) - def schema_value = group_params.get(param).default - def param_type = group_params.get(param).type - if (schema_value != null) { - if (param_type == 'string') { - if (schema_value.contains('$projectDir') || schema_value.contains('${projectDir}')) { - def sub_string = schema_value.replace('\$projectDir', '') - sub_string = sub_string.replace('\${projectDir}', '') - if (params_value.contains(sub_string)) { - schema_value = params_value - } - } - if (schema_value.contains('$params.outdir') || schema_value.contains('${params.outdir}')) { - def sub_string = schema_value.replace('\$params.outdir', '') - sub_string = sub_string.replace('\${params.outdir}', '') - if ("${params.outdir}${sub_string}" == params_value) { - schema_value = params_value - } - } - } - } - - // We have a default in the schema, and this isn't it - if (schema_value != null && params_value != schema_value) { - sub_params.put(param, params_value) - } - // No default in the schema, and this isn't empty - else if (schema_value == null && params_value != "" && params_value != null && params_value != false) { - sub_params.put(param, params_value) - } - } - } - params_summary.put(group, sub_params) - } - return [ 'Core Nextflow options' : workflow_summary ] << params_summary - } - - // - // Beautify parameters for summary and return as string - // - public static String paramsSummaryLog(workflow, params) { - Map colors = NfcoreTemplate.logColours(params.monochrome_logs) - String output = '' - def params_map = paramsSummaryMap(workflow, params) - def max_chars = paramsMaxChars(params_map) - for (group in params_map.keySet()) { - def group_params = params_map.get(group) // This gets the parameters of that particular group - if (group_params) { - output += colors.bold + group + colors.reset + '\n' - for (param in group_params.keySet()) { - output += " " + colors.blue + param.padRight(max_chars) + ": " + colors.green + group_params.get(param) + colors.reset + '\n' - } - output += '\n' - } - } - output += "!! Only displaying parameters that differ from the pipeline defaults !!\n" - output += NfcoreTemplate.dashedLine(params.monochrome_logs) - return output - } - - // - // Loop over nested exceptions and print the causingException - // - private static void printExceptions(ex_json, params_json, log, enums, limit=5) { - def causingExceptions = ex_json['causingExceptions'] - if (causingExceptions.length() == 0) { - def m = ex_json['message'] =~ /required key \[([^\]]+)\] not found/ - // Missing required param - if (m.matches()) { - log.error "* Missing required parameter: --${m[0][1]}" - } - // Other base-level error - else if (ex_json['pointerToViolation'] == '#') { - log.error "* ${ex_json['message']}" - } - // Error with specific param - else { - def param = ex_json['pointerToViolation'] - ~/^#\// - def param_val = params_json[param].toString() - if (enums.containsKey(param)) { - def error_msg = "* --${param}: '${param_val}' is not a valid choice (Available choices" - if (enums[param].size() > limit) { - log.error "${error_msg} (${limit} of ${enums[param].size()}): ${enums[param][0..limit-1].join(', ')}, ... )" - } else { - log.error "${error_msg}: ${enums[param].join(', ')})" - } - } else { - log.error "* --${param}: ${ex_json['message']} (${param_val})" - } - } - } - for (ex in causingExceptions) { - printExceptions(ex, params_json, log, enums) - } - } - - // - // Remove an element from a JSONArray - // - private static JSONArray removeElement(json_array, element) { - def list = [] - int len = json_array.length() - for (int i=0;i - if(raw_schema.keySet().contains('definitions')){ - raw_schema.definitions.each { definition -> - for (key in definition.keySet()){ - if (definition[key].get("properties").keySet().contains(ignore_param)){ - // Remove the param to ignore - definition[key].get("properties").remove(ignore_param) - // If the param was required, change this - if (definition[key].has("required")) { - def cleaned_required = removeElement(definition[key].required, ignore_param) - definition[key].put("required", cleaned_required) - } - } - } - } - } - if(raw_schema.keySet().contains('properties') && raw_schema.get('properties').keySet().contains(ignore_param)) { - raw_schema.get("properties").remove(ignore_param) - } - if(raw_schema.keySet().contains('required') && raw_schema.required.contains(ignore_param)) { - def cleaned_required = removeElement(raw_schema.required, ignore_param) - raw_schema.put("required", cleaned_required) - } - } - return raw_schema - } - - // - // Clean and check parameters relative to Nextflow native classes - // - private static Map cleanParameters(params) { - def new_params = params.getClass().newInstance(params) - for (p in params) { - // remove anything evaluating to false - if (!p['value']) { - new_params.remove(p.key) - } - // Cast MemoryUnit to String - if (p['value'].getClass() == nextflow.util.MemoryUnit) { - new_params.replace(p.key, p['value'].toString()) - } - // Cast Duration to String - if (p['value'].getClass() == nextflow.util.Duration) { - new_params.replace(p.key, p['value'].toString().replaceFirst(/d(?!\S)/, "day")) - } - // Cast LinkedHashMap to String - if (p['value'].getClass() == LinkedHashMap) { - new_params.replace(p.key, p['value'].toString()) - } - } - return new_params - } - - // - // This function tries to read a JSON params file - // - private static LinkedHashMap paramsLoad(String json_schema) { - def params_map = new LinkedHashMap() - try { - params_map = paramsRead(json_schema) - } catch (Exception e) { - println "Could not read parameters settings from JSON. $e" - params_map = new LinkedHashMap() - } - return params_map - } - - // - // Method to actually read in JSON file using Groovy. - // Group (as Key), values are all parameters - // - Parameter1 as Key, Description as Value - // - Parameter2 as Key, Description as Value - // .... - // Group - // - - private static LinkedHashMap paramsRead(String json_schema) throws Exception { - def json = new File(json_schema).text - def Map schema_definitions = (Map) new JsonSlurper().parseText(json).get('definitions') - def Map schema_properties = (Map) new JsonSlurper().parseText(json).get('properties') - /* Tree looks like this in nf-core schema - * definitions <- this is what the first get('definitions') gets us - group 1 - title - description - properties - parameter 1 - type - description - parameter 2 - type - description - group 2 - title - description - properties - parameter 1 - type - description - * properties <- parameters can also be ungrouped, outside of definitions - parameter 1 - type - description - */ - - // Grouped params - def params_map = new LinkedHashMap() - schema_definitions.each { key, val -> - def Map group = schema_definitions."$key".properties // Gets the property object of the group - def title = schema_definitions."$key".title - def sub_params = new LinkedHashMap() - group.each { innerkey, value -> - sub_params.put(innerkey, value) - } - params_map.put(title, sub_params) - } - - // Ungrouped params - def ungrouped_params = new LinkedHashMap() - schema_properties.each { innerkey, value -> - ungrouped_params.put(innerkey, value) - } - params_map.put("Other parameters", ungrouped_params) - - return params_map - } - - // - // Get maximum number of characters across all parameter names - // - private static Integer paramsMaxChars(params_map) { - Integer max_chars = 0 - for (group in params_map.keySet()) { - def group_params = params_map.get(group) // This gets the parameters of that particular group - for (param in group_params.keySet()) { - if (param.size() > max_chars) { - max_chars = param.size() - } - } - } - return max_chars - } -} diff --git a/lib/NfcoreTemplate.groovy b/lib/NfcoreTemplate.groovy index 25a0a74a..408951ae 100755 --- a/lib/NfcoreTemplate.groovy +++ b/lib/NfcoreTemplate.groovy @@ -128,7 +128,7 @@ class NfcoreTemplate { def email_html = html_template.toString() // Render the sendmail template - def max_multiqc_email_size = params.max_multiqc_email_size as nextflow.util.MemoryUnit + def max_multiqc_email_size = (params.containsKey('max_multiqc_email_size') ? params.max_multiqc_email_size : 0) as nextflow.util.MemoryUnit def smail_fields = [ email: email_address, subject: subject, email_txt: email_txt, email_html: email_html, projectDir: "$projectDir", mqcFile: mqc_report, mqcMaxSize: max_multiqc_email_size.toBytes() ] def sf = new File("$projectDir/assets/sendmail_template.txt") def sendmail_template = engine.createTemplate(sf).make(smail_fields) diff --git a/lib/WorkflowMain.groovy b/lib/WorkflowMain.groovy index 9a0db96c..ed5a126c 100755 --- a/lib/WorkflowMain.groovy +++ b/lib/WorkflowMain.groovy @@ -19,30 +19,6 @@ class WorkflowMain { " https://github.com/${workflow.manifest.name}/blob/master/CITATIONS.md" } - // - // Generate help string - // - public static String help(workflow, params) { - def command = "nextflow run ${workflow.manifest.name} --input samplesheet.csv --genome GRCh37 -profile docker" - def help_string = '' - help_string += NfcoreTemplate.logo(workflow, params.monochrome_logs) - help_string += NfcoreSchema.paramsHelp(workflow, params, command) - help_string += '\n' + citation(workflow) + '\n' - help_string += NfcoreTemplate.dashedLine(params.monochrome_logs) - return help_string - } - - // - // Generate parameter summary log string - // - public static String paramsSummaryLog(workflow, params) { - def summary_log = '' - summary_log += NfcoreTemplate.logo(workflow, params.monochrome_logs) - summary_log += NfcoreSchema.paramsSummaryLog(workflow, params) - summary_log += '\n' + citation(workflow) + '\n' - summary_log += NfcoreTemplate.dashedLine(params.monochrome_logs) - return summary_log - } // // Validate parameters and print summary to screen @@ -65,14 +41,6 @@ class WorkflowMain { System.exit(0) } - // Print parameter summary log to screen - log.info paramsSummaryLog(workflow, params) - - // Validate workflow parameters via the JSON schema - if (params.validate_params) { - NfcoreSchema.validateParameters(workflow, params, log) - } - // Check that a -profile or Nextflow config has been provided to run the pipeline NfcoreTemplate.checkConfigProvided(workflow, log) diff --git a/lib/WorkflowSmrnaseq.groovy b/lib/WorkflowSmrnaseq.groovy index 7013e903..703c1342 100755 --- a/lib/WorkflowSmrnaseq.groovy +++ b/lib/WorkflowSmrnaseq.groovy @@ -11,6 +11,7 @@ class WorkflowSmrnaseq { // Check and validate parameters // public static void initialise(params, log) { + genomeExistsError(params, log) } @@ -41,15 +42,57 @@ class WorkflowSmrnaseq { return yaml_file_text } - public static String methodsDescriptionText(run_workflow, mqc_methods_yaml) { + // + // Generate methods description for MultiQC + // + + public static String toolCitationText(params) { + + // TODO Optionally add in-text citation tools to this list. + // Can use ternary operators to dynamically construct based conditions, e.g. params["run_xyz"] ? "Tool (Foo et al. 2023)" : "", + // Uncomment function in methodsDescriptionText to render in MultiQC report + def citation_text = [ + "Tools used in the workflow included:", + "FastQC (Andrews 2010),", + "MultiQC (Ewels et al. 2016)", + "." + ].join(' ').trim() + + return citation_text + } + + public static String toolBibliographyText(params) { + + // TODO Optionally add bibliographic entries to this list. + // Can use ternary operators to dynamically construct based conditions, e.g. params["run_xyz"] ? "

  • Author (2023) Pub name, Journal, DOI
    • " : "", + // Uncomment function in methodsDescriptionText to render in MultiQC report + def reference_text = [ + "
  • Andrews S, (2010) FastQC, URL: https://www.bioinformatics.babraham.ac.uk/projects/fastqc/).
    • ", + "
  • Ewels, P., Magnusson, M., Lundin, S., & Käller, M. (2016). MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics , 32(19), 3047–3048. doi: /10.1093/bioinformatics/btw354
    • " + ].join(' ').trim() + + return reference_text + } + + public static String methodsDescriptionText(run_workflow, mqc_methods_yaml, params) { // Convert to a named map so can be used as with familar NXF ${workflow} variable syntax in the MultiQC YML file def meta = [:] meta.workflow = run_workflow.toMap() meta["manifest_map"] = run_workflow.manifest.toMap() + // Pipeline DOI meta["doi_text"] = meta.manifest_map.doi ? "(doi: ${meta.manifest_map.doi})" : "" meta["nodoi_text"] = meta.manifest_map.doi ? "": "
  • If available, make sure to update the text to include the Zenodo DOI of version of the pipeline used.
    • " + // Tool references + meta["tool_citations"] = "" + meta["tool_bibliography"] = "" + + // TODO Only uncomment below if logic in toolCitationText/toolBibliographyText has been filled! + //meta["tool_citations"] = toolCitationText(params).replaceAll(", \\.", ".").replaceAll("\\. \\.", ".").replaceAll(", \\.", ".") + //meta["tool_bibliography"] = toolBibliographyText(params) + + def methods_text = mqc_methods_yaml.text def engine = new SimpleTemplateEngine() diff --git a/main.nf b/main.nf index 68e88980..e0072925 100644 --- a/main.nf +++ b/main.nf @@ -27,6 +27,22 @@ params.bowtie_index = WorkflowMain.getGenomeAttribute(params, 'bowtie') ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +include { validateParameters; paramsHelp } from 'plugin/nf-validation' + +// Print help message if needed +if (params.help) { + def logo = NfcoreTemplate.logo(workflow, params.monochrome_logs) + def citation = '\n' + WorkflowMain.citation(workflow) + '\n' + def String command = "nextflow run ${workflow.manifest.name} --input samplesheet.csv --genome GRCh37 -profile docker" + log.info logo + paramsHelp(command) + citation + NfcoreTemplate.dashedLine(params.monochrome_logs) + System.exit(0) +} + +// Validate input parameters +if (params.validate_params) { + validateParameters() +} + WorkflowMain.initialise(workflow, params, log) /* diff --git a/nextflow.config b/nextflow.config index ecaa7ccb..a808d4aa 100644 --- a/nextflow.config +++ b/nextflow.config @@ -61,7 +61,6 @@ params { // Boilerplate options outdir = null - tracedir = "${params.outdir}/pipeline_info" publish_dir_mode = 'copy' email = null email_on_fail = null @@ -70,10 +69,6 @@ params { hook_url = null help = false version = false - validate_params = true - show_hidden_params = false - schema_ignore_params = 'genomes' - // Config options custom_config_version = 'master' @@ -89,6 +84,20 @@ params { max_cpus = 16 max_time = '240.h' + // Schema validation default options + validationFailUnrecognisedParams = false + validationLenientMode = false + validationSchemaIgnoreParams = 'genomes' + validationShowHiddenParams = false + validate_params = true + + // Schema validation default options + validationFailUnrecognisedParams = false + validationLenientMode = false + validationSchemaIgnoreParams = 'genomes' + validationShowHiddenParams = false + validate_params = true + } // Load base.config by default for all pipelines @@ -204,6 +213,19 @@ profiles { test_full { includeConfig 'conf/test_full.config' } } +// Set default registry for Apptainer, Docker, Podman and Singularity independent of -profile +// Will not be used unless Apptainer / Docker / Podman / Singularity are enabled +// Set to your registry if you have a mirror of containers +apptainer.registry = 'quay.io' +docker.registry = 'quay.io' +podman.registry = 'quay.io' +singularity.registry = 'quay.io' + +// Nextflow plugins +plugins { + id 'nf-validation' // Validation of pipeline parameters and creation of an input channel from a sample sheet +} + // Load igenomes.config if required if (!params.igenomes_ignore) { includeConfig 'conf/igenomes.config' @@ -234,19 +256,19 @@ podman.registry = 'quay.io' def trace_timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss') timeline { enabled = true - file = "${params.tracedir}/execution_timeline_${trace_timestamp}.html" + file = "${params.outdir}/pipeline_info/execution_timeline_${trace_timestamp}.html" } report { enabled = true - file = "${params.tracedir}/execution_report_${trace_timestamp}.html" + file = "${params.outdir}/pipeline_info/execution_report_${trace_timestamp}.html" } trace { enabled = true - file = "${params.tracedir}/execution_trace_${trace_timestamp}.txt" + file = "${params.outdir}/pipeline_info/execution_trace_${trace_timestamp}.txt" } dag { enabled = true - file = "${params.tracedir}/pipeline_dag_${trace_timestamp}.html" + file = "${params.outdir}/pipeline_info/pipeline_dag_${trace_timestamp}.html" } manifest { @@ -255,7 +277,7 @@ manifest { homePage = 'https://github.com/nf-core/smrnaseq' description = """Small RNA-Seq Best Practice Analysis Pipeline.""" mainScript = 'main.nf' - nextflowVersion = '!>=22.10.1' + nextflowVersion = '!>=23.04.0' version = '2.2.2' doi = '' } diff --git a/nextflow_schema.json b/nextflow_schema.json index 213199c1..331a41b6 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -15,9 +15,9 @@ "input": { "type": "string", "format": "file-path", + "exists": true, "mimetype": "text/csv", "pattern": "^\\S+\\.csv$", - "schema": "assets/schema_input.json", "description": "Path to comma-separated file containing information about the samples in the experiment.", "help_text": "You will need to create a design file with information about the samples in your experiment before running the pipeline. Use this parameter to specify its location. It has to be a comma-separated file with 3 columns, and a header row. See [usage docs](https://nf-co.re/smrnaseq/usage#samplesheet-input).", "fa_icon": "fas fa-file-csv" @@ -80,6 +80,8 @@ }, "fasta": { "type": "string", + "format": "file-path", + "exists": true, "fa_icon": "fas fa-font", "description": "Path to reference genome FASTA genome file.", "help_text": "If you have no genome reference available, the pipeline can build one using a FASTA file. This requires additional time and resources, so it's better to use a pre-build index if possible." @@ -348,7 +350,7 @@ "description": "Maximum amount of time that can be requested for any single job.", "default": "240.h", "fa_icon": "far fa-clock", - "pattern": "^(\\d+\\.?\\s*(s|m|h|day)\\s*)+$", + "pattern": "^(\\d+\\.?\\s*(s|m|h|d|day)\\s*)+$", "hidden": true, "help_text": "Use to set an upper-limit for the time requirement for each process. Should be a string in the format integer-unit e.g. `--max_time '2.h'`" } @@ -365,12 +367,14 @@ "type": "boolean", "description": "Display help text.", "fa_icon": "fas fa-question-circle", + "default": false, "hidden": true }, "version": { "type": "boolean", "description": "Display version and exit.", "fa_icon": "fas fa-question-circle", + "default": false, "hidden": true }, "publish_dir_mode": { @@ -394,6 +398,7 @@ "type": "boolean", "description": "Send plain-text email instead of HTML.", "fa_icon": "fas fa-remove-format", + "default": false, "hidden": true }, "max_multiqc_email_size": { @@ -408,6 +413,7 @@ "type": "boolean", "description": "Do not use coloured log outputs.", "fa_icon": "fas fa-palette", + "default": false, "hidden": true }, "hook_url": { @@ -419,6 +425,7 @@ }, "multiqc_config": { "type": "string", + "format": "file-path", "description": "Custom config file to supply to MultiQC.", "fa_icon": "fas fa-cog", "hidden": true @@ -434,13 +441,6 @@ "description": "Custom MultiQC yaml file containing HTML including a methods description.", "fa_icon": "fas fa-cog" }, - "tracedir": { - "type": "string", - "description": "Directory to keep pipeline Nextflow logs and reports.", - "default": "${params.outdir}/pipeline_info", - "fa_icon": "fas fa-cogs", - "hidden": true - }, "validate_params": { "type": "boolean", "description": "Boolean whether to validate parameters against the schema at runtime", @@ -448,12 +448,29 @@ "fa_icon": "fas fa-check-square", "hidden": true }, - "show_hidden_params": { + "validationShowHiddenParams": { "type": "boolean", "fa_icon": "far fa-eye-slash", "description": "Show all params when using `--help`", + "default": false, "hidden": true, "help_text": "By default, parameters set as _hidden_ in the schema are not shown on the command line when a user runs with `--help`. Specifying this option will tell the pipeline to show all parameters." + }, + "validationFailUnrecognisedParams": { + "type": "boolean", + "fa_icon": "far fa-check-circle", + "description": "Validation of parameters fails when an unrecognised parameter is found.", + "default": false, + "hidden": true, + "help_text": "By default, when an unrecognised parameter is found, it returns a warinig." + }, + "validationLenientMode": { + "type": "boolean", + "fa_icon": "far fa-check-circle", + "description": "Validation of parameters in lenient more.", + "default": false, + "hidden": true, + "help_text": "Allows string values that are parseable as numbers or booleans. For further information see [JSONSchema docs](https://github.com/everit-org/json-schema#lenient-mode)." } } } diff --git a/workflows/smrnaseq.nf b/workflows/smrnaseq.nf index ad5ecfef..ac9d1646 100644 --- a/workflows/smrnaseq.nf +++ b/workflows/smrnaseq.nf @@ -1,12 +1,18 @@ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - VALIDATE INPUTS + PRINT PARAMS SUMMARY ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -def summary_params = NfcoreSchema.paramsSummaryMap(workflow, params) +include { paramsSummaryLog; paramsSummaryMap } from 'plugin/nf-validation' + +def logo = NfcoreTemplate.logo(workflow, params.monochrome_logs) +def citation = '\n' + WorkflowMain.citation(workflow) + '\n' +def summary_params = paramsSummaryMap(workflow) + +// Print parameter summary log to screen +log.info logo + paramsSummaryLog(workflow) + citation -// Validate input parameters WorkflowSmrnaseq.initialise(params, log) // Check input path parameters to see if they exist @@ -96,7 +102,7 @@ workflow SMRNASEQ { // SUBWORKFLOW: Read in samplesheet, validate and stage input files // INPUT_CHECK ( - ch_input + file(params.input) ) .reads .dump(tag: 'group') @@ -109,6 +115,9 @@ workflow SMRNASEQ { } .set { ch_fastq } ch_versions = ch_versions.mix(INPUT_CHECK.out.versions) + // TODO: OPTIONAL, you can use nf-validation plugin to create an input channel from the samplesheet with Channel.fromSamplesheet("input") + // See the documentation https://nextflow-io.github.io/nf-validation/samplesheets/fromSamplesheet/ + // ! There is currently no tooling to help you write a sample sheet schema // // MODULE: Concatenate FastQ files from same sample if required From 6223c35a9cbe37f5f4e90a7d465d5c955a84b19f Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 06:57:33 +0000 Subject: [PATCH 12/33] Modules updates --- modules.json | 16 ++++++++-------- modules/local/mirtop_quant.nf | 4 ++-- modules/local/samplesheet_check.nf | 1 - .../nf-core/custom/dumpsoftwareversions/main.nf | 6 +++--- modules/nf-core/fastp/main.nf | 6 +++--- modules/nf-core/fastqc/main.nf | 6 +++++- modules/nf-core/multiqc/main.nf | 6 +++--- modules/nf-core/samtools/flagstat/main.nf | 11 +++++++++++ modules/nf-core/samtools/idxstats/main.nf | 12 ++++++++++++ modules/nf-core/samtools/sort/main.nf | 2 -- modules/nf-core/samtools/stats/main.nf | 2 +- modules/nf-core/samtools/stats/meta.yml | 10 ++++++++-- 12 files changed, 56 insertions(+), 26 deletions(-) diff --git a/modules.json b/modules.json index 0b6daac5..defa77af 100644 --- a/modules.json +++ b/modules.json @@ -12,32 +12,32 @@ }, "custom/dumpsoftwareversions": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "05c280924b6c768d484c7c443dad5e605c4ff4b4", "installed_by": ["modules"] }, "fastp": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "d497a4868ace3302016ea8ed4b395072d5e833cd", "installed_by": ["modules"] }, "fastqc": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "bd8092b67b5103bdd52e300f75889442275c3117", "installed_by": ["modules"] }, "multiqc": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "a6e11ac655e744f7ebc724be669dd568ffdc0e80", "installed_by": ["modules"] }, "samtools/flagstat": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "570ec5bcfe19c49e16c9ca35a7a116563af6cc1c", "installed_by": ["modules"] }, "samtools/idxstats": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "e662ab16e0c11f1e62983e21de9871f59371a639", "installed_by": ["modules"] }, "samtools/index": { @@ -47,12 +47,12 @@ }, "samtools/sort": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "a0f7be95788366c1923171e358da7d049eb440f9", "installed_by": ["modules"] }, "samtools/stats": { "branch": "master", - "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", + "git_sha": "735e1e04e7e01751d2d6e97055bbdb6f70683cc1", "installed_by": ["modules"] } } diff --git a/modules/local/mirtop_quant.nf b/modules/local/mirtop_quant.nf index 3ebb65ac..cc8d29a7 100644 --- a/modules/local/mirtop_quant.nf +++ b/modules/local/mirtop_quant.nf @@ -12,9 +12,9 @@ process MIRTOP_QUANT { path gtf output: - path "mirtop/mirtop.gff" + path "mirtop/mirtop.gff" , emit: mirtop_gff path "mirtop/mirtop.tsv" , emit: mirtop_table - path "mirtop/mirtop_rawData.tsv" + path "mirtop/mirtop_rawData.tsv", emit: mirtop_rawdata path "mirtop/stats/*" , emit: logs path "versions.yml" , emit: versions diff --git a/modules/local/samplesheet_check.nf b/modules/local/samplesheet_check.nf index c1b0967f..351d2322 100644 --- a/modules/local/samplesheet_check.nf +++ b/modules/local/samplesheet_check.nf @@ -1,5 +1,4 @@ process SAMPLESHEET_CHECK { - label 'process_low' tag "$samplesheet" label 'process_single' diff --git a/modules/nf-core/custom/dumpsoftwareversions/main.nf b/modules/nf-core/custom/dumpsoftwareversions/main.nf index ebc87273..c9d014b1 100644 --- a/modules/nf-core/custom/dumpsoftwareversions/main.nf +++ b/modules/nf-core/custom/dumpsoftwareversions/main.nf @@ -2,10 +2,10 @@ process CUSTOM_DUMPSOFTWAREVERSIONS { label 'process_single' // Requires `pyyaml` which does not have a dedicated container but is in the MultiQC container - conda "bioconda::multiqc=1.14" + conda "bioconda::multiqc=1.15" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.14--pyhdfd78af_0' : - 'biocontainers/multiqc:1.14--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/multiqc:1.15--pyhdfd78af_0' : + 'biocontainers/multiqc:1.15--pyhdfd78af_0' }" input: path versions diff --git a/modules/nf-core/fastp/main.nf b/modules/nf-core/fastp/main.nf index 2ca2d3ee..831b7f12 100644 --- a/modules/nf-core/fastp/main.nf +++ b/modules/nf-core/fastp/main.nf @@ -2,10 +2,10 @@ process FASTP { tag "$meta.id" label 'process_medium' - conda "bioconda::fastp=0.23.2" + conda "bioconda::fastp=0.23.4" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/fastp:0.23.2--h79da9fb_0' : - 'biocontainers/fastp:0.23.2--h79da9fb_0' }" + 'https://depot.galaxyproject.org/singularity/fastp:0.23.4--h5f740d0_0' : + 'biocontainers/fastp:0.23.4--h5f740d0_0' }" input: tuple val(meta), path(reads) diff --git a/modules/nf-core/fastqc/main.nf b/modules/nf-core/fastqc/main.nf index 07d5e433..249f9064 100644 --- a/modules/nf-core/fastqc/main.nf +++ b/modules/nf-core/fastqc/main.nf @@ -29,7 +29,11 @@ process FASTQC { printf "%s %s\\n" $rename_to | while read old_name new_name; do [ -f "\${new_name}" ] || ln -s \$old_name \$new_name done - fastqc $args --threads $task.cpus $renamed_files + + fastqc \\ + $args \\ + --threads $task.cpus \\ + $renamed_files cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf index 1fc387be..65d7dd0d 100644 --- a/modules/nf-core/multiqc/main.nf +++ b/modules/nf-core/multiqc/main.nf @@ -1,10 +1,10 @@ process MULTIQC { label 'process_single' - conda "bioconda::multiqc=1.14" + conda "bioconda::multiqc=1.15" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.14--pyhdfd78af_0' : - 'biocontainers/multiqc:1.14--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/multiqc:1.15--pyhdfd78af_0' : + 'biocontainers/multiqc:1.15--pyhdfd78af_0' }" input: path multiqc_files, stageAs: "?/*" diff --git a/modules/nf-core/samtools/flagstat/main.nf b/modules/nf-core/samtools/flagstat/main.nf index eb7e72fc..b75707ec 100644 --- a/modules/nf-core/samtools/flagstat/main.nf +++ b/modules/nf-core/samtools/flagstat/main.nf @@ -32,4 +32,15 @@ process SAMTOOLS_FLAGSTAT { samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.flagstat + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + END_VERSIONS + """ } diff --git a/modules/nf-core/samtools/idxstats/main.nf b/modules/nf-core/samtools/idxstats/main.nf index a257d700..83c7c34b 100644 --- a/modules/nf-core/samtools/idxstats/main.nf +++ b/modules/nf-core/samtools/idxstats/main.nf @@ -33,4 +33,16 @@ process SAMTOOLS_IDXSTATS { samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + + """ + touch ${prefix}.idxstats + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + END_VERSIONS + """ } diff --git a/modules/nf-core/samtools/sort/main.nf b/modules/nf-core/samtools/sort/main.nf index 1e5181d4..2b7753fd 100644 --- a/modules/nf-core/samtools/sort/main.nf +++ b/modules/nf-core/samtools/sort/main.nf @@ -21,13 +21,11 @@ process SAMTOOLS_SORT { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" - def sort_memory = (task.memory.mega/task.cpus).intValue() if ("$bam" == "${prefix}.bam") error "Input and output names are the same, use \"task.ext.prefix\" to disambiguate!" """ samtools sort \\ $args \\ -@ $task.cpus \\ - -m ${sort_memory}M \\ -o ${prefix}.bam \\ -T $prefix \\ $bam diff --git a/modules/nf-core/samtools/stats/main.nf b/modules/nf-core/samtools/stats/main.nf index eb7f098b..4a2607de 100644 --- a/modules/nf-core/samtools/stats/main.nf +++ b/modules/nf-core/samtools/stats/main.nf @@ -9,7 +9,7 @@ process SAMTOOLS_STATS { input: tuple val(meta), path(input), path(input_index) - path fasta + tuple val(meta2), path(fasta) output: tuple val(meta), path("*.stats"), emit: stats diff --git a/modules/nf-core/samtools/stats/meta.yml b/modules/nf-core/samtools/stats/meta.yml index 1d68a5d8..90e6345f 100644 --- a/modules/nf-core/samtools/stats/meta.yml +++ b/modules/nf-core/samtools/stats/meta.yml @@ -30,9 +30,14 @@ input: type: file description: BAI/CRAI file from alignment pattern: "*.{bai,crai}" + - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] - fasta: - type: optional file - description: Reference file the CRAM was created with + type: file + description: Reference file the CRAM was created with (optional) pattern: "*.{fasta,fa}" output: - meta: @@ -51,3 +56,4 @@ output: authors: - "@drpatelh" - "@FriederikeHanssen" + - "@ramprasadn" From e3867b016b0ecc7472a1c9230ec4162b9793df35 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 07:21:05 +0000 Subject: [PATCH 13/33] Fixing merge issue --- workflows/smrnaseq.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/smrnaseq.nf b/workflows/smrnaseq.nf index ac9d1646..3489b83c 100644 --- a/workflows/smrnaseq.nf +++ b/workflows/smrnaseq.nf @@ -220,7 +220,7 @@ workflow SMRNASEQ { if (!params.skip_multiqc) { workflow_summary = WorkflowSmrnaseq.paramsSummaryMultiqc(workflow, summary_params) ch_workflow_summary = Channel.value(workflow_summary) - methods_description = WorkflowSmrnaseq.methodsDescriptionText(workflow, ch_multiqc_custom_methods_description) + methods_description = WorkflowSmrnaseq.methodsDescriptionText(workflow, ch_multiqc_custom_methods_description, params) ch_methods_description = Channel.value(methods_description) ch_multiqc_files = Channel.empty() From 75f4c301f40d8bf21a984ef3b92451fe929429e8 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 07:26:19 +0000 Subject: [PATCH 14/33] 2.2.1dev --- nextflow.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextflow.config b/nextflow.config index a808d4aa..5ac1c01e 100644 --- a/nextflow.config +++ b/nextflow.config @@ -278,7 +278,7 @@ manifest { description = """Small RNA-Seq Best Practice Analysis Pipeline.""" mainScript = 'main.nf' nextflowVersion = '!>=23.04.0' - version = '2.2.2' + version = '2.2.1dev' doi = '' } From 157e6d89d09198926366855c7b02ea0828314ba5 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 07:30:04 +0000 Subject: [PATCH 15/33] 2.2.1dev --- README.md | 18 ------------------ assets/multiqc_config.yml | 4 ++-- nextflow.config | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 24226773..7bab3d6b 100644 --- a/README.md +++ b/README.md @@ -57,26 +57,8 @@ You can find numerous talks on the nf-core events page from various topics inclu > to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) > with `-profile test` before running the workflow on actual data. - - Now, you can run the pipeline using: - - ```bash nextflow run nf-core/smrnaseq \ -profile \ diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 23da1135..7c483b48 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -1,7 +1,7 @@ report_comment: > - This report has been generated by the nf-core/smrnaseq + This report has been generated by the nf-core/smrnaseq analysis pipeline. For information about how to interpret these results, please see the - documentation. + documentation. report_section_order: "nf-core-smrnaseq-methods-description": order: -1000 diff --git a/nextflow.config b/nextflow.config index 5ac1c01e..62c608b1 100644 --- a/nextflow.config +++ b/nextflow.config @@ -278,7 +278,7 @@ manifest { description = """Small RNA-Seq Best Practice Analysis Pipeline.""" mainScript = 'main.nf' nextflowVersion = '!>=23.04.0' - version = '2.2.1dev' + version = '2.2.1dev' doi = '' } From 86a5047c7431e6cff574996d4e173dd4c97a5cb9 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 09:50:52 +0200 Subject: [PATCH 16/33] Apply suggestions from code review Co-authored-by: Gregor Sturm --- nextflow.config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nextflow.config b/nextflow.config index 62c608b1..10181292 100644 --- a/nextflow.config +++ b/nextflow.config @@ -84,12 +84,6 @@ params { max_cpus = 16 max_time = '240.h' - // Schema validation default options - validationFailUnrecognisedParams = false - validationLenientMode = false - validationSchemaIgnoreParams = 'genomes' - validationShowHiddenParams = false - validate_params = true // Schema validation default options validationFailUnrecognisedParams = false From 6b7d36c4adf9f5f8f1109f1fb5c5f186cf8fc868 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 07:51:07 +0000 Subject: [PATCH 17/33] Adjust based on review --- README.md | 26 +++++++++++++++++++++----- assets/multiqc_config.yml | 4 ++-- nextflow.config | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7bab3d6b..005775f2 100644 --- a/README.md +++ b/README.md @@ -57,16 +57,32 @@ You can find numerous talks on the nf-core events page from various topics inclu > to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) > with `-profile test` before running the workflow on actual data. +First, prepare a samplesheet with your input data that looks as follows: + +`samplesheet.csv`: +```csv +sample,fastq_1 +Clone1_N1,s3://ngi-igenomes/test-data/smrnaseq/C1-N1-R1_S4_L001_R1_001.fastq.gz +Clone1_N3,s3://ngi-igenomes/test-data/smrnaseq/C1-N3-R1_S6_L001_R1_001.fastq.gz +Clone9_N1,s3://ngi-igenomes/test-data/smrnaseq/C9-N1-R1_S7_L001_R1_001.fastq.gz +Clone9_N2,s3://ngi-igenomes/test-data/smrnaseq/C9-N2-R1_S8_L001_R1_001.fastq.gz +Clone9_N3,s3://ngi-igenomes/test-data/smrnaseq/C9-N3-R1_S9_L001_R1_001.fastq.gz +Control_N1,s3://ngi-igenomes/test-data/smrnaseq/Ctl-N1-R1_S1_L001_R1_001.fastq.gz +Control_N2,s3://ngi-igenomes/test-data/smrnaseq/Ctl-N2-R1_S2_L001_R1_001.fastq.gz +Control_N3,s3://ngi-igenomes/test-data/smrnaseq/Ctl-N3-R1_S3_L001_R1_001.fastq.gz +``` +Each row represents a fastq file (single-end). + Now, you can run the pipeline using: ```bash nextflow run nf-core/smrnaseq \ -profile \ - --input samplesheet.csv \ - --genome 'GRCh37' \ - --mirtrace_species 'hsa' \ - --protocol 'illumina' \ - --outdir + --input samplesheet.csv \ + --genome 'GRCh37' \ + --mirtrace_species 'hsa' \ + --protocol 'illumina' \ + --outdir ``` > **Warning:** diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 7c483b48..fe2c8740 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -1,7 +1,7 @@ report_comment: > - This report has been generated by the nf-core/smrnaseq + This report has been generated by the nf-core/smrnaseq analysis pipeline. For information about how to interpret these results, please see the - documentation. + documentation. report_section_order: "nf-core-smrnaseq-methods-description": order: -1000 diff --git a/nextflow.config b/nextflow.config index 62c608b1..6d12aa98 100644 --- a/nextflow.config +++ b/nextflow.config @@ -278,7 +278,7 @@ manifest { description = """Small RNA-Seq Best Practice Analysis Pipeline.""" mainScript = 'main.nf' nextflowVersion = '!>=23.04.0' - version = '2.2.1dev' + version = '2.2.2dev' doi = '' } From 845832b5a40a34c7bcbe4f4ca4df1a88d9b579dc Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 07:52:08 +0000 Subject: [PATCH 18/33] Prettier --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 005775f2..44066051 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ You can find numerous talks on the nf-core events page from various topics inclu First, prepare a samplesheet with your input data that looks as follows: `samplesheet.csv`: + ```csv sample,fastq_1 Clone1_N1,s3://ngi-igenomes/test-data/smrnaseq/C1-N1-R1_S4_L001_R1_001.fastq.gz @@ -71,6 +72,7 @@ Control_N1,s3://ngi-igenomes/test-data/smrnaseq/Ctl-N1-R1_S1_L001_R1_001.fastq.g Control_N2,s3://ngi-igenomes/test-data/smrnaseq/Ctl-N2-R1_S2_L001_R1_001.fastq.gz Control_N3,s3://ngi-igenomes/test-data/smrnaseq/Ctl-N3-R1_S3_L001_R1_001.fastq.gz ``` + Each row represents a fastq file (single-end). Now, you can run the pipeline using: From 9a46d676df47c481e69c2204411fe452cb7b277f Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 10:50:07 +0000 Subject: [PATCH 19/33] Update imported nf-core workflows --- modules.json | 24 +++++-- .../main.nf} | 15 +++-- .../nf-core/bam_sort_stats_samtools/meta.yml | 67 +++++++++++++++++++ subworkflows/nf-core/bam_stats_samtools.nf | 32 --------- .../nf-core/bam_stats_samtools/main.nf | 32 +++++++++ .../nf-core/bam_stats_samtools/meta.yml | 41 ++++++++++++ 6 files changed, 167 insertions(+), 44 deletions(-) rename subworkflows/nf-core/{bam_sort_samtools.nf => bam_sort_stats_samtools/main.nf} (77%) create mode 100644 subworkflows/nf-core/bam_sort_stats_samtools/meta.yml delete mode 100644 subworkflows/nf-core/bam_stats_samtools.nf create mode 100644 subworkflows/nf-core/bam_stats_samtools/main.nf create mode 100644 subworkflows/nf-core/bam_stats_samtools/meta.yml diff --git a/modules.json b/modules.json index defa77af..758f1b84 100644 --- a/modules.json +++ b/modules.json @@ -33,27 +33,41 @@ "samtools/flagstat": { "branch": "master", "git_sha": "570ec5bcfe19c49e16c9ca35a7a116563af6cc1c", - "installed_by": ["modules"] + "installed_by": ["bam_stats_samtools", "modules"] }, "samtools/idxstats": { "branch": "master", "git_sha": "e662ab16e0c11f1e62983e21de9871f59371a639", - "installed_by": ["modules"] + "installed_by": ["bam_stats_samtools", "modules"] }, "samtools/index": { "branch": "master", "git_sha": "911696ea0b62df80e900ef244d7867d177971f73", - "installed_by": ["modules"] + "installed_by": ["bam_sort_stats_samtools", "modules"] }, "samtools/sort": { "branch": "master", "git_sha": "a0f7be95788366c1923171e358da7d049eb440f9", - "installed_by": ["modules"] + "installed_by": ["bam_sort_stats_samtools", "modules"] }, "samtools/stats": { "branch": "master", "git_sha": "735e1e04e7e01751d2d6e97055bbdb6f70683cc1", - "installed_by": ["modules"] + "installed_by": ["bam_stats_samtools", "modules"] + } + } + }, + "subworkflows": { + "nf-core": { + "bam_sort_stats_samtools": { + "branch": "master", + "git_sha": "dedc0e31087f3306101c38835d051bf49789445a", + "installed_by": ["subworkflows"] + }, + "bam_stats_samtools": { + "branch": "master", + "git_sha": "dedc0e31087f3306101c38835d051bf49789445a", + "installed_by": ["subworkflows", "bam_sort_stats_samtools"] } } } diff --git a/subworkflows/nf-core/bam_sort_samtools.nf b/subworkflows/nf-core/bam_sort_stats_samtools/main.nf similarity index 77% rename from subworkflows/nf-core/bam_sort_samtools.nf rename to subworkflows/nf-core/bam_sort_stats_samtools/main.nf index ded07b32..fc1c652b 100644 --- a/subworkflows/nf-core/bam_sort_samtools.nf +++ b/subworkflows/nf-core/bam_sort_stats_samtools/main.nf @@ -2,16 +2,17 @@ // Sort, index BAM file and run samtools stats, flagstat and idxstats // -include { SAMTOOLS_SORT } from '../../modules/nf-core/samtools/sort/main' -include { SAMTOOLS_INDEX } from '../../modules/nf-core/samtools/index/main' -include { BAM_STATS_SAMTOOLS } from './bam_stats_samtools' +include { SAMTOOLS_SORT } from '../../../modules/nf-core/samtools/sort/main' +include { SAMTOOLS_INDEX } from '../../../modules/nf-core/samtools/index/main' +include { BAM_STATS_SAMTOOLS } from '../bam_stats_samtools/main' -workflow BAM_SORT_SAMTOOLS { +workflow BAM_SORT_STATS_SAMTOOLS { take: - ch_bam // channel: [ val(meta), [ bam ] ] - fasta + ch_bam // channel: [ val(meta), [ bam ] ] + ch_fasta // channel: [ val(meta), path(fasta) ] main: + ch_versions = Channel.empty() SAMTOOLS_SORT ( ch_bam ) @@ -33,7 +34,7 @@ workflow BAM_SORT_SAMTOOLS { } .set { ch_bam_bai } - BAM_STATS_SAMTOOLS ( ch_bam_bai, fasta ) + BAM_STATS_SAMTOOLS ( ch_bam_bai, ch_fasta ) ch_versions = ch_versions.mix(BAM_STATS_SAMTOOLS.out.versions) emit: diff --git a/subworkflows/nf-core/bam_sort_stats_samtools/meta.yml b/subworkflows/nf-core/bam_sort_stats_samtools/meta.yml new file mode 100644 index 00000000..69c16be4 --- /dev/null +++ b/subworkflows/nf-core/bam_sort_stats_samtools/meta.yml @@ -0,0 +1,67 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: bam_sort_stats_samtools +description: Sort SAM/BAM/CRAM file +keywords: + - sort + - bam + - sam + - cram +components: + - samtools/sort + - samtools/index + - samtools/stats + - samtools/idxstats + - samtools/flagstat + - bam_stats_samtools +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: BAM/CRAM/SAM file + pattern: "*.{bam,cram,sam}" + - fasta: + type: file + description: Reference genome fasta file + pattern: "*.{fasta,fa}" +# TODO Update when we decide on a standard for subworkflow docs +output: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: Sorted BAM/CRAM/SAM file + pattern: "*.{bam,cram,sam}" + - bai: + type: file + description: BAM/CRAM/SAM index file + pattern: "*.{bai,crai,sai}" + - crai: + type: file + description: BAM/CRAM/SAM index file + pattern: "*.{bai,crai,sai}" + - stats: + type: file + description: File containing samtools stats output + pattern: "*.{stats}" + - flagstat: + type: file + description: File containing samtools flagstat output + pattern: "*.{flagstat}" + - idxstats: + type: file + description: File containing samtools idxstats output + pattern: "*.{idxstats}" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" + - "@ewels" diff --git a/subworkflows/nf-core/bam_stats_samtools.nf b/subworkflows/nf-core/bam_stats_samtools.nf deleted file mode 100644 index 38d2569b..00000000 --- a/subworkflows/nf-core/bam_stats_samtools.nf +++ /dev/null @@ -1,32 +0,0 @@ -// -// Run SAMtools stats, flagstat and idxstats -// - -include { SAMTOOLS_STATS } from '../../modules/nf-core/samtools/stats/main' -include { SAMTOOLS_IDXSTATS } from '../../modules/nf-core/samtools/idxstats/main' -include { SAMTOOLS_FLAGSTAT } from '../../modules/nf-core/samtools/flagstat/main' - -workflow BAM_STATS_SAMTOOLS { - take: - ch_bam_bai // channel: [ val(meta), [ bam ], [bai/csi] ] - fasta - - main: - ch_versions = Channel.empty() - - SAMTOOLS_STATS ( ch_bam_bai, fasta ) - ch_versions = ch_versions.mix(SAMTOOLS_STATS.out.versions.first()) - - SAMTOOLS_FLAGSTAT ( ch_bam_bai ) - ch_versions = ch_versions.mix(SAMTOOLS_FLAGSTAT.out.versions.first()) - - SAMTOOLS_IDXSTATS ( ch_bam_bai ) - ch_versions = ch_versions.mix(SAMTOOLS_IDXSTATS.out.versions.first()) - - emit: - stats = SAMTOOLS_STATS.out.stats // channel: [ val(meta), [ stats ] ] - flagstat = SAMTOOLS_FLAGSTAT.out.flagstat // channel: [ val(meta), [ flagstat ] ] - idxstats = SAMTOOLS_IDXSTATS.out.idxstats // channel: [ val(meta), [ idxstats ] ] - - versions = ch_versions // channel: [ versions.yml ] -} diff --git a/subworkflows/nf-core/bam_stats_samtools/main.nf b/subworkflows/nf-core/bam_stats_samtools/main.nf new file mode 100644 index 00000000..44d4c010 --- /dev/null +++ b/subworkflows/nf-core/bam_stats_samtools/main.nf @@ -0,0 +1,32 @@ +// +// Run SAMtools stats, flagstat and idxstats +// + +include { SAMTOOLS_STATS } from '../../../modules/nf-core/samtools/stats/main' +include { SAMTOOLS_IDXSTATS } from '../../../modules/nf-core/samtools/idxstats/main' +include { SAMTOOLS_FLAGSTAT } from '../../../modules/nf-core/samtools/flagstat/main' + +workflow BAM_STATS_SAMTOOLS { + take: + ch_bam_bai // channel: [ val(meta), path(bam), path(bai) ] + ch_fasta // channel: [ val(meta), path(fasta) ] + + main: + ch_versions = Channel.empty() + + SAMTOOLS_STATS ( ch_bam_bai, ch_fasta ) + ch_versions = ch_versions.mix(SAMTOOLS_STATS.out.versions) + + SAMTOOLS_FLAGSTAT ( ch_bam_bai ) + ch_versions = ch_versions.mix(SAMTOOLS_FLAGSTAT.out.versions) + + SAMTOOLS_IDXSTATS ( ch_bam_bai ) + ch_versions = ch_versions.mix(SAMTOOLS_IDXSTATS.out.versions) + + emit: + stats = SAMTOOLS_STATS.out.stats // channel: [ val(meta), path(stats) ] + flagstat = SAMTOOLS_FLAGSTAT.out.flagstat // channel: [ val(meta), path(flagstat) ] + idxstats = SAMTOOLS_IDXSTATS.out.idxstats // channel: [ val(meta), path(idxstats) ] + + versions = ch_versions // channel: [ path(versions.yml) ] +} diff --git a/subworkflows/nf-core/bam_stats_samtools/meta.yml b/subworkflows/nf-core/bam_stats_samtools/meta.yml new file mode 100644 index 00000000..87863b11 --- /dev/null +++ b/subworkflows/nf-core/bam_stats_samtools/meta.yml @@ -0,0 +1,41 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: bam_stats_samtools +description: Produces comprehensive statistics from SAM/BAM/CRAM file +keywords: + - statistics + - counts + - bam + - sam + - cram +components: + - samtools/stats + - samtools/idxstats + - samtools/flagstat +input: + - ch_bam_bai: + description: | + The input channel containing the BAM/CRAM and it's index + Structure: [ val(meta), path(bam), path(bai) ] + - ch_fasta: + description: | + Reference genome fasta file + Structure: [ path(fasta) ] +output: + - stats: + description: | + File containing samtools stats output + Structure: [ val(meta), path(stats) ] + - flagstat: + description: | + File containing samtools flagstat output + Structure: [ val(meta), path(flagstat) ] + - idxstats: + description: | + File containing samtools idxstats output + Structure: [ val(meta), path(idxstats)] + - versions: + description: | + Files containing software versions + Structure: [ path(versions.yml) ] +authors: + - "@drpatelh" From cbebb5a824849620b0c4836bcb069b08f8774ba7 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 10:56:19 +0000 Subject: [PATCH 20/33] Update workflows with nf-core ones --- subworkflows/local/genome_quant.nf | 8 ++++---- subworkflows/local/mirna_quant.nf | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/subworkflows/local/genome_quant.nf b/subworkflows/local/genome_quant.nf index 033f59ad..a20a7c1f 100644 --- a/subworkflows/local/genome_quant.nf +++ b/subworkflows/local/genome_quant.nf @@ -3,7 +3,7 @@ // include { INDEX_GENOME } from '../../modules/local/bowtie_genome' -include { BAM_SORT_SAMTOOLS } from '../nf-core/bam_sort_samtools' +include { BAM_SORT_STATS_SAMTOOLS } from '../nf-core/bam_sort_stats_samtools' include { BOWTIE_MAP_SEQ as BOWTIE_MAP_GENOME } from '../../modules/local/bowtie_map_mirna' workflow GENOME_QUANT { @@ -29,14 +29,14 @@ workflow GENOME_QUANT { BOWTIE_MAP_GENOME ( reads, bowtie_index.collect() ) ch_versions = ch_versions.mix(BOWTIE_MAP_GENOME.out.versions) - BAM_SORT_SAMTOOLS ( BOWTIE_MAP_GENOME.out.bam, Channel.empty() ) - ch_versions = ch_versions.mix(BAM_SORT_SAMTOOLS.out.versions) + BAM_SORT_STATS_SAMTOOLS ( BOWTIE_MAP_GENOME.out.bam, Channel.empty() ) + ch_versions = ch_versions.mix(BAM_SORT_STATS_SAMTOOLS.out.versions) } emit: fasta = fasta_formatted index = bowtie_index - stats = BAM_SORT_SAMTOOLS.out.stats + stats = BAM_SORT_STATS_SAMTOOLS.out.stats versions = ch_versions } diff --git a/subworkflows/local/mirna_quant.nf b/subworkflows/local/mirna_quant.nf index dd8a8412..70b872e3 100644 --- a/subworkflows/local/mirna_quant.nf +++ b/subworkflows/local/mirna_quant.nf @@ -15,8 +15,8 @@ include { BOWTIE_MAP_SEQ as BOWTIE_MAP_MATURE BOWTIE_MAP_SEQ as BOWTIE_MAP_HAIRPIN BOWTIE_MAP_SEQ as BOWTIE_MAP_SEQCLUSTER } from '../../modules/local/bowtie_map_mirna' -include { BAM_SORT_SAMTOOLS as BAM_STATS_MATURE - BAM_SORT_SAMTOOLS as BAM_STATS_HAIRPIN } from '../nf-core/bam_sort_samtools' +include { BAM_SORT_STATS_SAMTOOLS as BAM_STATS_MATURE + BAM_SORT_STATS_SAMTOOLS as BAM_STATS_HAIRPIN } from '../nf-core/bam_sort_stats_samtools' include { SEQCLUSTER_SEQUENCES } from '../../modules/local/seqcluster_collapse.nf' include { MIRTOP_QUANT } from '../../modules/local/mirtop_quant.nf' From 37f85f790caf26dfa833639e919361e1a3ecb9ac Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Wed, 30 Aug 2023 11:43:00 +0000 Subject: [PATCH 21/33] Fix prefix --- conf/modules.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 8644dd3c..556d8509 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -207,7 +207,7 @@ process { } process { - withName: 'NFCORE_SMRNASEQ:SMRNASEQ:GENOME_QUANT:BAM_SORT_SAMTOOLS:SAMTOOLS_.*' { + withName: 'NFCORE_SMRNASEQ:SMRNASEQ:GENOME_QUANT:BAM_SORT_STATS_SAMTOOLS:SAMTOOLS_.*' { ext.prefix = { "${meta.id}.sorted" } publishDir = [ path: { "${params.outdir}/samtools" }, @@ -215,7 +215,7 @@ process { saveAs: { filename -> filename.equals('versions.yml') ? null : filename } ] } - withName: 'NFCORE_SMRNASEQ:SMRNASEQ:GENOME_QUANT:BAM_SORT_SAMTOOLS:BAM_STATS_SAMTOOLS:.*' { + withName: 'NFCORE_SMRNASEQ:SMRNASEQ:GENOME_QUANT:BAM_SORT_STATS_SAMTOOLS:BAM_STATS_SAMTOOLS:.*' { ext.prefix = { "${meta.id}.sorted" } publishDir = [ path: { "${params.outdir}/samtools/samtools_stats" }, From ec610e6d0a5ecdddc0bd53fafe6d0c14aac56832 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Fri, 1 Sep 2023 07:09:47 +0000 Subject: [PATCH 22/33] Attempt at introducing meta2 everywhere --- modules/local/bowtie_genome.nf | 2 +- modules/local/bowtie_mirna.nf | 2 +- modules/local/format_fasta_mirna.nf | 4 ++-- modules/local/mirdeep2_run.nf | 2 +- modules/local/parse_fasta_mirna.nf | 2 +- subworkflows/local/genome_quant.nf | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/local/bowtie_genome.nf b/modules/local/bowtie_genome.nf index b132e1da..91a6cd53 100644 --- a/modules/local/bowtie_genome.nf +++ b/modules/local/bowtie_genome.nf @@ -8,7 +8,7 @@ process INDEX_GENOME { 'biocontainers/bowtie:1.3.1--py310h4070885_4' }" input: - path fasta + tuple val(meta2), path(fasta) output: path 'genome*ebwt' , emit: index diff --git a/modules/local/bowtie_mirna.nf b/modules/local/bowtie_mirna.nf index 9390730a..2be45bb8 100644 --- a/modules/local/bowtie_mirna.nf +++ b/modules/local/bowtie_mirna.nf @@ -7,7 +7,7 @@ process INDEX_MIRNA { 'biocontainers/bowtie:1.3.1--py310h4070885_4' }" input: - path fasta + tuple val(meta2), path(fasta) output: path 'fasta_bidx*' , emit: index diff --git a/modules/local/format_fasta_mirna.nf b/modules/local/format_fasta_mirna.nf index 3e247ce4..637a6604 100644 --- a/modules/local/format_fasta_mirna.nf +++ b/modules/local/format_fasta_mirna.nf @@ -10,10 +10,10 @@ process FORMAT_FASTA_MIRNA { 'biocontainers/fastx_toolkit:0.0.14--he1b5a44_8' }" input: - path fasta + tuple val(meta2), path(fasta) output: - path '*_idx.fa' , emit: formatted_fasta + tuple meta2, path '*_idx.fa' , emit: formatted_fasta path "versions.yml", emit: versions when: diff --git a/modules/local/mirdeep2_run.nf b/modules/local/mirdeep2_run.nf index 74044e4a..e4e2aaaf 100644 --- a/modules/local/mirdeep2_run.nf +++ b/modules/local/mirdeep2_run.nf @@ -10,7 +10,7 @@ process MIRDEEP2_RUN { 'biocontainers/mirdeep2:2.0.1.3--hdfd78af_1' }" input: - path fasta + tuple val(meta2), path(fasta) tuple path(reads), path(arf) path hairpin path mature diff --git a/modules/local/parse_fasta_mirna.nf b/modules/local/parse_fasta_mirna.nf index ab7a91f0..22950833 100644 --- a/modules/local/parse_fasta_mirna.nf +++ b/modules/local/parse_fasta_mirna.nf @@ -7,7 +7,7 @@ process PARSE_FASTA_MIRNA { 'biocontainers/seqkit:2.3.1--h9ee0642_0' }" input: - path fasta + tuple val(meta2), path(fasta) output: path '*_igenome.fa', emit: parsed_fasta diff --git a/subworkflows/local/genome_quant.nf b/subworkflows/local/genome_quant.nf index a20a7c1f..39d17e8a 100644 --- a/subworkflows/local/genome_quant.nf +++ b/subworkflows/local/genome_quant.nf @@ -8,7 +8,7 @@ include { BOWTIE_MAP_SEQ as BOWTIE_MAP_GENOME } from '../../modules/local/bowtie workflow GENOME_QUANT { take: - fasta + fasta //channel: [ val(meta2), [ reads ] ] index reads // channel: [ val(meta), [ reads ] ] From 26f95a119940c4348245ada3a501e9bf523fe46b Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Fri, 1 Sep 2023 09:19:07 +0200 Subject: [PATCH 23/33] Update modules/local/format_fasta_mirna.nf Co-authored-by: Christopher Mohr --- modules/local/format_fasta_mirna.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/local/format_fasta_mirna.nf b/modules/local/format_fasta_mirna.nf index 637a6604..c2efca97 100644 --- a/modules/local/format_fasta_mirna.nf +++ b/modules/local/format_fasta_mirna.nf @@ -13,7 +13,7 @@ process FORMAT_FASTA_MIRNA { tuple val(meta2), path(fasta) output: - tuple meta2, path '*_idx.fa' , emit: formatted_fasta + tuple val(meta2), path('*_idx.fa') , emit: formatted_fasta path "versions.yml", emit: versions when: From cd6c2ab3bbd004f50bfc71b1d6bddc4d8c22fe4a Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Fri, 1 Sep 2023 07:49:56 +0000 Subject: [PATCH 24/33] Add chanel description --- subworkflows/local/mirna_quant.nf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subworkflows/local/mirna_quant.nf b/subworkflows/local/mirna_quant.nf index 70b872e3..b1904296 100644 --- a/subworkflows/local/mirna_quant.nf +++ b/subworkflows/local/mirna_quant.nf @@ -25,8 +25,8 @@ include { EDGER_QC } from '../../modules/local/edger_qc.nf' workflow MIRNA_QUANT { take: - mature // channel: fasta file - hairpin // channel: fasta file + mature // channel: [ val(meta), fasta file] + hairpin // channel: [ val(meta), fasta file] gtf // channle: GTF file reads // channel: [ val(meta), [ reads ] ] From ea6b8e61c7172844f09534484936f7490ae9b367 Mon Sep 17 00:00:00 2001 From: Christopher Mohr Date: Fri, 1 Sep 2023 09:33:08 +0000 Subject: [PATCH 25/33] adapt fasta channel of modules and subworkflows --- modules/local/format_fasta_mirna.nf | 4 ++-- modules/local/parse_fasta_mirna.nf | 4 ++-- subworkflows/local/genome_quant.nf | 2 +- subworkflows/local/mirna_quant.nf | 2 +- workflows/smrnaseq.nf | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/local/format_fasta_mirna.nf b/modules/local/format_fasta_mirna.nf index c2efca97..489879a5 100644 --- a/modules/local/format_fasta_mirna.nf +++ b/modules/local/format_fasta_mirna.nf @@ -13,8 +13,8 @@ process FORMAT_FASTA_MIRNA { tuple val(meta2), path(fasta) output: - tuple val(meta2), path('*_idx.fa') , emit: formatted_fasta - path "versions.yml", emit: versions + tuple val(meta2), path('*_idx.fa') , emit: formatted_fasta + path "versions.yml" , emit: versions when: task.ext.when == null || task.ext.when diff --git a/modules/local/parse_fasta_mirna.nf b/modules/local/parse_fasta_mirna.nf index 22950833..71f5c85a 100644 --- a/modules/local/parse_fasta_mirna.nf +++ b/modules/local/parse_fasta_mirna.nf @@ -10,8 +10,8 @@ process PARSE_FASTA_MIRNA { tuple val(meta2), path(fasta) output: - path '*_igenome.fa', emit: parsed_fasta - path "versions.yml", emit: versions + tuple val(meta2), path('*_igenome.fa'), emit: parsed_fasta + path "versions.yml" , emit: versions when: task.ext.when == null || task.ext.when diff --git a/subworkflows/local/genome_quant.nf b/subworkflows/local/genome_quant.nf index 39d17e8a..07f4fa53 100644 --- a/subworkflows/local/genome_quant.nf +++ b/subworkflows/local/genome_quant.nf @@ -16,7 +16,7 @@ workflow GENOME_QUANT { ch_versions = Channel.empty() if (!index){ - INDEX_GENOME ( fasta ) + INDEX_GENOME ( [ [:], fasta ] ) bowtie_index = INDEX_GENOME.out.index fasta_formatted = INDEX_GENOME.out.fasta ch_versions = ch_versions.mix(INDEX_GENOME.out.versions) diff --git a/subworkflows/local/mirna_quant.nf b/subworkflows/local/mirna_quant.nf index b1904296..dfa16ab4 100644 --- a/subworkflows/local/mirna_quant.nf +++ b/subworkflows/local/mirna_quant.nf @@ -94,7 +94,7 @@ workflow MIRNA_QUANT { ch_mirtop_logs = Channel.empty() if (params.mirtrace_species){ - MIRTOP_QUANT ( BOWTIE_MAP_SEQCLUSTER.out.bam.collect{it[1]}, FORMAT_HAIRPIN.out.formatted_fasta, gtf ) + MIRTOP_QUANT ( BOWTIE_MAP_SEQCLUSTER.out.bam.collect{it[1]}, FORMAT_HAIRPIN.out.formatted_fasta.collect{it[1]}, gtf ) ch_mirtop_logs = MIRTOP_QUANT.out.logs ch_versions = ch_versions.mix(MIRTOP_QUANT.out.versions) diff --git a/workflows/smrnaseq.nf b/workflows/smrnaseq.nf index 3489b83c..cce83e56 100644 --- a/workflows/smrnaseq.nf +++ b/workflows/smrnaseq.nf @@ -179,8 +179,8 @@ workflow SMRNASEQ { } MIRNA_QUANT ( - reference_mature, - reference_hairpin, + [ [:], reference_mature], + [ [:], reference_hairpin], mirna_gtf, mirna_reads ) From a026ba147e10833d46968b1b49a291ae3deb0817 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Fri, 1 Sep 2023 11:47:08 +0000 Subject: [PATCH 26/33] Fix adapter trim for illumina case --- CHANGELOG.md | 1 + lib/WorkflowSmrnaseq.groovy | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ca1a1cc..c9ce51eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v2.2.2](https://github.com/nf-core/smrnaseq/releases/tag/2.2.2) - 2023-06-01 - [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers +- [[#237]](https://github.com/nf-core/smrnaseq/issues/237) - Fix illumina protocol clip parameters to default ## [v2.2.1](https://github.com/nf-core/smrnaseq/releases/tag/2.2.1) - 2023-05-12 diff --git a/lib/WorkflowSmrnaseq.groovy b/lib/WorkflowSmrnaseq.groovy index 703c1342..5b94bad7 100755 --- a/lib/WorkflowSmrnaseq.groovy +++ b/lib/WorkflowSmrnaseq.groovy @@ -125,8 +125,8 @@ class WorkflowSmrnaseq { switch(params.protocol){ case 'illumina': - params.putIfAbsent("clip_r1", 1); - params.putIfAbsent("three_prime_clip_r1",2); + params.putIfAbsent("clip_r1", 0); + params.putIfAbsent("three_prime_clip_r1",0); params.putIfAbsent("three_prime_adapter", "TGGAATTCTCGGGTGCCAAGG"); break case 'nextflex': From 9637f9b7700a534010e7c4b55f793dc3f45e3e82 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Mon, 4 Sep 2023 11:38:53 +0200 Subject: [PATCH 27/33] Update nextflow.config Co-authored-by: Christopher Mohr --- nextflow.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextflow.config b/nextflow.config index 29d41588..ff524df5 100644 --- a/nextflow.config +++ b/nextflow.config @@ -272,7 +272,7 @@ manifest { description = """Small RNA-Seq Best Practice Analysis Pipeline.""" mainScript = 'main.nf' nextflowVersion = '!>=23.04.0' - version = '2.2.2dev' + version = '2.2.2' doi = '' } From 83b20b2de704954f620cb734c06ee65e9ef43db7 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Mon, 4 Sep 2023 11:44:41 +0200 Subject: [PATCH 28/33] Update subworkflows/local/genome_quant.nf Co-authored-by: Christopher Mohr --- subworkflows/local/genome_quant.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subworkflows/local/genome_quant.nf b/subworkflows/local/genome_quant.nf index 07f4fa53..edb60a2a 100644 --- a/subworkflows/local/genome_quant.nf +++ b/subworkflows/local/genome_quant.nf @@ -8,7 +8,7 @@ include { BOWTIE_MAP_SEQ as BOWTIE_MAP_GENOME } from '../../modules/local/bowtie workflow GENOME_QUANT { take: - fasta //channel: [ val(meta2), [ reads ] ] + fasta index reads // channel: [ val(meta), [ reads ] ] From 0752c18dd6cb29ce691839b953e49eec7dd01513 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Mon, 4 Sep 2023 09:49:46 +0000 Subject: [PATCH 29/33] Adjust bits from PR review --- CHANGELOG.md | 12 ++++++++---- assets/multiqc_config.yml | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9ce51eb..65e46193 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## dev +## [v2.2.2](https://github.com/nf-core/smrnaseq/releases/tag/2.2.2) - 2023-09-04 +- [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers +- [[#237]](https://github.com/nf-core/smrnaseq/issues/237) - Fix illumina protocol clip parameters to default - Remove public_aws_ecr profile -## [v2.2.2](https://github.com/nf-core/smrnaseq/releases/tag/2.2.2) - 2023-06-01 +### Software dependencies -- [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers -- [[#237]](https://github.com/nf-core/smrnaseq/issues/237) - Fix illumina protocol clip parameters to default +| Dependency | Old version | New version | +| ---------- | ----------- | ----------- | +| `multiqc` | 1.13 | 1.15 | +| `fastp` | 0.23.2 | 0.23.4 | ## [v2.2.1](https://github.com/nf-core/smrnaseq/releases/tag/2.2.1) - 2023-05-12 diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index fe2c8740..23da1135 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -1,7 +1,7 @@ report_comment: > - This report has been generated by the nf-core/smrnaseq + This report has been generated by the nf-core/smrnaseq analysis pipeline. For information about how to interpret these results, please see the - documentation. + documentation. report_section_order: "nf-core-smrnaseq-methods-description": order: -1000 From 0602c6136a8f3f18ae83dd33314d6affc749a7e3 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Mon, 4 Sep 2023 12:50:55 +0000 Subject: [PATCH 30/33] Adjust changelog [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65e46193..fc874c04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [[#253]](https://github.com/nf-core/smrnaseq/pull/253) - Remove globs from process alias when using ECR containers - [[#237]](https://github.com/nf-core/smrnaseq/issues/237) - Fix illumina protocol clip parameters to default - Remove public_aws_ecr profile +- [[#269]](https://github.com/nf-core/smrnaseq/pull/269) - Updated miRBase URLs with new location (old ones were broken) ### Software dependencies From c55210f92ed5d303a889595b14603692d6bedc98 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Mon, 4 Sep 2023 17:35:18 +0200 Subject: [PATCH 31/33] Update nextflow.config Bugfix for users who are running offline / with -all distribution as seen in discussion with @bentsherman https://github.com/nextflow-io/nextflow/discussions/4126 --- nextflow.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextflow.config b/nextflow.config index ff524df5..44544307 100644 --- a/nextflow.config +++ b/nextflow.config @@ -217,7 +217,7 @@ singularity.registry = 'quay.io' // Nextflow plugins plugins { - id 'nf-validation' // Validation of pipeline parameters and creation of an input channel from a sample sheet + id 'nf-validation@0.3.1'// Validation of pipeline parameters and creation of an input channel from a sample sheet } // Load igenomes.config if required From 703bf6173bae08c5ea08637d36202dadc3542865 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Mon, 4 Sep 2023 15:56:45 +0000 Subject: [PATCH 32/33] Revert to latest --- nextflow.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextflow.config b/nextflow.config index 44544307..c9f81e43 100644 --- a/nextflow.config +++ b/nextflow.config @@ -217,7 +217,7 @@ singularity.registry = 'quay.io' // Nextflow plugins plugins { - id 'nf-validation@0.3.1'// Validation of pipeline parameters and creation of an input channel from a sample sheet + id 'nf-validation'// Validation of pipeline parameters and creation of an input channel from a sample sheet } // Load igenomes.config if required From d0be63a91577f9914a0466bfa90c658a4f44f146 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Tue, 5 Sep 2023 11:14:50 +0200 Subject: [PATCH 33/33] Update genome_quant.nf [skip ci] --- subworkflows/local/genome_quant.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subworkflows/local/genome_quant.nf b/subworkflows/local/genome_quant.nf index edb60a2a..967b2757 100644 --- a/subworkflows/local/genome_quant.nf +++ b/subworkflows/local/genome_quant.nf @@ -8,7 +8,7 @@ include { BOWTIE_MAP_SEQ as BOWTIE_MAP_GENOME } from '../../modules/local/bowtie workflow GENOME_QUANT { take: - fasta + fasta index reads // channel: [ val(meta), [ reads ] ]