From 10f7f1225e559333c71797c8ccf1a96bfb460a61 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 5 Mar 2024 12:42:02 -0600 Subject: [PATCH 001/255] chore: Bump version to 2.3.0dev --- CHANGELOG.md | 2 ++ assets/multiqc_config.yml | 4 ++-- nextflow.config | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dcf1174..eefe5581 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ 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). +## [Unreleased] + ## v2.2.0 - 2024-03-05 ### Added diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index cb879e3c..4c494338 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -1,8 +1,8 @@ report_comment: > - This report has been generated by the nf-core/nascent + This report has been generated by the nf-core/nascent analysis pipeline. For information about how to interpret these results, please see the - documentation. + documentation. report_section_order: "nf-core-nascent-methods-description": diff --git a/nextflow.config b/nextflow.config index 2118084b..c97fe490 100644 --- a/nextflow.config +++ b/nextflow.config @@ -255,7 +255,7 @@ manifest { description = """Global Run-On sequencing analysis pipeline""" mainScript = 'main.nf' nextflowVersion = '!>=23.04.0' - version = '2.2.0' + version = '2.3.0dev' doi = '10.5281/zenodo.7245273' } From 5bcfe4ff1729b89e9e5741c473d32168b836a57f Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Tue, 20 Feb 2024 15:29:08 +0000 Subject: [PATCH 002/255] Template update for nf-core/tools version 2.13 --- .editorconfig | 9 +- .github/workflows/awsfulltest.yml | 4 +- .github/workflows/awstest.yml | 4 +- .github/workflows/branch.yml | 2 +- .github/workflows/ci.yml | 7 +- .github/workflows/clean-up.yml | 2 +- .github/workflows/download_pipeline.yml | 18 +- .github/workflows/linting.yml | 12 +- .github/workflows/linting_comment.yml | 4 +- .github/workflows/release-announcements.yml | 11 +- README.md | 5 +- assets/multiqc_config.yml | 2 + assets/schema_input.json | 11 +- conf/modules.config | 12 +- lib/NfcoreTemplate.groovy | 356 -------------- lib/Utils.groovy | 47 -- lib/WorkflowMain.groovy | 76 --- lib/WorkflowNascent.groovy | 143 ------ main.nf | 108 +++-- modules.json | 19 + modules/local/gtf_gene_filter.nf | 33 -- .../dumpsoftwareversions/environment.yml | 7 - .../custom/dumpsoftwareversions/main.nf | 24 - .../custom/dumpsoftwareversions/meta.yml | 37 -- .../templates/dumpsoftwareversions.py | 101 ---- .../dumpsoftwareversions/tests/main.nf.test | 43 -- .../tests/main.nf.test.snap | 33 -- .../dumpsoftwareversions/tests/tags.yml | 2 - nextflow.config | 15 +- nextflow_schema.json | 2 +- pyproject.toml | 8 +- .../utils_nfcore_nascent_pipeline/main.nf | 247 ++++++++++ .../nf-core/utils_nextflow_pipeline/main.nf | 126 +++++ .../nf-core/utils_nextflow_pipeline/meta.yml | 38 ++ .../tests/main.function.nf.test | 54 +++ .../tests/main.function.nf.test.snap | 12 + .../tests/main.workflow.nf.test | 123 +++++ .../tests/nextflow.config | 9 + .../utils_nextflow_pipeline/tests/tags.yml | 2 + .../nf-core/utils_nfcore_pipeline/main.nf | 440 ++++++++++++++++++ .../nf-core/utils_nfcore_pipeline/meta.yml | 24 + .../tests/main.function.nf.test | 134 ++++++ .../tests/main.function.nf.test.snap | 138 ++++++ .../tests/main.workflow.nf.test | 29 ++ .../tests/main.workflow.nf.test.snap | 15 + .../tests/nextflow.config | 9 + .../utils_nfcore_pipeline/tests/tags.yml | 2 + .../nf-core/utils_nfvalidation_plugin/main.nf | 62 +++ .../utils_nfvalidation_plugin/meta.yml | 44 ++ .../tests/main.nf.test | 200 ++++++++ .../tests/nextflow_schema.json | 96 ++++ .../utils_nfvalidation_plugin/tests/tags.yml | 2 + workflows/nascent.nf | 181 +++---- workflows/tests/bowtie2.nf.test.snap | 4 +- workflows/tests/main.nf.test.snap | 12 +- workflows/tests/references.nf.test.snap | 8 +- 56 files changed, 2031 insertions(+), 1137 deletions(-) delete mode 100755 lib/NfcoreTemplate.groovy delete mode 100644 lib/Utils.groovy delete mode 100755 lib/WorkflowMain.groovy delete mode 100755 lib/WorkflowNascent.groovy delete mode 100644 modules/local/gtf_gene_filter.nf delete mode 100644 modules/nf-core/custom/dumpsoftwareversions/environment.yml delete mode 100644 modules/nf-core/custom/dumpsoftwareversions/main.nf delete mode 100644 modules/nf-core/custom/dumpsoftwareversions/meta.yml delete mode 100755 modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py delete mode 100644 modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test delete mode 100644 modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test.snap delete mode 100644 modules/nf-core/custom/dumpsoftwareversions/tests/tags.yml create mode 100644 subworkflows/local/utils_nfcore_nascent_pipeline/main.nf create mode 100644 subworkflows/nf-core/utils_nextflow_pipeline/main.nf create mode 100644 subworkflows/nf-core/utils_nextflow_pipeline/meta.yml create mode 100644 subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test create mode 100644 subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap create mode 100644 subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test create mode 100644 subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config create mode 100644 subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/main.nf create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/meta.yml create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config create mode 100644 subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml create mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/main.nf create mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml create mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test create mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/tests/nextflow_schema.json create mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml diff --git a/.editorconfig b/.editorconfig index 9b990088..dd9ffa53 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,7 +18,12 @@ end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset indent_style = unset -indent_size = unset +[/subworkflows/nf-core/**] +charset = unset +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +indent_style = unset [/assets/email*] indent_size = unset @@ -28,5 +33,5 @@ indent_size = unset indent_style = unset # ignore python -[*.{py}] +[*.{py,md}] indent_style = unset diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index bdf5ec1d..2ad04c00 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@v2 + uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} @@ -28,7 +28,7 @@ jobs: } profiles: test_full - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 with: name: Tower debug log file path: | diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml index bf337a02..a32ecf9f 100644 --- a/.github/workflows/awstest.yml +++ b/.github/workflows/awstest.yml @@ -12,7 +12,7 @@ jobs: steps: # Launch workflow using Tower CLI tool action - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@v2 + uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} @@ -25,7 +25,7 @@ jobs: } profiles: test - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 with: name: Tower debug log file path: | diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 72227f54..fed61579 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -19,7 +19,7 @@ jobs: # NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets - name: Post PR comment if: failure() - uses: mshick/add-pr-comment@v2 + uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2 with: message: | ## This PR is against the `master` branch :x: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4e171f0..8163720d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: profile: ["docker"] # TODO , "singularity", "conda"] steps: - name: Check out pipeline code - uses: actions/checkout@v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Cache Nextflow installation id: cache-software @@ -41,10 +41,13 @@ jobs: key: nascent-${{ runner.os }}-${{ matrix.NXF_VER }} - name: Install Nextflow - uses: nf-core/setup-nextflow@v1 + uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1 with: version: "${{ matrix.NXF_VER }}" + - name: Disk space cleanup + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + - name: Install nf-test if: steps.cache-software.outputs.cache-hit != 'true' run: | diff --git a/.github/workflows/clean-up.yml b/.github/workflows/clean-up.yml index e37cfda5..0b6b1f27 100644 --- a/.github/workflows/clean-up.yml +++ b/.github/workflows/clean-up.yml @@ -10,7 +10,7 @@ jobs: issues: write pull-requests: write steps: - - uses: actions/stale@v9 + - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9 with: stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days." stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment if it is still useful." diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml index 4a5fe7c7..f823210d 100644 --- a/.github/workflows/download_pipeline.yml +++ b/.github/workflows/download_pipeline.yml @@ -6,6 +6,11 @@ name: Test successful pipeline download with 'nf-core download' # - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev. on: workflow_dispatch: + inputs: + testbranch: + description: "The specific branch you wish to utilize for the test execution of nf-core download." + required: true + default: "dev" pull_request: types: - opened @@ -23,13 +28,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Nextflow - uses: nf-core/setup-nextflow@v1 + uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 with: python-version: "3.11" architecture: "x64" - - uses: eWaterCycle/setup-singularity@v7 + - uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7 with: singularity-version: 3.8.3 @@ -42,14 +47,13 @@ jobs: run: | echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV} echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV} - - echo "{% raw %}REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV} + echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV} - name: Download the pipeline env: NXF_SINGULARITY_CACHEDIR: ./ run: | - nf-core download ${{ env.REPO_LOWERCASE }} \ + nf-core download ${{ env.REPO_LOWERCASE }} \ --revision ${{ env.REPO_BRANCH }} \ --outdir ./${{ env.REPOTITLE_LOWERCASE }} \ --compress "none" \ @@ -65,4 +69,4 @@ jobs: env: NXF_SINGULARITY_CACHEDIR: ./ NXF_SINGULARITY_HOME_MOUNT: true - run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results{% endraw %} + run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 81cd098e..748b4311 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -14,10 +14,10 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up Python 3.11 - uses: actions/setup-python@v5 + uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 with: python-version: 3.11 cache: "pip" @@ -32,12 +32,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out pipeline code - uses: actions/checkout@v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Install Nextflow - uses: nf-core/setup-nextflow@v1 + uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 with: python-version: "3.11" architecture: "x64" @@ -60,7 +60,7 @@ jobs: - name: Upload linting log file artifact if: ${{ always() }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 with: name: linting-logs path: | diff --git a/.github/workflows/linting_comment.yml b/.github/workflows/linting_comment.yml index 147bcd10..b706875f 100644 --- a/.github/workflows/linting_comment.yml +++ b/.github/workflows/linting_comment.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download lint results - uses: dawidd6/action-download-artifact@v3 + uses: dawidd6/action-download-artifact@f6b0bace624032e30a85a8fd9c1a7f8f611f5737 # v3 with: workflow: linting.yml workflow_conclusion: completed @@ -21,7 +21,7 @@ jobs: run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT - name: Post PR comment - uses: marocchino/sticky-pull-request-comment@v2 + uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} number: ${{ steps.pr_number.outputs.pr_number }} diff --git a/.github/workflows/release-announcements.yml b/.github/workflows/release-announcements.yml index 21ac3f06..c3674af2 100644 --- a/.github/workflows/release-announcements.yml +++ b/.github/workflows/release-announcements.yml @@ -9,6 +9,11 @@ jobs: toot: runs-on: ubuntu-latest steps: + - name: get topics and convert to hashtags + id: get_topics + run: | + curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' > $GITHUB_OUTPUT + - uses: rzr/fediverse-action@master with: access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }} @@ -20,11 +25,13 @@ jobs: Please see the changelog: ${{ github.event.release.html_url }} + ${{ steps.get_topics.outputs.GITHUB_OUTPUT }} #nfcore #openscience #nextflow #bioinformatics + send-tweet: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v5 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 with: python-version: "3.10" - name: Install dependencies @@ -56,7 +63,7 @@ jobs: bsky-post: runs-on: ubuntu-latest steps: - - uses: zentered/bluesky-post-action@v0.1.0 + - uses: zentered/bluesky-post-action@80dbe0a7697de18c15ad22f4619919ceb5ccf597 # v0.1.0 with: post: | Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}! diff --git a/README.md b/README.md index 107fac57..aa3abdb6 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ nf-core/nascent -[![GitHub Actions CI Status](https://github.com/nf-core/nascent/workflows/nf-core%20CI/badge.svg)](https://github.com/nf-core/nascent/actions?query=workflow%3A%22nf-core+CI%22) -[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/workflows/nf-core%20linting/badge.svg)](https://github.com/nf-core/nascent/actions?query=workflow%3A%22nf-core+linting%22)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.7245273-blue)](https://doi.org/10.5281/zenodo.7245273) + +[![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml) +[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.7245273-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.7245273) [![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/) diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 4c494338..8390d866 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -38,3 +38,5 @@ sp: ignore_images: false export_plots: true + +disable_version_detection: true diff --git a/assets/schema_input.json b/assets/schema_input.json index 464527ac..cefed569 100644 --- a/assets/schema_input.json +++ b/assets/schema_input.json @@ -21,18 +21,11 @@ "errorMessage": "FastQ file for reads 1 must be provided, cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'" }, "fastq_2": { - "errorMessage": "FastQ file for reads 2 cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'", "type": "string", "format": "file-path", "exists": true, - "anyOf": [ - { - "pattern": "^\\S+\\.f(ast)?q\\.gz$" - }, - { - "maxLength": 0 - } - ] + "pattern": "^\\S+\\.f(ast)?q\\.gz$", + "errorMessage": "FastQ file for reads 2 cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'" } }, "required": ["sample", "fastq_1"] diff --git a/conf/modules.config b/conf/modules.config index 1382fe8e..d2378a7e 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -18,12 +18,8 @@ process { saveAs: { filename -> filename.equals('versions.yml') ? null : filename } ] - withName: CUSTOM_DUMPSOFTWAREVERSIONS { - publishDir = [ - path: { "${params.outdir}/pipeline_info" }, - mode: params.publish_dir_mode, - pattern: '*_versions.yml' - ] + withName: FASTQC { + ext.args = '--quiet' } withName: 'MULTIQC' { @@ -35,10 +31,6 @@ process { ] } - withName: FASTQC { - ext.args = '--quiet' - } - withName: FASTP { ext.prefix = { "${meta.id}.trimmed" } } diff --git a/lib/NfcoreTemplate.groovy b/lib/NfcoreTemplate.groovy deleted file mode 100755 index e248e4c3..00000000 --- a/lib/NfcoreTemplate.groovy +++ /dev/null @@ -1,356 +0,0 @@ -// -// This file holds several functions used within the nf-core pipeline template. -// - -import org.yaml.snakeyaml.Yaml -import groovy.json.JsonOutput -import nextflow.extension.FilesEx - -class NfcoreTemplate { - - // - // Check AWS Batch related parameters have been specified correctly - // - public static void awsBatch(workflow, params) { - if (workflow.profile.contains('awsbatch')) { - // Check params.awsqueue and params.awsregion have been set if running on AWSBatch - assert (params.awsqueue && params.awsregion) : "Specify correct --awsqueue and --awsregion parameters on AWSBatch!" - // Check outdir paths to be S3 buckets if running on AWSBatch - assert params.outdir.startsWith('s3:') : "Outdir not on S3 - specify S3 Bucket to run on AWSBatch!" - } - } - - // - // Warn if a -profile or Nextflow config has not been provided to run the pipeline - // - public static void checkConfigProvided(workflow, log) { - if (workflow.profile == 'standard' && workflow.configFiles.size() <= 1) { - log.warn "[$workflow.manifest.name] You are attempting to run the pipeline without any custom configuration!\n\n" + - "This will be dependent on your local compute environment but can be achieved via one or more of the following:\n" + - " (1) Using an existing pipeline profile e.g. `-profile docker` or `-profile singularity`\n" + - " (2) Using an existing nf-core/configs for your Institution e.g. `-profile crick` or `-profile uppmax`\n" + - " (3) Using your own local custom config e.g. `-c /path/to/your/custom.config`\n\n" + - "Please refer to the quick start section and usage docs for the pipeline.\n " - } - } - - // - // Generate version string - // - public static String version(workflow) { - String version_string = "" - - if (workflow.manifest.version) { - def prefix_v = workflow.manifest.version[0] != 'v' ? 'v' : '' - version_string += "${prefix_v}${workflow.manifest.version}" - } - - if (workflow.commitId) { - def git_shortsha = workflow.commitId.substring(0, 7) - version_string += "-g${git_shortsha}" - } - - return version_string - } - - // - // Construct and send completion email - // - public static void email(workflow, params, summary_params, projectDir, log, multiqc_report=[]) { - - // Set up the e-mail variables - def subject = "[$workflow.manifest.name] Successful: $workflow.runName" - if (!workflow.success) { - subject = "[$workflow.manifest.name] FAILED: $workflow.runName" - } - - def summary = [:] - for (group in summary_params.keySet()) { - summary << summary_params[group] - } - - def misc_fields = [:] - misc_fields['Date Started'] = workflow.start - misc_fields['Date Completed'] = workflow.complete - misc_fields['Pipeline script file path'] = workflow.scriptFile - misc_fields['Pipeline script hash ID'] = workflow.scriptId - if (workflow.repository) misc_fields['Pipeline repository Git URL'] = workflow.repository - if (workflow.commitId) misc_fields['Pipeline repository Git Commit'] = workflow.commitId - if (workflow.revision) misc_fields['Pipeline Git branch/tag'] = workflow.revision - misc_fields['Nextflow Version'] = workflow.nextflow.version - misc_fields['Nextflow Build'] = workflow.nextflow.build - misc_fields['Nextflow Compile Timestamp'] = workflow.nextflow.timestamp - - def email_fields = [:] - email_fields['version'] = NfcoreTemplate.version(workflow) - email_fields['runName'] = workflow.runName - email_fields['success'] = workflow.success - email_fields['dateComplete'] = workflow.complete - email_fields['duration'] = workflow.duration - email_fields['exitStatus'] = workflow.exitStatus - email_fields['errorMessage'] = (workflow.errorMessage ?: 'None') - email_fields['errorReport'] = (workflow.errorReport ?: 'None') - email_fields['commandLine'] = workflow.commandLine - email_fields['projectDir'] = workflow.projectDir - email_fields['summary'] = summary << misc_fields - - // On success try attach the multiqc report - def mqc_report = null - try { - if (workflow.success) { - mqc_report = multiqc_report.getVal() - if (mqc_report.getClass() == ArrayList && mqc_report.size() >= 1) { - if (mqc_report.size() > 1) { - log.warn "[$workflow.manifest.name] Found multiple reports from process 'MULTIQC', will use only one" - } - mqc_report = mqc_report[0] - } - } - } catch (all) { - if (multiqc_report) { - log.warn "[$workflow.manifest.name] Could not attach MultiQC report to summary email" - } - } - - // Check if we are only sending emails on failure - def email_address = params.email - if (!params.email && params.email_on_fail && !workflow.success) { - email_address = params.email_on_fail - } - - // Render the TXT template - def engine = new groovy.text.GStringTemplateEngine() - def tf = new File("$projectDir/assets/email_template.txt") - def txt_template = engine.createTemplate(tf).make(email_fields) - def email_txt = txt_template.toString() - - // Render the HTML template - def hf = new File("$projectDir/assets/email_template.html") - def html_template = engine.createTemplate(hf).make(email_fields) - def email_html = html_template.toString() - - // Render the sendmail template - 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) - def sendmail_html = sendmail_template.toString() - - // Send the HTML e-mail - Map colors = logColours(params.monochrome_logs) - if (email_address) { - try { - if (params.plaintext_email) { throw GroovyException('Send plaintext e-mail, not HTML') } - // Try to send HTML e-mail using sendmail - def sendmail_tf = new File(workflow.launchDir.toString(), ".sendmail_tmp.html") - sendmail_tf.withWriter { w -> w << sendmail_html } - [ 'sendmail', '-t' ].execute() << sendmail_html - log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Sent summary e-mail to $email_address (sendmail)-" - } catch (all) { - // Catch failures and try with plaintext - def mail_cmd = [ 'mail', '-s', subject, '--content-type=text/html', email_address ] - if ( mqc_report != null && mqc_report.size() <= max_multiqc_email_size.toBytes() ) { - mail_cmd += [ '-A', mqc_report ] - } - mail_cmd.execute() << email_html - log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Sent summary e-mail to $email_address (mail)-" - } - } - - // Write summary e-mail HTML to a file - def output_hf = new File(workflow.launchDir.toString(), ".pipeline_report.html") - output_hf.withWriter { w -> w << email_html } - FilesEx.copyTo(output_hf.toPath(), "${params.outdir}/pipeline_info/pipeline_report.html"); - output_hf.delete() - - // Write summary e-mail TXT to a file - def output_tf = new File(workflow.launchDir.toString(), ".pipeline_report.txt") - output_tf.withWriter { w -> w << email_txt } - FilesEx.copyTo(output_tf.toPath(), "${params.outdir}/pipeline_info/pipeline_report.txt"); - output_tf.delete() - } - - // - // Construct and send a notification to a web server as JSON - // e.g. Microsoft Teams and Slack - // - public static void IM_notification(workflow, params, summary_params, projectDir, log) { - def hook_url = params.hook_url - - def summary = [:] - for (group in summary_params.keySet()) { - summary << summary_params[group] - } - - def misc_fields = [:] - misc_fields['start'] = workflow.start - misc_fields['complete'] = workflow.complete - misc_fields['scriptfile'] = workflow.scriptFile - misc_fields['scriptid'] = workflow.scriptId - if (workflow.repository) misc_fields['repository'] = workflow.repository - if (workflow.commitId) misc_fields['commitid'] = workflow.commitId - if (workflow.revision) misc_fields['revision'] = workflow.revision - misc_fields['nxf_version'] = workflow.nextflow.version - misc_fields['nxf_build'] = workflow.nextflow.build - misc_fields['nxf_timestamp'] = workflow.nextflow.timestamp - - def msg_fields = [:] - msg_fields['version'] = NfcoreTemplate.version(workflow) - msg_fields['runName'] = workflow.runName - msg_fields['success'] = workflow.success - msg_fields['dateComplete'] = workflow.complete - msg_fields['duration'] = workflow.duration - msg_fields['exitStatus'] = workflow.exitStatus - msg_fields['errorMessage'] = (workflow.errorMessage ?: 'None') - msg_fields['errorReport'] = (workflow.errorReport ?: 'None') - msg_fields['commandLine'] = workflow.commandLine.replaceFirst(/ +--hook_url +[^ ]+/, "") - msg_fields['projectDir'] = workflow.projectDir - msg_fields['summary'] = summary << misc_fields - - // Render the JSON template - def engine = new groovy.text.GStringTemplateEngine() - // Different JSON depending on the service provider - // Defaults to "Adaptive Cards" (https://adaptivecards.io), except Slack which has its own format - def json_path = hook_url.contains("hooks.slack.com") ? "slackreport.json" : "adaptivecard.json" - def hf = new File("$projectDir/assets/${json_path}") - def json_template = engine.createTemplate(hf).make(msg_fields) - def json_message = json_template.toString() - - // POST - def post = new URL(hook_url).openConnection(); - post.setRequestMethod("POST") - post.setDoOutput(true) - post.setRequestProperty("Content-Type", "application/json") - post.getOutputStream().write(json_message.getBytes("UTF-8")); - def postRC = post.getResponseCode(); - if (! postRC.equals(200)) { - log.warn(post.getErrorStream().getText()); - } - } - - // - // Dump pipeline parameters in a json file - // - public static void dump_parameters(workflow, params) { - def timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss') - def filename = "params_${timestamp}.json" - def temp_pf = new File(workflow.launchDir.toString(), ".${filename}") - def jsonStr = JsonOutput.toJson(params) - temp_pf.text = JsonOutput.prettyPrint(jsonStr) - - FilesEx.copyTo(temp_pf.toPath(), "${params.outdir}/pipeline_info/params_${timestamp}.json") - temp_pf.delete() - } - - // - // Print pipeline summary on completion - // - public static void summary(workflow, params, log) { - Map colors = logColours(params.monochrome_logs) - if (workflow.success) { - if (workflow.stats.ignoredCount == 0) { - log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Pipeline completed successfully${colors.reset}-" - } else { - log.info "-${colors.purple}[$workflow.manifest.name]${colors.yellow} Pipeline completed successfully, but with errored process(es) ${colors.reset}-" - } - } else { - log.info "-${colors.purple}[$workflow.manifest.name]${colors.red} Pipeline completed with errors${colors.reset}-" - } - } - - // - // ANSII Colours used for terminal logging - // - public static Map logColours(Boolean monochrome_logs) { - Map colorcodes = [:] - - // Reset / Meta - colorcodes['reset'] = monochrome_logs ? '' : "\033[0m" - colorcodes['bold'] = monochrome_logs ? '' : "\033[1m" - colorcodes['dim'] = monochrome_logs ? '' : "\033[2m" - colorcodes['underlined'] = monochrome_logs ? '' : "\033[4m" - colorcodes['blink'] = monochrome_logs ? '' : "\033[5m" - colorcodes['reverse'] = monochrome_logs ? '' : "\033[7m" - colorcodes['hidden'] = monochrome_logs ? '' : "\033[8m" - - // Regular Colors - colorcodes['black'] = monochrome_logs ? '' : "\033[0;30m" - colorcodes['red'] = monochrome_logs ? '' : "\033[0;31m" - colorcodes['green'] = monochrome_logs ? '' : "\033[0;32m" - colorcodes['yellow'] = monochrome_logs ? '' : "\033[0;33m" - colorcodes['blue'] = monochrome_logs ? '' : "\033[0;34m" - colorcodes['purple'] = monochrome_logs ? '' : "\033[0;35m" - colorcodes['cyan'] = monochrome_logs ? '' : "\033[0;36m" - colorcodes['white'] = monochrome_logs ? '' : "\033[0;37m" - - // Bold - colorcodes['bblack'] = monochrome_logs ? '' : "\033[1;30m" - colorcodes['bred'] = monochrome_logs ? '' : "\033[1;31m" - colorcodes['bgreen'] = monochrome_logs ? '' : "\033[1;32m" - colorcodes['byellow'] = monochrome_logs ? '' : "\033[1;33m" - colorcodes['bblue'] = monochrome_logs ? '' : "\033[1;34m" - colorcodes['bpurple'] = monochrome_logs ? '' : "\033[1;35m" - colorcodes['bcyan'] = monochrome_logs ? '' : "\033[1;36m" - colorcodes['bwhite'] = monochrome_logs ? '' : "\033[1;37m" - - // Underline - colorcodes['ublack'] = monochrome_logs ? '' : "\033[4;30m" - colorcodes['ured'] = monochrome_logs ? '' : "\033[4;31m" - colorcodes['ugreen'] = monochrome_logs ? '' : "\033[4;32m" - colorcodes['uyellow'] = monochrome_logs ? '' : "\033[4;33m" - colorcodes['ublue'] = monochrome_logs ? '' : "\033[4;34m" - colorcodes['upurple'] = monochrome_logs ? '' : "\033[4;35m" - colorcodes['ucyan'] = monochrome_logs ? '' : "\033[4;36m" - colorcodes['uwhite'] = monochrome_logs ? '' : "\033[4;37m" - - // High Intensity - colorcodes['iblack'] = monochrome_logs ? '' : "\033[0;90m" - colorcodes['ired'] = monochrome_logs ? '' : "\033[0;91m" - colorcodes['igreen'] = monochrome_logs ? '' : "\033[0;92m" - colorcodes['iyellow'] = monochrome_logs ? '' : "\033[0;93m" - colorcodes['iblue'] = monochrome_logs ? '' : "\033[0;94m" - colorcodes['ipurple'] = monochrome_logs ? '' : "\033[0;95m" - colorcodes['icyan'] = monochrome_logs ? '' : "\033[0;96m" - colorcodes['iwhite'] = monochrome_logs ? '' : "\033[0;97m" - - // Bold High Intensity - colorcodes['biblack'] = monochrome_logs ? '' : "\033[1;90m" - colorcodes['bired'] = monochrome_logs ? '' : "\033[1;91m" - colorcodes['bigreen'] = monochrome_logs ? '' : "\033[1;92m" - colorcodes['biyellow'] = monochrome_logs ? '' : "\033[1;93m" - colorcodes['biblue'] = monochrome_logs ? '' : "\033[1;94m" - colorcodes['bipurple'] = monochrome_logs ? '' : "\033[1;95m" - colorcodes['bicyan'] = monochrome_logs ? '' : "\033[1;96m" - colorcodes['biwhite'] = monochrome_logs ? '' : "\033[1;97m" - - return colorcodes - } - - // - // Does what is says on the tin - // - public static String dashedLine(monochrome_logs) { - Map colors = logColours(monochrome_logs) - return "-${colors.dim}----------------------------------------------------${colors.reset}-" - } - - // - // nf-core logo - // - public static String logo(workflow, monochrome_logs) { - Map colors = logColours(monochrome_logs) - String workflow_version = NfcoreTemplate.version(workflow) - String.format( - """\n - ${dashedLine(monochrome_logs)} - ${colors.green},--.${colors.black}/${colors.green},-.${colors.reset} - ${colors.blue} ___ __ __ __ ___ ${colors.green}/,-._.--~\'${colors.reset} - ${colors.blue} |\\ | |__ __ / ` / \\ |__) |__ ${colors.yellow}} {${colors.reset} - ${colors.blue} | \\| | \\__, \\__/ | \\ |___ ${colors.green}\\`-._,-`-,${colors.reset} - ${colors.green}`._,._,\'${colors.reset} - ${colors.purple} ${workflow.manifest.name} ${workflow_version}${colors.reset} - ${dashedLine(monochrome_logs)} - """.stripIndent() - ) - } -} diff --git a/lib/Utils.groovy b/lib/Utils.groovy deleted file mode 100644 index 8d030f4e..00000000 --- a/lib/Utils.groovy +++ /dev/null @@ -1,47 +0,0 @@ -// -// This file holds several Groovy functions that could be useful for any Nextflow pipeline -// - -import org.yaml.snakeyaml.Yaml - -class Utils { - - // - // When running with -profile conda, warn if channels have not been set-up appropriately - // - public static void checkCondaChannels(log) { - Yaml parser = new Yaml() - def channels = [] - try { - def config = parser.load("conda config --show channels".execute().text) - channels = config.channels - } catch(NullPointerException | IOException e) { - log.warn "Could not verify conda channel configuration." - return - } - - // Check that all channels are present - // This channel list is ordered by required channel priority. - def required_channels_in_order = ['conda-forge', 'bioconda', 'defaults'] - def channels_missing = ((required_channels_in_order as Set) - (channels as Set)) as Boolean - - // Check that they are in the right order - def channel_priority_violation = false - def n = required_channels_in_order.size() - for (int i = 0; i < n - 1; i++) { - channel_priority_violation |= !(channels.indexOf(required_channels_in_order[i]) < channels.indexOf(required_channels_in_order[i+1])) - } - - if (channels_missing | channel_priority_violation) { - log.warn "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + - " There is a problem with your Conda configuration!\n\n" + - " You will need to set-up the conda-forge and bioconda channels correctly.\n" + - " Please refer to https://bioconda.github.io/\n" + - " The observed channel order is \n" + - " ${channels}\n" + - " but the following channel order is required:\n" + - " ${required_channels_in_order}\n" + - "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - } - } -} diff --git a/lib/WorkflowMain.groovy b/lib/WorkflowMain.groovy deleted file mode 100755 index 62c0675e..00000000 --- a/lib/WorkflowMain.groovy +++ /dev/null @@ -1,76 +0,0 @@ -// -// This file holds several functions specific to the main.nf workflow in the nf-core/nascent pipeline -// - -import nextflow.Nextflow - -class WorkflowMain { - - // - // Citation string for pipeline - // - public static String citation(workflow) { - return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + - "* The pipeline\n" + - " https://doi.org/10.5281/zenodo.7245273\n\n" + - "* The nf-core framework\n" + - " https://doi.org/10.1038/s41587-020-0439-x\n\n" + - "* Software dependencies\n" + - " https://github.com/${workflow.manifest.name}/blob/master/CITATIONS.md" - } - - - // - // Validate parameters and print summary to screen - // - public static void initialise(workflow, params, log, args) { - - // Print workflow version and exit on --version - if (params.version) { - String workflow_version = NfcoreTemplate.version(workflow) - log.info "${workflow.manifest.name} ${workflow_version}" - System.exit(0) - } - - // Check that a -profile or Nextflow config has been provided to run the pipeline - NfcoreTemplate.checkConfigProvided(workflow, log) - // Check that the profile doesn't contain spaces and doesn't end with a trailing comma - checkProfile(workflow.profile, args, log) - - // Check that conda channels are set-up correctly - if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) { - Utils.checkCondaChannels(log) - } - - // Check AWS batch settings - NfcoreTemplate.awsBatch(workflow, params) - - // Check input has been provided - if (!params.input) { - Nextflow.error("Please provide an input samplesheet to the pipeline e.g. '--input samplesheet.csv'") - } - } - // - // Get attribute from genome config file e.g. fasta - // - public static Object getGenomeAttribute(params, attribute) { - if (params.genomes && params.genome && params.genomes.containsKey(params.genome)) { - if (params.genomes[ params.genome ].containsKey(attribute)) { - return params.genomes[ params.genome ][ attribute ] - } - } - return null - } - - // - // Exit pipeline if --profile contains spaces - // - private static void checkProfile(profile, args, log) { - if (profile.endsWith(',')) { - Nextflow.error "Profile cannot end with a trailing comma. Please remove the comma from the end of the profile string.\nHint: A common mistake is to provide multiple values to `-profile` separated by spaces. Please use commas to separate profiles instead,e.g., `-profile docker,test`." - } - if (args[0]) { - log.warn "nf-core pipelines do not accept positional arguments. The positional argument `${args[0]}` has been detected.\n Hint: A common mistake is to provide multiple values to `-profile` separated by spaces. Please use commas to separate profiles instead,e.g., `-profile docker,test`." - } - } -} diff --git a/lib/WorkflowNascent.groovy b/lib/WorkflowNascent.groovy deleted file mode 100755 index 44446da4..00000000 --- a/lib/WorkflowNascent.groovy +++ /dev/null @@ -1,143 +0,0 @@ -// -// This file holds several functions specific to the workflow/nascent.nf in the nf-core/nascent pipeline -// - -import nextflow.Nextflow -import groovy.text.SimpleTemplateEngine - -class WorkflowNascent { - - // - // Check and validate parameters - // - public static void initialise(params, log) { - - genomeExistsError(params, log) - - - if (!params.fasta) { - Nextflow.error "Genome fasta file not specified with e.g. '--fasta genome.fa' or via a detectable config file." - } - } - - // - // Function to validate channels from input samplesheet - // - public static ArrayList validateInput(input) { - def (metas, fastqs) = input[1..2] - - // Check that multiple runs of the same sample are of the same strandedness - def strandedness_ok = metas.collect{ it.strandedness }.unique().size == 1 - if (!strandedness_ok) { - Nextflow.error("Please check input samplesheet -> Multiple runs of a sample must have the same strandedness!: ${metas[0].id}") - } - - // Check that multiple runs of the same sample are of the same datatype i.e. single-end / paired-end - def endedness_ok = metas.collect{ it.single_end }.unique().size == 1 - if (!endedness_ok) { - Nextflow.error("Please check input samplesheet -> Multiple runs of a sample must be of the same datatype i.e. single-end or paired-end: ${metas[0].id}") - } - - return [ metas[0], fastqs ] - } - - // - // Get workflow summary for MultiQC - // - public static String paramsSummaryMultiqc(workflow, summary) { - String summary_section = '' - for (group in summary.keySet()) { - def group_params = summary.get(group) // This gets the parameters of that particular group - if (group_params) { - summary_section += "

$group

\n" - summary_section += "
\n" - for (param in group_params.keySet()) { - summary_section += "
$param
${group_params.get(param) ?: 'N/A'}
\n" - } - summary_section += "
\n" - } - } - - String yaml_file_text = "id: '${workflow.manifest.name.replace('/','-')}-summary'\n" - yaml_file_text += "description: ' - this information is collected when the pipeline is started.'\n" - yaml_file_text += "section_name: '${workflow.manifest.name} Workflow Summary'\n" - yaml_file_text += "section_href: 'https://github.com/${workflow.manifest.name}'\n" - yaml_file_text += "plot_type: 'html'\n" - yaml_file_text += "data: |\n" - yaml_file_text += "${summary_section}" - return yaml_file_text - } - - // - // Generate methods description for MultiQC - // - - public static String toolCitationText(params) { - - // TODO nf-core: 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() - def description_html = engine.createTemplate(methods_text).make(meta) - - return description_html - } - - // - // Exit pipeline if incorrect --genome key provided - // - private static void genomeExistsError(params, log) { - if (params.genomes && params.genome && !params.genomes.containsKey(params.genome)) { - def error_string = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + - " Genome '${params.genome}' not found in any config files provided to the pipeline.\n" + - " Currently, the available genome keys are:\n" + - " ${params.genomes.keySet().join(", ")}\n" + - "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - Nextflow.error(error_string) - } - } -} diff --git a/main.nf b/main.nf index df61e5c2..ee68059b 100644 --- a/main.nf +++ b/main.nf @@ -13,70 +13,100 @@ nextflow.enable.dsl = 2 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - GENOME PARAMETER VALUES + IMPORT FUNCTIONS / MODULES / SUBWORKFLOWS / WORKFLOWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -params.fasta = WorkflowMain.getGenomeAttribute(params, 'fasta') -params.gtf = WorkflowMain.getGenomeAttribute(params, 'gtf') -params.gff = WorkflowMain.getGenomeAttribute(params, 'gff') -params.gene_bed = WorkflowMain.getGenomeAttribute(params, 'bed12') -params.bwa_index = WorkflowMain.getGenomeAttribute(params, 'bwa') -params.bwamem2_index = WorkflowMain.getGenomeAttribute(params, 'bwamem2') -params.dragmap = WorkflowMain.getGenomeAttribute(params, 'dragmap') -params.bowtie2_index = WorkflowMain.getGenomeAttribute(params, 'bowtie2') +include { NASCENT } from './workflows/nascent' +include { PIPELINE_INITIALISATION } from './subworkflows/local/utils_nfcore_nascent_pipeline' +include { PIPELINE_COMPLETION } from './subworkflows/local/utils_nfcore_nascent_pipeline' + +include { getGenomeAttribute } from './subworkflows/local/utils_nfcore_nascent_pipeline' /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - VALIDATE & PRINT PARAMETER SUMMARY + GENOME PARAMETER VALUES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -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, args) +params.fasta = getGenomeAttribute('fasta') +params.gtf = getGenomeAttribute('gtf') +params.gff = getGenomeAttribute('gff') +params.gene_bed = getGenomeAttribute('bed12') +params.bwa_index = getGenomeAttribute('bwa') +params.bwamem2_index = getGenomeAttribute('bwamem2') +params.dragmap = getGenomeAttribute('dragmap') +params.bowtie2_index = getGenomeAttribute('bowtie2') /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - NAMED WORKFLOW FOR PIPELINE + NAMED WORKFLOWS FOR PIPELINE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -include { NASCENT } from './workflows/nascent' - // -// WORKFLOW: Run main nf-core/nascent analysis pipeline +// WORKFLOW: Run main analysis pipeline depending on type of input // workflow NFCORE_NASCENT { - NASCENT () -} + take: + samplesheet // channel: samplesheet read in from --input + + main: + + // + // WORKFLOW: Run pipeline + // + NASCENT ( + samplesheet + ) + + emit: + multiqc_report = NASCENT.out.multiqc_report // channel: /path/to/multiqc_report.html + +} /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - RUN ALL WORKFLOWS + RUN MAIN WORKFLOW ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -// -// WORKFLOW: Execute a single named workflow for the pipeline -// See: https://github.com/nf-core/rnaseq/issues/619 -// workflow { - NFCORE_NASCENT () + + main: + + // + // SUBWORKFLOW: Run initialisation tasks + // + PIPELINE_INITIALISATION ( + params.version, + params.help, + params.validate_params, + params.monochrome_logs, + args, + params.outdir, + params.input + ) + + // + // WORKFLOW: Run main workflow + // + NFCORE_NASCENT ( + PIPELINE_INITIALISATION.out.samplesheet + ) + + // + // SUBWORKFLOW: Run completion tasks + // + PIPELINE_COMPLETION ( + params.email, + params.email_on_fail, + params.plaintext_email, + params.outdir, + params.monochrome_logs, + params.hook_url, + NFCORE_NASCENT.out.multiqc_report + ) } /* diff --git a/modules.json b/modules.json index f42e59cc..77459c5a 100644 --- a/modules.json +++ b/modules.json @@ -247,6 +247,25 @@ "installed_by": ["subworkflows"] } } + }, + "subworkflows": { + "nf-core": { + "utils_nextflow_pipeline": { + "branch": "master", + "git_sha": "cd08c91373cd00a73255081340e4914485846ba1", + "installed_by": ["subworkflows"] + }, + "utils_nfcore_pipeline": { + "branch": "master", + "git_sha": "262b17ed2aad591039f914951659177e6c39a8d8", + "installed_by": ["subworkflows"] + }, + "utils_nfvalidation_plugin": { + "branch": "master", + "git_sha": "cd08c91373cd00a73255081340e4914485846ba1", + "installed_by": ["subworkflows"] + } + } } } } diff --git a/modules/local/gtf_gene_filter.nf b/modules/local/gtf_gene_filter.nf deleted file mode 100644 index ccf4124c..00000000 --- a/modules/local/gtf_gene_filter.nf +++ /dev/null @@ -1,33 +0,0 @@ -process GTF_GENE_FILTER { - tag "$fasta" - label 'process_low' - - conda "conda-forge::python=3.8.3" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/python:3.8.3' : - 'biocontainers/python:3.8.3' }" - - input: - path fasta - path gtf - - output: - path "*.gtf", emit: gtf - path "versions.yml", emit: versions - - when: - task.ext.when == null || task.ext.when - - script: // filter_gtf_for_genes_in_genome.py is bundled with the pipeline, borrowed from nf-core/rnaseq/bin/ - """ - filter_gtf_for_genes_in_genome.py \\ - --gtf $gtf \\ - --fasta $fasta \\ - -o ${fasta.baseName}_genes.gtf - - cat <<-END_VERSIONS > versions.yml - "${task.process}": - python: \$(python --version | sed 's/Python //g') - END_VERSIONS - """ -} diff --git a/modules/nf-core/custom/dumpsoftwareversions/environment.yml b/modules/nf-core/custom/dumpsoftwareversions/environment.yml deleted file mode 100644 index b48ced26..00000000 --- a/modules/nf-core/custom/dumpsoftwareversions/environment.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: custom_dumpsoftwareversions -channels: - - conda-forge - - bioconda - - defaults -dependencies: - - bioconda::multiqc=1.20 diff --git a/modules/nf-core/custom/dumpsoftwareversions/main.nf b/modules/nf-core/custom/dumpsoftwareversions/main.nf deleted file mode 100644 index 105f9265..00000000 --- a/modules/nf-core/custom/dumpsoftwareversions/main.nf +++ /dev/null @@ -1,24 +0,0 @@ -process CUSTOM_DUMPSOFTWAREVERSIONS { - label 'process_single' - - // Requires `pyyaml` which does not have a dedicated container but is in the MultiQC container - conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.20--pyhdfd78af_0' : - 'biocontainers/multiqc:1.20--pyhdfd78af_0' }" - - input: - path versions - - output: - path "software_versions.yml" , emit: yml - path "software_versions_mqc.yml", emit: mqc_yml - path "versions.yml" , emit: versions - - when: - task.ext.when == null || task.ext.when - - script: - def args = task.ext.args ?: '' - template 'dumpsoftwareversions.py' -} diff --git a/modules/nf-core/custom/dumpsoftwareversions/meta.yml b/modules/nf-core/custom/dumpsoftwareversions/meta.yml deleted file mode 100644 index 5f15a5fd..00000000 --- a/modules/nf-core/custom/dumpsoftwareversions/meta.yml +++ /dev/null @@ -1,37 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/meta-schema.json -name: custom_dumpsoftwareversions -description: Custom module used to dump software versions within the nf-core pipeline template -keywords: - - custom - - dump - - version -tools: - - custom: - description: Custom module used to dump software versions within the nf-core pipeline template - homepage: https://github.com/nf-core/tools - documentation: https://github.com/nf-core/tools - licence: ["MIT"] -input: - - versions: - type: file - description: YML file containing software versions - pattern: "*.yml" -output: - - yml: - type: file - description: Standard YML file containing software versions - pattern: "software_versions.yml" - - mqc_yml: - type: file - description: MultiQC custom content YML file containing software versions - pattern: "software_versions_mqc.yml" - - versions: - type: file - description: File containing software versions - pattern: "versions.yml" -authors: - - "@drpatelh" - - "@grst" -maintainers: - - "@drpatelh" - - "@grst" diff --git a/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py b/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py deleted file mode 100755 index da033408..00000000 --- a/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env python - - -"""Provide functions to merge multiple versions.yml files.""" - - -import yaml -import platform -from textwrap import dedent - - -def _make_versions_html(versions): - """Generate a tabular HTML output of all versions for MultiQC.""" - html = [ - dedent( - """\\ - - - - - - - - - - """ - ) - ] - for process, tmp_versions in sorted(versions.items()): - html.append("") - for i, (tool, version) in enumerate(sorted(tmp_versions.items())): - html.append( - dedent( - f"""\\ - - - - - - """ - ) - ) - html.append("") - html.append("
    Process Name Software Version
    {process if (i == 0) else ''}{tool}{version}
    ") - return "\\n".join(html) - - -def main(): - """Load all version files and generate merged output.""" - versions_this_module = {} - versions_this_module["${task.process}"] = { - "python": platform.python_version(), - "yaml": yaml.__version__, - } - - with open("$versions") as f: - versions_by_process = yaml.load(f, Loader=yaml.BaseLoader) | versions_this_module - - # aggregate versions by the module name (derived from fully-qualified process name) - versions_by_module = {} - for process, process_versions in versions_by_process.items(): - module = process.split(":")[-1] - try: - if versions_by_module[module] != process_versions: - raise AssertionError( - "We assume that software versions are the same between all modules. " - "If you see this error-message it means you discovered an edge-case " - "and should open an issue in nf-core/tools. " - ) - except KeyError: - versions_by_module[module] = process_versions - - versions_by_module["Workflow"] = { - "Nextflow": "$workflow.nextflow.version", - "$workflow.manifest.name": "$workflow.manifest.version", - } - - versions_mqc = { - "id": "software_versions", - "section_name": "${workflow.manifest.name} Software Versions", - "section_href": "https://github.com/${workflow.manifest.name}", - "plot_type": "html", - "description": "are collected at run time from the software output.", - "data": _make_versions_html(versions_by_module), - } - - with open("software_versions.yml", "w") as f: - yaml.dump(versions_by_module, f, default_flow_style=False) - with open("software_versions_mqc.yml", "w") as f: - yaml.dump(versions_mqc, f, default_flow_style=False) - - with open("versions.yml", "w") as f: - yaml.dump(versions_this_module, f, default_flow_style=False) - - -if __name__ == "__main__": - main() diff --git a/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test b/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test deleted file mode 100644 index b1e1630b..00000000 --- a/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test +++ /dev/null @@ -1,43 +0,0 @@ -nextflow_process { - - name "Test Process CUSTOM_DUMPSOFTWAREVERSIONS" - script "../main.nf" - process "CUSTOM_DUMPSOFTWAREVERSIONS" - tag "modules" - tag "modules_nfcore" - tag "custom" - tag "dumpsoftwareversions" - tag "custom/dumpsoftwareversions" - - test("Should run without failures") { - when { - process { - """ - def tool1_version = ''' - TOOL1: - tool1: 0.11.9 - '''.stripIndent() - - def tool2_version = ''' - TOOL2: - tool2: 1.9 - '''.stripIndent() - - input[0] = Channel.of(tool1_version, tool2_version).collectFile() - """ - } - } - - then { - assertAll( - { assert process.success }, - { assert snapshot( - process.out.versions, - file(process.out.mqc_yml[0]).readLines()[0..10], - file(process.out.yml[0]).readLines()[0..7] - ).match() - } - ) - } - } -} diff --git a/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test.snap b/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test.snap deleted file mode 100644 index 5f59a936..00000000 --- a/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test.snap +++ /dev/null @@ -1,33 +0,0 @@ -{ - "Should run without failures": { - "content": [ - [ - "versions.yml:md5,76d454d92244589d32455833f7c1ba6d" - ], - [ - "data: \"\\n\\n \\n \\n \\n \\n \\n \\n \\n\\", - " \\n\\n\\n \\n \\n\\", - " \\ \\n\\n\\n\\n \\n \\", - " \\ \\n \\n\\n\\n\\n\\", - " \\n\\n \\n \\n\\", - " \\ \\n\\n\\n\\n\\n\\n \\n\\", - " \\ \\n \\n\\n\\n\\n\\", - " \\n\\n \\n \\n\\" - ], - [ - "CUSTOM_DUMPSOFTWAREVERSIONS:", - " python: 3.11.7", - " yaml: 5.4.1", - "TOOL1:", - " tool1: 0.11.9", - "TOOL2:", - " tool2: '1.9'", - "Workflow:" - ] - ], - "timestamp": "2024-01-09T23:01:18.710682" - } -} \ No newline at end of file diff --git a/modules/nf-core/custom/dumpsoftwareversions/tests/tags.yml b/modules/nf-core/custom/dumpsoftwareversions/tests/tags.yml deleted file mode 100644 index 405aa24a..00000000 --- a/modules/nf-core/custom/dumpsoftwareversions/tests/tags.yml +++ /dev/null @@ -1,2 +0,0 @@ -custom/dumpsoftwareversions: - - modules/nf-core/custom/dumpsoftwareversions/** diff --git a/nextflow.config b/nextflow.config index c97fe490..fa6a3500 100644 --- a/nextflow.config +++ b/nextflow.config @@ -11,12 +11,6 @@ params { // Input options input = null - // References - genome = null - igenomes_base = 's3://ngi-igenomes/igenomes/' - igenomes_ignore = false - save_reference = false - // UMI handling with_umi = false umitools_dedup_stats = false @@ -37,6 +31,14 @@ params { filter_bed = null intersect_bed = null + // References + genome = null + igenomes_base = 's3://ngi-igenomes/igenomes/' + igenomes_ignore = false + fasta = null + + save_reference = false + // MultiQC options multiqc_config = null multiqc_title = null @@ -63,7 +65,6 @@ params { config_profile_contact = null config_profile_url = null - // Max resource options // Defaults only, expecting to be overwritten max_memory = '128.GB' diff --git a/nextflow_schema.json b/nextflow_schema.json index 355fd4f5..6e4c7e4b 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -16,8 +16,8 @@ "type": "string", "format": "file-path", "exists": true, - "mimetype": "text/csv", "schema": "assets/schema_input.json", + "mimetype": "text/csv", "pattern": "^\\S+\\.csv$", "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/nascent/usage#samplesheet-input).", diff --git a/pyproject.toml b/pyproject.toml index 7d08e1c8..56110621 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,11 +3,13 @@ [tool.ruff] line-length = 120 target-version = "py38" -select = ["I", "E1", "E4", "E7", "E9", "F", "UP", "N"] cache-dir = "~/.cache/ruff" -[tool.ruff.isort] +[tool.ruff.lint] +select = ["I", "E1", "E4", "E7", "E9", "F", "UP", "N"] + +[tool.ruff.lint.isort] known-first-party = ["nf_core"] -[tool.ruff.per-file-ignores] +[tool.ruff.lint.per-file-ignores] "__init__.py" = ["E402", "F401"] diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf new file mode 100644 index 00000000..dc90ad90 --- /dev/null +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -0,0 +1,247 @@ +// +// Subworkflow with functionality specific to the nf-core/pipeline pipeline +// + +/* +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + IMPORT FUNCTIONS / MODULES / SUBWORKFLOWS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +*/ + +include { UTILS_NFVALIDATION_PLUGIN } from '../../nf-core/utils_nfvalidation_plugin' +include { paramsSummaryMap } from 'plugin/nf-validation' +include { fromSamplesheet } from 'plugin/nf-validation' +include { UTILS_NEXTFLOW_PIPELINE } from '../../nf-core/utils_nextflow_pipeline' +include { completionEmail } from '../../nf-core/utils_nfcore_pipeline' +include { completionSummary } from '../../nf-core/utils_nfcore_pipeline' +include { dashedLine } from '../../nf-core/utils_nfcore_pipeline' +include { nfCoreLogo } from '../../nf-core/utils_nfcore_pipeline' +include { imNotification } from '../../nf-core/utils_nfcore_pipeline' +include { UTILS_NFCORE_PIPELINE } from '../../nf-core/utils_nfcore_pipeline' +include { workflowCitation } from '../../nf-core/utils_nfcore_pipeline' + +/* +======================================================================================== + SUBWORKFLOW TO INITIALISE PIPELINE +======================================================================================== +*/ + +workflow PIPELINE_INITIALISATION { + + take: + version // boolean: Display version and exit + help // boolean: Display help text + validate_params // boolean: Boolean whether to validate parameters against the schema at runtime + monochrome_logs // boolean: Do not use coloured log outputs + nextflow_cli_args // array: List of positional nextflow CLI args + outdir // string: The output directory where the results will be saved + input // string: Path to input samplesheet + + main: + + ch_versions = Channel.empty() + + // + // Print version and exit if required and dump pipeline parameters to JSON file + // + UTILS_NEXTFLOW_PIPELINE ( + version, + true, + outdir, + workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1 + ) + + // + // Validate parameters and generate parameter summary to stdout + // + pre_help_text = nfCoreLogo(monochrome_logs) + post_help_text = '\n' + workflowCitation() + '\n' + dashedLine(monochrome_logs) + def String workflow_command = "nextflow run ${workflow.manifest.name} -profile --input samplesheet.csv --outdir " + UTILS_NFVALIDATION_PLUGIN ( + help, + workflow_command, + pre_help_text, + post_help_text, + validate_params, + "nextflow_schema.json" + ) + + // + // Check config provided to the pipeline + // + UTILS_NFCORE_PIPELINE ( + nextflow_cli_args + ) + // + // Custom validation for pipeline parameters + // + validateInputParameters() + + // + // Create channel from input file provided through params.input + // + Channel + .fromSamplesheet("input") + .map { + meta, fastq_1, fastq_2 -> + if (!fastq_2) { + return [ meta.id, meta + [ single_end:true ], [ fastq_1 ] ] + } else { + return [ meta.id, meta + [ single_end:false ], [ fastq_1, fastq_2 ] ] + } + } + .groupTuple() + .map { + validateInputSamplesheet(it) + } + .map { + meta, fastqs -> + return [ meta, fastqs.flatten() ] + } + .set { ch_samplesheet } + + emit: + samplesheet = ch_samplesheet + versions = ch_versions +} + +/* +======================================================================================== + SUBWORKFLOW FOR PIPELINE COMPLETION +======================================================================================== +*/ + +workflow PIPELINE_COMPLETION { + + take: + email // string: email address + email_on_fail // string: email address sent on pipeline failure + plaintext_email // boolean: Send plain-text email instead of HTML + outdir // path: Path to output directory where results will be published + monochrome_logs // boolean: Disable ANSI colour codes in log output + hook_url // string: hook URL for notifications + multiqc_report // string: Path to MultiQC report + + main: + + summary_params = paramsSummaryMap(workflow, parameters_schema: "nextflow_schema.json") + + // + // Completion email and summary + // + workflow.onComplete { + if (email || email_on_fail) { + completionEmail(summary_params, email, email_on_fail, plaintext_email, outdir, monochrome_logs, multiqc_report.toList()) + } + + completionSummary(monochrome_logs) + + if (hook_url) { + imNotification(summary_params, hook_url) + } + } +} + +/* +======================================================================================== + FUNCTIONS +======================================================================================== +*/ +// +// Check and validate pipeline parameters +// +def validateInputParameters() { + genomeExistsError() +}// +// Validate channels from input samplesheet +// +def validateInputSamplesheet(input) { + def (metas, fastqs) = input[1..2] + + // Check that multiple runs of the same sample are of the same datatype i.e. single-end / paired-end + def endedness_ok = metas.collect{ it.single_end }.unique().size == 1 + if (!endedness_ok) { + error("Please check input samplesheet -> Multiple runs of a sample must be of the same datatype i.e. single-end or paired-end: ${metas[0].id}") + } + + return [ metas[0], fastqs ] +} +// +// Get attribute from genome config file e.g. fasta +// +def getGenomeAttribute(attribute) { + if (params.genomes && params.genome && params.genomes.containsKey(params.genome)) { + if (params.genomes[ params.genome ].containsKey(attribute)) { + return params.genomes[ params.genome ][ attribute ] + } + } + return null +} + +// +// Exit pipeline if incorrect --genome key provided +// +def genomeExistsError() { + if (params.genomes && params.genome && !params.genomes.containsKey(params.genome)) { + def error_string = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + + " Genome '${params.genome}' not found in any config files provided to the pipeline.\n" + + " Currently, the available genome keys are:\n" + + " ${params.genomes.keySet().join(", ")}\n" + + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + error(error_string) + } +}// +// Generate methods description for MultiQC +// +def toolCitationText() { + // TODO nf-core: 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 +} + +def toolBibliographyText() { + // TODO nf-core: 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 +} + +def methodsDescriptionText(mqc_methods_yaml) { + // 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 = workflow.toMap() + meta["manifest_map"] = 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 nf-core: Only uncomment below if logic in toolCitationText/toolBibliographyText has been filled! + // meta["tool_citations"] = toolCitationText().replaceAll(", \\.", ".").replaceAll("\\. \\.", ".").replaceAll(", \\.", ".") + // meta["tool_bibliography"] = toolBibliographyText() + + + def methods_text = mqc_methods_yaml.text + + def engine = new groovy.text.SimpleTemplateEngine() + def description_html = engine.createTemplate(methods_text).make(meta) + + return description_html.toString() +} diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf new file mode 100644 index 00000000..ac31f28f --- /dev/null +++ b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf @@ -0,0 +1,126 @@ +// +// Subworkflow with functionality that may be useful for any Nextflow pipeline +// + +import org.yaml.snakeyaml.Yaml +import groovy.json.JsonOutput +import nextflow.extension.FilesEx + +/* +======================================================================================== + SUBWORKFLOW DEFINITION +======================================================================================== +*/ + +workflow UTILS_NEXTFLOW_PIPELINE { + + take: + print_version // boolean: print version + dump_parameters // boolean: dump parameters + outdir // path: base directory used to publish pipeline results + check_conda_channels // boolean: check conda channels + + main: + + // + // Print workflow version and exit on --version + // + if (print_version) { + log.info "${workflow.manifest.name} ${getWorkflowVersion()}" + System.exit(0) + } + + // + // Dump pipeline parameters to a JSON file + // + if (dump_parameters && outdir) { + dumpParametersToJSON(outdir) + } + + // + // When running with Conda, warn if channels have not been set-up appropriately + // + if (check_conda_channels) { + checkCondaChannels() + } + + emit: + dummy_emit = true +} + +/* +======================================================================================== + FUNCTIONS +======================================================================================== +*/ + +// +// Generate version string +// +def getWorkflowVersion() { + String version_string = "" + if (workflow.manifest.version) { + def prefix_v = workflow.manifest.version[0] != 'v' ? 'v' : '' + version_string += "${prefix_v}${workflow.manifest.version}" + } + + if (workflow.commitId) { + def git_shortsha = workflow.commitId.substring(0, 7) + version_string += "-g${git_shortsha}" + } + + return version_string +} + +// +// Dump pipeline parameters to a JSON file +// +def dumpParametersToJSON(outdir) { + def timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss') + def filename = "params_${timestamp}.json" + def temp_pf = new File(workflow.launchDir.toString(), ".${filename}") + def jsonStr = JsonOutput.toJson(params) + temp_pf.text = JsonOutput.prettyPrint(jsonStr) + + FilesEx.copyTo(temp_pf.toPath(), "${outdir}/pipeline_info/params_${timestamp}.json") + temp_pf.delete() +} + +// +// When running with -profile conda, warn if channels have not been set-up appropriately +// +def checkCondaChannels() { + Yaml parser = new Yaml() + def channels = [] + try { + def config = parser.load("conda config --show channels".execute().text) + channels = config.channels + } catch(NullPointerException | IOException e) { + log.warn "Could not verify conda channel configuration." + return + } + + // Check that all channels are present + // This channel list is ordered by required channel priority. + def required_channels_in_order = ['conda-forge', 'bioconda', 'defaults'] + def channels_missing = ((required_channels_in_order as Set) - (channels as Set)) as Boolean + + // Check that they are in the right order + def channel_priority_violation = false + def n = required_channels_in_order.size() + for (int i = 0; i < n - 1; i++) { + channel_priority_violation |= !(channels.indexOf(required_channels_in_order[i]) < channels.indexOf(required_channels_in_order[i+1])) + } + + if (channels_missing | channel_priority_violation) { + log.warn "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + + " There is a problem with your Conda configuration!\n\n" + + " You will need to set-up the conda-forge and bioconda channels correctly.\n" + + " Please refer to https://bioconda.github.io/\n" + + " The observed channel order is \n" + + " ${channels}\n" + + " but the following channel order is required:\n" + + " ${required_channels_in_order}\n" + + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + } +} diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/meta.yml b/subworkflows/nf-core/utils_nextflow_pipeline/meta.yml new file mode 100644 index 00000000..e5c3a0a8 --- /dev/null +++ b/subworkflows/nf-core/utils_nextflow_pipeline/meta.yml @@ -0,0 +1,38 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: "UTILS_NEXTFLOW_PIPELINE" +description: Subworkflow with functionality that may be useful for any Nextflow pipeline +keywords: + - utility + - pipeline + - initialise + - version +components: [] +input: + - print_version: + type: boolean + description: | + Print the version of the pipeline and exit + - dump_parameters: + type: boolean + description: | + Dump the parameters of the pipeline to a JSON file + - output_directory: + type: directory + description: Path to output dir to write JSON file to. + pattern: "results/" + - check_conda_channel: + type: boolean + description: | + Check if the conda channel priority is correct. +output: + - dummy_emit: + type: boolean + description: | + Dummy emit to make nf-core subworkflows lint happy +authors: + - "@adamrtalbot" + - "@drpatelh" +maintainers: + - "@adamrtalbot" + - "@drpatelh" + - "@maxulysse" diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test new file mode 100644 index 00000000..8ed4310c --- /dev/null +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test @@ -0,0 +1,54 @@ + +nextflow_function { + + name "Test Functions" + script "subworkflows/nf-core/utils_nextflow_pipeline/main.nf" + config "subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config" + tag 'subworkflows' + tag 'utils_nextflow_pipeline' + tag 'subworkflows/utils_nextflow_pipeline' + + test("Test Function getWorkflowVersion") { + + function "getWorkflowVersion" + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } + + test("Test Function dumpParametersToJSON") { + + function "dumpParametersToJSON" + + when { + function { + """ + // define inputs of the function here. Example: + input[0] = "$outputDir" + """.stripIndent() + } + } + + then { + assertAll( + { assert function.success } + ) + } + } + + test("Test Function checkCondaChannels") { + + function "checkCondaChannels" + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap new file mode 100644 index 00000000..db2030f8 --- /dev/null +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap @@ -0,0 +1,12 @@ +{ + "Test Function getWorkflowVersion": { + "content": [ + "v9.9.9" + ], + "timestamp": "2024-01-19T11:32:36.031083" + }, + "Test Function checkCondaChannels": { + "content": null, + "timestamp": "2024-01-19T11:32:50.456" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test new file mode 100644 index 00000000..f7c54bc6 --- /dev/null +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test @@ -0,0 +1,123 @@ +nextflow_workflow { + + name "Test Workflow UTILS_NEXTFLOW_PIPELINE" + script "../main.nf" + config "subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config" + workflow "UTILS_NEXTFLOW_PIPELINE" + tag 'subworkflows' + tag 'utils_nextflow_pipeline' + tag 'subworkflows/utils_nextflow_pipeline' + + test("Should run no inputs") { + + when { + params { + outdir = "tests/results" + } + workflow { + """ + print_version = false + dump_parameters = false + outdir = null + check_conda_channels = false + + input[0] = print_version + input[1] = dump_parameters + input[2] = outdir + input[3] = check_conda_channels + """ + } + } + + then { + assertAll( + { assert workflow.success } + ) + } + } + + test("Should print version") { + + when { + params { + outdir = "tests/results" + } + workflow { + """ + print_version = true + dump_parameters = false + outdir = null + check_conda_channels = false + + input[0] = print_version + input[1] = dump_parameters + input[2] = outdir + input[3] = check_conda_channels + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert workflow.stdout.contains("nextflow_workflow v9.9.9") } + ) + } + } + + test("Should dump params") { + + when { + params { + outdir = "$outputDir" + } + workflow { + """ + print_version = false + dump_parameters = true + outdir = params.outdir + check_conda_channels = false + + input[0] = false + input[1] = true + input[2] = params.outdir + input[3] = false + """ + } + } + + then { + assertAll( + { assert workflow.success } + ) + } + } + + test("Should not create params JSON if no output directory") { + + when { + params { + outdir = "$outputDir" + } + workflow { + """ + print_version = false + dump_parameters = true + outdir = params.outdir + check_conda_channels = false + + input[0] = false + input[1] = true + input[2] = null + input[3] = false + """ + } + } + + then { + assertAll( + { assert workflow.success } + ) + } + } +} diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config b/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config new file mode 100644 index 00000000..53574ffe --- /dev/null +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config @@ -0,0 +1,9 @@ +manifest { + name = 'nextflow_workflow' + author = """nf-core""" + homePage = 'https://127.0.0.1' + description = """Dummy pipeline""" + nextflowVersion = '!>=23.04.0' + version = '9.9.9' + doi = 'https://doi.org/10.5281/zenodo.5070524' +} \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml b/subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml new file mode 100644 index 00000000..f8476112 --- /dev/null +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/utils_nextflow_pipeline: + - subworkflows/nf-core/utils_nextflow_pipeline/** diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf new file mode 100644 index 00000000..a8b55d6f --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf @@ -0,0 +1,440 @@ +// +// Subworkflow with utility functions specific to the nf-core pipeline template +// + +import org.yaml.snakeyaml.Yaml +import nextflow.extension.FilesEx + +/* +======================================================================================== + SUBWORKFLOW DEFINITION +======================================================================================== +*/ + +workflow UTILS_NFCORE_PIPELINE { + + take: + nextflow_cli_args + + main: + valid_config = checkConfigProvided() + checkProfileProvided(nextflow_cli_args) + + emit: + valid_config +} + +/* +======================================================================================== + FUNCTIONS +======================================================================================== +*/ + +// +// Warn if a -profile or Nextflow config has not been provided to run the pipeline +// +def checkConfigProvided() { + valid_config = true + if (workflow.profile == 'standard' && workflow.configFiles.size() <= 1) { + log.warn "[$workflow.manifest.name] You are attempting to run the pipeline without any custom configuration!\n\n" + + "This will be dependent on your local compute environment but can be achieved via one or more of the following:\n" + + " (1) Using an existing pipeline profile e.g. `-profile docker` or `-profile singularity`\n" + + " (2) Using an existing nf-core/configs for your Institution e.g. `-profile crick` or `-profile uppmax`\n" + + " (3) Using your own local custom config e.g. `-c /path/to/your/custom.config`\n\n" + + "Please refer to the quick start section and usage docs for the pipeline.\n " + valid_config = false + } + return valid_config +} + +// +// Exit pipeline if --profile contains spaces +// +def checkProfileProvided(nextflow_cli_args) { + if (workflow.profile.endsWith(',')) { + error "The `-profile` option cannot end with a trailing comma, please remove it and re-run the pipeline!\n" + + "HINT: A common mistake is to provide multiple values separated by spaces e.g. `-profile test, docker`.\n" + } + if (nextflow_cli_args[0]) { + log.warn "nf-core pipelines do not accept positional arguments. The positional argument `${nextflow_cli_args[0]}` has been detected.\n" + + "HINT: A common mistake is to provide multiple values separated by spaces e.g. `-profile test, docker`.\n" + } +} + +// +// Citation string for pipeline +// +def workflowCitation() { + return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + + "* The pipeline\n" + + " ${workflow.manifest.doi}\n\n" + + "* The nf-core framework\n" + + " https://doi.org/10.1038/s41587-020-0439-x\n\n" + + "* Software dependencies\n" + + " https://github.com/${workflow.manifest.name}/blob/master/CITATIONS.md" +} + +// +// Generate workflow version string +// +def getWorkflowVersion() { + String version_string = "" + if (workflow.manifest.version) { + def prefix_v = workflow.manifest.version[0] != 'v' ? 'v' : '' + version_string += "${prefix_v}${workflow.manifest.version}" + } + + if (workflow.commitId) { + def git_shortsha = workflow.commitId.substring(0, 7) + version_string += "-g${git_shortsha}" + } + + return version_string +} + +// +// Get software versions for pipeline +// +def processVersionsFromYAML(yaml_file) { + Yaml yaml = new Yaml() + versions = yaml.load(yaml_file).collectEntries { k, v -> [ k.tokenize(':')[-1], v ] } + return yaml.dumpAsMap(versions).trim() +} + +// +// Get workflow version for pipeline +// +def workflowVersionToYAML() { + return """ + Workflow: + $workflow.manifest.name: ${getWorkflowVersion()} + Nextflow: $workflow.nextflow.version + """.stripIndent().trim() +} + +// +// Get channel of software versions used in pipeline in YAML format +// +def softwareVersionsToYAML(ch_versions) { + return ch_versions + .unique() + .map { processVersionsFromYAML(it) } + .unique() + .mix(Channel.of(workflowVersionToYAML())) +} + +// +// Get workflow summary for MultiQC +// +def paramsSummaryMultiqc(summary_params) { + def summary_section = '' + for (group in summary_params.keySet()) { + def group_params = summary_params.get(group) // This gets the parameters of that particular group + if (group_params) { + summary_section += "

    $group

    \n" + summary_section += "
    \n" + for (param in group_params.keySet()) { + summary_section += "
    $param
    ${group_params.get(param) ?: 'N/A'}
    \n" + } + summary_section += "
    \n" + } + } + + String yaml_file_text = "id: '${workflow.manifest.name.replace('/','-')}-summary'\n" + yaml_file_text += "description: ' - this information is collected when the pipeline is started.'\n" + yaml_file_text += "section_name: '${workflow.manifest.name} Workflow Summary'\n" + yaml_file_text += "section_href: 'https://github.com/${workflow.manifest.name}'\n" + yaml_file_text += "plot_type: 'html'\n" + yaml_file_text += "data: |\n" + yaml_file_text += "${summary_section}" + + return yaml_file_text +} + +// +// nf-core logo +// +def nfCoreLogo(monochrome_logs=true) { + Map colors = logColours(monochrome_logs) + String.format( + """\n + ${dashedLine(monochrome_logs)} + ${colors.green},--.${colors.black}/${colors.green},-.${colors.reset} + ${colors.blue} ___ __ __ __ ___ ${colors.green}/,-._.--~\'${colors.reset} + ${colors.blue} |\\ | |__ __ / ` / \\ |__) |__ ${colors.yellow}} {${colors.reset} + ${colors.blue} | \\| | \\__, \\__/ | \\ |___ ${colors.green}\\`-._,-`-,${colors.reset} + ${colors.green}`._,._,\'${colors.reset} + ${colors.purple} ${workflow.manifest.name} ${getWorkflowVersion()}${colors.reset} + ${dashedLine(monochrome_logs)} + """.stripIndent() + ) +} + +// +// Return dashed line +// +def dashedLine(monochrome_logs=true) { + Map colors = logColours(monochrome_logs) + return "-${colors.dim}----------------------------------------------------${colors.reset}-" +} + +// +// ANSII colours used for terminal logging +// +def logColours(monochrome_logs=true) { + Map colorcodes = [:] + + // Reset / Meta + colorcodes['reset'] = monochrome_logs ? '' : "\033[0m" + colorcodes['bold'] = monochrome_logs ? '' : "\033[1m" + colorcodes['dim'] = monochrome_logs ? '' : "\033[2m" + colorcodes['underlined'] = monochrome_logs ? '' : "\033[4m" + colorcodes['blink'] = monochrome_logs ? '' : "\033[5m" + colorcodes['reverse'] = monochrome_logs ? '' : "\033[7m" + colorcodes['hidden'] = monochrome_logs ? '' : "\033[8m" + + // Regular Colors + colorcodes['black'] = monochrome_logs ? '' : "\033[0;30m" + colorcodes['red'] = monochrome_logs ? '' : "\033[0;31m" + colorcodes['green'] = monochrome_logs ? '' : "\033[0;32m" + colorcodes['yellow'] = monochrome_logs ? '' : "\033[0;33m" + colorcodes['blue'] = monochrome_logs ? '' : "\033[0;34m" + colorcodes['purple'] = monochrome_logs ? '' : "\033[0;35m" + colorcodes['cyan'] = monochrome_logs ? '' : "\033[0;36m" + colorcodes['white'] = monochrome_logs ? '' : "\033[0;37m" + + // Bold + colorcodes['bblack'] = monochrome_logs ? '' : "\033[1;30m" + colorcodes['bred'] = monochrome_logs ? '' : "\033[1;31m" + colorcodes['bgreen'] = monochrome_logs ? '' : "\033[1;32m" + colorcodes['byellow'] = monochrome_logs ? '' : "\033[1;33m" + colorcodes['bblue'] = monochrome_logs ? '' : "\033[1;34m" + colorcodes['bpurple'] = monochrome_logs ? '' : "\033[1;35m" + colorcodes['bcyan'] = monochrome_logs ? '' : "\033[1;36m" + colorcodes['bwhite'] = monochrome_logs ? '' : "\033[1;37m" + + // Underline + colorcodes['ublack'] = monochrome_logs ? '' : "\033[4;30m" + colorcodes['ured'] = monochrome_logs ? '' : "\033[4;31m" + colorcodes['ugreen'] = monochrome_logs ? '' : "\033[4;32m" + colorcodes['uyellow'] = monochrome_logs ? '' : "\033[4;33m" + colorcodes['ublue'] = monochrome_logs ? '' : "\033[4;34m" + colorcodes['upurple'] = monochrome_logs ? '' : "\033[4;35m" + colorcodes['ucyan'] = monochrome_logs ? '' : "\033[4;36m" + colorcodes['uwhite'] = monochrome_logs ? '' : "\033[4;37m" + + // High Intensity + colorcodes['iblack'] = monochrome_logs ? '' : "\033[0;90m" + colorcodes['ired'] = monochrome_logs ? '' : "\033[0;91m" + colorcodes['igreen'] = monochrome_logs ? '' : "\033[0;92m" + colorcodes['iyellow'] = monochrome_logs ? '' : "\033[0;93m" + colorcodes['iblue'] = monochrome_logs ? '' : "\033[0;94m" + colorcodes['ipurple'] = monochrome_logs ? '' : "\033[0;95m" + colorcodes['icyan'] = monochrome_logs ? '' : "\033[0;96m" + colorcodes['iwhite'] = monochrome_logs ? '' : "\033[0;97m" + + // Bold High Intensity + colorcodes['biblack'] = monochrome_logs ? '' : "\033[1;90m" + colorcodes['bired'] = monochrome_logs ? '' : "\033[1;91m" + colorcodes['bigreen'] = monochrome_logs ? '' : "\033[1;92m" + colorcodes['biyellow'] = monochrome_logs ? '' : "\033[1;93m" + colorcodes['biblue'] = monochrome_logs ? '' : "\033[1;94m" + colorcodes['bipurple'] = monochrome_logs ? '' : "\033[1;95m" + colorcodes['bicyan'] = monochrome_logs ? '' : "\033[1;96m" + colorcodes['biwhite'] = monochrome_logs ? '' : "\033[1;97m" + + return colorcodes +} + +// +// Attach the multiqc report to email +// +def attachMultiqcReport(multiqc_report) { + def mqc_report = null + try { + if (workflow.success) { + mqc_report = multiqc_report.getVal() + if (mqc_report.getClass() == ArrayList && mqc_report.size() >= 1) { + if (mqc_report.size() > 1) { + log.warn "[$workflow.manifest.name] Found multiple reports from process 'MULTIQC', will use only one" + } + mqc_report = mqc_report[0] + } + } + } catch (all) { + if (multiqc_report) { + log.warn "[$workflow.manifest.name] Could not attach MultiQC report to summary email" + } + } + return mqc_report +} + +// +// Construct and send completion email +// +def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdir, monochrome_logs=true, multiqc_report=null) { + + // Set up the e-mail variables + def subject = "[$workflow.manifest.name] Successful: $workflow.runName" + if (!workflow.success) { + subject = "[$workflow.manifest.name] FAILED: $workflow.runName" + } + + def summary = [:] + for (group in summary_params.keySet()) { + summary << summary_params[group] + } + + def misc_fields = [:] + misc_fields['Date Started'] = workflow.start + misc_fields['Date Completed'] = workflow.complete + misc_fields['Pipeline script file path'] = workflow.scriptFile + misc_fields['Pipeline script hash ID'] = workflow.scriptId + if (workflow.repository) misc_fields['Pipeline repository Git URL'] = workflow.repository + if (workflow.commitId) misc_fields['Pipeline repository Git Commit'] = workflow.commitId + if (workflow.revision) misc_fields['Pipeline Git branch/tag'] = workflow.revision + misc_fields['Nextflow Version'] = workflow.nextflow.version + misc_fields['Nextflow Build'] = workflow.nextflow.build + misc_fields['Nextflow Compile Timestamp'] = workflow.nextflow.timestamp + + def email_fields = [:] + email_fields['version'] = getWorkflowVersion() + email_fields['runName'] = workflow.runName + email_fields['success'] = workflow.success + email_fields['dateComplete'] = workflow.complete + email_fields['duration'] = workflow.duration + email_fields['exitStatus'] = workflow.exitStatus + email_fields['errorMessage'] = (workflow.errorMessage ?: 'None') + email_fields['errorReport'] = (workflow.errorReport ?: 'None') + email_fields['commandLine'] = workflow.commandLine + email_fields['projectDir'] = workflow.projectDir + email_fields['summary'] = summary << misc_fields + + // On success try attach the multiqc report + def mqc_report = attachMultiqcReport(multiqc_report) + + // Check if we are only sending emails on failure + def email_address = email + if (!email && email_on_fail && !workflow.success) { + email_address = email_on_fail + } + + // Render the TXT template + def engine = new groovy.text.GStringTemplateEngine() + def tf = new File("${workflow.projectDir}/assets/email_template.txt") + def txt_template = engine.createTemplate(tf).make(email_fields) + def email_txt = txt_template.toString() + + // Render the HTML template + def hf = new File("${workflow.projectDir}/assets/email_template.html") + def html_template = engine.createTemplate(hf).make(email_fields) + def email_html = html_template.toString() + + // Render the sendmail template + 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: "${workflow.projectDir}", mqcFile: mqc_report, mqcMaxSize: max_multiqc_email_size.toBytes() ] + def sf = new File("${workflow.projectDir}/assets/sendmail_template.txt") + def sendmail_template = engine.createTemplate(sf).make(smail_fields) + def sendmail_html = sendmail_template.toString() + + // Send the HTML e-mail + Map colors = logColours(monochrome_logs) + if (email_address) { + try { + if (plaintext_email) { throw GroovyException('Send plaintext e-mail, not HTML') } + // Try to send HTML e-mail using sendmail + def sendmail_tf = new File(workflow.launchDir.toString(), ".sendmail_tmp.html") + sendmail_tf.withWriter { w -> w << sendmail_html } + [ 'sendmail', '-t' ].execute() << sendmail_html + log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Sent summary e-mail to $email_address (sendmail)-" + } catch (all) { + // Catch failures and try with plaintext + def mail_cmd = [ 'mail', '-s', subject, '--content-type=text/html', email_address ] + mail_cmd.execute() << email_html + log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Sent summary e-mail to $email_address (mail)-" + } + } + + // Write summary e-mail HTML to a file + def output_hf = new File(workflow.launchDir.toString(), ".pipeline_report.html") + output_hf.withWriter { w -> w << email_html } + FilesEx.copyTo(output_hf.toPath(), "${outdir}/pipeline_info/pipeline_report.html"); + output_hf.delete() + + // Write summary e-mail TXT to a file + def output_tf = new File(workflow.launchDir.toString(), ".pipeline_report.txt") + output_tf.withWriter { w -> w << email_txt } + FilesEx.copyTo(output_tf.toPath(), "${outdir}/pipeline_info/pipeline_report.txt"); + output_tf.delete() +} + +// +// Print pipeline summary on completion +// +def completionSummary(monochrome_logs=true) { + Map colors = logColours(monochrome_logs) + if (workflow.success) { + if (workflow.stats.ignoredCount == 0) { + log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Pipeline completed successfully${colors.reset}-" + } else { + log.info "-${colors.purple}[$workflow.manifest.name]${colors.yellow} Pipeline completed successfully, but with errored process(es) ${colors.reset}-" + } + } else { + log.info "-${colors.purple}[$workflow.manifest.name]${colors.red} Pipeline completed with errors${colors.reset}-" + } +} + +// +// Construct and send a notification to a web server as JSON e.g. Microsoft Teams and Slack +// +def imNotification(summary_params, hook_url) { + def summary = [:] + for (group in summary_params.keySet()) { + summary << summary_params[group] + } + + def misc_fields = [:] + misc_fields['start'] = workflow.start + misc_fields['complete'] = workflow.complete + misc_fields['scriptfile'] = workflow.scriptFile + misc_fields['scriptid'] = workflow.scriptId + if (workflow.repository) misc_fields['repository'] = workflow.repository + if (workflow.commitId) misc_fields['commitid'] = workflow.commitId + if (workflow.revision) misc_fields['revision'] = workflow.revision + misc_fields['nxf_version'] = workflow.nextflow.version + misc_fields['nxf_build'] = workflow.nextflow.build + misc_fields['nxf_timestamp'] = workflow.nextflow.timestamp + + def msg_fields = [:] + msg_fields['version'] = getWorkflowVersion() + msg_fields['runName'] = workflow.runName + msg_fields['success'] = workflow.success + msg_fields['dateComplete'] = workflow.complete + msg_fields['duration'] = workflow.duration + msg_fields['exitStatus'] = workflow.exitStatus + msg_fields['errorMessage'] = (workflow.errorMessage ?: 'None') + msg_fields['errorReport'] = (workflow.errorReport ?: 'None') + msg_fields['commandLine'] = workflow.commandLine.replaceFirst(/ +--hook_url +[^ ]+/, "") + msg_fields['projectDir'] = workflow.projectDir + msg_fields['summary'] = summary << misc_fields + + // Render the JSON template + def engine = new groovy.text.GStringTemplateEngine() + // Different JSON depending on the service provider + // Defaults to "Adaptive Cards" (https://adaptivecards.io), except Slack which has its own format + def json_path = hook_url.contains("hooks.slack.com") ? "slackreport.json" : "adaptivecard.json" + def hf = new File("${workflow.projectDir}/assets/${json_path}") + def json_template = engine.createTemplate(hf).make(msg_fields) + def json_message = json_template.toString() + + // POST + def post = new URL(hook_url).openConnection(); + post.setRequestMethod("POST") + post.setDoOutput(true) + post.setRequestProperty("Content-Type", "application/json") + post.getOutputStream().write(json_message.getBytes("UTF-8")); + def postRC = post.getResponseCode(); + if (! postRC.equals(200)) { + log.warn(post.getErrorStream().getText()); + } +} diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/meta.yml b/subworkflows/nf-core/utils_nfcore_pipeline/meta.yml new file mode 100644 index 00000000..d08d2434 --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/meta.yml @@ -0,0 +1,24 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: "UTILS_NFCORE_PIPELINE" +description: Subworkflow with utility functions specific to the nf-core pipeline template +keywords: + - utility + - pipeline + - initialise + - version +components: [] +input: + - nextflow_cli_args: + type: list + description: | + Nextflow CLI positional arguments +output: + - success: + type: boolean + description: | + Dummy output to indicate success +authors: + - "@adamrtalbot" +maintainers: + - "@adamrtalbot" + - "@maxulysse" diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test new file mode 100644 index 00000000..1dc317f8 --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test @@ -0,0 +1,134 @@ + +nextflow_function { + + name "Test Functions" + script "../main.nf" + config "subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config" + tag "subworkflows" + tag "subworkflows_nfcore" + tag "utils_nfcore_pipeline" + tag "subworkflows/utils_nfcore_pipeline" + + test("Test Function checkConfigProvided") { + + function "checkConfigProvided" + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } + + test("Test Function checkProfileProvided") { + + function "checkProfileProvided" + + when { + function { + """ + input[0] = [] + """ + } + } + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } + + test("Test Function workflowCitation") { + + function "workflowCitation" + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } + + test("Test Function nfCoreLogo") { + + function "nfCoreLogo" + + when { + function { + """ + input[0] = false + """ + } + } + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } + + test("Test Function dashedLine") { + + function "dashedLine" + + when { + function { + """ + input[0] = false + """ + } + } + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } + + test("Test Function without logColours") { + + function "logColours" + + when { + function { + """ + input[0] = true + """ + } + } + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } + + test("Test Function with logColours") { + function "logColours" + + when { + function { + """ + input[0] = false + """ + } + } + + then { + assertAll( + { assert function.success }, + { assert snapshot(function.result).match() } + ) + } + } +} diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap new file mode 100644 index 00000000..10f948e6 --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap @@ -0,0 +1,138 @@ +{ + "Test Function checkProfileProvided": { + "content": null, + "timestamp": "2024-02-09T15:43:55.145717" + }, + "Test Function checkConfigProvided": { + "content": [ + true + ], + "timestamp": "2024-01-19T11:34:13.548431224" + }, + "Test Function nfCoreLogo": { + "content": [ + "\n\n-\u001b[2m----------------------------------------------------\u001b[0m-\n \u001b[0;32m,--.\u001b[0;30m/\u001b[0;32m,-.\u001b[0m\n\u001b[0;34m ___ __ __ __ ___ \u001b[0;32m/,-._.--~'\u001b[0m\n\u001b[0;34m |\\ | |__ __ / ` / \\ |__) |__ \u001b[0;33m} {\u001b[0m\n\u001b[0;34m | \\| | \\__, \\__/ | \\ |___ \u001b[0;32m\\`-._,-`-,\u001b[0m\n \u001b[0;32m`._,._,'\u001b[0m\n\u001b[0;35m nextflow_workflow v9.9.9\u001b[0m\n-\u001b[2m----------------------------------------------------\u001b[0m-\n" + ], + "timestamp": "2024-01-19T11:34:38.840454873" + }, + "Test Function workflowCitation": { + "content": [ + "If you use nextflow_workflow for your analysis please cite:\n\n* The pipeline\n https://doi.org/10.5281/zenodo.5070524\n\n* The nf-core framework\n https://doi.org/10.1038/s41587-020-0439-x\n\n* Software dependencies\n https://github.com/nextflow_workflow/blob/master/CITATIONS.md" + ], + "timestamp": "2024-01-19T11:34:22.24352016" + }, + "Test Function without logColours": { + "content": [ + { + "reset": "", + "bold": "", + "dim": "", + "underlined": "", + "blink": "", + "reverse": "", + "hidden": "", + "black": "", + "red": "", + "green": "", + "yellow": "", + "blue": "", + "purple": "", + "cyan": "", + "white": "", + "bblack": "", + "bred": "", + "bgreen": "", + "byellow": "", + "bblue": "", + "bpurple": "", + "bcyan": "", + "bwhite": "", + "ublack": "", + "ured": "", + "ugreen": "", + "uyellow": "", + "ublue": "", + "upurple": "", + "ucyan": "", + "uwhite": "", + "iblack": "", + "ired": "", + "igreen": "", + "iyellow": "", + "iblue": "", + "ipurple": "", + "icyan": "", + "iwhite": "", + "biblack": "", + "bired": "", + "bigreen": "", + "biyellow": "", + "biblue": "", + "bipurple": "", + "bicyan": "", + "biwhite": "" + } + ], + "timestamp": "2024-01-19T11:35:04.418416984" + }, + "Test Function dashedLine": { + "content": [ + "-\u001b[2m----------------------------------------------------\u001b[0m-" + ], + "timestamp": "2024-01-19T11:34:55.420000755" + }, + "Test Function with logColours": { + "content": [ + { + "reset": "\u001b[0m", + "bold": "\u001b[1m", + "dim": "\u001b[2m", + "underlined": "\u001b[4m", + "blink": "\u001b[5m", + "reverse": "\u001b[7m", + "hidden": "\u001b[8m", + "black": "\u001b[0;30m", + "red": "\u001b[0;31m", + "green": "\u001b[0;32m", + "yellow": "\u001b[0;33m", + "blue": "\u001b[0;34m", + "purple": "\u001b[0;35m", + "cyan": "\u001b[0;36m", + "white": "\u001b[0;37m", + "bblack": "\u001b[1;30m", + "bred": "\u001b[1;31m", + "bgreen": "\u001b[1;32m", + "byellow": "\u001b[1;33m", + "bblue": "\u001b[1;34m", + "bpurple": "\u001b[1;35m", + "bcyan": "\u001b[1;36m", + "bwhite": "\u001b[1;37m", + "ublack": "\u001b[4;30m", + "ured": "\u001b[4;31m", + "ugreen": "\u001b[4;32m", + "uyellow": "\u001b[4;33m", + "ublue": "\u001b[4;34m", + "upurple": "\u001b[4;35m", + "ucyan": "\u001b[4;36m", + "uwhite": "\u001b[4;37m", + "iblack": "\u001b[0;90m", + "ired": "\u001b[0;91m", + "igreen": "\u001b[0;92m", + "iyellow": "\u001b[0;93m", + "iblue": "\u001b[0;94m", + "ipurple": "\u001b[0;95m", + "icyan": "\u001b[0;96m", + "iwhite": "\u001b[0;97m", + "biblack": "\u001b[1;90m", + "bired": "\u001b[1;91m", + "bigreen": "\u001b[1;92m", + "biyellow": "\u001b[1;93m", + "biblue": "\u001b[1;94m", + "bipurple": "\u001b[1;95m", + "bicyan": "\u001b[1;96m", + "biwhite": "\u001b[1;97m" + } + ], + "timestamp": "2024-01-19T11:35:13.436366565" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test new file mode 100644 index 00000000..8940d32d --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test @@ -0,0 +1,29 @@ +nextflow_workflow { + + name "Test Workflow UTILS_NFCORE_PIPELINE" + script "../main.nf" + config "subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config" + workflow "UTILS_NFCORE_PIPELINE" + tag "subworkflows" + tag "subworkflows_nfcore" + tag "utils_nfcore_pipeline" + tag "subworkflows/utils_nfcore_pipeline" + + test("Should run without failures") { + + when { + workflow { + """ + input[0] = [] + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(workflow.out).match() } + ) + } + } +} diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap new file mode 100644 index 00000000..d07ce54c --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap @@ -0,0 +1,15 @@ +{ + "Should run without failures": { + "content": [ + { + "0": [ + true + ], + "valid_config": [ + true + ] + } + ], + "timestamp": "2024-01-19T11:35:22.538940073" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config b/subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config new file mode 100644 index 00000000..d0a926bf --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/nextflow.config @@ -0,0 +1,9 @@ +manifest { + name = 'nextflow_workflow' + author = """nf-core""" + homePage = 'https://127.0.0.1' + description = """Dummy pipeline""" + nextflowVersion = '!>=23.04.0' + version = '9.9.9' + doi = 'https://doi.org/10.5281/zenodo.5070524' +} diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml b/subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml new file mode 100644 index 00000000..ac8523c9 --- /dev/null +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/utils_nfcore_pipeline: + - subworkflows/nf-core/utils_nfcore_pipeline/** diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/main.nf b/subworkflows/nf-core/utils_nfvalidation_plugin/main.nf new file mode 100644 index 00000000..2585b65d --- /dev/null +++ b/subworkflows/nf-core/utils_nfvalidation_plugin/main.nf @@ -0,0 +1,62 @@ +// +// Subworkflow that uses the nf-validation plugin to render help text and parameter summary +// + +/* +======================================================================================== + IMPORT NF-VALIDATION PLUGIN +======================================================================================== +*/ + +include { paramsHelp } from 'plugin/nf-validation' +include { paramsSummaryLog } from 'plugin/nf-validation' +include { validateParameters } from 'plugin/nf-validation' + +/* +======================================================================================== + SUBWORKFLOW DEFINITION +======================================================================================== +*/ + +workflow UTILS_NFVALIDATION_PLUGIN { + + take: + print_help // boolean: print help + workflow_command // string: default commmand used to run pipeline + pre_help_text // string: string to be printed before help text and summary log + post_help_text // string: string to be printed after help text and summary log + validate_params // boolean: validate parameters + schema_filename // path: JSON schema file, null to use default value + + main: + + log.debug "Using schema file: ${schema_filename}" + + // Default values for strings + pre_help_text = pre_help_text ?: '' + post_help_text = post_help_text ?: '' + workflow_command = workflow_command ?: '' + + // + // Print help message if needed + // + if (print_help) { + log.info pre_help_text + paramsHelp(workflow_command, parameters_schema: schema_filename) + post_help_text + System.exit(0) + } + + // + // Print parameter summary to stdout + // + log.info pre_help_text + paramsSummaryLog(workflow, parameters_schema: schema_filename) + post_help_text + + // + // Validate parameters relative to the parameter JSON schema + // + if (validate_params){ + validateParameters(parameters_schema: schema_filename) + } + + emit: + dummy_emit = true +} diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml b/subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml new file mode 100644 index 00000000..3d4a6b04 --- /dev/null +++ b/subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml @@ -0,0 +1,44 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: "UTILS_NFVALIDATION_PLUGIN" +description: Use nf-validation to initiate and validate a pipeline +keywords: + - utility + - pipeline + - initialise + - validation +components: [] +input: + - print_help: + type: boolean + description: | + Print help message and exit + - workflow_command: + type: string + description: | + The command to run the workflow e.g. "nextflow run main.nf" + - pre_help_text: + type: string + description: | + Text to print before the help message + - post_help_text: + type: string + description: | + Text to print after the help message + - validate_params: + type: boolean + description: | + Validate the parameters and error if invalid. + - schema_filename: + type: string + description: | + The filename of the schema to validate against. +output: + - dummy_emit: + type: boolean + description: | + Dummy emit to make nf-core subworkflows lint happy +authors: + - "@adamrtalbot" +maintainers: + - "@adamrtalbot" + - "@maxulysse" diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test new file mode 100644 index 00000000..517ee54e --- /dev/null +++ b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test @@ -0,0 +1,200 @@ +nextflow_workflow { + + name "Test Workflow UTILS_NFVALIDATION_PLUGIN" + script "../main.nf" + workflow "UTILS_NFVALIDATION_PLUGIN" + tag "subworkflows" + tag "subworkflows_nfcore" + tag "plugin/nf-validation" + tag "'plugin/nf-validation'" + tag "utils_nfvalidation_plugin" + tag "subworkflows/utils_nfvalidation_plugin" + + test("Should run nothing") { + + when { + + params { + monochrome_logs = true + test_data = '' + } + + workflow { + """ + help = false + workflow_command = null + pre_help_text = null + post_help_text = null + validate_params = false + schema_filename = "$moduleTestDir/nextflow_schema.json" + + input[0] = help + input[1] = workflow_command + input[2] = pre_help_text + input[3] = post_help_text + input[4] = validate_params + input[5] = schema_filename + """ + } + } + + then { + assertAll( + { assert workflow.success } + ) + } + } + + test("Should run help") { + + + when { + + params { + monochrome_logs = true + test_data = '' + } + workflow { + """ + help = true + workflow_command = null + pre_help_text = null + post_help_text = null + validate_params = false + schema_filename = "$moduleTestDir/nextflow_schema.json" + + input[0] = help + input[1] = workflow_command + input[2] = pre_help_text + input[3] = post_help_text + input[4] = validate_params + input[5] = schema_filename + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert workflow.exitStatus == 0 }, + { assert workflow.stdout.any { it.contains('Input/output options') } }, + { assert workflow.stdout.any { it.contains('--outdir') } } + ) + } + } + + test("Should run help with command") { + + when { + + params { + monochrome_logs = true + test_data = '' + } + workflow { + """ + help = true + workflow_command = "nextflow run noorg/doesntexist" + pre_help_text = null + post_help_text = null + validate_params = false + schema_filename = "$moduleTestDir/nextflow_schema.json" + + input[0] = help + input[1] = workflow_command + input[2] = pre_help_text + input[3] = post_help_text + input[4] = validate_params + input[5] = schema_filename + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert workflow.exitStatus == 0 }, + { assert workflow.stdout.any { it.contains('nextflow run noorg/doesntexist') } }, + { assert workflow.stdout.any { it.contains('Input/output options') } }, + { assert workflow.stdout.any { it.contains('--outdir') } } + ) + } + } + + test("Should run help with extra text") { + + + when { + + params { + monochrome_logs = true + test_data = '' + } + workflow { + """ + help = true + workflow_command = "nextflow run noorg/doesntexist" + pre_help_text = "pre-help-text" + post_help_text = "post-help-text" + validate_params = false + schema_filename = "$moduleTestDir/nextflow_schema.json" + + input[0] = help + input[1] = workflow_command + input[2] = pre_help_text + input[3] = post_help_text + input[4] = validate_params + input[5] = schema_filename + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert workflow.exitStatus == 0 }, + { assert workflow.stdout.any { it.contains('pre-help-text') } }, + { assert workflow.stdout.any { it.contains('nextflow run noorg/doesntexist') } }, + { assert workflow.stdout.any { it.contains('Input/output options') } }, + { assert workflow.stdout.any { it.contains('--outdir') } }, + { assert workflow.stdout.any { it.contains('post-help-text') } } + ) + } + } + + test("Should validate params") { + + when { + + params { + monochrome_logs = true + test_data = '' + outdir = 1 + } + workflow { + """ + help = false + workflow_command = null + pre_help_text = null + post_help_text = null + validate_params = true + schema_filename = "$moduleTestDir/nextflow_schema.json" + + input[0] = help + input[1] = workflow_command + input[2] = pre_help_text + input[3] = post_help_text + input[4] = validate_params + input[5] = schema_filename + """ + } + } + + then { + assertAll( + { assert workflow.failed }, + { assert workflow.stdout.any { it.contains('ERROR ~ ERROR: Validation of pipeline parameters failed!') } } + ) + } + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/nextflow_schema.json b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/nextflow_schema.json new file mode 100644 index 00000000..7626c1c9 --- /dev/null +++ b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/nextflow_schema.json @@ -0,0 +1,96 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "https://raw.githubusercontent.com/./master/nextflow_schema.json", + "title": ". pipeline parameters", + "description": "", + "type": "object", + "definitions": { + "input_output_options": { + "title": "Input/output options", + "type": "object", + "fa_icon": "fas fa-terminal", + "description": "Define where the pipeline should find input data and save output data.", + "required": ["outdir"], + "properties": { + "validate_params": { + "type": "boolean", + "description": "Validate parameters?", + "default": true, + "hidden": true + }, + "outdir": { + "type": "string", + "format": "directory-path", + "description": "The output directory where the results will be saved. You have to use absolute paths to storage on Cloud infrastructure.", + "fa_icon": "fas fa-folder-open" + }, + "test_data_base": { + "type": "string", + "default": "https://raw.githubusercontent.com/nf-core/test-datasets/modules", + "description": "Base for test data directory", + "hidden": true + }, + "test_data": { + "type": "string", + "description": "Fake test data param", + "hidden": true + } + } + }, + "generic_options": { + "title": "Generic options", + "type": "object", + "fa_icon": "fas fa-file-import", + "description": "Less common options for the pipeline, typically set in a config file.", + "help_text": "These options are common to all nf-core pipelines and allow you to customise some of the core preferences for how the pipeline runs.\n\nTypically these options would be set in a Nextflow config file loaded for all pipeline runs, such as `~/.nextflow/config`.", + "properties": { + "help": { + "type": "boolean", + "description": "Display help text.", + "fa_icon": "fas fa-question-circle", + "hidden": true + }, + "version": { + "type": "boolean", + "description": "Display version and exit.", + "fa_icon": "fas fa-question-circle", + "hidden": true + }, + "logo": { + "type": "boolean", + "default": true, + "description": "Display nf-core logo in console output.", + "fa_icon": "fas fa-image", + "hidden": true + }, + "singularity_pull_docker_container": { + "type": "boolean", + "description": "Pull Singularity container from Docker?", + "hidden": true + }, + "publish_dir_mode": { + "type": "string", + "default": "copy", + "description": "Method used to save pipeline results to output directory.", + "help_text": "The Nextflow `publishDir` option specifies which intermediate files should be saved to the output directory. This option tells the pipeline what method should be used to move these files. See [Nextflow docs](https://www.nextflow.io/docs/latest/process.html#publishdir) for details.", + "fa_icon": "fas fa-copy", + "enum": ["symlink", "rellink", "link", "copy", "copyNoFollow", "move"], + "hidden": true + }, + "monochrome_logs": { + "type": "boolean", + "description": "Use monochrome_logs", + "hidden": true + } + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/input_output_options" + }, + { + "$ref": "#/definitions/generic_options" + } + ] +} diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml new file mode 100644 index 00000000..60b1cfff --- /dev/null +++ b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/utils_nfvalidation_plugin: + - subworkflows/nf-core/utils_nfvalidation_plugin/** diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 26cb4e63..7ae84d76 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -1,38 +1,6 @@ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - PRINT PARAMS SUMMARY -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -*/ - -include { paramsSummaryLog; paramsSummaryMap; fromSamplesheet } 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 - -WorkflowNascent.initialise(params, log) - -// HACK Rework this because of nf-validation -def prepareToolIndices = [] -if (!params.skip_alignment) { prepareToolIndices << params.aligner } - -/* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - CONFIG FILES -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -*/ - -ch_multiqc_config = Channel.fromPath("$projectDir/assets/multiqc_config.yml", checkIfExists: true) -ch_multiqc_custom_config = params.multiqc_config ? Channel.fromPath( params.multiqc_config, checkIfExists: true ) : Channel.empty() -ch_multiqc_logo = params.multiqc_logo ? Channel.fromPath( params.multiqc_logo, checkIfExists: true ) : Channel.empty() -ch_multiqc_custom_methods_description = params.multiqc_methods_description ? file(params.multiqc_methods_description, checkIfExists: true) : file("$projectDir/assets/methods_description_template.yml", checkIfExists: true) - -/* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - IMPORT LOCAL MODULES/SUBWORKFLOWS + IMPORT MODULES / SUBWORKFLOWS / FUNCTIONS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -45,21 +13,17 @@ include { QUALITY_CONTROL } from '../subworkflows/local/quality_control.nf' include { COVERAGE_GRAPHS } from '../subworkflows/local/coverage_graphs.nf' include { TRANSCRIPT_INDENTIFICATION } from '../subworkflows/local/transcript_identification.nf' -/* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - IMPORT NF-CORE MODULES/SUBWORKFLOWS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -*/ - -include { FASTQC } from '../modules/nf-core/fastqc/main' include { FASTP } from '../modules/nf-core/fastp/main' -include { CAT_FASTQ } from '../modules/nf-core/cat/fastq/main' include { SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_GENE SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_PREDICTED } from '../modules/nf-core/subread/featurecounts/main' -include { MULTIQC } from '../modules/nf-core/multiqc/main' -include { CUSTOM_DUMPSOFTWAREVERSIONS } from '../modules/nf-core/custom/dumpsoftwareversions/main' +include { FASTQC } from '../modules/nf-core/fastqc/main' +include { MULTIQC } from '../modules/nf-core/multiqc/main' +include { paramsSummaryMap } from 'plugin/nf-validation' +include { paramsSummaryMultiqc } from '../subworkflows/nf-core/utils_nfcore_pipeline' +include { softwareVersionsToYAML } from '../subworkflows/nf-core/utils_nfcore_pipeline' +include { methodsDescriptionText } from '../subworkflows/local/utils_nfcore_nascent_pipeline' // // SUBWORKFLOW: Consisting entirely of nf-core/modules @@ -74,17 +38,23 @@ include { BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS } from '../subworkflows/nf-core/bam_ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -// Info required for completion email and summary -def multiqc_report = [] - workflow NASCENT { + take: + ch_samplesheet // channel: samplesheet read in from --input + + main: + ch_versions = Channel.empty() - ch_nascent_logo = Channel.fromPath("$projectDir/docs/images/nf-core-nascent_logo_light.png") + ch_multiqc_files = Channel.empty() // // SUBWORKFLOW: Uncompress and prepare reference genome files // + + // HACK Rework this because of nf-validation + def prepareToolIndices = [] + if (!params.skip_alignment) { prepareToolIndices << params.aligner } PREPARE_GENOME ( prepareToolIndices, params.fasta, @@ -94,44 +64,22 @@ workflow NASCENT { ch_versions = ch_versions.mix(PREPARE_GENOME.out.versions.first()) ch_fasta = PREPARE_GENOME.out.fasta.map{ fasta -> [ [ id:fasta.baseName ], fasta ] } - // - // Create input channel from input file provided through params.input - // - Channel - .fromSamplesheet("input") - .map { - meta, fastq_1, fastq_2 -> - if (!fastq_2) { - return [ meta.id, meta + [ single_end:true ], [ fastq_1 ] ] - } else { - return [ meta.id, meta + [ single_end:false ], [ fastq_1, fastq_2 ] ] - } - } - .groupTuple() - .map { - WorkflowNascent.validateInput(it) - } - .map { - meta, fastqs -> - return [ meta, fastqs.flatten() ] - } - .set { ch_fastq } - // // MODULE: Run FastQC // FASTQC ( - ch_fastq + ch_samplesheet ) + ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip.collect{it[1]}) ch_versions = ch_versions.mix(FASTQC.out.versions.first()) ch_reads = Channel.empty() if(!params.skip_trimming) { - FASTP ( ch_fastq, [], false, false ) + FASTP ( ch_samplesheet, [], false, false ) ch_reads = FASTP.out.reads ch_versions = ch_versions.mix(FASTP.out.versions.first()) } else { - ch_reads = ch_fastq + ch_reads = ch_samplesheet } // @@ -273,38 +221,42 @@ workflow NASCENT { ) ch_versions = ch_versions.mix(SUBREAD_FEATURECOUNTS_GENE.out.versions.first()) - CUSTOM_DUMPSOFTWAREVERSIONS ( - ch_versions.unique().collectFile(name: 'collated_versions.yml') - ) + // + // Collate and save software versions + // + softwareVersionsToYAML(ch_versions) + .collectFile(storeDir: "${params.outdir}/pipeline_info", name: 'nf_core_pipeline_software_mqc_versions.yml', sort: true, newLine: true) + .set { ch_collated_versions } // // MODULE: MultiQC // - workflow_summary = WorkflowNascent.paramsSummaryMultiqc(workflow, summary_params) - ch_workflow_summary = Channel.value(workflow_summary) - - methods_description = WorkflowNascent.methodsDescriptionText(workflow, ch_multiqc_custom_methods_description, params) - ch_methods_description = Channel.value(methods_description) - - ch_multiqc_files = Channel.empty() - .mix(ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) - .mix(ch_methods_description.collectFile(name: 'methods_description_mqc.yaml')) - .mix(CUSTOM_DUMPSOFTWAREVERSIONS.out.mqc_yml.collect()) - .mix(FASTQC.out.zip.collect{it[1]}.ifEmpty([])) - .mix(ch_bowtie2_multiqc.collect{it[1]}.ifEmpty([])) - .mix(ch_samtools_stats.collect{it[1]}.ifEmpty([])) - .mix(ch_samtools_flagstat.collect{it[1]}.ifEmpty([])) - .mix(ch_samtools_idxstats.collect{it[1]}.ifEmpty([])) - .mix(QUALITY_CONTROL.out.preseq_ccurve.collect{it[1]}.ifEmpty([])) - .mix(QUALITY_CONTROL.out.preseq_lcextrap.collect{it[1]}.ifEmpty([])) - .mix(QUALITY_CONTROL.out.readdistribution_txt.collect{it[1]}.ifEmpty([])) - .mix(QUALITY_CONTROL.out.readduplication_seq_xls.collect{it[1]}.ifEmpty([])) - .mix(QUALITY_CONTROL.out.readduplication_pos_xls.collect{it[1]}.ifEmpty([])) - .mix(QUALITY_CONTROL.out.inferexperiment_txt.collect{it[1]}.ifEmpty([])) - .mix(ch_grohmm_multiqc.collect{it[1]}.ifEmpty([])) - .mix(ch_homer_multiqc.collect{it[1]}.ifEmpty([])) - .mix(SUBREAD_FEATURECOUNTS_PREDICTED.out.summary.collect{it[1]}.ifEmpty([])) - .mix(SUBREAD_FEATURECOUNTS_GENE.out.summary.collect{it[1]}.ifEmpty([])) + ch_multiqc_config = Channel.fromPath("$projectDir/assets/multiqc_config.yml", checkIfExists: true) + ch_multiqc_custom_config = params.multiqc_config ? Channel.fromPath(params.multiqc_config, checkIfExists: true) : Channel.empty() + ch_multiqc_logo = params.multiqc_logo ? Channel.fromPath(params.multiqc_logo, checkIfExists: true) : Channel.empty() + summary_params = paramsSummaryMap(workflow, parameters_schema: "nextflow_schema.json") + ch_workflow_summary = Channel.value(paramsSummaryMultiqc(summary_params)) + ch_multiqc_custom_methods_description = params.multiqc_methods_description ? file(params.multiqc_methods_description, checkIfExists: true) : file("$projectDir/assets/methods_description_template.yml", checkIfExists: true) + ch_methods_description = Channel.value(methodsDescriptionText(ch_multiqc_custom_methods_description)) + ch_multiqc_files = ch_multiqc_files.mix(ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) + ch_multiqc_files = ch_multiqc_files.mix(ch_collated_versions) + ch_multiqc_files = ch_multiqc_files.mix(ch_methods_description.collectFile(name: 'methods_description_mqc.yaml', sort: false)) + + ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_bowtie2_multiqc.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_stats.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_flagstat.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_idxstats.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.preseq_ccurve.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.preseq_lcextrap.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readdistribution_txt.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readduplication_seq_xls.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readduplication_pos_xls.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.inferexperiment_txt.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_grohmm_multiqc.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_homer_multiqc.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(SUBREAD_FEATURECOUNTS_PREDICTED.out.summary.collect{it[1]}.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(SUBREAD_FEATURECOUNTS_GENE.out.summary.collect{it[1]}.ifEmpty([])) MULTIQC ( ch_multiqc_files.collect(), @@ -312,31 +264,10 @@ workflow NASCENT { ch_multiqc_custom_config.toList(), ch_multiqc_logo.toList() ) - multiqc_report = MULTIQC.out.report.toList() -} - -/* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - COMPLETION EMAIL AND SUMMARY -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -*/ -workflow.onComplete { - if (params.email || params.email_on_fail) { - NfcoreTemplate.email(workflow, params, summary_params, projectDir, log, multiqc_report) - } - NfcoreTemplate.dump_parameters(workflow, params) - NfcoreTemplate.summary(workflow, params, log) - if (params.hook_url) { - NfcoreTemplate.IM_notification(workflow, params, summary_params, projectDir, log) - } -} - -workflow.onError { - if (workflow.errorReport.contains("Process requirement exceeds available memory")) { - println("🛑 Default resources exceed availability 🛑 ") - println("💡 See here on how to configure pipeline: https://nf-co.re/docs/usage/configuration#tuning-workflow-resources 💡") - } + emit: + multiqc_report = MULTIQC.out.report.toList() // channel: /path/to/multiqc_report.html + versions = ch_versions // channel: [ path(versions.yml) ] } /* diff --git a/workflows/tests/bowtie2.nf.test.snap b/workflows/tests/bowtie2.nf.test.snap index e6dff48c..8cef6127 100644 --- a/workflows/tests/bowtie2.nf.test.snap +++ b/workflows/tests/bowtie2.nf.test.snap @@ -1,12 +1,12 @@ { "Should run with bowtie2 (default)": { "content": [ - 127 + 126 ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-15T09:57:57.950183345" + "timestamp": "2024-03-05T16:05:54.646114124" } } \ No newline at end of file diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index 3b846411..62e06bdd 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -1,7 +1,7 @@ { "Should run with bwa (default)": { "content": [ - 129, + 128, [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", @@ -75,11 +75,11 @@ "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-17T22:45:14.737941295" + "timestamp": "2024-03-05T15:54:18.985765284" }, "Should run with bwamem2": { "content": [ - 129, + 128, [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", @@ -153,11 +153,11 @@ "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-17T22:47:07.961805653" + "timestamp": "2024-03-05T15:56:25.053122616" }, "Should run with dragmap": { "content": [ - 129, + 128, [ "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", @@ -199,6 +199,6 @@ "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-17T22:49:01.647145296" + "timestamp": "2024-03-05T15:58:59.071139821" } } \ No newline at end of file diff --git a/workflows/tests/references.nf.test.snap b/workflows/tests/references.nf.test.snap index 29076018..2761a7d4 100644 --- a/workflows/tests/references.nf.test.snap +++ b/workflows/tests/references.nf.test.snap @@ -1,22 +1,22 @@ { "Should work with gzipped references": { "content": [ - 99 + 98 ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-14T16:39:27.539091004" + "timestamp": "2024-03-05T16:02:57.855321372" }, "Should work with BWA Index": { "content": [ - 114 + 113 ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-18T08:05:07.088179653" + "timestamp": "2024-03-05T16:01:56.042895683" } } \ No newline at end of file From a3bc907e9afd9dd2a9572798fa16fbc781c3dcb0 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Thu, 29 Feb 2024 16:11:07 +0000 Subject: [PATCH 003/255] Template update for nf-core/tools version 2.13.1 --- .devcontainer/devcontainer.json | 10 +---- .github/CONTRIBUTING.md | 14 ++++--- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/awsfulltest.yml | 4 +- .github/workflows/awstest.yml | 4 +- .github/workflows/ci.yml | 2 +- .github/workflows/download_pipeline.yml | 2 +- .github/workflows/linting.yml | 2 +- .github/workflows/release-announcements.yml | 2 +- .gitpod.yml | 6 +-- README.md | 3 +- modules.json | 8 ++-- modules/nf-core/multiqc/environment.yml | 2 +- modules/nf-core/multiqc/main.nf | 4 +- .../nf-core/multiqc/tests/main.nf.test.snap | 12 +++--- .../utils_nfcore_nascent_pipeline/main.nf | 10 +++-- .../tests/main.function.nf.test | 2 +- .../tests/main.function.nf.test.snap | 12 +++++- .../tests/main.workflow.nf.test | 20 ++------- .../tests/nextflow.config | 2 +- .../tests/main.function.nf.test.snap | 42 +++++++++++++++---- .../tests/main.workflow.nf.test.snap | 6 ++- .../tests/main.nf.test | 2 +- 23 files changed, 99 insertions(+), 74 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4ecfbfe3..b290e090 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,15 +10,7 @@ "vscode": { // Set *default* container specific settings.json values on container create. "settings": { - "python.defaultInterpreterPath": "/opt/conda/bin/python", - "python.linting.enabled": true, - "python.linting.pylintEnabled": true, - "python.formatting.autopep8Path": "/opt/conda/bin/autopep8", - "python.formatting.yapfPath": "/opt/conda/bin/yapf", - "python.linting.flake8Path": "/opt/conda/bin/flake8", - "python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle", - "python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle", - "python.linting.pylintPath": "/opt/conda/bin/pylint" + "python.defaultInterpreterPath": "/opt/conda/bin/python" }, // Add the IDs of extensions you want installed when the container is created. diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 74553c01..1f600c1a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,9 +9,8 @@ Please use the pre-filled template to save time. However, don't be put off by this template - other more general issues and suggestions are welcome! Contributions to the code are even more welcome ;) -:::info -If you need help using or modifying nf-core/nascent then the best place to ask is on the nf-core Slack [#nascent](https://nfcore.slack.com/channels/nascent) channel ([join our Slack here](https://nf-co.re/join/slack)). -::: +> [!NOTE] +> If you need help using or modifying nf-core/nascent then the best place to ask is on the nf-core Slack [#nascent](https://nfcore.slack.com/channels/nascent) channel ([join our Slack here](https://nf-co.re/join/slack)). ## Contribution workflow @@ -27,8 +26,11 @@ If you're not used to this workflow with git, you can start with some [docs from ## Tests -You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to -receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir `. +You have the option to test your changes locally by running the pipeline. For receiving warnings about process selectors and other `debug` information, it is recommended to use the debug profile. Execute all the tests with the following command: + +```bash +nf-test test --profile debug,test,docker --verbose +``` When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests. Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then. @@ -90,7 +92,7 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`. Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels. -The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block. +The process resources can be passed on to the tool dynamically within the process with the `${task.cpus}` and `${task.memory}` variables in the `script:` block. ### Naming schemes diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e33f09a1..b0071e65 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -18,7 +18,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/nasc - [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/nascent/tree/master/.github/CONTRIBUTING.md) - [ ] If necessary, also make a PR on the nf-core/nascent _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository. - [ ] Make sure your code lints (`nf-core lint`). -- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir `). +- [ ] Ensure the test suite passes (`nf-test test main.nf.test -profile test,docker`). - [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir `). - [ ] Usage Documentation in `docs/usage.md` is updated. - [ ] Output Documentation in `docs/output.md` is updated. diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index 2ad04c00..bdf5ec1d 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2 + uses: seqeralabs/action-tower-launch@v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} @@ -28,7 +28,7 @@ jobs: } profiles: test_full - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 + - uses: actions/upload-artifact@v4 with: name: Tower debug log file path: | diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml index a32ecf9f..bf337a02 100644 --- a/.github/workflows/awstest.yml +++ b/.github/workflows/awstest.yml @@ -12,7 +12,7 @@ jobs: steps: # Launch workflow using Tower CLI tool action - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2 + uses: seqeralabs/action-tower-launch@v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} @@ -25,7 +25,7 @@ jobs: } profiles: test - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 + - uses: actions/upload-artifact@v4 with: name: Tower debug log file path: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8163720d..f840f546 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: key: nascent-${{ runner.os }}-${{ matrix.NXF_VER }} - name: Install Nextflow - uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1 + uses: nf-core/setup-nextflow@v1 with: version: "${{ matrix.NXF_VER }}" diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml index f823210d..08622fd5 100644 --- a/.github/workflows/download_pipeline.yml +++ b/.github/workflows/download_pipeline.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Nextflow - uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1 + uses: nf-core/setup-nextflow@v1 - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 with: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 748b4311..073e1876 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Install Nextflow - uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1 + uses: nf-core/setup-nextflow@v1 - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 with: diff --git a/.github/workflows/release-announcements.yml b/.github/workflows/release-announcements.yml index c3674af2..d468aeaa 100644 --- a/.github/workflows/release-announcements.yml +++ b/.github/workflows/release-announcements.yml @@ -12,7 +12,7 @@ jobs: - name: get topics and convert to hashtags id: get_topics run: | - curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' > $GITHUB_OUTPUT + curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' >> $GITHUB_OUTPUT - uses: rzr/fediverse-action@master with: diff --git a/.gitpod.yml b/.gitpod.yml index 363d5b1d..105a1821 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -10,13 +10,11 @@ tasks: vscode: extensions: # based on nf-core.nf-core-extensionpack - - codezombiech.gitignore # Language support for .gitignore files - # - cssho.vscode-svgviewer # SVG viewer - esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code - - eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed - EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files - Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar - mechatroner.rainbow-csv # Highlight columns in csv files in different colors - # - nextflow.nextflow # Nextflow syntax highlighting + # - nextflow.nextflow # Nextflow syntax highlighting - oderwat.indent-rainbow # Highlight indentation level - streetsidesoftware.code-spell-checker # Spelling checker for source code + - charliermarsh.ruff # Code linter Ruff diff --git a/README.md b/README.md index aa3abdb6..db8dbea2 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,13 @@ [![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml) [![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.7245273-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.7245273) +[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com) [![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/) -[![Launch on Nextflow Tower](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Nextflow%20Tower-%234256e7)](https://tower.nf/launch?pipeline=https://github.com/nf-core/nascent) +[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://tower.nf/launch?pipeline=https://github.com/nf-core/nascent) [![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core) diff --git a/modules.json b/modules.json index 77459c5a..c6b73b82 100644 --- a/modules.json +++ b/modules.json @@ -138,7 +138,7 @@ }, "multiqc": { "branch": "master", - "git_sha": "ccacf6f5de6df3bc6d73b665c1fd2933d8bbc290", + "git_sha": "b7ebe95761cd389603f9cc0e0dc384c0f663815a", "installed_by": ["modules"] }, "pints/caller": { @@ -252,17 +252,17 @@ "nf-core": { "utils_nextflow_pipeline": { "branch": "master", - "git_sha": "cd08c91373cd00a73255081340e4914485846ba1", + "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa", "installed_by": ["subworkflows"] }, "utils_nfcore_pipeline": { "branch": "master", - "git_sha": "262b17ed2aad591039f914951659177e6c39a8d8", + "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa", "installed_by": ["subworkflows"] }, "utils_nfvalidation_plugin": { "branch": "master", - "git_sha": "cd08c91373cd00a73255081340e4914485846ba1", + "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa", "installed_by": ["subworkflows"] } } diff --git a/modules/nf-core/multiqc/environment.yml b/modules/nf-core/multiqc/environment.yml index 2212096a..ca39fb67 100644 --- a/modules/nf-core/multiqc/environment.yml +++ b/modules/nf-core/multiqc/environment.yml @@ -4,4 +4,4 @@ channels: - bioconda - defaults dependencies: - - bioconda::multiqc=1.20 + - bioconda::multiqc=1.21 diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf index 354f4430..47ac352f 100644 --- a/modules/nf-core/multiqc/main.nf +++ b/modules/nf-core/multiqc/main.nf @@ -3,8 +3,8 @@ process MULTIQC { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.20--pyhdfd78af_0' : - 'biocontainers/multiqc:1.20--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/multiqc:1.21--pyhdfd78af_0' : + 'biocontainers/multiqc:1.21--pyhdfd78af_0' }" input: path multiqc_files, stageAs: "?/*" diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap index c204b488..bfebd802 100644 --- a/modules/nf-core/multiqc/tests/main.nf.test.snap +++ b/modules/nf-core/multiqc/tests/main.nf.test.snap @@ -2,14 +2,14 @@ "multiqc_versions_single": { "content": [ [ - "versions.yml:md5,d320d4c37e349c5588e07e7a31cd4186" + "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d" ] ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-14T09:28:51.744211298" + "timestamp": "2024-02-29T08:48:55.657331" }, "multiqc_stub": { "content": [ @@ -17,25 +17,25 @@ "multiqc_report.html", "multiqc_data", "multiqc_plots", - "versions.yml:md5,d320d4c37e349c5588e07e7a31cd4186" + "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d" ] ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-14T09:29:28.847433492" + "timestamp": "2024-02-29T08:49:49.071937" }, "multiqc_versions_config": { "content": [ [ - "versions.yml:md5,d320d4c37e349c5588e07e7a31cd4186" + "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d" ] ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-02-14T09:29:13.223621555" + "timestamp": "2024-02-29T08:49:25.457567" } } \ No newline at end of file diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index dc90ad90..acb9b605 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -1,5 +1,5 @@ // -// Subworkflow with functionality specific to the nf-core/pipeline pipeline +// Subworkflow with functionality specific to the nf-core/nascent pipeline // /* @@ -152,7 +152,9 @@ workflow PIPELINE_COMPLETION { // def validateInputParameters() { genomeExistsError() -}// +} + +// // Validate channels from input samplesheet // def validateInputSamplesheet(input) { @@ -190,7 +192,9 @@ def genomeExistsError() { "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" error(error_string) } -}// +} + +// // Generate methods description for MultiQC // def toolCitationText() { diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test index 8ed4310c..68718e4f 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test @@ -51,4 +51,4 @@ nextflow_function { ) } } -} \ No newline at end of file +} diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap index db2030f8..e3f0baf4 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.function.nf.test.snap @@ -3,10 +3,18 @@ "content": [ "v9.9.9" ], - "timestamp": "2024-01-19T11:32:36.031083" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:02:05.308243" }, "Test Function checkCondaChannels": { "content": null, - "timestamp": "2024-01-19T11:32:50.456" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:02:12.425833" } } \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test index f7c54bc6..ca964ce8 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test @@ -11,9 +11,6 @@ nextflow_workflow { test("Should run no inputs") { when { - params { - outdir = "tests/results" - } workflow { """ print_version = false @@ -39,9 +36,6 @@ nextflow_workflow { test("Should print version") { when { - params { - outdir = "tests/results" - } workflow { """ print_version = true @@ -68,19 +62,16 @@ nextflow_workflow { test("Should dump params") { when { - params { - outdir = "$outputDir" - } workflow { """ print_version = false dump_parameters = true - outdir = params.outdir + outdir = 'results' check_conda_channels = false input[0] = false input[1] = true - input[2] = params.outdir + input[2] = outdir input[3] = false """ } @@ -96,19 +87,16 @@ nextflow_workflow { test("Should not create params JSON if no output directory") { when { - params { - outdir = "$outputDir" - } workflow { """ print_version = false dump_parameters = true - outdir = params.outdir + outdir = null check_conda_channels = false input[0] = false input[1] = true - input[2] = null + input[2] = outdir input[3] = false """ } diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config b/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config index 53574ffe..d0a926bf 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config @@ -6,4 +6,4 @@ manifest { nextflowVersion = '!>=23.04.0' version = '9.9.9' doi = 'https://doi.org/10.5281/zenodo.5070524' -} \ No newline at end of file +} diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap index 10f948e6..1037232c 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap @@ -1,25 +1,41 @@ { "Test Function checkProfileProvided": { "content": null, - "timestamp": "2024-02-09T15:43:55.145717" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:03:03.360873" }, "Test Function checkConfigProvided": { "content": [ true ], - "timestamp": "2024-01-19T11:34:13.548431224" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:02:59.729647" }, "Test Function nfCoreLogo": { "content": [ "\n\n-\u001b[2m----------------------------------------------------\u001b[0m-\n \u001b[0;32m,--.\u001b[0;30m/\u001b[0;32m,-.\u001b[0m\n\u001b[0;34m ___ __ __ __ ___ \u001b[0;32m/,-._.--~'\u001b[0m\n\u001b[0;34m |\\ | |__ __ / ` / \\ |__) |__ \u001b[0;33m} {\u001b[0m\n\u001b[0;34m | \\| | \\__, \\__/ | \\ |___ \u001b[0;32m\\`-._,-`-,\u001b[0m\n \u001b[0;32m`._,._,'\u001b[0m\n\u001b[0;35m nextflow_workflow v9.9.9\u001b[0m\n-\u001b[2m----------------------------------------------------\u001b[0m-\n" ], - "timestamp": "2024-01-19T11:34:38.840454873" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:03:10.562934" }, "Test Function workflowCitation": { "content": [ "If you use nextflow_workflow for your analysis please cite:\n\n* The pipeline\n https://doi.org/10.5281/zenodo.5070524\n\n* The nf-core framework\n https://doi.org/10.1038/s41587-020-0439-x\n\n* Software dependencies\n https://github.com/nextflow_workflow/blob/master/CITATIONS.md" ], - "timestamp": "2024-01-19T11:34:22.24352016" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:03:07.019761" }, "Test Function without logColours": { "content": [ @@ -73,13 +89,21 @@ "biwhite": "" } ], - "timestamp": "2024-01-19T11:35:04.418416984" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:03:17.969323" }, "Test Function dashedLine": { "content": [ "-\u001b[2m----------------------------------------------------\u001b[0m-" ], - "timestamp": "2024-01-19T11:34:55.420000755" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:03:14.366181" }, "Test Function with logColours": { "content": [ @@ -133,6 +157,10 @@ "biwhite": "\u001b[1;97m" } ], - "timestamp": "2024-01-19T11:35:13.436366565" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:03:21.714424" } } \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap index d07ce54c..859d1030 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.workflow.nf.test.snap @@ -10,6 +10,10 @@ ] } ], - "timestamp": "2024-01-19T11:35:22.538940073" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-28T12:03:25.726491" } } \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test index 517ee54e..5784a33f 100644 --- a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test +++ b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test @@ -197,4 +197,4 @@ nextflow_workflow { ) } } -} \ No newline at end of file +} From a08c2bd99c53541ebe466895f1884be3ed739e8b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 5 Mar 2024 16:30:51 -0600 Subject: [PATCH 004/255] chore: Add template updates to CHANGELOG --- CHANGELOG.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eefe5581..219dced4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,14 +5,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- [5bcfe4f](https://github.com/nf-core/nascent/commit/5bcfe4ff1729b89e9e5741c473d32168b836a57f) - Update pipeline template to [nf-core/tools 2.13](https://github.com/nf-core/tools/releases/tag/2.13) +- [a3bc907](https://github.com/nf-core/nascent/commit/a3bc907e9afd9dd2a9572798fa16fbc781c3dcb0) - Update pipeline template to [nf-core/tools 2.13.1](https://github.com/nf-core/tools/releases/tag/2.13.1) + ## v2.2.0 - 2024-03-05 ### Added -- [1494fff](https://github.com/nf-core/nascent/commit/1494fff2ecd8b498e19d7d0fa3f7ee0f71088ab4) - Update pipeline template to [nf-core/tools 2.12](https://github.com/nf-core/tools/releases/tag/2.12) -- [ec24cfb](https://github.com/nf-core/nascent/commit/ec24cfb2646904bcc78379a071b50b53a855b9a9) - Update pipeline template to [nf-core/tools 2.11.1](https://github.com/nf-core/tools/releases/tag/2.11.1) -- [15b8ff3](https://github.com/nf-core/nascent/commit/15b8ff31cd43ec2e330ce7958bd6d7d65529b4d3) - Update pipeline template to [nf-core/tools 2.11](https://github.com/nf-core/tools/releases/tag/2.11) - [9712163](https://github.com/nf-core/nascent/commit/97121638eb77e175b912ff45a669426e532c5d7f) - Update pipeline template to [nf-core/tools 2.10](https://github.com/nf-core/tools/releases/tag/2.10) +- [15b8ff3](https://github.com/nf-core/nascent/commit/15b8ff31cd43ec2e330ce7958bd6d7d65529b4d3) - Update pipeline template to [nf-core/tools 2.11](https://github.com/nf-core/tools/releases/tag/2.11) +- [ec24cfb](https://github.com/nf-core/nascent/commit/ec24cfb2646904bcc78379a071b50b53a855b9a9) - Update pipeline template to [nf-core/tools 2.11.1](https://github.com/nf-core/tools/releases/tag/2.11.1) +- [1494fff](https://github.com/nf-core/nascent/commit/1494fff2ecd8b498e19d7d0fa3f7ee0f71088ab4) - Update pipeline template to [nf-core/tools 2.12](https://github.com/nf-core/tools/releases/tag/2.12) - [[#130](https://github.com/nf-core/nascent/pull/130)] - AWS Mega Tests - [[#132](https://github.com/nf-core/nascent/pull/132)] - Add Bowtie 2 as an aligner option From 14cba30bc9a38f8749770fe06a6a8286304b3a1c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 29 Feb 2024 12:30:12 -0600 Subject: [PATCH 005/255] fix: Remove pull_docker_container from PINTS --- CHANGELOG.md | 4 ++++ conf/modules.config | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 219dced4..65ed4092 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [5bcfe4f](https://github.com/nf-core/nascent/commit/5bcfe4ff1729b89e9e5741c473d32168b836a57f) - Update pipeline template to [nf-core/tools 2.13](https://github.com/nf-core/tools/releases/tag/2.13) - [a3bc907](https://github.com/nf-core/nascent/commit/a3bc907e9afd9dd2a9572798fa16fbc781c3dcb0) - Update pipeline template to [nf-core/tools 2.13.1](https://github.com/nf-core/tools/releases/tag/2.13.1) +### Changed + +- [[#137](https://github.com/nf-core/nascent/pull/137)] - Use singularity containers for PINTS + ## v2.2.0 - 2024-03-05 ### Added diff --git a/conf/modules.config b/conf/modules.config index d2378a7e..563ee7b8 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -153,9 +153,6 @@ process { withName: PINTS_CALLER { // FIXME bowtie2 fails for some reason ext.when = { params.aligner != "bowtie2" } - // FIXME The singularity image doesn't exist on biocontainers yet - // https://github.com/hyulab/PINTS/issues/3 - ext.singularity_pull_docker_container = true } withName: BEDTOOLS_SORT { From 50929255e7dd2b615720fa599da2fdb88ed95bcc Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 14 Mar 2024 13:19:31 -0500 Subject: [PATCH 006/255] fix: Remove extra fasta in params --- nextflow.config | 1 - 1 file changed, 1 deletion(-) diff --git a/nextflow.config b/nextflow.config index fa6a3500..bfc46fa4 100644 --- a/nextflow.config +++ b/nextflow.config @@ -35,7 +35,6 @@ params { genome = null igenomes_base = 's3://ngi-igenomes/igenomes/' igenomes_ignore = false - fasta = null save_reference = false From 50e6a7b35ddcc457b9d4ef780c65a50f7bc1f29a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 15 Mar 2024 10:44:16 -0500 Subject: [PATCH 007/255] fix: Remove references used as params --- main.nf | 11 ++++++- subworkflows/local/prepare_genome.nf | 46 ++++++++++++++++------------ workflows/nascent.nf | 21 +++++++++++-- 3 files changed, 54 insertions(+), 24 deletions(-) diff --git a/main.nf b/main.nf index ee68059b..c39577e4 100644 --- a/main.nf +++ b/main.nf @@ -58,7 +58,16 @@ workflow NFCORE_NASCENT { // WORKFLOW: Run pipeline // NASCENT ( - samplesheet + samplesheet, + params.fasta, + params.gtf, + params.gff, + params.gene_bed, + params.bwa_index, + params.bwamem2_index, + params.dragmap, + params.bowtie2_index, + params.hisat2_index, ) emit: diff --git a/subworkflows/local/prepare_genome.nf b/subworkflows/local/prepare_genome.nf index 8b860e25..3c0e23db 100644 --- a/subworkflows/local/prepare_genome.nf +++ b/subworkflows/local/prepare_genome.nf @@ -25,6 +25,12 @@ workflow PREPARE_GENOME { fasta gtf gff + gene_bed + bwa_index + bwamem2_index + dragmap + bowtie2_index + hisat2_index main: @@ -66,12 +72,12 @@ workflow PREPARE_GENOME { // // Uncompress gene BED annotation file or create from GTF if required // - if (params.gene_bed) { - if (params.gene_bed.endsWith('.gz')) { - ch_gene_bed = GUNZIP_GENE_BED ( [ [:], params.gene_bed ] ).gunzip.map { it[1] } + if (gene_bed) { + if (gene_bed.endsWith('.gz')) { + ch_gene_bed = GUNZIP_GENE_BED ( [ [:], gene_bed ] ).gunzip.map { it[1] } ch_versions = ch_versions.mix(GUNZIP_GENE_BED.out.versions) } else { - ch_gene_bed = file(params.gene_bed) + ch_gene_bed = file(gene_bed) } } else { ch_gene_bed = GTF2BED ( ch_gtf ).bed @@ -94,52 +100,52 @@ workflow PREPARE_GENOME { ch_bowtie2_index = Channel.empty() // TODO Turn this into a switch if ('bwa' in prepare_tool_indices) { - if (params.bwa_index) { - if (params.bwa_index.endsWith('.tar.gz')) { - ch_bwa_index = UNTAR_BWA_INDEX ( params.bwa_index ).untar + if (bwa_index) { + if (bwa_index.endsWith('.tar.gz')) { + ch_bwa_index = UNTAR_BWA_INDEX ( [ [:], bwa_index ] ).untar ch_versions = ch_versions.mix(UNTAR_BWA_INDEX.out.versions) } else { // TODO Give the meta from basename or genome? - ch_bwa_index = [ [meta: "Genome"], file(params.bwa_index) ] + ch_bwa_index = [ [meta: "Genome"], file(bwa_index) ] } } else { ch_bwa_index = BWA_INDEX ( ch_fasta.map { [ [:], it ] } ).index ch_versions = ch_versions.mix(BWA_INDEX.out.versions) } } else if ('bwamem2' in prepare_tool_indices) { - if (params.bwamem2_index) { - if (params.bwamem2_index.endsWith('.tar.gz') || params.bwamem2_index.endsWith('.tgz')) { - ch_bwa_index = UNTAR_BWA_INDEX ( [ [:], params.bwamem2_index ] ).untar + if (bwamem2_index) { + if (bwamem2_index.endsWith('.tar.gz') || bwamem2_index.endsWith('.tgz')) { + ch_bwa_index = UNTAR_BWA_INDEX ( [ [:], bwamem2_index ] ).untar ch_versions = ch_versions.mix(UNTAR_BWA_INDEX.out.versions) } else { // TODO Give the meta from basename or genome? - ch_bwa_index = [ [meta: "Genome"], file(params.bwamem2_index) ] + ch_bwa_index = [ [meta: "Genome"], file(bwamem2_index) ] } } else { ch_bwa_index = BWAMEM2_INDEX ( ch_fasta.map { [ [:], it ] } ).index ch_versions = ch_versions.mix(BWAMEM2_INDEX.out.versions) } } else if ('dragmap' in prepare_tool_indices) { - if (params.dragmap) { - if (params.dragmap.endsWith('.tar.gz')) { - ch_dragmap = UNTAR_DRAGMAP_INDEX ( params.dragmap ).untar + if (dragmap) { + if (dragmap.endsWith('.tar.gz')) { + ch_dragmap = UNTAR_DRAGMAP_INDEX ( dragmap ).untar ch_versions = ch_versions.mix(UNTAR_DRAGMAP_INDEX.out.versions) } else { // TODO Give the meta from basename or genome? - ch_dragmap = [ [meta: "Genome"], file(params.dragmap) ] + ch_dragmap = [ [meta: "Genome"], file(dragmap) ] } } else { ch_dragmap = DRAGMAP_HASHTABLE( ch_fasta.map { [ [:], it ] } ).hashmap ch_versions = ch_versions.mix(DRAGMAP_HASHTABLE.out.versions) } } else if ('bowtie2' in prepare_tool_indices) { - if (params.bowtie2_index) { - if (params.bowtie2_index.endsWith('.tar.gz')) { - ch_bowtie2_index = UNTAR_BOWTIE2_INDEX ( params.bowtie2_index ).untar + if (bowtie2_index) { + if (bowtie2_index.endsWith('.tar.gz')) { + ch_bowtie2_index = UNTAR_BOWTIE2_INDEX ( bowtie2_index ).untar ch_versions = ch_versions.mix(UNTAR_BOWTIE2_INDEX.out.versions) } else { // TODO Give the meta from basename or genome? - ch_bowtie2_index = [ [meta: "Genome"], file(params.bowtie2_index) ] + ch_bowtie2_index = [ [meta: "Genome"], file(bowtie2_index) ] } } else { ch_bowtie2_index = BOWTIE2_BUILD ( ch_fasta.map { [ [:], it ] } ).index diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 7ae84d76..25264fe0 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -42,6 +42,15 @@ workflow NASCENT { take: ch_samplesheet // channel: samplesheet read in from --input + ch_fasta + ch_gtf + ch_gff + ch_gene_bed + ch_bwa_index + ch_bwamem2_index + ch_dragmap + ch_bowtie2_index + ch_hisat2_index main: @@ -57,9 +66,15 @@ workflow NASCENT { if (!params.skip_alignment) { prepareToolIndices << params.aligner } PREPARE_GENOME ( prepareToolIndices, - params.fasta, - params.gtf, - params.gff, + ch_fasta, + ch_gtf, + ch_gff, + ch_gene_bed, + ch_bwa_index, + ch_bwamem2_index, + ch_dragmap, + ch_bowtie2_index, + ch_hisat2_index, ) ch_versions = ch_versions.mix(PREPARE_GENOME.out.versions.first()) ch_fasta = PREPARE_GENOME.out.fasta.map{ fasta -> [ [ id:fasta.baseName ], fasta ] } From f13ff2fab5546338510283bd2bc4ab1cfcf7de6b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 18 Feb 2024 11:00:14 -0600 Subject: [PATCH 008/255] build: nf-core subworkflows install fastq_align_hisat2 --- modules.json | 12 +- modules/nf-core/hisat2/align/environment.yml | 8 + modules/nf-core/hisat2/align/main.nf | 93 ++++++++ modules/nf-core/hisat2/align/meta.yml | 67 ++++++ .../nf-core/hisat2/align/tests/main.nf.test | 218 ++++++++++++++++++ .../hisat2/align/tests/main.nf.test.snap | 122 ++++++++++ modules/nf-core/hisat2/align/tests/tags.yml | 4 + .../nf-core/fastq_align_hisat2/main.nf | 44 ++++ .../nf-core/fastq_align_hisat2/meta.yml | 91 ++++++++ 9 files changed, 658 insertions(+), 1 deletion(-) create mode 100644 modules/nf-core/hisat2/align/environment.yml create mode 100644 modules/nf-core/hisat2/align/main.nf create mode 100644 modules/nf-core/hisat2/align/meta.yml create mode 100644 modules/nf-core/hisat2/align/tests/main.nf.test create mode 100644 modules/nf-core/hisat2/align/tests/main.nf.test.snap create mode 100644 modules/nf-core/hisat2/align/tests/tags.yml create mode 100644 subworkflows/nf-core/fastq_align_hisat2/main.nf create mode 100644 subworkflows/nf-core/fastq_align_hisat2/meta.yml diff --git a/modules.json b/modules.json index c6b73b82..1969b586 100644 --- a/modules.json +++ b/modules.json @@ -116,6 +116,11 @@ "git_sha": "3a5fef109d113b4997c9822198664ca5f2716208", "installed_by": ["modules"] }, + "hisat2/align": { + "branch": "master", + "git_sha": "400037f54de4b0c42712ec5a499d9fd9e66250d1", + "installed_by": ["fastq_align_hisat2", "modules"] + }, "homer/findpeaks": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", @@ -224,7 +229,7 @@ "bam_sort_stats_samtools": { "branch": "master", "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", - "installed_by": ["fastq_align_bowtie2", "fastq_align_bwa", "subworkflows"] + "installed_by": ["fastq_align_bowtie2", "fastq_align_bwa", "fastq_align_hisat2", "subworkflows"] }, "bam_stats_samtools": { "branch": "master", @@ -241,6 +246,11 @@ "git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f", "installed_by": ["subworkflows"] }, + "fastq_align_hisat2": { + "branch": "master", + "git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f", + "installed_by": ["subworkflows"] + }, "homer/groseq": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", diff --git a/modules/nf-core/hisat2/align/environment.yml b/modules/nf-core/hisat2/align/environment.yml new file mode 100644 index 00000000..0c1415f9 --- /dev/null +++ b/modules/nf-core/hisat2/align/environment.yml @@ -0,0 +1,8 @@ +name: hisat2_align +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::hisat2=2.2.1 + - bioconda::samtools=1.16.1 diff --git a/modules/nf-core/hisat2/align/main.nf b/modules/nf-core/hisat2/align/main.nf new file mode 100644 index 00000000..2289a9fc --- /dev/null +++ b/modules/nf-core/hisat2/align/main.nf @@ -0,0 +1,93 @@ +process HISAT2_ALIGN { + tag "$meta.id" + label 'process_high' + + // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions. + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/mulled-v2-a97e90b3b802d1da3d6958e0867610c718cb5eb1:2cdf6bf1e92acbeb9b2834b1c58754167173a410-0' : + 'biocontainers/mulled-v2-a97e90b3b802d1da3d6958e0867610c718cb5eb1:2cdf6bf1e92acbeb9b2834b1c58754167173a410-0' }" + + input: + tuple val(meta), path(reads) + tuple val(meta2), path(index) + tuple val(meta3), path(splicesites) + + output: + tuple val(meta), path("*.bam") , emit: bam + tuple val(meta), path("*.log") , emit: summary + tuple val(meta), path("*fastq.gz"), optional:true, emit: fastq + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '2.2.1' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + + def strandedness = '' + if (meta.strandedness == 'forward') { + strandedness = meta.single_end ? '--rna-strandness F' : '--rna-strandness FR' + } else if (meta.strandedness == 'reverse') { + strandedness = meta.single_end ? '--rna-strandness R' : '--rna-strandness RF' + } + ss = "$splicesites" ? "--known-splicesite-infile $splicesites" : '' + def seq_center = params.seq_center ? "--rg-id ${prefix} --rg SM:$prefix --rg CN:${params.seq_center.replaceAll('\\s','_')}" : "--rg-id ${prefix} --rg SM:$prefix" + if (meta.single_end) { + def unaligned = params.save_unaligned ? "--un-gz ${prefix}.unmapped.fastq.gz" : '' + """ + INDEX=`find -L ./ -name "*.1.ht2" | sed 's/\\.1.ht2\$//'` + hisat2 \\ + -x \$INDEX \\ + -U $reads \\ + $strandedness \\ + $ss \\ + --summary-file ${prefix}.hisat2.summary.log \\ + --threads $task.cpus \\ + $seq_center \\ + $unaligned \\ + $args \\ + | samtools view -bS -F 4 -F 256 - > ${prefix}.bam + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + hisat2: $VERSION + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + END_VERSIONS + """ + } else { + def unaligned = params.save_unaligned ? "--un-conc-gz ${prefix}.unmapped.fastq.gz" : '' + """ + INDEX=`find -L ./ -name "*.1.ht2" | sed 's/\\.1.ht2\$//'` + hisat2 \\ + -x \$INDEX \\ + -1 ${reads[0]} \\ + -2 ${reads[1]} \\ + $strandedness \\ + $ss \\ + --summary-file ${prefix}.hisat2.summary.log \\ + --threads $task.cpus \\ + $seq_center \\ + $unaligned \\ + --no-mixed \\ + --no-discordant \\ + $args \\ + | samtools view -bS -F 4 -F 8 -F 256 - > ${prefix}.bam + + if [ -f ${prefix}.unmapped.fastq.1.gz ]; then + mv ${prefix}.unmapped.fastq.1.gz ${prefix}.unmapped_1.fastq.gz + fi + if [ -f ${prefix}.unmapped.fastq.2.gz ]; then + mv ${prefix}.unmapped.fastq.2.gz ${prefix}.unmapped_2.fastq.gz + fi + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + hisat2: $VERSION + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + END_VERSIONS + """ + } +} diff --git a/modules/nf-core/hisat2/align/meta.yml b/modules/nf-core/hisat2/align/meta.yml new file mode 100644 index 00000000..b23eab75 --- /dev/null +++ b/modules/nf-core/hisat2/align/meta.yml @@ -0,0 +1,67 @@ +name: hisat2_align +description: Align RNA-Seq reads to a reference with HISAT2 +keywords: + - align + - fasta + - genome + - reference +tools: + - hisat2: + description: HISAT2 is a fast and sensitive alignment program for mapping next-generation sequencing reads (both DNA and RNA) to a population of human genomes as well as to a single reference genome. + homepage: https://daehwankimlab.github.io/hisat2/ + documentation: https://daehwankimlab.github.io/hisat2/manual/ + doi: "10.1038/s41587-019-0201-4" + licence: ["MIT"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - reads: + type: file + description: | + List of input FastQ files of size 1 and 2 for single-end and paired-end data, + respectively. + - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - index: + type: file + description: HISAT2 genome index file + pattern: "*.ht2" + - meta3: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - splicesites: + type: file + description: Splices sites in gtf file + pattern: "*.{txt}" +output: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: Output BAM file containing read alignments + pattern: "*.{bam}" + - summary: + type: file + description: Aligment log + pattern: "*.log" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@ntoda03" + - "@ramprasadn" +maintainers: + - "@ntoda03" + - "@ramprasadn" diff --git a/modules/nf-core/hisat2/align/tests/main.nf.test b/modules/nf-core/hisat2/align/tests/main.nf.test new file mode 100644 index 00000000..3a520e9a --- /dev/null +++ b/modules/nf-core/hisat2/align/tests/main.nf.test @@ -0,0 +1,218 @@ +nextflow_process { + + name "Test Process HISAT2_ALIGN" + script "../main.nf" + process "HISAT2_ALIGN" + tag "modules" + tag "modules_nfcore" + tag "hisat2" + tag "hisat2/align" + tag "hisat2/build" + tag "hisat2/extractsplicesites" + + test("Single-End") { + + setup { + run("HISAT2_EXTRACTSPLICESITES") { + script "../../extractsplicesites/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + """ + } + } + + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = Channel.of([ [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true)] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.summary).match("se_summary") }, + { assert snapshot(process.out.fastq).match("se_fastq") }, + { assert snapshot(process.out.versions).match("se_versions") } + ) + } + } + + test("Paired-End") { + + setup { + run("HISAT2_EXTRACTSPLICESITES") { + script "../../extractsplicesites/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + """ + } + } + + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = Channel.of([ [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.summary).match("pe_summary") }, + { assert snapshot(process.out.fastq).match("pe_fastq") }, + { assert snapshot(process.out.versions).match("pe_versions") } + ) + } + } + + test("Single-End No Splice Sites") { + + setup { + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = [[:],[]] + input[2] = [[:],[]] + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = [[:],[]] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.summary).match("se_no_ss_summary") }, + { assert snapshot(process.out.fastq).match("se_no_ss_fastq") }, + { assert snapshot(process.out.versions).match("se_no_ss_versions") } + ) + } + } + + test("Paired-End No Splice Sites") { + + setup { + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = [[:],[]] + input[2] = [[:],[]] + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = [[:],[]] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.summary).match("pe_no_ss_summary") }, + { assert snapshot(process.out.fastq).match("pe_no_ss_fastq") }, + { assert snapshot(process.out.versions).match("pe_no_ss_versions") } + ) + } + } +} diff --git a/modules/nf-core/hisat2/align/tests/main.nf.test.snap b/modules/nf-core/hisat2/align/tests/main.nf.test.snap new file mode 100644 index 00000000..a80fa3c5 --- /dev/null +++ b/modules/nf-core/hisat2/align/tests/main.nf.test.snap @@ -0,0 +1,122 @@ +{ + "se_versions": { + "content": [ + [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + ], + "timestamp": "2023-10-16T15:14:50.269895296" + }, + "se_no_ss_summary": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,7b8a9e61b7646da1089b041333c41a87" + ] + ] + ], + "timestamp": "2023-10-16T15:15:22.897386626" + }, + "pe_no_ss_versions": { + "content": [ + [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + ], + "timestamp": "2023-10-16T15:15:42.583699978" + }, + "se_no_ss_versions": { + "content": [ + [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + ], + "timestamp": "2023-10-16T15:15:22.909407356" + }, + "pe_no_ss_summary": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,9839b31db795958cc4b70711a3414e9c" + ] + ] + ], + "timestamp": "2023-10-16T15:15:42.569775538" + }, + "pe_no_ss_fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-10-16T15:15:42.576881608" + }, + "se_summary": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,7b8a9e61b7646da1089b041333c41a87" + ] + ] + ], + "timestamp": "2023-10-16T15:14:50.252466896" + }, + "pe_summary": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,9839b31db795958cc4b70711a3414e9c" + ] + ] + ], + "timestamp": "2023-10-16T15:15:09.881690889" + }, + "pe_fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-10-16T15:15:09.888696129" + }, + "se_no_ss_fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-10-16T15:15:22.904010016" + }, + "se_fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-10-16T15:14:50.264366105" + }, + "pe_versions": { + "content": [ + [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + ], + "timestamp": "2023-10-16T15:15:09.894683308" + } +} \ No newline at end of file diff --git a/modules/nf-core/hisat2/align/tests/tags.yml b/modules/nf-core/hisat2/align/tests/tags.yml new file mode 100644 index 00000000..3a46cc89 --- /dev/null +++ b/modules/nf-core/hisat2/align/tests/tags.yml @@ -0,0 +1,4 @@ +hisat2/align: + - modules/nf-core/hisat2/align/** + - modules/nf-core/hisat2/build/** + - modules/nf-core/hisat2/extractsplicesites/** diff --git a/subworkflows/nf-core/fastq_align_hisat2/main.nf b/subworkflows/nf-core/fastq_align_hisat2/main.nf new file mode 100644 index 00000000..a2ec1cf5 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_hisat2/main.nf @@ -0,0 +1,44 @@ +include { HISAT2_ALIGN } from '../../../modules/nf-core/hisat2/align/main' +include { BAM_SORT_STATS_SAMTOOLS } from '../bam_sort_stats_samtools/main' + +workflow FASTQ_ALIGN_HISAT2 { + + take: + reads // channel: [ val(meta), [ reads ] ] + index // channel: /path/to/hisat2/index + splicesites // channel: /path/to/genome.splicesites.txt + ch_fasta // channel: [ fasta ] + + main: + + ch_versions = Channel.empty() + + + // + // Map reads with HISAT2 + // + HISAT2_ALIGN ( reads, index, splicesites ) + ch_versions = ch_versions.mix(HISAT2_ALIGN.out.versions.first()) + + // + // Sort, index BAM file and run samtools stats, flagstat and idxstats + // + BAM_SORT_STATS_SAMTOOLS ( HISAT2_ALIGN.out.bam, ch_fasta ) + ch_versions = ch_versions.mix(BAM_SORT_STATS_SAMTOOLS.out.versions) + + + emit: + orig_bam = HISAT2_ALIGN.out.bam // channel: [ val(meta), bam ] + summary = HISAT2_ALIGN.out.summary // channel: [ val(meta), log ] + fastq = HISAT2_ALIGN.out.fastq // channel: [ val(meta), fastq ] + + bam = BAM_SORT_STATS_SAMTOOLS.out.bam // channel: [ val(meta), [ bam ] ] + bai = BAM_SORT_STATS_SAMTOOLS.out.bai // channel: [ val(meta), [ bai ] ] + csi = BAM_SORT_STATS_SAMTOOLS.out.csi // channel: [ val(meta), [ csi ] ] + stats = BAM_SORT_STATS_SAMTOOLS.out.stats // channel: [ val(meta), [ stats ] ] + flagstat = BAM_SORT_STATS_SAMTOOLS.out.flagstat // channel: [ val(meta), [ flagstat ] ] + idxstats = BAM_SORT_STATS_SAMTOOLS.out.idxstats // channel: [ val(meta), [ idxstats ] ] + + versions = ch_versions // channel: [ versions.yml ] +} + diff --git a/subworkflows/nf-core/fastq_align_hisat2/meta.yml b/subworkflows/nf-core/fastq_align_hisat2/meta.yml new file mode 100644 index 00000000..6f00d4da --- /dev/null +++ b/subworkflows/nf-core/fastq_align_hisat2/meta.yml @@ -0,0 +1,91 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: "fastq_align_hisat2" +description: Align reads to a reference genome using hisat2 then sort with samtools +keywords: + - align + - sort + - rnaseq + - genome + - fastq + - bam + - sam + - cram +components: + - hisat2/align + - samtools/stats + - samtools/idxstats + - samtools/flagstat + - bam_sort_stats_samtools +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test' ] + - reads: + type: file + description: | + List of input FastQ files of size 1 and 2 for single-end and paired-end data, + respectively. + - index: + type: file + description: HISAT2 genome index file + pattern: "*.ht2" + - splicesites: + type: file + description: Splices sites in gtf file + pattern: "*.{txt}" + - fasta: + type: file + description: Reference genome fasta file + pattern: "*.{fasta,fa}" +output: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test' ] + - bam: + type: file + description: Output BAM file containing read alignments + pattern: "*.{bam}" + - summary: + type: file + description: Aligment log + pattern: "*.log" + - fastq: + type: file + description: Optional output FASTQ file containing unaligned reads + pattern: ".fastq.gz" + - 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: + - "@priyanka-surana" +maintainers: + - "@priyanka-surana" From cbf6bce8bab7ff1f35951b860381830b8822f041 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 18 Feb 2024 14:54:03 -0600 Subject: [PATCH 009/255] feat(hisat2): Add hisat2 aligner --- CHANGELOG.md | 1 + CITATIONS.md | 4 +++ conf/igenomes.config | 1 + conf/modules.config | 11 ++++++++ conf/test.config | 1 + docs/output.md | 19 +++++++++++++ main.nf | 1 + nextflow_schema.json | 8 +++++- workflows/nascent.nf | 25 +++++++++++++++++ workflows/tests/main.nf.test | 37 ++++++++++++++++++++++++- workflows/tests/main.nf.test.snap | 46 +++++++++++++++++++++++++++++++ 11 files changed, 152 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65ed4092..4f3649c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [5bcfe4f](https://github.com/nf-core/nascent/commit/5bcfe4ff1729b89e9e5741c473d32168b836a57f) - Update pipeline template to [nf-core/tools 2.13](https://github.com/nf-core/tools/releases/tag/2.13) - [a3bc907](https://github.com/nf-core/nascent/commit/a3bc907e9afd9dd2a9572798fa16fbc781c3dcb0) - Update pipeline template to [nf-core/tools 2.13.1](https://github.com/nf-core/tools/releases/tag/2.13.1) +- [#140](https://github.com/nf-core/nascent/pull/140) - Add HISAT2 ### Changed diff --git a/CITATIONS.md b/CITATIONS.md index 1f9ec210..d6f930af 100644 --- a/CITATIONS.md +++ b/CITATIONS.md @@ -50,6 +50,10 @@ > Pertea G, Pertea M. GFF Utilities: GffRead and GffCompare. F1000Res. 2020 Apr 28;9:ISCB Comm J-304. doi: 10.12688/f1000research.23297.2. eCollection 2020. PubMed PMID: 32489650; PubMed Central PMCID: PMC7222033. +- [HISAT2](https://pubmed.ncbi.nlm.nih.gov/31375807/) + + > Kim D, Paggi JM, Park C, Bennett C, Salzberg SL. Graph-based genome alignment and genotyping with HISAT2 and HISAT-genotype Graph-based genome alignment and genotyping with HISAT2 and HISAT-genotype. Nat Biotechnol. 2019 Aug;37(8):907-915. doi: 10.1038/s41587-019-0201-4. Epub 2019 Aug 2. PubMed PMID: 31375807. + - [HOMER](http://homer.ucsd.edu/homer/index.html) > Heinz S, Benner C, Spann N, Bertolino E et al. Simple Combinations of Lineage-Determining Transcription Factors Prime cis-Regulatory Elements Required for Macrophage and B Cell Identities. Mol Cell 2010 May 28;38(4):576-589. PMID: 20513432 diff --git a/conf/igenomes.config b/conf/igenomes.config index 3f114377..4e8e502a 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -285,6 +285,7 @@ params { bowtie2 = "${params.igenomes_base}/Homo_sapiens/UCSC/hg38/Sequence/Bowtie2Index/" star = "${params.igenomes_base}/Homo_sapiens/UCSC/hg38/Sequence/STARIndex/" bismark = "${params.igenomes_base}/Homo_sapiens/UCSC/hg38/Sequence/BismarkIndex/" + hisat2 = "s3://genome-idx/hisat/hg38_genome.tar.gz" gtf = "${params.igenomes_base}/Homo_sapiens/UCSC/hg38/Annotation/Genes/genes.gtf" bed12 = "${params.igenomes_base}/Homo_sapiens/UCSC/hg38/Annotation/Genes/genes.bed" mito_name = "chrM" diff --git a/conf/modules.config b/conf/modules.config index 563ee7b8..091c1a8b 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -69,6 +69,17 @@ process { ext.args = { "--RGSM ${meta.read_group}" } } + withName: '.*:FASTQ_ALIGN_HISAT2:HISAT2_ALIGN' { + ext.args = '--met-stderr --new-summary --dta' + publishDir = [ + [ + path: { "${params.outdir}/${params.aligner}/log" }, + mode: params.publish_dir_mode, + pattern: '*.log' + ] + ] + } + if(params.with_umi) { withName: '.*:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:UMITOOLS_DEDUP' { ext.args = { [ diff --git a/conf/test.config b/conf/test.config index c5fc339d..f902fe46 100644 --- a/conf/test.config +++ b/conf/test.config @@ -25,6 +25,7 @@ params { // Genome references fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21.fa' gtf = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gtf' + hisat2_index = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21_hisat2.tar.gz' assay_type = "GROseq" skip_grohmm = true // FIXME Fails due to higher memory requirements diff --git a/docs/output.md b/docs/output.md index f6c1f784..915b5c83 100644 --- a/docs/output.md +++ b/docs/output.md @@ -18,6 +18,7 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d - [bwa-mem2](#bwa-mem2) - The next version of bwa-mem - [DRAGMAP](#dragmap) - Open-source software implementation of the DRAGEN mapper - [Bowtie 2](#bowtie-2) - A fast and sensitive gapped read aligner + - [HISAT2](#hisat2) - A fast and sensitive gapped read aligner - [Alignment post-processing](#alignment-post-processing) - [SAMtools](#samtools) - Sort and index alignments - [UMI-tools dedup](#umi-tools-dedup) - UMI-based deduplication @@ -134,6 +135,24 @@ The FastQC plots displayed in the MultiQC report shows _untrimmed_ reads. They m The aligned reads are then coordinate-sorted with [samtools](https://www.htslib.org/doc/samtools.html). +### HISAT2 + +
    +Output files + +- `hisat2/` + - `.bam`: The original BAM file containing read alignments to the reference genome. +- `hisat2/log/` + - `*.log`: HISAT2 alignment report containing the mapping results summary. +- `hisat2/unmapped/` + - `*.fastq.gz`: FastQ files containing unmapped reads will be placed in this directory. + +
    + +[HISAT2](http://daehwankimlab.github.io/hisat2/) is a fast and sensitive alignment program for mapping next-generation sequencing reads (both DNA and RNA) to a population of human genomes as well as to a single reference genome. It introduced a new indexing scheme called a Hierarchical Graph FM index (HGFM) which when combined with several alignment strategies, enable rapid and accurate alignment of sequencing reads. The HISAT2 route through the pipeline is a good option if you have memory limitations on your compute. However, quantification isn't performed if using `--aligner hisat2` due to the lack of an appropriate option to calculate accurate expression estimates from HISAT2 derived genomic alignments. However, you can use this route if you have a preference for the alignment, QC and other types of downstream analysis compatible with the output of HISAT2. + +You can choose to align your data with HISAT2 by providing the `--aligner hisat2` parameter. + ## Alignment post-processing ### SAMtools diff --git a/main.nf b/main.nf index c39577e4..056f217b 100644 --- a/main.nf +++ b/main.nf @@ -37,6 +37,7 @@ params.bwa_index = getGenomeAttribute('bwa') params.bwamem2_index = getGenomeAttribute('bwamem2') params.dragmap = getGenomeAttribute('dragmap') params.bowtie2_index = getGenomeAttribute('bowtie2') +params.hisat2_index = getGenomeAttribute('hisat2') /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/nextflow_schema.json b/nextflow_schema.json index 6e4c7e4b..717c42d0 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -53,7 +53,7 @@ "type": "string", "default": "bwa", "fa_icon": "fas fa-puzzle-piece", - "enum": ["bwa", "bwamem2", "dragmap", "bowtie2"], + "enum": ["bwa", "bwamem2", "dragmap", "bowtie2", "hisat2"], "description": "Specify aligner to be used to map reads to reference genome." }, "skip_alignment": { @@ -230,6 +230,12 @@ "help_text": "If you use AWS iGenomes, this has already been set for you appropriately.\n\nIf you wish to recompute indices available on igenomes, set `--dragmap false`.\n\n> **NB** If none provided, will be generated automatically from the FASTA reference, if `--aligner bowtie2` is specified. Combine with `--save_reference` to save for future runs.", "hidden": true }, + "hisat2_index": { + "type": "string", + "description": "Path to HISAT2 indices.", + "fa_icon": "fas fa-copy", + "help_text": "> **NB** If none provided, index will **NOT** be generated automatically from the FASTA reference. See nf-core/references if a custom index is needed." + }, "save_reference": { "type": "boolean", "description": "If generated by the pipeline save the BWA index in the results directory.", diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 25264fe0..a3261f26 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -14,6 +14,7 @@ include { COVERAGE_GRAPHS } from '../subworkflows/local/coverage_graphs.nf' include { TRANSCRIPT_INDENTIFICATION } from '../subworkflows/local/transcript_identification.nf' include { FASTP } from '../modules/nf-core/fastp/main' +include { UNTAR as UNTAR_HISAT2_INDEX } from '../modules/nf-core/untar/main' include { SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_GENE SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_PREDICTED } from '../modules/nf-core/subread/featurecounts/main' @@ -30,6 +31,7 @@ include { methodsDescriptionText } from '../subworkflows/local/utils_nfcore_nasc // include { FASTQ_ALIGN_BWA } from '../subworkflows/nf-core/fastq_align_bwa/main' include { FASTQ_ALIGN_BOWTIE2 } from '../subworkflows/nf-core/fastq_align_bowtie2/main' +include { FASTQ_ALIGN_HISAT2 } from '../subworkflows/nf-core/fastq_align_hisat2/main' include { BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS } from '../subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main' /* @@ -167,6 +169,29 @@ workflow NASCENT { ch_bowtie2_multiqc = FASTQ_ALIGN_BOWTIE2.out.log_out ch_versions = ch_versions.mix(FASTQ_ALIGN_BOWTIE2.out.versions) + } else if (!params.skip_alignment && params.aligner == 'hisat2') { + if (params.hisat2_index.endsWith('.tar.gz')) { + ch_hisat2_index = UNTAR_HISAT2_INDEX ( [ [:], params.hisat2_index ] ).untar + ch_versions = ch_versions.mix(UNTAR_HISAT2_INDEX.out.versions) + } else { + // TODO Give the meta from basename or genome? + ch_hisat2_index = [ [meta: "Genome"], file(params.hisat2_index) ] + } + + FASTQ_ALIGN_HISAT2 ( + ch_reads, + ch_hisat2_index, + [[:],[]], + ch_fasta, + ) + ch_genome_bam = FASTQ_ALIGN_HISAT2.out.bam + ch_genome_bai = FASTQ_ALIGN_HISAT2.out.bai + ch_samtools_stats = FASTQ_ALIGN_HISAT2.out.stats + ch_samtools_flagstat = FASTQ_ALIGN_HISAT2.out.flagstat + ch_samtools_idxstats = FASTQ_ALIGN_HISAT2.out.idxstats + + ch_HISAT2_multiqc = FASTQ_ALIGN_HISAT2.out.summary + ch_versions = ch_versions.mix(FASTQ_ALIGN_HISAT2.out.versions) } if(params.with_umi) { diff --git a/workflows/tests/main.nf.test b/workflows/tests/main.nf.test index 5d881502..a452555a 100644 --- a/workflows/tests/main.nf.test +++ b/workflows/tests/main.nf.test @@ -103,7 +103,42 @@ nextflow_pipeline { // path("$outputDir/samtools").list(), ).match() } - } + test("Should run with HISAT2") { + + tag "HISAT2" + + when { + params { + outdir = "$outputDir" + aligner = "hisat2" + hisat2_index = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21_hisat2.tar.gz' + } + } + + then { + assert workflow.success + assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + // FIXME Not deterministic + // path("$outputDir/samtools").list(), + ).match() + } + } } diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index 62e06bdd..b38fa6ae 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -200,5 +200,51 @@ "nextflow": "23.10.1" }, "timestamp": "2024-03-05T15:58:59.071139821" + }, + "Should run with HISAT2": { + "content": [ + 128, + [ + "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", + "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", + "cd4_REP2.coverage.hist.txt:md5,ca9e862c16d556b3f1baa230d565e0a7", + "cd4_REP2.coverage.stats.txt:md5,14d8e9d53e129de3caf98fe6c8f52ace", + "cd4_REP3.coverage.hist.txt:md5,411058935790bff32f9e6d9b7d136597", + "cd4_REP3.coverage.stats.txt:md5,46bcbba43196873e663d3fa8ca381917", + "cd4_REP4.coverage.hist.txt:md5,5888d0a421c07cd417e18b09b25b68ab", + "cd4_REP4.coverage.stats.txt:md5,611d637d4bbdd0d96071cd1e291be5dd", + "jurkat_REP1.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", + "jurkat_REP1.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4", + "jurkat_REP2.coverage.hist.txt:md5,aba00d7a48866322ce46c9427023fd36", + "jurkat_REP2.coverage.stats.txt:md5,4a5f9c89f04b4792669ca4d23bcfb66e" + ], + "cd4.bed:md5,74d4739278c1d8af17a5f9d3296325da", + "jurkat.bed:md5,6d3edfc671c1bed970ca5934edc60756", + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_REP1.lc_extrap.txt:md5,81f27f75f082bca4eeeaed416a484429", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_REP2.lc_extrap.txt:md5,7c95f712b396568825145383cea0c525", + "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP3.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_REP3.lc_extrap.txt:md5,e83ef4e546a1d66ec5cc5e84a9766c33", + "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP4.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_REP4.lc_extrap.txt:md5,728975500782651e233de6705a044e8b", + "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_REP1.lc_extrap.txt:md5,04931737e170ed1764125f940684983e", + "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_REP2.lc_extrap.txt:md5,157f7f7532f865226da4fb460c2ff7da" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-18T19:39:47.797490045" } } \ No newline at end of file From 6f11e07c89376529d7b3b38a023b8b880b85f485 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 19 Mar 2024 15:35:27 -0500 Subject: [PATCH 010/255] build: Fix modules.json and bump subworkflows --- modules.json | 45 ++- modules/nf-core/bowtie2/align/main.nf | 26 +- .../bowtie2/align/tests/cram_crai.config | 5 + .../nf-core/bowtie2/align/tests/main.nf.test | 162 +++++++--- .../bowtie2/align/tests/main.nf.test.snap | 216 ++++++++----- modules/nf-core/bwa/mem/environment.yml | 4 +- modules/nf-core/bwa/mem/main.nf | 35 ++- modules/nf-core/bwa/mem/meta.yml | 18 ++ modules/nf-core/bwa/mem/tests/main.nf.test | 161 +++++++++- .../nf-core/bwa/mem/tests/main.nf.test.snap | 209 +++++++++++-- modules/nf-core/samtools/sort/main.nf | 28 +- modules/nf-core/samtools/sort/meta.yml | 32 +- .../nf-core/samtools/sort/tests/main.nf.test | 38 ++- .../samtools/sort/tests/main.nf.test.snap | 99 +++++- .../samtools/sort/tests/nextflow.config | 3 +- .../nf-core/umitools/dedup/tests/main.nf.test | 98 ++++++ .../umitools/dedup/tests/main.nf.test.snap | 146 +++++++++ .../umitools/dedup/tests/nextflow.config | 5 + modules/nf-core/umitools/dedup/tests/tags.yml | 2 + .../nf-core/bam_sort_stats_samtools/main.nf | 2 +- .../nf-core/fastq_align_bowtie2/main.nf | 6 +- .../fastq_align_bowtie2/tests/main.nf.test | 99 ++++++ .../tests/main.nf.test.snap | 126 ++++++++ .../fastq_align_bowtie2/tests/nextflow.config | 8 + .../fastq_align_bowtie2/tests/tags.yml | 2 + subworkflows/nf-core/fastq_align_bwa/main.nf | 2 +- .../fastq_align_bwa/tests/main.nf.test | 77 +++++ .../fastq_align_bwa/tests/main.nf.test.snap | 284 +++++++++++++++++ .../fastq_align_bwa/tests/nextflow.config | 8 + .../nf-core/fastq_align_bwa/tests/tags.yml | 2 + .../fastq_align_hisat2/tests/main.nf.test | 128 ++++++++ .../tests/main.nf.test.snap | 288 ++++++++++++++++++ .../fastq_align_hisat2/tests/nextflow.config | 5 + .../nf-core/fastq_align_hisat2/tests/tags.yml | 2 + workflows/tests/main.nf.test.snap | 52 ++-- 35 files changed, 2162 insertions(+), 261 deletions(-) create mode 100644 modules/nf-core/bowtie2/align/tests/cram_crai.config create mode 100644 modules/nf-core/umitools/dedup/tests/main.nf.test create mode 100644 modules/nf-core/umitools/dedup/tests/main.nf.test.snap create mode 100644 modules/nf-core/umitools/dedup/tests/nextflow.config create mode 100644 modules/nf-core/umitools/dedup/tests/tags.yml create mode 100644 subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test create mode 100644 subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap create mode 100644 subworkflows/nf-core/fastq_align_bowtie2/tests/nextflow.config create mode 100644 subworkflows/nf-core/fastq_align_bowtie2/tests/tags.yml create mode 100644 subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test create mode 100644 subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap create mode 100644 subworkflows/nf-core/fastq_align_bwa/tests/nextflow.config create mode 100644 subworkflows/nf-core/fastq_align_bwa/tests/tags.yml create mode 100644 subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test create mode 100644 subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap create mode 100644 subworkflows/nf-core/fastq_align_hisat2/tests/nextflow.config create mode 100644 subworkflows/nf-core/fastq_align_hisat2/tests/tags.yml diff --git a/modules.json b/modules.json index 1969b586..152c2ba2 100644 --- a/modules.json +++ b/modules.json @@ -32,8 +32,8 @@ }, "bowtie2/align": { "branch": "master", - "git_sha": "3c77ca9aac783e76c3614a06db3bfe4fef619bde", - "installed_by": ["fastq_align_bowtie2", "modules"] + "git_sha": "0fe30831abbc2ed115e46e92330edf38f56edc3d", + "installed_by": ["fastq_align_bowtie2"] }, "bowtie2/build": { "branch": "master", @@ -47,8 +47,8 @@ }, "bwa/mem": { "branch": "master", - "git_sha": "1e2b7fb7106852388610c0360d234b0829eb980e", - "installed_by": ["fastq_align_bwa", "modules"] + "git_sha": "b97197968ac12dde2463fa54541f6350c46f2035", + "installed_by": ["fastq_align_bwa"] }, "bwamem2/index": { "branch": "master", @@ -70,11 +70,6 @@ "git_sha": "02fd5bd7275abad27aad32d5c852e0a9b1b98882", "installed_by": ["modules"] }, - "custom/dumpsoftwareversions": { - "branch": "master", - "git_sha": "de45447d060b8c8b98575bc637a4a575fd0638e1", - "installed_by": ["modules"] - }, "custom/getchromsizes": { "branch": "master", "git_sha": "1b0ffa4e5aed5b7e3cd4311af31bd3b2c8345051", @@ -119,27 +114,27 @@ "hisat2/align": { "branch": "master", "git_sha": "400037f54de4b0c42712ec5a499d9fd9e66250d1", - "installed_by": ["fastq_align_hisat2", "modules"] + "installed_by": ["fastq_align_hisat2"] }, "homer/findpeaks": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["homer/groseq"] + "installed_by": ["groseq", "homer/groseq"] }, "homer/maketagdirectory": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["homer/groseq"] + "installed_by": ["groseq", "homer/groseq"] }, "homer/makeucscfile": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["homer/groseq"] + "installed_by": ["groseq", "homer/groseq"] }, "homer/pos2bed": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["homer/groseq"] + "installed_by": ["groseq", "homer/groseq"] }, "multiqc": { "branch": "master", @@ -194,7 +189,7 @@ }, "samtools/sort": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", + "git_sha": "4352dbdb09ec40db71e9b172b97a01dcf5622c26", "installed_by": ["bam_sort_stats_samtools"] }, "samtools/stats": { @@ -209,7 +204,7 @@ }, "umitools/dedup": { "branch": "master", - "git_sha": "ff7e93715a2acecf3f143ec78c9858deba2984d0", + "git_sha": "3bd4f34e3093c2a16e6a8eefc22242b9b94641db", "installed_by": ["bam_dedup_stats_samtools_umitools"] }, "untar": { @@ -228,38 +223,34 @@ }, "bam_sort_stats_samtools": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", - "installed_by": ["fastq_align_bowtie2", "fastq_align_bwa", "fastq_align_hisat2", "subworkflows"] + "git_sha": "4352dbdb09ec40db71e9b172b97a01dcf5622c26", + "installed_by": ["fastq_align_bowtie2", "fastq_align_bwa", "fastq_align_hisat2"] }, "bam_stats_samtools": { "branch": "master", "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", - "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools", "subworkflows"] + "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools"] }, "fastq_align_bowtie2": { "branch": "master", - "git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f", + "git_sha": "0fe30831abbc2ed115e46e92330edf38f56edc3d", "installed_by": ["subworkflows"] }, "fastq_align_bwa": { "branch": "master", - "git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f", + "git_sha": "b97197968ac12dde2463fa54541f6350c46f2035", "installed_by": ["subworkflows"] }, "fastq_align_hisat2": { "branch": "master", - "git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f", + "git_sha": "701ae347c4508fba1b7d65262596f278b6a11cb6", "installed_by": ["subworkflows"] }, "homer/groseq": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", "installed_by": ["subworkflows"] - } - } - }, - "subworkflows": { - "nf-core": { + }, "utils_nextflow_pipeline": { "branch": "master", "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa", diff --git a/modules/nf-core/bowtie2/align/main.nf b/modules/nf-core/bowtie2/align/main.nf index 8c405ee3..96a7027d 100644 --- a/modules/nf-core/bowtie2/align/main.nf +++ b/modules/nf-core/bowtie2/align/main.nf @@ -10,13 +10,18 @@ process BOWTIE2_ALIGN { input: tuple val(meta) , path(reads) tuple val(meta2), path(index) + tuple val(meta3), path(fasta) val save_unaligned val sort_bam output: - tuple val(meta), path("*.{bam,sam}"), emit: aligned + tuple val(meta), path("*.sam") , emit: sam , optional:true + tuple val(meta), path("*.bam") , emit: bam , optional:true + tuple val(meta), path("*.cram") , emit: cram , optional:true + tuple val(meta), path("*.csi") , emit: csi , optional:true + tuple val(meta), path("*.crai") , emit: crai , optional:true tuple val(meta), path("*.log") , emit: log - tuple val(meta), path("*fastq.gz") , emit: fastq, optional:true + tuple val(meta), path("*fastq.gz") , emit: fastq , optional:true path "versions.yml" , emit: versions when: @@ -39,7 +44,10 @@ process BOWTIE2_ALIGN { def samtools_command = sort_bam ? 'sort' : 'view' def extension_pattern = /(--output-fmt|-O)+\s+(\S+)/ - def extension = (args2 ==~ extension_pattern) ? (args2 =~ extension_pattern)[0][2].toLowerCase() : "bam" + def extension_matcher = (args2 =~ extension_pattern) + def extension = extension_matcher.getCount() > 0 ? extension_matcher[0][2].toLowerCase() : "bam" + def reference = fasta && extension=="cram" ? "--reference ${fasta}" : "" + if (!fasta && extension=="cram") error "Fasta reference is required for CRAM output" """ INDEX=`find -L ./ -name "*.rev.1.bt2" | sed "s/\\.rev.1.bt2\$//"` @@ -53,7 +61,7 @@ process BOWTIE2_ALIGN { $unaligned \\ $args \\ 2> >(tee ${prefix}.bowtie2.log >&2) \\ - | samtools $samtools_command $args2 --threads $task.cpus -o ${prefix}.${extension} - + | samtools $samtools_command $args2 --threads $task.cpus ${reference} -o ${prefix}.${extension} - if [ -f ${prefix}.unmapped.fastq.1.gz ]; then mv ${prefix}.unmapped.fastq.1.gz ${prefix}.unmapped_1.fastq.gz @@ -82,9 +90,19 @@ process BOWTIE2_ALIGN { } else { create_unmapped = save_unaligned ? "touch ${prefix}.unmapped_1.fastq.gz && touch ${prefix}.unmapped_2.fastq.gz" : "" } + def reference = fasta && extension=="cram" ? "--reference ${fasta}" : "" + if (!fasta && extension=="cram") error "Fasta reference is required for CRAM output" + + def create_index = "" + if (extension == "cram") { + create_index = "touch ${prefix}.crai" + } else if (extension == "bam") { + create_index = "touch ${prefix}.csi" + } """ touch ${prefix}.${extension} + ${create_index} touch ${prefix}.bowtie2.log ${create_unmapped} diff --git a/modules/nf-core/bowtie2/align/tests/cram_crai.config b/modules/nf-core/bowtie2/align/tests/cram_crai.config new file mode 100644 index 00000000..03f1d5e5 --- /dev/null +++ b/modules/nf-core/bowtie2/align/tests/cram_crai.config @@ -0,0 +1,5 @@ +process { + withName: BOWTIE2_ALIGN { + ext.args2 = '--output-fmt cram --write-index' + } +} diff --git a/modules/nf-core/bowtie2/align/tests/main.nf.test b/modules/nf-core/bowtie2/align/tests/main.nf.test index a478d17b..03aeaf9e 100644 --- a/modules/nf-core/bowtie2/align/tests/main.nf.test +++ b/modules/nf-core/bowtie2/align/tests/main.nf.test @@ -6,9 +6,10 @@ nextflow_process { tag "modules" tag "modules_nfcore" tag "bowtie2" + tag "bowtie2/build" tag "bowtie2/align" - test("sarscov2 - fastq, index, false, false - bam") { + test("sarscov2 - fastq, index, fasta, false, false - bam") { setup { run("BOWTIE2_BUILD") { @@ -32,8 +33,9 @@ nextflow_process { file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -42,7 +44,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -52,7 +54,7 @@ nextflow_process { } - test("sarscov2 - fastq, index, false, false - sam") { + test("sarscov2 - fastq, index, fasta, false, false - sam") { config "./sam.config" setup { @@ -77,8 +79,9 @@ nextflow_process { file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -87,7 +90,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).readLines()[0..4], + file(process.out.sam[0][1]).readLines()[0..4], process.out.log, process.out.fastq, process.out.versions @@ -97,7 +100,7 @@ nextflow_process { } - test("sarscov2 - fastq, index, false, false - sam2") { + test("sarscov2 - fastq, index, fasta, false, false - sam2") { config "./sam2.config" setup { @@ -122,8 +125,9 @@ nextflow_process { file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -132,7 +136,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).readLines()[0..4], + file(process.out.sam[0][1]).readLines()[0..4], process.out.log, process.out.fastq, process.out.versions @@ -142,7 +146,7 @@ nextflow_process { } - test("sarscov2 - fastq, index, false, true - bam") { + test("sarscov2 - fastq, index, fasta, false, true - bam") { setup { run("BOWTIE2_BUILD") { @@ -166,8 +170,9 @@ nextflow_process { file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = true //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -176,7 +181,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -186,7 +191,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], index, false, false - bam") { + test("sarscov2 - [fastq1, fastq2], index, fasta, false, false - bam") { setup { run("BOWTIE2_BUILD") { @@ -213,8 +218,9 @@ nextflow_process { ] ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -223,7 +229,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -233,7 +239,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], index, false, true - bam") { + test("sarscov2 - [fastq1, fastq2], index, fasta, false, true - bam") { setup { run("BOWTIE2_BUILD") { @@ -260,8 +266,9 @@ nextflow_process { ] ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = true //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -270,7 +277,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -280,7 +287,7 @@ nextflow_process { } - test("sarscov2 - fastq, large_index, false, false - bam") { + test("sarscov2 - fastq, large_index, fasta, false, false - bam") { config "./large_index.config" setup { @@ -305,8 +312,9 @@ nextflow_process { file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -315,7 +323,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -325,7 +333,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], large_index, false, false - bam") { + test("sarscov2 - [fastq1, fastq2], large_index, fasta, false, false - bam") { config "./large_index.config" setup { @@ -353,8 +361,9 @@ nextflow_process { ] ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -363,7 +372,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -373,7 +382,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], index, true, false - bam") { + test("sarscov2 - [fastq1, fastq2], index, fasta, true, false - bam") { setup { run("BOWTIE2_BUILD") { @@ -400,8 +409,9 @@ nextflow_process { ] ] input[1] = BOWTIE2_BUILD.out.index - input[2] = true //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -410,7 +420,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -420,7 +430,7 @@ nextflow_process { } - test("sarscov2 - fastq, index, true, false - bam") { + test("sarscov2 - fastq, index, fasta, true, false - bam") { setup { run("BOWTIE2_BUILD") { @@ -444,8 +454,9 @@ nextflow_process { file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ] input[1] = BOWTIE2_BUILD.out.index - input[2] = true //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -454,7 +465,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, process.out.log, process.out.fastq, process.out.versions @@ -465,7 +476,54 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], index, false, false - stub") { + test("sarscov2 - [fastq1, fastq2], index, fasta, true, true - cram") { + + config "./cram_crai.config" + setup { + run("BOWTIE2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = [ + [ id:'test'], + file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + ] + """ + } + } + } + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + [ + file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), + file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + ] + ] + input[1] = BOWTIE2_BUILD.out.index + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = true //sort + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot( + file(process.out.cram[0][1]).name, + file(process.out.crai[0][1]).name + ).match() } + ) + } + + } + + test("sarscov2 - [fastq1, fastq2], index, fasta, false, false - stub") { options "-stub" setup { @@ -493,8 +551,9 @@ nextflow_process { ] ] input[1] = BOWTIE2_BUILD.out.index - input[2] = false //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -503,7 +562,8 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, + file(process.out.csi[0][1]).name, file(process.out.log[0][1]).name, process.out.fastq, process.out.versions @@ -513,7 +573,7 @@ nextflow_process { } - test("sarscov2 - fastq, index, true, false - stub") { + test("sarscov2 - fastq, index, fasta, true, false - stub") { options "-stub" setup { @@ -538,8 +598,9 @@ nextflow_process { file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ] input[1] = BOWTIE2_BUILD.out.index - input[2] = true //save_unaligned - input[3] = false //sort + input[2] = [[ id:'test'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)] + input[3] = false //save_unaligned + input[4] = false //sort """ } } @@ -548,14 +609,15 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.aligned[0][1]).name, + file(process.out.bam[0][1]).name, + file(process.out.csi[0][1]).name, file(process.out.log[0][1]).name, - file(process.out.fastq[0][1]).name, + process.out.fastq, process.out.versions ).match() } ) } } - + } diff --git a/modules/nf-core/bowtie2/align/tests/main.nf.test.snap b/modules/nf-core/bowtie2/align/tests/main.nf.test.snap index 883dc7ec..028e7da6 100644 --- a/modules/nf-core/bowtie2/align/tests/main.nf.test.snap +++ b/modules/nf-core/bowtie2/align/tests/main.nf.test.snap @@ -1,34 +1,38 @@ { - "sarscov2 - fastq, index, false, false - sam2": { + "sarscov2 - [fastq1, fastq2], large_index, fasta, false, false - bam": { "content": [ - [ - "ERR5069949.2151832\t16\tMT192765.1\t17453\t42\t150M\t*\t0\t0\tACGCACATTGCTAACTAAGGGCACACTAGAACCAGAATATTTCAATTCAGTGTGTAGACTTATGAAAACTATAGGTCCAGACATGTTCCTCGGAACTTGTCGGCGTTGTCCTGCTGAAATTGTTGACACTGTGAGTGCTTTGGTTTATGA\tAAAA versions.yml "${task.process}": @@ -42,9 +53,19 @@ process BWA_MEM { """ stub: + def args = task.ext.args ?: '' + def args2 = task.ext.args2 ?: '' def prefix = task.ext.prefix ?: "${meta.id}" + def samtools_command = sort_bam ? 'sort' : 'view' + def extension = args2.contains("--output-fmt sam") ? "sam" : + args2.contains("--output-fmt cram") ? "cram": + sort_bam && args2.contains("-O cram")? "cram": + !sort_bam && args2.contains("-C") ? "cram": + "bam" """ - touch ${prefix}.bam + touch ${prefix}.${extension} + touch ${prefix}.csi + touch ${prefix}.crai cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/bwa/mem/meta.yml b/modules/nf-core/bwa/mem/meta.yml index 440fb1f9..1532c261 100644 --- a/modules/nf-core/bwa/mem/meta.yml +++ b/modules/nf-core/bwa/mem/meta.yml @@ -37,6 +37,10 @@ input: type: file description: BWA genome index files pattern: "Directory containing BWA index *.{amb,ann,bwt,pac,sa}" + - fasta: + type: file + description: Reference genome in FASTA format + pattern: "*.{fasta,fa}" - sort_bam: type: boolean description: use samtools sort (true) or samtools view (false) @@ -46,6 +50,18 @@ output: type: file description: Output BAM file containing read alignments pattern: "*.{bam}" + - cram: + type: file + description: Output CRAM file containing read alignments + pattern: "*.{cram}" + - csi: + type: file + description: Optional index file for BAM file + pattern: "*.{csi}" + - crai: + type: file + description: Optional index file for CRAM file + pattern: "*.{crai}" - versions: type: file description: File containing software versions @@ -53,6 +69,8 @@ output: authors: - "@drpatelh" - "@jeremy1805" + - "@matthdsm" maintainers: - "@drpatelh" - "@jeremy1805" + - "@matthdsm" diff --git a/modules/nf-core/bwa/mem/tests/main.nf.test b/modules/nf-core/bwa/mem/tests/main.nf.test index cd6591ff..1fa9b56d 100644 --- a/modules/nf-core/bwa/mem/tests/main.nf.test +++ b/modules/nf-core/bwa/mem/tests/main.nf.test @@ -18,7 +18,7 @@ nextflow_process { """ input[0] = [ [id: 'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -31,11 +31,12 @@ nextflow_process { input[0] = [ [ id:'test', single_end:true ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] ] input[1] = BWA_INDEX.out.index - input[2] = false + input[2] = [[id: 'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = false """ } } @@ -58,7 +59,7 @@ nextflow_process { """ input[0] = [ [id: 'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -71,11 +72,12 @@ nextflow_process { input[0] = [ [ id:'test', single_end:true ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] ] input[1] = BWA_INDEX.out.index - input[2] = true + input[2] = [[id: 'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = true """ } } @@ -98,7 +100,7 @@ nextflow_process { """ input[0] = [ [id: 'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -111,12 +113,13 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ] input[1] = BWA_INDEX.out.index - input[2] = false + input[2] = [[id: 'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = false """ } } @@ -139,7 +142,7 @@ nextflow_process { """ input[0] = [ [id: 'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -152,12 +155,13 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ] input[1] = BWA_INDEX.out.index - input[2] = true + input[2] = [[id: 'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = true """ } } @@ -170,4 +174,133 @@ nextflow_process { } } + + test("Paired-End - no fasta") { + + setup { + run("BWA_INDEX") { + script "../../index/main.nf" + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ] + """ + } + } + } + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) + ] + ] + input[1] = BWA_INDEX.out.index + input[2] = [[:],[]] + input[3] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + + test("Single-end - stub") { + options "-stub" + setup { + run("BWA_INDEX") { + script "../../index/main.nf" + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ] + """ + } + } + } + when { + process { + """ + input[0] = [ + [ id:'test', single_end:true ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) + ] + ] + input[1] = BWA_INDEX.out.index + input[2] = [[id: 'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + file(process.out.bam[0][1]).name, + file(process.out.csi[0][1]).name, + process.out.versions + ).match() } + ) + } + } + + test("Paired-end - stub") { + options "-stub" + setup { + run("BWA_INDEX") { + script "../../index/main.nf" + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ] + """ + } + } + } + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) + ] + ] + input[1] = BWA_INDEX.out.index + input[2] = [[id: 'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + file(process.out.bam[0][1]).name, + file(process.out.csi[0][1]).name, + process.out.versions + ).match() } + ) + } + } } diff --git a/modules/nf-core/bwa/mem/tests/main.nf.test.snap b/modules/nf-core/bwa/mem/tests/main.nf.test.snap index bfb55fc7..0d1bdb41 100644 --- a/modules/nf-core/bwa/mem/tests/main.nf.test.snap +++ b/modules/nf-core/bwa/mem/tests/main.nf.test.snap @@ -8,11 +8,20 @@ "id": "test", "single_end": true }, - "test.bam:md5,df203d7c7e8fef351408a909570c7952" + "test.bam:md5,a74710a0345b4717bb4431bf9c257120" ] ], "1": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + + ], + "2": [ + + ], + "3": [ + + ], + "4": [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ], "bam": [ [ @@ -20,15 +29,28 @@ "id": "test", "single_end": true }, - "test.bam:md5,df203d7c7e8fef351408a909570c7952" + "test.bam:md5,a74710a0345b4717bb4431bf9c257120" ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + ], "versions": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ] } ], - "timestamp": "2023-12-04T11:01:22.483594641" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-14T14:14:56.820798254" }, "Single-End Sort": { "content": [ @@ -39,11 +61,20 @@ "id": "test", "single_end": true }, - "test.bam:md5,8a52bd78fdcecb994c1f63897d5b431c" + "test.bam:md5,cb1e038bc4d990683fa485d632550b54" ] ], "1": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + + ], + "2": [ + + ], + "3": [ + + ], + "4": [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ], "bam": [ [ @@ -51,15 +82,28 @@ "id": "test", "single_end": true }, - "test.bam:md5,8a52bd78fdcecb994c1f63897d5b431c" + "test.bam:md5,cb1e038bc4d990683fa485d632550b54" ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + ], "versions": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ] } ], - "timestamp": "2023-12-04T11:01:30.180783483" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-14T14:15:20.271428534" }, "Paired-End": { "content": [ @@ -70,11 +114,20 @@ "id": "test", "single_end": false }, - "test.bam:md5,9815aef9ec763a60c53c3879be2d73ae" + "test.bam:md5,aea123a3828a99da1906126355f15a12" ] ], "1": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + + ], + "2": [ + + ], + "3": [ + + ], + "4": [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ], "bam": [ [ @@ -82,15 +135,28 @@ "id": "test", "single_end": false }, - "test.bam:md5,9815aef9ec763a60c53c3879be2d73ae" + "test.bam:md5,aea123a3828a99da1906126355f15a12" ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + ], "versions": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ] } ], - "timestamp": "2023-12-04T11:01:38.761983007" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-14T14:15:38.264256823" }, "Paired-End Sort": { "content": [ @@ -101,11 +167,20 @@ "id": "test", "single_end": false }, - "test.bam:md5,0f0cda73704c4f7ba08af482edcbbe88" + "test.bam:md5,4682087bcdc3617384b375093fecd8dd" ] ], "1": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + + ], + "2": [ + + ], + "3": [ + + ], + "4": [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ], "bam": [ [ @@ -113,14 +188,108 @@ "id": "test", "single_end": false }, - "test.bam:md5,0f0cda73704c4f7ba08af482edcbbe88" + "test.bam:md5,4682087bcdc3617384b375093fecd8dd" ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + ], "versions": [ - "versions.yml:md5,a18ac8ef8cfcc7b2cc262c49d4c064f9" + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" ] } ], - "timestamp": "2023-12-04T11:01:46.284587802" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-14T14:16:00.528642686" + }, + "Single-end - stub": { + "content": [ + "test.bam", + "test.csi", + [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-15T09:50:33.238543011" + }, + "Paired-End - no fasta": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,aea123a3828a99da1906126355f15a12" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + + ], + "4": [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,aea123a3828a99da1906126355f15a12" + ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + + ], + "versions": [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-14T14:40:16.345342005" + }, + "Paired-end - stub": { + "content": [ + "test.bam", + "test.csi", + [ + "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-15T09:50:42.268673302" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/sort/main.nf b/modules/nf-core/samtools/sort/main.nf index cdd8305d..fc374f98 100644 --- a/modules/nf-core/samtools/sort/main.nf +++ b/modules/nf-core/samtools/sort/main.nf @@ -8,11 +8,14 @@ process SAMTOOLS_SORT { 'biocontainers/samtools:1.19.2--h50ea8bc_0' }" input: - tuple val(meta), path(bam) + tuple val(meta) , path(bam) + tuple val(meta2), path(fasta) output: - tuple val(meta), path("*.bam"), emit: bam - tuple val(meta), path("*.csi"), emit: csi, optional: true + tuple val(meta), path("*.bam"), emit: bam, optional: true + tuple val(meta), path("*.cram"), emit: cram, optional: true + tuple val(meta), path("*.crai"), emit: crai, optional: true + tuple val(meta), path("*.csi"), emit: csi, optional: true path "versions.yml" , emit: versions when: @@ -21,14 +24,24 @@ process SAMTOOLS_SORT { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" + def extension = args.contains("--output-fmt sam") ? "sam" : + args.contains("--output-fmt cram") ? "cram" : + "bam" + def reference = fasta ? "--reference ${fasta}" : "" if ("$bam" == "${prefix}.bam") error "Input and output names are the same, use \"task.ext.prefix\" to disambiguate!" + """ + samtools cat \\ + --threads $task.cpus \\ + ${bam} \\ + | \\ samtools sort \\ $args \\ - -@ $task.cpus \\ - -o ${prefix}.bam \\ - -T $prefix \\ - $bam + -T ${prefix} \\ + --threads $task.cpus \\ + ${reference} \\ + -o ${prefix}.${extension} \\ + - cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -40,6 +53,7 @@ process SAMTOOLS_SORT { def prefix = task.ext.prefix ?: "${meta.id}" """ touch ${prefix}.bam + touch ${prefix}.bam.csi cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/samtools/sort/meta.yml b/modules/nf-core/samtools/sort/meta.yml index 2200de72..341a7d0e 100644 --- a/modules/nf-core/samtools/sort/meta.yml +++ b/modules/nf-core/samtools/sort/meta.yml @@ -23,8 +23,18 @@ input: e.g. [ id:'test', single_end:false ] - bam: type: file - description: BAM/CRAM/SAM file + description: BAM/CRAM/SAM file(s) pattern: "*.{bam,cram,sam}" + - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - fasta: + type: file + description: Reference genome FASTA file + pattern: "*.{fa,fasta,fna}" + optional: true output: - meta: type: map @@ -33,19 +43,29 @@ output: e.g. [ id:'test', single_end:false ] - bam: type: file - description: Sorted BAM/CRAM/SAM file - pattern: "*.{bam,cram,sam}" - - versions: + description: Sorted BAM file + pattern: "*.{bam}" + - cram: type: file - description: File containing software versions - pattern: "versions.yml" + description: Sorted CRAM file + pattern: "*.{cram}" + - crai: + type: file + description: CRAM index file (optional) + pattern: "*.crai" - csi: type: file description: BAM index file (optional) pattern: "*.csi" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" - "@ewels" + - "@matthdsm" maintainers: - "@drpatelh" - "@ewels" + - "@matthdsm" diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test b/modules/nf-core/samtools/sort/tests/main.nf.test index 31e24b88..8360e2b1 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test +++ b/modules/nf-core/samtools/sort/tests/main.nf.test @@ -13,15 +13,43 @@ nextflow_process { config "./nextflow.config" when { - params { - outdir = "$outputDir" + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.bam', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'fasta' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + """ } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("cram") { + + config "./nextflow.config" + + when { process { """ input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.bam', checkIfExists: true) ]) + input[1] = Channel.of([ + [ id:'fasta' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) """ } } @@ -37,7 +65,7 @@ nextflow_process { test("bam_stub") { config "./nextflow.config" - options "-stub-run" + options "-stub" when { params { @@ -49,6 +77,10 @@ nextflow_process { [ id:'test', single_end:false ], // meta map file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.bam', checkIfExists: true) ]) + input[1] = Channel.of([ + [ id:'fasta' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) """ } } diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test.snap b/modules/nf-core/samtools/sort/tests/main.nf.test.snap index a7cf0210..38477656 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/sort/tests/main.nf.test.snap @@ -1,4 +1,69 @@ { + "cram": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" + ] + ], + "4": [ + "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" + ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" + ] + ], + "versions": [ + "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-04T15:08:00.830294" + }, "bam_stub_bam": { "content": [ "test.sorted.bam" @@ -30,13 +95,25 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,c6ea1346ec4aae007eb40b708935088c" + "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" ] ], "1": [ ], "2": [ + + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" + ] + ], + "4": [ "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" ], "bam": [ @@ -45,11 +122,23 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,c6ea1346ec4aae007eb40b708935088c" + "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" ] ], - "csi": [ + "crai": [ + + ], + "cram": [ + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" + ] ], "versions": [ "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" @@ -58,8 +147,8 @@ ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:14:52.736359271" + "timestamp": "2024-03-04T15:07:48.773803" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/sort/tests/nextflow.config b/modules/nf-core/samtools/sort/tests/nextflow.config index d0f35086..f642771f 100644 --- a/modules/nf-core/samtools/sort/tests/nextflow.config +++ b/modules/nf-core/samtools/sort/tests/nextflow.config @@ -1,7 +1,8 @@ process { withName: SAMTOOLS_SORT { - ext.prefix = { "${meta.id}.sorted" } + ext.prefix = { "${meta.id}.sorted" } + ext.args = "--write-index" } } diff --git a/modules/nf-core/umitools/dedup/tests/main.nf.test b/modules/nf-core/umitools/dedup/tests/main.nf.test new file mode 100644 index 00000000..84698be4 --- /dev/null +++ b/modules/nf-core/umitools/dedup/tests/main.nf.test @@ -0,0 +1,98 @@ +nextflow_process { + + name "Test Process UMITOOLS_DEDUP" + script "../main.nf" + process "UMITOOLS_DEDUP" + + tag "modules" + tag "modules_nfcore" + tag "umitools" + tag "umitools/dedup" + + test("se - no stats") { + config "./nextflow.config" + + when { + process { + """ + get_output_stats = false + + input[0] = [ + [ id:'test', single_end:true ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam.bai", checkIfExists: true) + ] + input[1] = get_output_stats + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert path("${process.out.log[0][1]}").exists() }, + { assert snapshot(process.out.bam).match("se no stats - bam") }, + { assert snapshot(process.out.versions).match("se no stats - versions") } + ) + } + } + + test("pe - no stats") { + config "./nextflow.config" + + when { + process { + """ + get_output_stats = false + + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + ] + input[1] = get_output_stats + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert path("${process.out.log[0][1]}").exists() }, + { assert snapshot(process.out.bam).match("pe no stats - bam") }, + { assert snapshot(process.out.versions).match("pe no stats - versions") } + ) + } + } + + test("pe - with stats") { + config "./nextflow.config" + + when { + process { + """ + get_output_stats = true + + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + ] + input[1] = get_output_stats + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert path("${process.out.log[0][1]}").exists() }, + { assert snapshot(process.out.bam).match("pe - bam") }, + { assert snapshot(process.out.tsv_edit_distance).match("pe - tsv_edit_distance") }, + { assert snapshot(process.out.tsv_per_umi).match("pe - tsv_per_umi") }, + { assert snapshot(process.out.tsv_umi_per_position).match("pe - tsv_umi_per_position") }, + { assert snapshot(process.out.versions).match("pe - versions") } + ) + } + } +} diff --git a/modules/nf-core/umitools/dedup/tests/main.nf.test.snap b/modules/nf-core/umitools/dedup/tests/main.nf.test.snap new file mode 100644 index 00000000..bc3c8693 --- /dev/null +++ b/modules/nf-core/umitools/dedup/tests/main.nf.test.snap @@ -0,0 +1,146 @@ +{ + "pe no stats - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.dedup.bam:md5,350e942a0d45e8356fa24bc8c47dc1ed" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:38.139428" + }, + "pe - tsv_per_umi": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.dedup_per_umi.tsv:md5,8e6783a4a79437b095f095f2aefe7c01" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:56.21078" + }, + "pe - tsv_edit_distance": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.dedup_edit_distance.tsv:md5,65186b0964e2f8d970cc04d736d8b119" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:56.203654" + }, + "pe - tsv_umi_per_position": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.dedup_per_umi_per_position.tsv:md5,9386db4a104b8e4e32f3ca4a84efa4ac" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:56.217525" + }, + "se no stats - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.dedup.bam:md5,c9da2ee4f07f5c6922251bd01d6bcb01" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:16.383148" + }, + "se no stats - versions": { + "content": [ + [ + "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:16.391241" + }, + "pe - versions": { + "content": [ + [ + "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:56.226748" + }, + "pe - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.dedup.bam:md5,350e942a0d45e8356fa24bc8c47dc1ed" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:56.19652" + }, + "pe no stats - versions": { + "content": [ + [ + "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-03-04T17:41:38.157629" + } +} \ No newline at end of file diff --git a/modules/nf-core/umitools/dedup/tests/nextflow.config b/modules/nf-core/umitools/dedup/tests/nextflow.config new file mode 100644 index 00000000..da6652dc --- /dev/null +++ b/modules/nf-core/umitools/dedup/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: UMITOOLS_DEDUP { + ext.prefix = { "${meta.id}.dedup" } + } +} diff --git a/modules/nf-core/umitools/dedup/tests/tags.yml b/modules/nf-core/umitools/dedup/tests/tags.yml new file mode 100644 index 00000000..5934c5cb --- /dev/null +++ b/modules/nf-core/umitools/dedup/tests/tags.yml @@ -0,0 +1,2 @@ +umitools/dedup: + - "modules/nf-core/umitools/dedup/**" diff --git a/subworkflows/nf-core/bam_sort_stats_samtools/main.nf b/subworkflows/nf-core/bam_sort_stats_samtools/main.nf index fc1c652b..b716375b 100644 --- a/subworkflows/nf-core/bam_sort_stats_samtools/main.nf +++ b/subworkflows/nf-core/bam_sort_stats_samtools/main.nf @@ -15,7 +15,7 @@ workflow BAM_SORT_STATS_SAMTOOLS { ch_versions = Channel.empty() - SAMTOOLS_SORT ( ch_bam ) + SAMTOOLS_SORT ( ch_bam, ch_fasta ) ch_versions = ch_versions.mix(SAMTOOLS_SORT.out.versions.first()) SAMTOOLS_INDEX ( SAMTOOLS_SORT.out.bam ) diff --git a/subworkflows/nf-core/fastq_align_bowtie2/main.nf b/subworkflows/nf-core/fastq_align_bowtie2/main.nf index ba4420f7..cafaa9bf 100644 --- a/subworkflows/nf-core/fastq_align_bowtie2/main.nf +++ b/subworkflows/nf-core/fastq_align_bowtie2/main.nf @@ -20,17 +20,17 @@ workflow FASTQ_ALIGN_BOWTIE2 { // // Map reads with Bowtie2 // - BOWTIE2_ALIGN ( ch_reads, ch_index, save_unaligned, sort_bam ) + BOWTIE2_ALIGN ( ch_reads, ch_index, ch_fasta, save_unaligned, sort_bam ) ch_versions = ch_versions.mix(BOWTIE2_ALIGN.out.versions) // // Sort, index BAM file and run samtools stats, flagstat and idxstats // - BAM_SORT_STATS_SAMTOOLS ( BOWTIE2_ALIGN.out.aligned, ch_fasta ) + BAM_SORT_STATS_SAMTOOLS ( BOWTIE2_ALIGN.out.bam, ch_fasta ) ch_versions = ch_versions.mix(BAM_SORT_STATS_SAMTOOLS.out.versions) emit: - bam_orig = BOWTIE2_ALIGN.out.aligned // channel: [ val(meta), aligned ] + bam_orig = BOWTIE2_ALIGN.out.bam // channel: [ val(meta), aligned ] log_out = BOWTIE2_ALIGN.out.log // channel: [ val(meta), log ] fastq = BOWTIE2_ALIGN.out.fastq // channel: [ val(meta), fastq ] diff --git a/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test new file mode 100644 index 00000000..b5e84f51 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test @@ -0,0 +1,99 @@ +nextflow_workflow { + + name "Test Subworkflow FASTQ_ALIGN_BOWTIE2" + script "../main.nf" + config "./nextflow.config" + workflow "FASTQ_ALIGN_BOWTIE2" + + tag "subworkflows" + tag "subworkflows_nfcore" + tag "subworkflows/fastq_align_bowtie2" + tag "subworkflows/bam_sort_stats_samtools" + tag "bowtie2" + tag "bowtie2/build" + tag "bowtie2/align" + + test("test_align_bowtie2_single_end") { + setup { + run("BOWTIE2_BUILD") { + script "../../../../modules/nf-core/bowtie2/build/main.nf" + process { + """ + input[0] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + } + when { + workflow { + """ + input[0] = Channel.of([[ id:'test', single_end:true ], [ file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ]]) + input[1] = BOWTIE2_BUILD.out.index + input[2] = false + input[3] = false + input[4] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot( + file(workflow.out.bam_orig[0][1]).name, + workflow.out.fastq, + workflow.out.log_out, + file(workflow.out.bam[0][1]).name, + file(workflow.out.bai[0][1]).name, + workflow.out.csi, + workflow.out.stats, + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.versions, + ).match()} + ) + } + } + + test("test_align_bowtie2_paired_end") { + setup { + run("BOWTIE2_BUILD") { + script "../../../../modules/nf-core/bowtie2/build/main.nf" + process { + """ + input[0] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + } + when { + workflow { + """ + input[0] = Channel.of([[ id:'test', single_end:false ], [file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true)]]) + input[1] = BOWTIE2_BUILD.out.index + input[2] = false + input[3] = false + input[4] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot( + file(workflow.out.bam_orig[0][1]).name, + workflow.out.fastq, + workflow.out.log_out, + file(workflow.out.bam[0][1]).name, + file(workflow.out.bai[0][1]).name, + workflow.out.csi, + workflow.out.stats, + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.versions, + ).match()} + ) + } + } +} diff --git a/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap new file mode 100644 index 00000000..c0f3f8bf --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap @@ -0,0 +1,126 @@ +{ + "test_align_bowtie2_single_end": { + "content": [ + "test.bam", + [ + + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.bowtie2.log:md5,7b8a9e61b7646da1089b041333c41a87" + ] + ], + "test.sorted.bam", + "test.sorted.bam.bai", + [ + + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.stats:md5,9a65272e49581873b1ea211f738e992f" + ] + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.flagstat:md5,e9ce9093133116bc54fd335cfe698372" + ] + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.idxstats:md5,e16eb632f7f462514b0873c7ac8ac905" + ] + ], + [ + "versions.yml:md5,5d5ab1d650a93d8bb5ed142943798a6a", + "versions.yml:md5,666dbae2343fc479e483656c35d3d8a1", + "versions.yml:md5,aab337e63eac9055aadb9a35cec16053", + "versions.yml:md5,c27f74d9c37fbb3365c437a9f7e81c27", + "versions.yml:md5,eb9364a9f1745d6a345b8b4b03aebe25", + "versions.yml:md5,f982efa9031f340ace29f76dd47a8ce1" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-18T14:40:54.318808117" + }, + "test_align_bowtie2_paired_end": { + "content": [ + "test.bam", + [ + + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.bowtie2.log:md5,bd89ce1b28c93bf822bae391ffcedd19" + ] + ], + "test.sorted.bam", + "test.sorted.bam.bai", + [ + + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,1086d408391af2a5c80c6dee0efa7e59" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,49f3d51a8804ce58fe9cecd2549d279b" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,29ff2fa56d35b2a47625b8f517f1a947" + ] + ], + [ + "versions.yml:md5,5d5ab1d650a93d8bb5ed142943798a6a", + "versions.yml:md5,666dbae2343fc479e483656c35d3d8a1", + "versions.yml:md5,aab337e63eac9055aadb9a35cec16053", + "versions.yml:md5,c27f74d9c37fbb3365c437a9f7e81c27", + "versions.yml:md5,eb9364a9f1745d6a345b8b4b03aebe25", + "versions.yml:md5,f982efa9031f340ace29f76dd47a8ce1" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-18T14:41:11.243874685" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_bowtie2/tests/nextflow.config b/subworkflows/nf-core/fastq_align_bowtie2/tests/nextflow.config new file mode 100644 index 00000000..2f85e807 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bowtie2/tests/nextflow.config @@ -0,0 +1,8 @@ +process { + withName: '.*:BAM_SORT_STATS_SAMTOOLS:SAMTOOLS_.*' { + ext.prefix = { "${meta.id}.sorted" } + } + withName: '.*:BAM_SORT_STATS_SAMTOOLS:BAM_STATS_SAMTOOLS:.*' { + ext.prefix = { "${meta.id}.sorted.bam" } + } +} diff --git a/subworkflows/nf-core/fastq_align_bowtie2/tests/tags.yml b/subworkflows/nf-core/fastq_align_bowtie2/tests/tags.yml new file mode 100644 index 00000000..267bcc77 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bowtie2/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/fastq_align_bowtie2: + - subworkflows/nf-core/fastq_align_bowtie2/** diff --git a/subworkflows/nf-core/fastq_align_bwa/main.nf b/subworkflows/nf-core/fastq_align_bwa/main.nf index 9192550d..c7408d08 100644 --- a/subworkflows/nf-core/fastq_align_bwa/main.nf +++ b/subworkflows/nf-core/fastq_align_bwa/main.nf @@ -19,7 +19,7 @@ workflow FASTQ_ALIGN_BWA { // Map reads with BWA // - BWA_MEM ( ch_reads, ch_index, val_sort_bam ) + BWA_MEM ( ch_reads, ch_index, ch_fasta, val_sort_bam ) ch_versions = ch_versions.mix(BWA_MEM.out.versions.first()) // diff --git a/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test b/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test new file mode 100644 index 00000000..93c3aac3 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test @@ -0,0 +1,77 @@ +nextflow_workflow { + + name "Test Subworkflow FASTQ_ALIGN_BWA" + script "../main.nf" + config "./nextflow.config" + workflow "FASTQ_ALIGN_BWA" + + tag "subworkflows" + tag "subworkflows_nfcore" + tag "subworkflows/fastq_align_bwa" + tag "subworkflows/bam_sort_stats_samtools" + tag "bwa" + tag "bwa/mem" + tag "bwa/index" + + + test("fastq_align_bwa_single_end") { + setup { + run("BWA_INDEX") { + script "../../../../modules/nf-core/bwa/index/main.nf" + process { + """ + input[0] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + } + when { + workflow { + """ + input[0] = Channel.of([[ id:'test', single_end:true ],[ file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ]]) + input[1] = BWA_INDEX.out.index + input[2] = false + input[3] = Channel.value([[id: 'genome'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match()} + ) + } + } + + test("fastq_align_bwa_paired_end") { + setup { + run("BWA_INDEX") { + script "../../../../modules/nf-core/bwa/index/main.nf" + process { + """ + input[0] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + } + when { + workflow { + """ + input[0] = Channel.of([[ id:'test', single_end:false ], [file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true)] + ] ) + input[1] = BWA_INDEX.out.index + input[2] = false + input[3] = Channel.value([[id: 'genome'], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match()} + ) + } + } +} diff --git a/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap new file mode 100644 index 00000000..8e8075da --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap @@ -0,0 +1,284 @@ +{ + "fastq_align_bwa_paired_end": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,aea123a3828a99da1906126355f15a12" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,8d6755b312c5c41ff32632a0734e13df" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,b5b49beae3e9ff2c620e680d81ceff81" + ] + ], + "3": [ + + ], + "4": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,9c42440e435b7ad02a343d367affafcd" + ] + ], + "5": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,18d602435a02a4d721b78d1812622159" + ] + ], + "6": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,85d20a901eef23ca50c323638a2eb602" + ] + ], + "7": [ + "versions.yml:md5,484d99e7712f776c479382a1f338845f", + "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", + "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", + "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", + "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", + "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + ], + "bai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,b5b49beae3e9ff2c620e680d81ceff81" + ] + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,8d6755b312c5c41ff32632a0734e13df" + ] + ], + "bam_orig": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,aea123a3828a99da1906126355f15a12" + ] + ], + "csi": [ + + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,18d602435a02a4d721b78d1812622159" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,85d20a901eef23ca50c323638a2eb602" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,9c42440e435b7ad02a343d367affafcd" + ] + ], + "versions": [ + "versions.yml:md5,484d99e7712f776c479382a1f338845f", + "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", + "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", + "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", + "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", + "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-14T13:25:38.265819012" + }, + "fastq_align_bwa_single_end": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,a74710a0345b4717bb4431bf9c257120" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam:md5,e023c5a6d28a4998a0d8199c459c2a08" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.bai:md5,9257847727b20a8f7288ad6912fbada4" + ] + ], + "3": [ + + ], + "4": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.stats:md5,c8e4edbf950def8abbd9e4ae74b31383" + ] + ], + "5": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.flagstat:md5,2191911d72575a2358b08b1df64ccb53" + ] + ], + "6": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.idxstats:md5,613e048487662c694aa4a2f73ca96a20" + ] + ], + "7": [ + "versions.yml:md5,484d99e7712f776c479382a1f338845f", + "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", + "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", + "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", + "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", + "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + ], + "bai": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.bai:md5,9257847727b20a8f7288ad6912fbada4" + ] + ], + "bam": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam:md5,e023c5a6d28a4998a0d8199c459c2a08" + ] + ], + "bam_orig": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,a74710a0345b4717bb4431bf9c257120" + ] + ], + "csi": [ + + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.flagstat:md5,2191911d72575a2358b08b1df64ccb53" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.idxstats:md5,613e048487662c694aa4a2f73ca96a20" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.stats:md5,c8e4edbf950def8abbd9e4ae74b31383" + ] + ], + "versions": [ + "versions.yml:md5,484d99e7712f776c479382a1f338845f", + "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", + "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", + "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", + "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", + "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-14T13:25:08.154131783" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_bwa/tests/nextflow.config b/subworkflows/nf-core/fastq_align_bwa/tests/nextflow.config new file mode 100644 index 00000000..2f85e807 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bwa/tests/nextflow.config @@ -0,0 +1,8 @@ +process { + withName: '.*:BAM_SORT_STATS_SAMTOOLS:SAMTOOLS_.*' { + ext.prefix = { "${meta.id}.sorted" } + } + withName: '.*:BAM_SORT_STATS_SAMTOOLS:BAM_STATS_SAMTOOLS:.*' { + ext.prefix = { "${meta.id}.sorted.bam" } + } +} diff --git a/subworkflows/nf-core/fastq_align_bwa/tests/tags.yml b/subworkflows/nf-core/fastq_align_bwa/tests/tags.yml new file mode 100644 index 00000000..bfe89ccf --- /dev/null +++ b/subworkflows/nf-core/fastq_align_bwa/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/fastq_align_bwa: + - subworkflows/nf-core/fastq_align_bwa/** diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test new file mode 100644 index 00000000..b0c0ca51 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test @@ -0,0 +1,128 @@ +nextflow_workflow { + + name "Test Subworkflow FASTQ_ALIGN_HISAT2" + script "../main.nf" + workflow "FASTQ_ALIGN_HISAT2" + config "./nextflow.config" + + tag "subworkflows" + tag "subworkflows_nfcore" + tag "subworkflows/fastq_align_hisat2" + + tag "hisat2/align" + tag "hisat2/build" + tag "hisat2/extractsplicesites" + + tag "samtools/flagstat" + tag "samtools/idxstats" + tag "samtools/index" + tag "samtools/sort" + tag "samtools/stats" + tag "subworkflows/bam_sort_stats_samtools" + + setup { + run("HISAT2_EXTRACTSPLICESITES") { + script "../../../../modules/nf-core/hisat2/extractsplicesites/main.nf" + process { + """ + input[0] = Channel.of([ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ]) + """ + } + } + run("HISAT2_BUILD") { + script "../../../../modules/nf-core/hisat2/build/main.nf" + process { + """ + input[0] = Channel.of([ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + ]) + input[1] = Channel.of([ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ]) + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + } + + test("sarscov2 - bam - single_end") { + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], + [ + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/fastq/test_1.fastq.gz", checkIfExists: true) + ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + input[3] = Channel.of([ + [ id:'test' ], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(file(workflow.out.bai[0][1]).name).match("se - bai")}, + { assert snapshot(file(workflow.out.bam[0][1]).name).match("se - bam")}, + { assert snapshot(file(workflow.out.orig_bam[0][1]).name).match("se - orig_bam")}, + { assert snapshot(workflow.out.csi).match("se - csi")}, + { assert snapshot(workflow.out.fastq).match("se - fastq")}, + { assert snapshot(workflow.out.flagstat).match("se - flagstat")}, + { assert snapshot(workflow.out.idxstats).match("se - idxstats")}, + { assert snapshot(workflow.out.stats).match("se - stats")}, + { assert snapshot(workflow.out.summary).match("se - summary")}, + { assert snapshot(workflow.out.versions).match("se - versions")} + ) + } + } + test("sarscov2 - bam - paired_end") { + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], + [ + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/fastq/test_1.fastq.gz", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/fastq/test_2.fastq.gz", checkIfExists: true) + ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + input[3] = Channel.of([ + [ id:'test' ], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(file(workflow.out.bai[0][1]).name).match("pe - bai")}, + { assert snapshot(file(workflow.out.bam[0][1]).name).match("pe - bam")}, + { assert snapshot(file(workflow.out.orig_bam[0][1]).name).match("pe - orig_bam")}, + { assert snapshot(workflow.out.csi).match("pe - csi")}, + { assert snapshot(workflow.out.fastq).match("pe - fastq")}, + { assert snapshot(workflow.out.flagstat).match("pe - flagstat")}, + { assert snapshot(workflow.out.idxstats).match("pe - idxstats")}, + { assert snapshot(workflow.out.stats).match("pe - stats")}, + { assert snapshot(workflow.out.summary).match("pe - summary")}, + { assert snapshot(workflow.out.versions).match("pe - versions")} + ) + } + } +} diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap new file mode 100644 index 00000000..d3f66927 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap @@ -0,0 +1,288 @@ +{ + "pe - stats": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,ed4e2ba437f4819b7ab93a6df8dd5348" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.091982" + }, + "pe - csi": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.081055" + }, + "se - bai": { + "content": [ + "test.sorted.bam.bai" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.763127" + }, + "pe - flagstat": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,2fa0d90162a1b655863796c2a6bd8f45" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.08653" + }, + "pe - orig_bam": { + "content": [ + "test.bam" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.077797" + }, + "se - bam": { + "content": [ + "test.sorted.bam" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.773767" + }, + "se - summary": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,7b8a9e61b7646da1089b041333c41a87" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.818659" + }, + "pe - bam": { + "content": [ + "test.sorted.bam" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.074968" + }, + "se - versions": { + "content": [ + [ + "versions.yml:md5,34be144fb97a11f1c581b39301f6f0d1", + "versions.yml:md5,4392ca9e255d9137e74a73a8d1e1559d", + "versions.yml:md5,651e735a2754f3be76b516f5fbf099b5", + "versions.yml:md5,912e1daa1e432f6b5ca601ab2294e37f", + "versions.yml:md5,9b7dd7f9a173fbf92f5e476451c840c1", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.826601" + }, + "pe - idxstats": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,1adb27b52d4d64b826f48b59d61dcd4d" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.089411" + }, + "pe - bai": { + "content": [ + "test.sorted.bam.bai" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.071767" + }, + "pe - fastq": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.083598" + }, + "se - fastq": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.782981" + }, + "se - csi": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.77962" + }, + "se - idxstats": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.idxstats:md5,2a5df85e0d90e55bb2b359f6e05d5fbb" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.798637" + }, + "se - orig_bam": { + "content": [ + "test.bam" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.776773" + }, + "pe - summary": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,9839b31db795958cc4b70711a3414e9c" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.095265" + }, + "pe - versions": { + "content": [ + [ + "versions.yml:md5,34be144fb97a11f1c581b39301f6f0d1", + "versions.yml:md5,4392ca9e255d9137e74a73a8d1e1559d", + "versions.yml:md5,651e735a2754f3be76b516f5fbf099b5", + "versions.yml:md5,912e1daa1e432f6b5ca601ab2294e37f", + "versions.yml:md5,9b7dd7f9a173fbf92f5e476451c840c1", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:28:06.098801" + }, + "se - flagstat": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,6de3bfde9582ad2532033832091f5c46" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.786813" + }, + "se - stats": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.stats:md5,f712acf6108a70c3fb06ac51e5e76f15" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-29T13:27:50.804219" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/nextflow.config b/subworkflows/nf-core/fastq_align_hisat2/tests/nextflow.config new file mode 100644 index 00000000..d2a119b5 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: SAMTOOLS_SORT { + ext.prefix = { "${meta.id}.sorted" } + } +} diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/tags.yml b/subworkflows/nf-core/fastq_align_hisat2/tests/tags.yml new file mode 100644 index 00000000..8993cde0 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/fastq_align_hisat2: + - subworkflows/nf-core/fastq_align_hisat2/** diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index b38fa6ae..449b1e46 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -41,33 +41,33 @@ [ "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam:md5,bcf7172fc9681b8a4d6da53dc885d369", - "cd4_REP1.sorted.bam.bai:md5,81a74745a7b117da0c8d7f7f95b352d0", + "cd4_REP1.sorted.bam:md5,11a805cfc0bde874d6a7de7467ca25cc", + "cd4_REP1.sorted.bam.bai:md5,85c4acc92dc079ec42adb5fbea6cbcce", "cd4_REP1.stats:md5,1a937e63fb7b1f8063121d8f14f4e918", "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam:md5,58402e4242c81af27c031907abd7bf49", - "cd4_REP2.sorted.bam.bai:md5,f75a9e0ac39ca322f1d084f968d67fe3", + "cd4_REP2.sorted.bam:md5,76bf40b388dc71e35c05792bec0b44c6", + "cd4_REP2.sorted.bam.bai:md5,2a8ea9af3c3ac5c6923aac765850b833", "cd4_REP2.stats:md5,6ac59691b72f0ccbe2dfa4408586a39b", "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam:md5,7ecd4f4eafc7551a0d37cfbd690005d2", - "cd4_REP3.sorted.bam.bai:md5,64cb3302603284eb4cc6a66c1bcbe857", + "cd4_REP3.sorted.bam:md5,39bdb1f466ce3fa508547b2b7aa1ca92", + "cd4_REP3.sorted.bam.bai:md5,f30a9cd423736d71cbe25a9cd685cb54", "cd4_REP3.stats:md5,43cfc143cb086a7fa22a0c8d9d1fc9bb", "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam:md5,401da47cbdf9c262f6c84017efedd567", - "cd4_REP4.sorted.bam.bai:md5,901fadf09dcd111606522766123fba07", + "cd4_REP4.sorted.bam:md5,8dfe41ab8ad05dcca85cafb8797c8db0", + "cd4_REP4.sorted.bam.bai:md5,2982bfa9b766a29bb8291a56e58855d5", "cd4_REP4.stats:md5,e91a8bd8d0918555892235999ff15b1e", "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam:md5,a3178b414156d28cf22b98fd9d742392", - "jurkat_REP1.sorted.bam.bai:md5,67c37ae4d072ebbf2cc15999d8e18e41", + "jurkat_REP1.sorted.bam:md5,ef3c7becc330cff76bf1d3490b743c8b", + "jurkat_REP1.sorted.bam.bai:md5,9af71e18c414c16dbb28dd3330157d60", "jurkat_REP1.stats:md5,895eddd56d3fc3487f54649dcf063fc7", "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam:md5,175cf112edf380e1e0cab23a818b6ab0", - "jurkat_REP2.sorted.bam.bai:md5,a2f3e49a63c02bde49c24c56a1050606", + "jurkat_REP2.sorted.bam:md5,7dfe0b9eb0918426bf03f639114d571f", + "jurkat_REP2.sorted.bam.bai:md5,ad78f94a551665d02177debe97df74db", "jurkat_REP2.stats:md5,9466c2094bb843e845d1c15d25aec2ab" ] ], @@ -75,7 +75,7 @@ "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-05T15:54:18.985765284" + "timestamp": "2024-03-19T21:59:19.074977598" }, "Should run with bwamem2": { "content": [ @@ -119,33 +119,33 @@ [ "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam:md5,8ba4050082d4c90f6aab1dbdfc10750d", - "cd4_REP1.sorted.bam.bai:md5,a8d78c0a98c7d984cfd15c180cca3dfe", + "cd4_REP1.sorted.bam:md5,0ef96c52d334ac02709b65cdd603f869", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", "cd4_REP1.stats:md5,1a937e63fb7b1f8063121d8f14f4e918", "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam:md5,daa348ffd92d1b7bd9461b630fe0cadd", - "cd4_REP2.sorted.bam.bai:md5,512539251014f664aa66d1ca091914d5", + "cd4_REP2.sorted.bam:md5,298c44c1b77d008aa5a8f3e77dfae0c8", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", "cd4_REP2.stats:md5,6ac59691b72f0ccbe2dfa4408586a39b", "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam:md5,54401355efd28816d914e1528d10ca56", - "cd4_REP3.sorted.bam.bai:md5,e48a3892b710d2de5878cad3cf83d711", + "cd4_REP3.sorted.bam:md5,836cda61a69c692394ae8aebb3af89d7", + "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", "cd4_REP3.stats:md5,43cfc143cb086a7fa22a0c8d9d1fc9bb", "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam:md5,faa381807425a2b5822380391fb25d30", - "cd4_REP4.sorted.bam.bai:md5,30eae2c6d450930679e7680cdfa3f98a", + "cd4_REP4.sorted.bam:md5,6778d910ddfabde8e13de2687833e8b7", + "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", "cd4_REP4.stats:md5,e91a8bd8d0918555892235999ff15b1e", "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam:md5,755d348bae58bdb87483a11932cfe2c6", - "jurkat_REP1.sorted.bam.bai:md5,af8e82924f430046f8f16f8d87cd26d8", + "jurkat_REP1.sorted.bam:md5,dd813d4d4f076a1a6317c4f3578f60f5", + "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", "jurkat_REP1.stats:md5,895eddd56d3fc3487f54649dcf063fc7", "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam:md5,eb6ff38a542eb6ed99dfdbf97dce5507", - "jurkat_REP2.sorted.bam.bai:md5,69795a27982c966af95a398fea7d60e9", + "jurkat_REP2.sorted.bam:md5,910b84a2697b85801cf8b2711c4fae5f", + "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", "jurkat_REP2.stats:md5,9466c2094bb843e845d1c15d25aec2ab" ] ], @@ -153,7 +153,7 @@ "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-05T15:56:25.053122616" + "timestamp": "2024-03-19T22:01:36.548364874" }, "Should run with dragmap": { "content": [ From 209ca1e6587ba548f0b0764bf5bada66ff9908da Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 13 Mar 2024 15:00:57 -0500 Subject: [PATCH 011/255] chore: Borrow from Bidirectional-flow https://github.com/Dowell-Lab/Bidirectional-Flow/blob/0e83e678b3321d9986e7eba9796d9c4828c01147/main.nf#L756-L914 --- modules/local/prep_dreg/main.nf | 159 ++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 modules/local/prep_dreg/main.nf diff --git a/modules/local/prep_dreg/main.nf b/modules/local/prep_dreg/main.nf new file mode 100644 index 00000000..1a65cd29 --- /dev/null +++ b/modules/local/prep_dreg/main.nf @@ -0,0 +1,159 @@ +process dreg_prep { + println "[Log 5]: Generating bigwig files for dREG" + + errorStrategy 'ignore' + tag "$prefix" + memory '60 GB' + cpus 16 + queue 'short' + + publishDir "${params.outdir}" , mode: 'copy', + saveAs: {filename -> + if (params.savebg && (filename == "${prefix}.bedGraph")) "bedgraphs/${prefix}.fivep.bedGraph" + else if (params.savebw && (filename.indexOf("bw") > 0)) "bigwigs/$filename" + else null + } + + when: + params.dreg || params.dreg_results + + input: + set val(prefix), file(bam_file), file(index) from bam_for_dreg + + output: + tuple val(prefix), file("${prefix}.pos.bw"), file("${prefix}.neg.bw") into dreg_bigwig + tuple val(prefix), file("${prefix}.bedGraph") into dreg_bg + + script: + if (params.singleEnd) { + """ + echo "Creating BigWigs suitable as inputs to dREG" + + export CRAM_REFERENCE=${params.genome} + + bamToBed -i ${bam_file} | awk 'BEGIN{OFS="\t"} (\$5 > 0){print \$0}' | \ + awk 'BEGIN{OFS="\t"} (\$6 == "+") {print \$1,\$2,\$2+1,\$4,\$5,\$6}; (\$6 == "-") {print \$1, \$3-1,\$3,\$4,\$5,\$6}' \ + > ${prefix}.dreg.bed + sortBed -i ${prefix}.dreg.bed > ${prefix}.dreg.sort.bed + + echo "positive strand processed to bedGraph" + + bedtools genomecov \ + -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${params.chrom_sizes} \ + -strand + \ + > ${prefix}.pos.bedGraph + + sortBed \ + -i ${prefix}.pos.bedGraph \ + > ${prefix}.pos.sort.bedGraph + + bedtools genomecov \ + -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${params.chrom_sizes} \ + -strand - \ + | awk 'BEGIN{FS=OFS="\t"} {\$4=-\$4}1' > ${prefix}.neg.bedGraph + + sortBed \ + -i ${prefix}.neg.bedGraph \ + > ${prefix}.neg.sort.bedGraph + + echo "negative strand processed to bedGraph" + + ${params.bedGraphToBigWig} ${prefix}.pos.sort.bedGraph ${params.chrom_sizes} ${prefix}.pos.bw + ${params.bedGraphToBigWig} ${prefix}.neg.sort.bedGraph ${params.chrom_sizes} ${prefix}.neg.bw + + cat ${prefix}.pos.bedGraph \ + ${prefix}.neg.bedGraph \ + > ${prefix}.unsorted.bedGraph + + sortBed \ + -i ${prefix}.unsorted.bedGraph \ + > ${prefix}.bedGraph + + echo "bedGraph to bigwig done" + """ + } else { + if (params.forwardStranded) { + """ + samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ + > ${prefix}.dreg.bam + + bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ + | awk 'BEGIN{OFS="\t"} (\$9 == "+") {print \$1,\$2,\$2+1,\$7,\$8,\$9}; (\$9 == "-") {print \$1,\$3-1,\$3,\$7,\$8,\$9}' \ + | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${params.chrom_sizes} \ + -strand + \ + > ${prefix}.pos.bedGraph + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${params.chrom_sizes} \ + -strand - \ + > ${prefix}.neg.noinv.bedGraph + + cat ${prefix}.neg.noinv.bedGraph \ + | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ + > ${prefix}.neg.bedGraph + + ${params.bedGraphToBigWig} ${prefix}.pos.bedGraph \ + ${params.chrom_sizes} ${prefix}.pos.bw + + ${params.bedGraphToBigWig} ${prefix}.neg.bedGraph \ + ${params.chrom_sizes} ${prefix}.neg.bw + + cat ${prefix}.pos.bedGraph \ + ${prefix}.neg.bedGraph \ + > ${prefix}.unsorted.bedGraph + + sortBed \ + -i ${prefix}.unsorted.bedGraph \ + > ${prefix}.bedGraph + """ + } else { + """ + samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ + > ${prefix}.dreg.bam + + bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ + | awk 'BEGIN{OFS="\t"} (\$10 == "+") {print \$1,\$5,\$5+1,\$7,\$8,\$10}; (\$10 == "-") {print \$1,\$6-1,\$6,\$7,\$8,\$10}' \ + | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${params.chrom_sizes} \ + -strand + \ + > ${prefix}.pos.bedGraph + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${params.chrom_sizes} \ + -strand - \ + > ${prefix}.neg.noinv.bedGraph + + cat ${prefix}.neg.noinv.bedGraph \ + | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ + > ${prefix}.neg.bedGraph + + ${params.bedGraphToBigWig} ${prefix}.pos.bedGraph \ + ${params.chrom_sizes} ${prefix}.pos.bw + + ${params.bedGraphToBigWig} ${prefix}.neg.bedGraph \ + ${params.chrom_sizes} ${prefix}.neg.bw + + cat ${prefix}.pos.bedGraph \ + ${prefix}.neg.bedGraph \ + > ${prefix}.unsorted.bedGraph + + sortBed \ + -i ${prefix}.unsorted.bedGraph \ + > ${prefix}.bedGraph + """ + } + } +} From 838a9a3a43a5469296cd1e35cb10a2448e94cdbc Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 13 Mar 2024 15:17:03 -0500 Subject: [PATCH 012/255] refactor: nf-core-ize prep_dreg --- conf/modules.config | 4 + modules/local/dreg_prep/environment.yml | 9 ++ modules/local/dreg_prep/main.nf | 151 ++++++++++++++++++++++ modules/local/prep_dreg/main.nf | 159 ------------------------ subworkflows/local/coverage_graphs.nf | 7 ++ 5 files changed, 171 insertions(+), 159 deletions(-) create mode 100644 modules/local/dreg_prep/environment.yml create mode 100644 modules/local/dreg_prep/main.nf delete mode 100644 modules/local/prep_dreg/main.nf diff --git a/conf/modules.config b/conf/modules.config index 091c1a8b..d28d3f4e 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -131,6 +131,10 @@ process { ext.prefix = { "${meta.id}.minus.bigWig" } } + withName:DREG_PREP { + ext.prefix = { "${meta.id}.dreg" } + } + withName: SUBREAD_FEATURECOUNTS_GENE { ext.args = "-B -C" publishDir = [ diff --git a/modules/local/dreg_prep/environment.yml b/modules/local/dreg_prep/environment.yml new file mode 100644 index 00000000..906c65f1 --- /dev/null +++ b/modules/local/dreg_prep/environment.yml @@ -0,0 +1,9 @@ +name: dreg_prep +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::bedtools=2.31.1 + - bioconda::ucsc-bedgraphtobigwig=445 + - bioconda::samtools=1.16.1 diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf new file mode 100644 index 00000000..0b368822 --- /dev/null +++ b/modules/local/dreg_prep/main.nf @@ -0,0 +1,151 @@ +process DREG_PREP { + + tag "$meta.id" + label 'process_medium' + + conda "${moduleDir}/environment.yml" + container 'nf-core/nascent/dreg_prep:b6f1c5d2a964415f' + + input: + tuple val(meta), path(bam_file), val(index) + path sizes + + output: + tuple val(meta), path("${prefix}.pos.bw"), path("${prefix}.neg.bw"), emit: dreg_bigwig + tuple val(meta), path("${prefix}.bedGraph"), emit: dreg_bg + + when: + task.ext.when == null || task.ext.when + + script: + prefix = task.ext.prefix ?: "${meta.id}" + if (meta.single_end) { + """ + echo "Creating BigWigs suitable as inputs to dREG" + + bamToBed -i ${bam_file} | awk 'BEGIN{OFS="\t"} (\$5 > 0){print \$0}' | \ + awk 'BEGIN{OFS="\t"} (\$6 == "+") {print \$1,\$2,\$2+1,\$4,\$5,\$6}; (\$6 == "-") {print \$1, \$3-1,\$3,\$4,\$5,\$6}' \ + > ${prefix}.dreg.bed + sortBed -i ${prefix}.dreg.bed > ${prefix}.dreg.sort.bed + + echo "positive strand processed to bedGraph" + + bedtools genomecov \ + -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${sizes} \ + -strand + \ + > ${prefix}.pos.bedGraph + + sortBed \ + -i ${prefix}.pos.bedGraph \ + > ${prefix}.pos.sort.bedGraph + + bedtools genomecov \ + -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${sizes} \ + -strand - \ + | awk 'BEGIN{FS=OFS="\t"} {\$4=-\$4}1' > ${prefix}.neg.bedGraph + + sortBed \ + -i ${prefix}.neg.bedGraph \ + > ${prefix}.neg.sort.bedGraph + + echo "negative strand processed to bedGraph" + + bedGraphToBigWig ${prefix}.pos.sort.bedGraph ${sizes} ${prefix}.pos.bw + bedGraphToBigWig ${prefix}.neg.sort.bedGraph ${sizes} ${prefix}.neg.bw + + cat ${prefix}.pos.bedGraph \ + ${prefix}.neg.bedGraph \ + > ${prefix}.unsorted.bedGraph + + sortBed \ + -i ${prefix}.unsorted.bedGraph \ + > ${prefix}.bedGraph + + echo "bedGraph to bigwig done" + """ + } else { + if (params.forwardStranded) { + """ + samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ + > ${prefix}.dreg.bam + + bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ + | awk 'BEGIN{OFS="\t"} (\$9 == "+") {print \$1,\$2,\$2+1,\$7,\$8,\$9}; (\$9 == "-") {print \$1,\$3-1,\$3,\$7,\$8,\$9}' \ + | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${sizes} \ + -strand + \ + > ${prefix}.pos.bedGraph + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${sizes} \ + -strand - \ + > ${prefix}.neg.noinv.bedGraph + + cat ${prefix}.neg.noinv.bedGraph \ + | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ + > ${prefix}.neg.bedGraph + + bedGraphToBigWig ${prefix}.pos.bedGraph \ + ${sizes} ${prefix}.pos.bw + + bedGraphToBigWig ${prefix}.neg.bedGraph \ + ${sizes} ${prefix}.neg.bw + + cat ${prefix}.pos.bedGraph \ + ${prefix}.neg.bedGraph \ + > ${prefix}.unsorted.bedGraph + + sortBed \ + -i ${prefix}.unsorted.bedGraph \ + > ${prefix}.bedGraph + """ + } else { + """ + samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ + > ${prefix}.dreg.bam + + bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ + | awk 'BEGIN{OFS="\t"} (\$10 == "+") {print \$1,\$5,\$5+1,\$7,\$8,\$10}; (\$10 == "-") {print \$1,\$6-1,\$6,\$7,\$8,\$10}' \ + | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${sizes} \ + -strand + \ + > ${prefix}.pos.bedGraph + + bedtools genomecov -bg \ + -i ${prefix}.dreg.sort.bed \ + -g ${sizes} \ + -strand - \ + > ${prefix}.neg.noinv.bedGraph + + cat ${prefix}.neg.noinv.bedGraph \ + | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ + > ${prefix}.neg.bedGraph + + bedGraphToBigWig ${prefix}.pos.bedGraph \ + ${sizes} ${prefix}.pos.bw + + bedGraphToBigWig ${prefix}.neg.bedGraph \ + ${sizes} ${prefix}.neg.bw + + cat ${prefix}.pos.bedGraph \ + ${prefix}.neg.bedGraph \ + > ${prefix}.unsorted.bedGraph + + sortBed \ + -i ${prefix}.unsorted.bedGraph \ + > ${prefix}.bedGraph + """ + } + } +} diff --git a/modules/local/prep_dreg/main.nf b/modules/local/prep_dreg/main.nf deleted file mode 100644 index 1a65cd29..00000000 --- a/modules/local/prep_dreg/main.nf +++ /dev/null @@ -1,159 +0,0 @@ -process dreg_prep { - println "[Log 5]: Generating bigwig files for dREG" - - errorStrategy 'ignore' - tag "$prefix" - memory '60 GB' - cpus 16 - queue 'short' - - publishDir "${params.outdir}" , mode: 'copy', - saveAs: {filename -> - if (params.savebg && (filename == "${prefix}.bedGraph")) "bedgraphs/${prefix}.fivep.bedGraph" - else if (params.savebw && (filename.indexOf("bw") > 0)) "bigwigs/$filename" - else null - } - - when: - params.dreg || params.dreg_results - - input: - set val(prefix), file(bam_file), file(index) from bam_for_dreg - - output: - tuple val(prefix), file("${prefix}.pos.bw"), file("${prefix}.neg.bw") into dreg_bigwig - tuple val(prefix), file("${prefix}.bedGraph") into dreg_bg - - script: - if (params.singleEnd) { - """ - echo "Creating BigWigs suitable as inputs to dREG" - - export CRAM_REFERENCE=${params.genome} - - bamToBed -i ${bam_file} | awk 'BEGIN{OFS="\t"} (\$5 > 0){print \$0}' | \ - awk 'BEGIN{OFS="\t"} (\$6 == "+") {print \$1,\$2,\$2+1,\$4,\$5,\$6}; (\$6 == "-") {print \$1, \$3-1,\$3,\$4,\$5,\$6}' \ - > ${prefix}.dreg.bed - sortBed -i ${prefix}.dreg.bed > ${prefix}.dreg.sort.bed - - echo "positive strand processed to bedGraph" - - bedtools genomecov \ - -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${params.chrom_sizes} \ - -strand + \ - > ${prefix}.pos.bedGraph - - sortBed \ - -i ${prefix}.pos.bedGraph \ - > ${prefix}.pos.sort.bedGraph - - bedtools genomecov \ - -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${params.chrom_sizes} \ - -strand - \ - | awk 'BEGIN{FS=OFS="\t"} {\$4=-\$4}1' > ${prefix}.neg.bedGraph - - sortBed \ - -i ${prefix}.neg.bedGraph \ - > ${prefix}.neg.sort.bedGraph - - echo "negative strand processed to bedGraph" - - ${params.bedGraphToBigWig} ${prefix}.pos.sort.bedGraph ${params.chrom_sizes} ${prefix}.pos.bw - ${params.bedGraphToBigWig} ${prefix}.neg.sort.bedGraph ${params.chrom_sizes} ${prefix}.neg.bw - - cat ${prefix}.pos.bedGraph \ - ${prefix}.neg.bedGraph \ - > ${prefix}.unsorted.bedGraph - - sortBed \ - -i ${prefix}.unsorted.bedGraph \ - > ${prefix}.bedGraph - - echo "bedGraph to bigwig done" - """ - } else { - if (params.forwardStranded) { - """ - samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ - > ${prefix}.dreg.bam - - bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ - | awk 'BEGIN{OFS="\t"} (\$9 == "+") {print \$1,\$2,\$2+1,\$7,\$8,\$9}; (\$9 == "-") {print \$1,\$3-1,\$3,\$7,\$8,\$9}' \ - | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed - - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${params.chrom_sizes} \ - -strand + \ - > ${prefix}.pos.bedGraph - - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${params.chrom_sizes} \ - -strand - \ - > ${prefix}.neg.noinv.bedGraph - - cat ${prefix}.neg.noinv.bedGraph \ - | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ - > ${prefix}.neg.bedGraph - - ${params.bedGraphToBigWig} ${prefix}.pos.bedGraph \ - ${params.chrom_sizes} ${prefix}.pos.bw - - ${params.bedGraphToBigWig} ${prefix}.neg.bedGraph \ - ${params.chrom_sizes} ${prefix}.neg.bw - - cat ${prefix}.pos.bedGraph \ - ${prefix}.neg.bedGraph \ - > ${prefix}.unsorted.bedGraph - - sortBed \ - -i ${prefix}.unsorted.bedGraph \ - > ${prefix}.bedGraph - """ - } else { - """ - samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ - > ${prefix}.dreg.bam - - bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ - | awk 'BEGIN{OFS="\t"} (\$10 == "+") {print \$1,\$5,\$5+1,\$7,\$8,\$10}; (\$10 == "-") {print \$1,\$6-1,\$6,\$7,\$8,\$10}' \ - | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed - - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${params.chrom_sizes} \ - -strand + \ - > ${prefix}.pos.bedGraph - - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${params.chrom_sizes} \ - -strand - \ - > ${prefix}.neg.noinv.bedGraph - - cat ${prefix}.neg.noinv.bedGraph \ - | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ - > ${prefix}.neg.bedGraph - - ${params.bedGraphToBigWig} ${prefix}.pos.bedGraph \ - ${params.chrom_sizes} ${prefix}.pos.bw - - ${params.bedGraphToBigWig} ${prefix}.neg.bedGraph \ - ${params.chrom_sizes} ${prefix}.neg.bw - - cat ${prefix}.pos.bedGraph \ - ${prefix}.neg.bedGraph \ - > ${prefix}.unsorted.bedGraph - - sortBed \ - -i ${prefix}.unsorted.bedGraph \ - > ${prefix}.bedGraph - """ - } - } -} diff --git a/subworkflows/local/coverage_graphs.nf b/subworkflows/local/coverage_graphs.nf index a64fdc29..ff182c85 100644 --- a/subworkflows/local/coverage_graphs.nf +++ b/subworkflows/local/coverage_graphs.nf @@ -10,6 +10,8 @@ include { DEEPTOOLS_BAMCOVERAGE as DEEPTOOLS_BAMCOVERAGE_PLUS DEEPTOOLS_BAMCOVERAGE as DEEPTOOLS_BAMCOVERAGE_MINUS } from '../../modules/nf-core/deeptools/bamcoverage/main' +include { DREG_PREP } from '../../modules/local/dreg_prep/main' + workflow COVERAGE_GRAPHS { take: bam @@ -57,6 +59,11 @@ workflow COVERAGE_GRAPHS { ch_plus_minus = DEEPTOOLS_BAMCOVERAGE_PLUS.out.bigwig.join(DEEPTOOLS_BAMCOVERAGE_MINUS.out.bigwig) + DREG_PREP ( + ch_bam_bai, + sizes + ) + emit: plus_bedGraph = BEDTOOLS_GENOMECOV_PLUS.out.genomecov minus_bedGraph = BEDTOOLS_GENOMECOV_MINUS.out.genomecov From a3cb6c557455d00ebb914f1d1d13e03df8c52628 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 13 Mar 2024 15:30:36 -0500 Subject: [PATCH 013/255] fix: Include sizes in genomecov --- subworkflows/local/coverage_graphs.nf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subworkflows/local/coverage_graphs.nf b/subworkflows/local/coverage_graphs.nf index ff182c85..c06baf99 100644 --- a/subworkflows/local/coverage_graphs.nf +++ b/subworkflows/local/coverage_graphs.nf @@ -28,14 +28,14 @@ workflow COVERAGE_GRAPHS { BEDTOOLS_GENOMECOV_PLUS ( ch_genomecov_bam, - [], + sizes, 'bedGraph' ) ch_versions = ch_versions.mix(BEDTOOLS_GENOMECOV_PLUS.out.versions.first()) BEDTOOLS_GENOMECOV_MINUS ( ch_genomecov_bam, - [], + sizes, 'bedGraph' ) ch_versions = ch_versions.mix(BEDTOOLS_GENOMECOV_MINUS.out.versions.first()) From a0dc0e8a9ef22c8affc3dde061b398b145780c0f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 15 Mar 2024 10:44:16 -0500 Subject: [PATCH 014/255] fix: Remove references used as params --- workflows/nascent.nf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflows/nascent.nf b/workflows/nascent.nf index a3261f26..b78caa21 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -170,12 +170,12 @@ workflow NASCENT { ch_bowtie2_multiqc = FASTQ_ALIGN_BOWTIE2.out.log_out ch_versions = ch_versions.mix(FASTQ_ALIGN_BOWTIE2.out.versions) } else if (!params.skip_alignment && params.aligner == 'hisat2') { - if (params.hisat2_index.endsWith('.tar.gz')) { - ch_hisat2_index = UNTAR_HISAT2_INDEX ( [ [:], params.hisat2_index ] ).untar + if (ch_hisat2_index.endsWith('.tar.gz')) { + ch_hisat2_index = UNTAR_HISAT2_INDEX ( [ [:], ch_hisat2_index ] ).untar ch_versions = ch_versions.mix(UNTAR_HISAT2_INDEX.out.versions) } else { // TODO Give the meta from basename or genome? - ch_hisat2_index = [ [meta: "Genome"], file(params.hisat2_index) ] + ch_hisat2_index = [ [meta: "Genome"], file(ch_hisat2_index) ] } FASTQ_ALIGN_HISAT2 ( From 5158682cb52cd926177412c98223837a22e1a0c7 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 15 Mar 2024 12:27:21 -0500 Subject: [PATCH 015/255] chore: Make a singularity container for dreg_prep --- modules/local/dreg_prep/main.nf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index 0b368822..e51fb493 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -4,7 +4,9 @@ process DREG_PREP { label 'process_medium' conda "${moduleDir}/environment.yml" - container 'nf-core/nascent/dreg_prep:b6f1c5d2a964415f' + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'nf-core/nascent/dreg_prep:dreg_prep--18e6e4570a433d65' : + 'nf-core/nascent/dreg_prep:b6f1c5d2a964415f' }" input: tuple val(meta), path(bam_file), val(index) From 2d336aa638e516e00d531e151713bec3f39addd4 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 15 Mar 2024 13:28:52 -0500 Subject: [PATCH 016/255] build: Container and ociautopull? --- modules/local/dreg_prep/main.nf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index e51fb493..0b368822 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -4,9 +4,7 @@ process DREG_PREP { label 'process_medium' conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'nf-core/nascent/dreg_prep:dreg_prep--18e6e4570a433d65' : - 'nf-core/nascent/dreg_prep:b6f1c5d2a964415f' }" + container 'nf-core/nascent/dreg_prep:b6f1c5d2a964415f' input: tuple val(meta), path(bam_file), val(index) From 2c99fccbcc8a87d508f47b5d38b51fc4ec370ee7 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 16 Mar 2024 13:58:31 -0500 Subject: [PATCH 017/255] build: Give up and use biocontainers --- modules/local/dreg_prep/main.nf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index 0b368822..1ba89bb2 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -4,7 +4,9 @@ process DREG_PREP { label 'process_medium' conda "${moduleDir}/environment.yml" - container 'nf-core/nascent/dreg_prep:b6f1c5d2a964415f' + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/mulled-v2-f01e242bdea19948f0576fdca94777242fe4c2cb:4238fb992d2a93e648108c86e3a9f51348e834a9-0' : + 'biocontainers/mulled-v2-f01e242bdea19948f0576fdca94777242fe4c2cb:4238fb992d2a93e648108c86e3a9f51348e834a9-0' }" input: tuple val(meta), path(bam_file), val(index) From 1419c9e689fb425d4cb55cc7733a3f0ecd68d4a1 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 16 Mar 2024 16:18:57 -0500 Subject: [PATCH 018/255] style: Add \'s --- modules/local/dreg_prep/main.nf | 117 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index 1ba89bb2..b000d36b 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -25,33 +25,34 @@ process DREG_PREP { """ echo "Creating BigWigs suitable as inputs to dREG" - bamToBed -i ${bam_file} | awk 'BEGIN{OFS="\t"} (\$5 > 0){print \$0}' | \ - awk 'BEGIN{OFS="\t"} (\$6 == "+") {print \$1,\$2,\$2+1,\$4,\$5,\$6}; (\$6 == "-") {print \$1, \$3-1,\$3,\$4,\$5,\$6}' \ + bamToBed -i ${bam_file} | awk 'BEGIN{OFS="\t"} (\$5 > 0){print \$0}' | \\ + awk 'BEGIN{OFS="\t"} (\$6 == "+") {print \$1,\$2,\$2+1,\$4,\$5,\$6}; (\$6 == "-") {print \$1, \$3-1,\$3,\$4,\$5,\$6}' \\ > ${prefix}.dreg.bed + sortBed -i ${prefix}.dreg.bed > ${prefix}.dreg.sort.bed echo "positive strand processed to bedGraph" - bedtools genomecov \ - -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${sizes} \ - -strand + \ + bedtools genomecov \\ + -bg \\ + -i ${prefix}.dreg.sort.bed \\ + -g ${sizes} \\ + -strand + \\ > ${prefix}.pos.bedGraph - sortBed \ - -i ${prefix}.pos.bedGraph \ + sortBed \\ + -i ${prefix}.pos.bedGraph \\ > ${prefix}.pos.sort.bedGraph - bedtools genomecov \ - -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${sizes} \ - -strand - \ + bedtools genomecov \\ + -bg \\ + -i ${prefix}.dreg.sort.bed \\ + -g ${sizes} \\ + -strand - \\ | awk 'BEGIN{FS=OFS="\t"} {\$4=-\$4}1' > ${prefix}.neg.bedGraph - sortBed \ - -i ${prefix}.neg.bedGraph \ + sortBed \\ + -i ${prefix}.neg.bedGraph \\ > ${prefix}.neg.sort.bedGraph echo "negative strand processed to bedGraph" @@ -59,12 +60,12 @@ process DREG_PREP { bedGraphToBigWig ${prefix}.pos.sort.bedGraph ${sizes} ${prefix}.pos.bw bedGraphToBigWig ${prefix}.neg.sort.bedGraph ${sizes} ${prefix}.neg.bw - cat ${prefix}.pos.bedGraph \ - ${prefix}.neg.bedGraph \ + cat ${prefix}.pos.bedGraph \\ + ${prefix}.neg.bedGraph \\ > ${prefix}.unsorted.bedGraph - sortBed \ - -i ${prefix}.unsorted.bedGraph \ + sortBed \\ + -i ${prefix}.unsorted.bedGraph \\ > ${prefix}.bedGraph echo "bedGraph to bigwig done" @@ -72,80 +73,80 @@ process DREG_PREP { } else { if (params.forwardStranded) { """ - samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ + samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \\ > ${prefix}.dreg.bam - bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ - | awk 'BEGIN{OFS="\t"} (\$9 == "+") {print \$1,\$2,\$2+1,\$7,\$8,\$9}; (\$9 == "-") {print \$1,\$3-1,\$3,\$7,\$8,\$9}' \ + bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \\ + | awk 'BEGIN{OFS="\t"} (\$9 == "+") {print \$1,\$2,\$2+1,\$7,\$8,\$9}; (\$9 == "-") {print \$1,\$3-1,\$3,\$7,\$8,\$9}' \\ | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${sizes} \ - -strand + \ + bedtools genomecov -bg \\ + -i ${prefix}.dreg.sort.bed \\ + -g ${sizes} \\ + -strand + \\ > ${prefix}.pos.bedGraph - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${sizes} \ - -strand - \ + bedtools genomecov -bg \\ + -i ${prefix}.dreg.sort.bed \\ + -g ${sizes} \\ + -strand - \\ > ${prefix}.neg.noinv.bedGraph - cat ${prefix}.neg.noinv.bedGraph \ - | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ + cat ${prefix}.neg.noinv.bedGraph \\ + | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \\ > ${prefix}.neg.bedGraph - bedGraphToBigWig ${prefix}.pos.bedGraph \ + bedGraphToBigWig ${prefix}.pos.bedGraph \\ ${sizes} ${prefix}.pos.bw - bedGraphToBigWig ${prefix}.neg.bedGraph \ + bedGraphToBigWig ${prefix}.neg.bedGraph \\ ${sizes} ${prefix}.neg.bw - cat ${prefix}.pos.bedGraph \ - ${prefix}.neg.bedGraph \ + cat ${prefix}.pos.bedGraph \\ + ${prefix}.neg.bedGraph \\ > ${prefix}.unsorted.bedGraph - sortBed \ - -i ${prefix}.unsorted.bedGraph \ + sortBed \\ + -i ${prefix}.unsorted.bedGraph \\ > ${prefix}.bedGraph """ } else { """ - samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \ + samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \\ > ${prefix}.dreg.bam - bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \ - | awk 'BEGIN{OFS="\t"} (\$10 == "+") {print \$1,\$5,\$5+1,\$7,\$8,\$10}; (\$10 == "-") {print \$1,\$6-1,\$6,\$7,\$8,\$10}' \ + bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \\ + | awk 'BEGIN{OFS="\t"} (\$10 == "+") {print \$1,\$5,\$5+1,\$7,\$8,\$10}; (\$10 == "-") {print \$1,\$6-1,\$6,\$7,\$8,\$10}' \\ | sort -k 1,1 -k 2,2n > ${prefix}.dreg.sort.bed - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${sizes} \ - -strand + \ + bedtools genomecov -bg \\ + -i ${prefix}.dreg.sort.bed \\ + -g ${sizes} \\ + -strand + \\ > ${prefix}.pos.bedGraph - bedtools genomecov -bg \ - -i ${prefix}.dreg.sort.bed \ - -g ${sizes} \ - -strand - \ + bedtools genomecov -bg \\ + -i ${prefix}.dreg.sort.bed \\ + -g ${sizes} \\ + -strand - \\ > ${prefix}.neg.noinv.bedGraph - cat ${prefix}.neg.noinv.bedGraph \ - | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \ + cat ${prefix}.neg.noinv.bedGraph \\ + | awk 'BEGIN{OFS="\t"} {print \$1,\$2,\$3,-1*\$4}' \\ > ${prefix}.neg.bedGraph - bedGraphToBigWig ${prefix}.pos.bedGraph \ + bedGraphToBigWig ${prefix}.pos.bedGraph \\ ${sizes} ${prefix}.pos.bw - bedGraphToBigWig ${prefix}.neg.bedGraph \ + bedGraphToBigWig ${prefix}.neg.bedGraph \\ ${sizes} ${prefix}.neg.bw - cat ${prefix}.pos.bedGraph \ - ${prefix}.neg.bedGraph \ + cat ${prefix}.pos.bedGraph \\ + ${prefix}.neg.bedGraph \\ > ${prefix}.unsorted.bedGraph - sortBed \ - -i ${prefix}.unsorted.bedGraph \ + sortBed \\ + -i ${prefix}.unsorted.bedGraph \\ > ${prefix}.bedGraph """ } From cbcdf6edd9ca6cca7aa7f53aaa2766590899b7c5 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 16 Mar 2024 16:25:34 -0500 Subject: [PATCH 019/255] fix(dreg_prep): Use task.cpus --- modules/local/dreg_prep/main.nf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index b000d36b..3aec4b90 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -73,7 +73,7 @@ process DREG_PREP { } else { if (params.forwardStranded) { """ - samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \\ + samtools view -@ $task.cpus -bf 0x2 ${bam_file} | samtools sort -n -@ $task.cpus \\ > ${prefix}.dreg.bam bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \\ @@ -112,7 +112,7 @@ process DREG_PREP { """ } else { """ - samtools view -@ 16 -bf 0x2 ${bam_file} | samtools sort -n -@ 16 \\ + samtools view -@ $task.cpus -bf 0x2 ${bam_file} | samtools sort -n -@ $task.cpus \\ > ${prefix}.dreg.bam bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \\ From e6a297da8d9ff461ae8c0b053545fde24f9e3d6e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 16 Mar 2024 16:26:27 -0500 Subject: [PATCH 020/255] refactor(dreg_prep): Use sort instead of sortBed https://bedtools.readthedocs.io/en/latest/content/tools/sort.html#optional-sorting-behavior --- modules/local/dreg_prep/main.nf | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index 3aec4b90..382235a9 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -29,7 +29,9 @@ process DREG_PREP { awk 'BEGIN{OFS="\t"} (\$6 == "+") {print \$1,\$2,\$2+1,\$4,\$5,\$6}; (\$6 == "-") {print \$1, \$3-1,\$3,\$4,\$5,\$6}' \\ > ${prefix}.dreg.bed - sortBed -i ${prefix}.dreg.bed > ${prefix}.dreg.sort.bed + sort -k 1,1 -k2,2n \\ + ${prefix}.dreg.bed \\ + > ${prefix}.dreg.sort.bed echo "positive strand processed to bedGraph" @@ -40,8 +42,8 @@ process DREG_PREP { -strand + \\ > ${prefix}.pos.bedGraph - sortBed \\ - -i ${prefix}.pos.bedGraph \\ + sort -k 1,1 -k2,2n \\ + ${prefix}.pos.bedGraph \\ > ${prefix}.pos.sort.bedGraph bedtools genomecov \\ @@ -51,8 +53,9 @@ process DREG_PREP { -strand - \\ | awk 'BEGIN{FS=OFS="\t"} {\$4=-\$4}1' > ${prefix}.neg.bedGraph - sortBed \\ - -i ${prefix}.neg.bedGraph \\ + + sort -k 1,1 -k2,2n \\ + ${prefix}.neg.bedGraph \\ > ${prefix}.neg.sort.bedGraph echo "negative strand processed to bedGraph" @@ -64,8 +67,8 @@ process DREG_PREP { ${prefix}.neg.bedGraph \\ > ${prefix}.unsorted.bedGraph - sortBed \\ - -i ${prefix}.unsorted.bedGraph \\ + sort -k 1,1 -k2,2n \\ + ${prefix}.unsorted.bedGraph \\ > ${prefix}.bedGraph echo "bedGraph to bigwig done" @@ -106,8 +109,8 @@ process DREG_PREP { ${prefix}.neg.bedGraph \\ > ${prefix}.unsorted.bedGraph - sortBed \\ - -i ${prefix}.unsorted.bedGraph \\ + sort -k 1,1 -k2,2n \\ + ${prefix}.unsorted.bedGraph \\ > ${prefix}.bedGraph """ } else { @@ -145,8 +148,9 @@ process DREG_PREP { ${prefix}.neg.bedGraph \\ > ${prefix}.unsorted.bedGraph - sortBed \\ - -i ${prefix}.unsorted.bedGraph \\ + + sort -k 1,1 -k2,2n \\ + ${prefix}.unsorted.bedGraph \\ > ${prefix}.bedGraph """ } From b1107048cadc6bb4e1d6a684c0893d2c2262c7bd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 16 Mar 2024 16:43:09 -0500 Subject: [PATCH 021/255] fix(dreg_prep): Make it a process low The only thing using more than one thread is samtools --- modules/local/dreg_prep/main.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index 382235a9..3b3e1c68 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -1,7 +1,7 @@ process DREG_PREP { tag "$meta.id" - label 'process_medium' + label 'process_low' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? From 899ac94752c085b1220b4555df80bba644354d76 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 18 Mar 2024 11:31:38 -0500 Subject: [PATCH 022/255] feat: Start DREG_PREP Subworkflow --- modules.json | 5 ++ .../nf-core/bedtools/bamtobed/environment.yml | 7 +++ modules/nf-core/bedtools/bamtobed/main.nf | 46 +++++++++++++++ modules/nf-core/bedtools/bamtobed/meta.yml | 44 +++++++++++++++ .../bedtools/bamtobed/tests/main.nf.test | 56 +++++++++++++++++++ .../bedtools/bamtobed/tests/main.nf.test.snap | 37 ++++++++++++ .../nf-core/bedtools/bamtobed/tests/tags.yml | 2 + subworkflows/local/dreg_prep/main.nf | 14 +++++ 8 files changed, 211 insertions(+) create mode 100644 modules/nf-core/bedtools/bamtobed/environment.yml create mode 100644 modules/nf-core/bedtools/bamtobed/main.nf create mode 100644 modules/nf-core/bedtools/bamtobed/meta.yml create mode 100644 modules/nf-core/bedtools/bamtobed/tests/main.nf.test create mode 100644 modules/nf-core/bedtools/bamtobed/tests/main.nf.test.snap create mode 100644 modules/nf-core/bedtools/bamtobed/tests/tags.yml create mode 100644 subworkflows/local/dreg_prep/main.nf diff --git a/modules.json b/modules.json index 152c2ba2..b7479a7a 100644 --- a/modules.json +++ b/modules.json @@ -10,6 +10,11 @@ "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", "installed_by": ["modules"] }, + "bedtools/bamtobed": { + "branch": "master", + "git_sha": "1d1cb7bfef6cf67fbc7faafa6992ad8bdc3045b3", + "installed_by": ["modules"] + }, "bedtools/genomecov": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", diff --git a/modules/nf-core/bedtools/bamtobed/environment.yml b/modules/nf-core/bedtools/bamtobed/environment.yml new file mode 100644 index 00000000..4b50139e --- /dev/null +++ b/modules/nf-core/bedtools/bamtobed/environment.yml @@ -0,0 +1,7 @@ +name: bedtools_bamtobed +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::bedtools=2.31.1 diff --git a/modules/nf-core/bedtools/bamtobed/main.nf b/modules/nf-core/bedtools/bamtobed/main.nf new file mode 100644 index 00000000..bb8295dc --- /dev/null +++ b/modules/nf-core/bedtools/bamtobed/main.nf @@ -0,0 +1,46 @@ +process BEDTOOLS_BAMTOBED { + tag "$meta.id" + label 'process_medium' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/bedtools:2.31.1--hf5e1c6e_0' : + 'biocontainers/bedtools:2.31.1--hf5e1c6e_0' }" + + input: + tuple val(meta), path(bam) + + output: + tuple val(meta), path("*.bed"), emit: bed + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + """ + bedtools \\ + bamtobed \\ + $args \\ + -i $bam \\ + > ${prefix}.bed + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + bedtools: \$(bedtools --version | sed -e "s/bedtools v//g") + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.bed + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + bedtools: \$(bedtools --version | sed -e "s/bedtools v//g") + END_VERSIONS + """ +} diff --git a/modules/nf-core/bedtools/bamtobed/meta.yml b/modules/nf-core/bedtools/bamtobed/meta.yml new file mode 100644 index 00000000..b6d14929 --- /dev/null +++ b/modules/nf-core/bedtools/bamtobed/meta.yml @@ -0,0 +1,44 @@ +name: bedtools_bamtobed +description: Converts a bam file to a bed12 file. +keywords: + - bam + - bed + - bedtools + - bamtobed + - converter +tools: + - bedtools: + description: | + A set of tools for genomic analysis tasks, specifically enabling genome arithmetic (merge, count, complement) on various file types. + documentation: https://bedtools.readthedocs.io/en/latest/content/tools/complement.html + licence: ["MIT"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: Input BAM file + pattern: "*.{bam}" +output: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bed: + type: file + description: Bed file containing genomic intervals. + pattern: "*.{bed}" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@yuukiiwa" + - "@drpatelh" +maintainers: + - "@yuukiiwa" + - "@drpatelh" diff --git a/modules/nf-core/bedtools/bamtobed/tests/main.nf.test b/modules/nf-core/bedtools/bamtobed/tests/main.nf.test new file mode 100644 index 00000000..9c65ef70 --- /dev/null +++ b/modules/nf-core/bedtools/bamtobed/tests/main.nf.test @@ -0,0 +1,56 @@ +nextflow_process { + name "Test Process BEDTOOLS_BAMTOBED" + script "../main.nf" + process "BEDTOOLS_BAMTOBED" + + tag "modules" + tag "modules_nfcore" + tag "bedtools" + tag "bedtools/bamtobed" + + test("sarscov2 - bam") { + when { + process { + """ + input[0] = [ + [ id:'test' ], // meta map + file(params.test_data['sarscov2']['illumina']['test_single_end_bam'], checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + + test("stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test' ], // meta map + file(params.test_data['sarscov2']['illumina']['test_single_end_bam'], checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.bed[0][1]).name).match() } + ) + } + + } + +} diff --git a/modules/nf-core/bedtools/bamtobed/tests/main.nf.test.snap b/modules/nf-core/bedtools/bamtobed/tests/main.nf.test.snap new file mode 100644 index 00000000..d28ddd3e --- /dev/null +++ b/modules/nf-core/bedtools/bamtobed/tests/main.nf.test.snap @@ -0,0 +1,37 @@ +{ + "stub": { + "content": [ + "test.bed" + ], + "timestamp": "2023-12-05T17:37:27.785556" + }, + "sarscov2 - bam": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.bed:md5,a6a299bd39dc56225f8029c05ea97dcb" + ] + ], + "1": [ + "versions.yml:md5,90a53b0acd234b4f7d125dadd0dbbdfb" + ], + "bed": [ + [ + { + "id": "test" + }, + "test.bed:md5,a6a299bd39dc56225f8029c05ea97dcb" + ] + ], + "versions": [ + "versions.yml:md5,90a53b0acd234b4f7d125dadd0dbbdfb" + ] + } + ], + "timestamp": "2023-12-05T17:37:20.997988" + } +} \ No newline at end of file diff --git a/modules/nf-core/bedtools/bamtobed/tests/tags.yml b/modules/nf-core/bedtools/bamtobed/tests/tags.yml new file mode 100644 index 00000000..54510dda --- /dev/null +++ b/modules/nf-core/bedtools/bamtobed/tests/tags.yml @@ -0,0 +1,2 @@ +bedtools/bamtobed: + - "modules/nf-core/bedtools/bamtobed/**" diff --git a/subworkflows/local/dreg_prep/main.nf b/subworkflows/local/dreg_prep/main.nf new file mode 100644 index 00000000..54c0bff8 --- /dev/null +++ b/subworkflows/local/dreg_prep/main.nf @@ -0,0 +1,14 @@ +include { BEDTOOLS_BAMTOBED } from '../modules/nf-core/bedtools/bamtobed/main' + +workflow DREG_PREP { + take: + bam + bai + sizes + + main: + BEDTOOLS_BAMTOBED( + bam + ) + +} From 43194a87d0cbcf17a6121620665a3020b7c99c53 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 11:56:17 -0500 Subject: [PATCH 023/255] build: nf-core subworkflows install fastq_align_star --- modules.json | 17 +- modules/nf-core/star/align/environment.yml | 10 + modules/nf-core/star/align/main.nf | 109 ++ modules/nf-core/star/align/meta.yml | 115 ++ modules/nf-core/star/align/tests/main.nf.test | 268 +++++ .../star/align/tests/main.nf.test.snap | 769 +++++++++++++ .../star/align/tests/nextflow.arriba.config | 14 + .../nf-core/star/align/tests/nextflow.config | 14 + .../align/tests/nextflow.starfusion.config | 14 + modules/nf-core/star/align/tests/tags.yml | 2 + subworkflows/nf-core/fastq_align_star/main.nf | 68 ++ .../nf-core/fastq_align_star/meta.yml | 133 +++ .../nf-core/fastq_align_star/nextflow.config | 10 + .../fastq_align_star/tests/main.nf.test | 262 +++++ .../fastq_align_star/tests/main.nf.test.snap | 1010 +++++++++++++++++ .../fastq_align_star/tests/nextflow.config | 21 + .../nf-core/fastq_align_star/tests/tags.yml | 2 + .../tests/with_transcripts.config | 21 + 18 files changed, 2858 insertions(+), 1 deletion(-) create mode 100644 modules/nf-core/star/align/environment.yml create mode 100644 modules/nf-core/star/align/main.nf create mode 100644 modules/nf-core/star/align/meta.yml create mode 100644 modules/nf-core/star/align/tests/main.nf.test create mode 100644 modules/nf-core/star/align/tests/main.nf.test.snap create mode 100644 modules/nf-core/star/align/tests/nextflow.arriba.config create mode 100644 modules/nf-core/star/align/tests/nextflow.config create mode 100644 modules/nf-core/star/align/tests/nextflow.starfusion.config create mode 100644 modules/nf-core/star/align/tests/tags.yml create mode 100644 subworkflows/nf-core/fastq_align_star/main.nf create mode 100644 subworkflows/nf-core/fastq_align_star/meta.yml create mode 100644 subworkflows/nf-core/fastq_align_star/nextflow.config create mode 100644 subworkflows/nf-core/fastq_align_star/tests/main.nf.test create mode 100644 subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap create mode 100644 subworkflows/nf-core/fastq_align_star/tests/nextflow.config create mode 100644 subworkflows/nf-core/fastq_align_star/tests/tags.yml create mode 100644 subworkflows/nf-core/fastq_align_star/tests/with_transcripts.config diff --git a/modules.json b/modules.json index b7479a7a..d11cc872 100644 --- a/modules.json +++ b/modules.json @@ -202,6 +202,11 @@ "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", "installed_by": ["bam_stats_samtools"] }, + "star/align": { + "branch": "master", + "git_sha": "a21faa6a3481af92a343a10926f59c189a2c16c9", + "installed_by": ["fastq_align_star", "modules"] + }, "subread/featurecounts": { "branch": "master", "git_sha": "f6bba1a67cdbb605f24d7a4e8dd383b0eec45b52", @@ -229,7 +234,12 @@ "bam_sort_stats_samtools": { "branch": "master", "git_sha": "4352dbdb09ec40db71e9b172b97a01dcf5622c26", - "installed_by": ["fastq_align_bowtie2", "fastq_align_bwa", "fastq_align_hisat2"] + "installed_by": [ + "fastq_align_bowtie2", + "fastq_align_bwa", + "fastq_align_hisat2", + "fastq_align_star" + ] }, "bam_stats_samtools": { "branch": "master", @@ -251,6 +261,11 @@ "git_sha": "701ae347c4508fba1b7d65262596f278b6a11cb6", "installed_by": ["subworkflows"] }, + "fastq_align_star": { + "branch": "master", + "git_sha": "1d1d7df613ff53223259c14185858cd742cd4743", + "installed_by": ["subworkflows"] + }, "homer/groseq": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", diff --git a/modules/nf-core/star/align/environment.yml b/modules/nf-core/star/align/environment.yml new file mode 100644 index 00000000..8bd58cff --- /dev/null +++ b/modules/nf-core/star/align/environment.yml @@ -0,0 +1,10 @@ +name: star_align +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::star=2.7.10a + - bioconda::samtools=1.18 + - bioconda::htslib=1.18 + - conda-forge::gawk=5.1.0 diff --git a/modules/nf-core/star/align/main.nf b/modules/nf-core/star/align/main.nf new file mode 100644 index 00000000..8e9c48b1 --- /dev/null +++ b/modules/nf-core/star/align/main.nf @@ -0,0 +1,109 @@ +process STAR_ALIGN { + tag "$meta.id" + label 'process_high' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/mulled-v2-1fa26d1ce03c295fe2fdcf85831a92fbcbd7e8c2:ded3841da0194af2701c780e9b3d653a85d27489-0' : + 'biocontainers/mulled-v2-1fa26d1ce03c295fe2fdcf85831a92fbcbd7e8c2:ded3841da0194af2701c780e9b3d653a85d27489-0' }" + + input: + tuple val(meta), path(reads, stageAs: "input*/*") + tuple val(meta2), path(index) + tuple val(meta3), path(gtf) + val star_ignore_sjdbgtf + val seq_platform + val seq_center + + output: + tuple val(meta), path('*Log.final.out') , emit: log_final + tuple val(meta), path('*Log.out') , emit: log_out + tuple val(meta), path('*Log.progress.out'), emit: log_progress + path "versions.yml" , emit: versions + + tuple val(meta), path('*d.out.bam') , optional:true, emit: bam + tuple val(meta), path('*sortedByCoord.out.bam') , optional:true, emit: bam_sorted + tuple val(meta), path('*toTranscriptome.out.bam'), optional:true, emit: bam_transcript + tuple val(meta), path('*Aligned.unsort.out.bam') , optional:true, emit: bam_unsorted + tuple val(meta), path('*fastq.gz') , optional:true, emit: fastq + tuple val(meta), path('*.tab') , optional:true, emit: tab + tuple val(meta), path('*.SJ.out.tab') , optional:true, emit: spl_junc_tab + tuple val(meta), path('*.ReadsPerGene.out.tab') , optional:true, emit: read_per_gene_tab + tuple val(meta), path('*.out.junction') , optional:true, emit: junction + tuple val(meta), path('*.out.sam') , optional:true, emit: sam + tuple val(meta), path('*.wig') , optional:true, emit: wig + tuple val(meta), path('*.bg') , optional:true, emit: bedgraph + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def reads1 = [], reads2 = [] + meta.single_end ? [reads].flatten().each{reads1 << it} : reads.eachWithIndex{ v, ix -> ( ix & 1 ? reads2 : reads1) << v } + def ignore_gtf = star_ignore_sjdbgtf ? '' : "--sjdbGTFfile $gtf" + def seq_platform = seq_platform ? "'PL:$seq_platform'" : "" + def seq_center = seq_center ? "'CN:$seq_center'" : "" + def attrRG = args.contains("--outSAMattrRGline") ? "" : "--outSAMattrRGline 'ID:$prefix' $seq_center 'SM:$prefix' $seq_platform" + def out_sam_type = (args.contains('--outSAMtype')) ? '' : '--outSAMtype BAM Unsorted' + def mv_unsorted_bam = (args.contains('--outSAMtype BAM Unsorted SortedByCoordinate')) ? "mv ${prefix}.Aligned.out.bam ${prefix}.Aligned.unsort.out.bam" : '' + """ + STAR \\ + --genomeDir $index \\ + --readFilesIn ${reads1.join(",")} ${reads2.join(",")} \\ + --runThreadN $task.cpus \\ + --outFileNamePrefix $prefix. \\ + $out_sam_type \\ + $ignore_gtf \\ + $attrRG \\ + $args + + $mv_unsorted_bam + + if [ -f ${prefix}.Unmapped.out.mate1 ]; then + mv ${prefix}.Unmapped.out.mate1 ${prefix}.unmapped_1.fastq + gzip ${prefix}.unmapped_1.fastq + fi + if [ -f ${prefix}.Unmapped.out.mate2 ]; then + mv ${prefix}.Unmapped.out.mate2 ${prefix}.unmapped_2.fastq + gzip ${prefix}.unmapped_2.fastq + fi + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + star: \$(STAR --version | sed -e "s/STAR_//g") + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//') + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}Xd.out.bam + touch ${prefix}.Log.final.out + touch ${prefix}.Log.out + touch ${prefix}.Log.progress.out + touch ${prefix}.sortedByCoord.out.bam + touch ${prefix}.toTranscriptome.out.bam + touch ${prefix}.Aligned.unsort.out.bam + touch ${prefix}.Aligned.sortedByCoord.out.bam + touch ${prefix}.unmapped_1.fastq.gz + touch ${prefix}.unmapped_2.fastq.gz + touch ${prefix}.tab + touch ${prefix}.SJ.out.tab + touch ${prefix}.ReadsPerGene.out.tab + touch ${prefix}.Chimeric.out.junction + touch ${prefix}.out.sam + touch ${prefix}.Signal.UniqueMultiple.str1.out.wig + touch ${prefix}.Signal.UniqueMultiple.str1.out.bg + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + star: \$(STAR --version | sed -e "s/STAR_//g") + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//') + END_VERSIONS + """ +} diff --git a/modules/nf-core/star/align/meta.yml b/modules/nf-core/star/align/meta.yml new file mode 100644 index 00000000..e80dbb7d --- /dev/null +++ b/modules/nf-core/star/align/meta.yml @@ -0,0 +1,115 @@ +name: star_align +description: Align reads to a reference genome using STAR +keywords: + - align + - fasta + - genome + - reference +tools: + - star: + description: | + STAR is a software package for mapping DNA sequences against + a large reference genome, such as the human genome. + homepage: https://github.com/alexdobin/STAR + manual: https://github.com/alexdobin/STAR/blob/master/doc/STARmanual.pdf + doi: 10.1093/bioinformatics/bts635 + licence: ["MIT"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - reads: + type: file + description: | + List of input FastQ files of size 1 and 2 for single-end and paired-end data, + respectively. + - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'test' ] + - index: + type: directory + description: STAR genome index + pattern: "star" + - meta3: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'test' ] + - gtf: + type: file + description: Annotation GTF file + pattern: "*.{gtf}" + - star_ignore_sjdbgtf: + type: boolean + description: Ignore annotation GTF file + - seq_platform: + type: string + description: Sequencing platform + - seq_center: + type: string + description: Sequencing center +output: + - bam: + type: file + description: Output BAM file containing read alignments + pattern: "*.{bam}" + - log_final: + type: file + description: STAR final log file + pattern: "*Log.final.out" + - log_out: + type: file + description: STAR lot out file + pattern: "*Log.out" + - log_progress: + type: file + description: STAR log progress file + pattern: "*Log.progress.out" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" + - bam_sorted: + type: file + description: Sorted BAM file of read alignments (optional) + pattern: "*sortedByCoord.out.bam" + - bam_transcript: + type: file + description: Output BAM file of transcriptome alignment (optional) + pattern: "*toTranscriptome.out.bam" + - bam_unsorted: + type: file + description: Unsorted BAM file of read alignments (optional) + pattern: "*Aligned.unsort.out.bam" + - fastq: + type: file + description: Unmapped FastQ files (optional) + pattern: "*fastq.gz" + - tab: + type: file + description: STAR output tab file(s) (optional) + pattern: "*.tab" + - junction: + type: file + description: STAR chimeric junction output file (optional) + pattern: "*.out.junction" + - wig: + type: file + description: STAR output wiggle format file(s) (optional) + pattern: "*.wig" + - bedgraph: + type: file + description: STAR output bedGraph format file(s) (optional) + pattern: "*.bg" +authors: + - "@kevinmenden" + - "@drpatelh" + - "@praveenraj2018" +maintainers: + - "@kevinmenden" + - "@drpatelh" + - "@praveenraj2018" diff --git a/modules/nf-core/star/align/tests/main.nf.test b/modules/nf-core/star/align/tests/main.nf.test new file mode 100644 index 00000000..6ecd7786 --- /dev/null +++ b/modules/nf-core/star/align/tests/main.nf.test @@ -0,0 +1,268 @@ +nextflow_process { + + name "Test Process STAR_ALIGN" + script "../main.nf" + process "STAR_ALIGN" + tag "modules" + tag "modules_nfcore" + tag "star" + tag "star/align" + tag "star/genomegenerate" + + setup { + run("STAR_GENOMEGENERATE") { + script "../../../star/genomegenerate/main.nf" + process { + """ + input[0] = Channel.of([ + [ id:'test_fasta' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[1] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + """ + } + } + } + + test("homo_sapiens - single_end") { + config "./nextflow.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = false + input[4] = 'illumina' + input[5] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.log_final[0][1]).name).match("homo_sapiens - single_end - log_final") }, + { assert snapshot(file(process.out.log_out[0][1]).name).match("homo_sapiens - single_end - log_out") }, + { assert snapshot(process.out.bam).match("homo_sapiens - single_end - bam") }, + { assert snapshot(process.out.bam_sorted).match("homo_sapiens - single_end - bam_sorted") }, + { assert snapshot(process.out.bam_transcript).match("homo_sapiens - single_end - bam_transcript") }, + { assert snapshot(process.out.bam_unsorted).match("homo_sapiens - single_end - bam_unsorted") }, + { assert snapshot(process.out.bedgraph).match("homo_sapiens - single_end - bedgraph") }, + { assert snapshot(process.out.fastq).match("homo_sapiens - single_end - fastq") }, + { assert snapshot(process.out.junction).match("homo_sapiens - single_end - junction") }, + { assert snapshot(process.out.log_progress).match("homo_sapiens - single_end - log_progress") }, + { assert snapshot(process.out.read_per_gene_tab).match("homo_sapiens - single_end - read_per_gene_tab") }, + { assert snapshot(process.out.sam).match("homo_sapiens - single_end - sam") }, + { assert snapshot(process.out.spl_junc_tab).match("homo_sapiens - single_end - spl_junc_tab") }, + { assert snapshot(process.out.tab).match("homo_sapiens - single_end - tab") }, + { assert snapshot(process.out.wig).match("homo_sapiens - single_end - wig") }, + { assert snapshot(process.out.versions).match("homo_sapiens - single_end - versions") } + ) + } + } + + test("homo_sapiens - paired_end") { + config "./nextflow.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true) + ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = false + input[4] = 'illumina' + input[5] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.log_final[0][1]).name).match("homo_sapiens - paired_end - log_final") }, + { assert snapshot(file(process.out.log_out[0][1]).name).match("homo_sapiens - paired_end - log_out") }, + { assert snapshot(process.out.bam).match("homo_sapiens - paired_end - bam") }, + { assert snapshot(process.out.bam_sorted).match("homo_sapiens - paired_end - bam_sorted") }, + { assert snapshot(process.out.bam_transcript).match("homo_sapiens - paired_end - bam_transcript") }, + { assert snapshot(process.out.bam_unsorted).match("homo_sapiens - paired_end - bam_unsorted") }, + { assert snapshot(process.out.bedgraph).match("homo_sapiens - paired_end - bedgraph") }, + { assert snapshot(process.out.fastq).match("homo_sapiens - paired_end - fastq") }, + { assert snapshot(process.out.junction).match("homo_sapiens - paired_end - junction") }, + { assert snapshot(process.out.log_progress).match("homo_sapiens - paired_end - log_progress") }, + { assert snapshot(process.out.read_per_gene_tab).match("homo_sapiens - paired_end - read_per_gene_tab") }, + { assert snapshot(process.out.sam).match("homo_sapiens - paired_end - sam") }, + { assert snapshot(process.out.spl_junc_tab).match("homo_sapiens - paired_end - spl_junc_tab") }, + { assert snapshot(process.out.tab).match("homo_sapiens - paired_end - tab") }, + { assert snapshot(process.out.wig).match("homo_sapiens - paired_end - wig") }, + { assert snapshot(process.out.versions).match("homo_sapiens - paired_end - versions") } + ) + } + } + + test("homo_sapiens - paired_end - arriba") { + config "./nextflow.arriba.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true) + ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = false + input[4] = 'illumina' + input[5] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.log_final[0][1]).name).match("homo_sapiens - paired_end - arriba - log_final") }, + { assert snapshot(file(process.out.log_out[0][1]).name).match("homo_sapiens - paired_end - arriba - log_out") }, + { assert snapshot(file(process.out.log_progress[0][1]).name).match("homo_sapiens - paired_end - arriba - log_progress") }, + { assert snapshot(process.out.bam).match("homo_sapiens - paired_end - arriba - bam") }, + { assert snapshot(process.out.bam_sorted).match("homo_sapiens - paired_end - arriba - bam_sorted") }, + { assert snapshot(process.out.bam_transcript).match("homo_sapiens - paired_end - arriba - bam_transcript") }, + { assert snapshot(process.out.bam_unsorted).match("homo_sapiens - paired_end - arriba - bam_unsorted") }, + { assert snapshot(process.out.bedgraph).match("homo_sapiens - paired_end - arriba - bedgraph") }, + { assert snapshot(process.out.fastq).match("homo_sapiens - paired_end - arriba - fastq") }, + { assert snapshot(process.out.junction).match("homo_sapiens - paired_end - arriba - junction") }, + { assert snapshot(process.out.read_per_gene_tab).match("homo_sapiens - paired_end - arriba - read_per_gene_tab") }, + { assert snapshot(process.out.sam).match("homo_sapiens - paired_end - arriba - sam") }, + { assert snapshot(process.out.spl_junc_tab).match("homo_sapiens - paired_end - arriba - spl_junc_tab") }, + { assert snapshot(process.out.tab).match("homo_sapiens - paired_end - arriba - tab") }, + { assert snapshot(process.out.wig).match("homo_sapiens - paired_end - arriba - wig") }, + { assert snapshot(process.out.versions).match("homo_sapiens - paired_end - arriba - versions") } + ) + } + } + + test("homo_sapiens - paired_end - starfusion") { + config "./nextflow.starfusion.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true) + ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = false + input[4] = 'illumina' + input[5] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.log_final[0][1]).name).match("homo_sapiens - paired_end - starfusion - log_final") }, + { assert snapshot(file(process.out.log_out[0][1]).name).match("homo_sapiens - paired_end - starfusion - log_out") }, + { assert snapshot(file(process.out.log_progress[0][1]).name).match("homo_sapiens - paired_end - starfusion - log_progress") }, + { assert snapshot(process.out.bam).match("homo_sapiens - paired_end - starfusion - bam") }, + { assert snapshot(process.out.bam_sorted).match("homo_sapiens - paired_end - starfusion - bam_sorted") }, + { assert snapshot(process.out.bam_transcript).match("homo_sapiens - paired_end - starfusion - bam_transcript") }, + { assert snapshot(process.out.bam_unsorted).match("homo_sapiens - paired_end - starfusion - bam_unsorted") }, + { assert snapshot(process.out.bedgraph).match("homo_sapiens - paired_end - starfusion - bedgraph") }, + { assert snapshot(process.out.fastq).match("homo_sapiens - paired_end - starfusion - fastq") }, + { assert snapshot(process.out.junction).match("homo_sapiens - paired_end - starfusion - junction") }, + { assert snapshot(process.out.read_per_gene_tab).match("homo_sapiens - paired_end - starfusion - read_per_gene_tab") }, + { assert snapshot(process.out.sam).match("homo_sapiens - paired_end - starfusion - sam") }, + { assert snapshot(process.out.spl_junc_tab).match("homo_sapiens - paired_end - starfusion - spl_junc_tab") }, + { assert snapshot(process.out.tab).match("homo_sapiens - paired_end - starfusion - tab") }, + { assert snapshot(process.out.wig).match("homo_sapiens - paired_end - starfusion - wig") }, + { assert snapshot(process.out.versions).match("homo_sapiens - paired_end - starfusion - versions") } + ) + } + } + + test("homo_sapiens - paired_end - multiple") { + config "./nextflow.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true) + ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = false + input[4] = 'illumina' + input[5] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.log_final[0][1]).name).match("homo_sapiens - paired_end - multiple - log_final") }, + { assert snapshot(file(process.out.log_out[0][1]).name).match("homo_sapiens - paired_end - multiple - log_out") }, + { assert snapshot(file(process.out.log_progress[0][1]).name).match("homo_sapiens - paired_end - multiple - log_progress") }, + { assert snapshot(process.out.bam).match("homo_sapiens - paired_end - multiple - bam") }, + { assert snapshot(process.out.bam_sorted).match("homo_sapiens - paired_end - multiple - bam_sorted") }, + { assert snapshot(process.out.bam_transcript).match("homo_sapiens - paired_end - multiple - bam_transcript") }, + { assert snapshot(process.out.bam_unsorted).match("homo_sapiens - paired_end - multiple - bam_unsorted") }, + { assert snapshot(process.out.bedgraph).match("homo_sapiens - paired_end - multiple - bedgraph") }, + { assert snapshot(process.out.fastq).match("homo_sapiens - paired_end - multiple - fastq") }, + { assert snapshot(process.out.junction).match("homo_sapiens - paired_end - multiple - junction") }, + { assert snapshot(process.out.read_per_gene_tab).match("homo_sapiens - paired_end - multiple - read_per_gene_tab") }, + { assert snapshot(process.out.sam).match("homo_sapiens - paired_end - multiple - sam") }, + { assert snapshot(process.out.spl_junc_tab).match("homo_sapiens - paired_end - multiple - spl_junc_tab") }, + { assert snapshot(process.out.tab).match("homo_sapiens - paired_end - multiple - tab") }, + { assert snapshot(process.out.wig).match("homo_sapiens - paired_end - multiple - wig") }, + { assert snapshot(process.out.versions).match("homo_sapiens - paired_end - multiple - versions") } + ) + } + } +} \ No newline at end of file diff --git a/modules/nf-core/star/align/tests/main.nf.test.snap b/modules/nf-core/star/align/tests/main.nf.test.snap new file mode 100644 index 00000000..08edb914 --- /dev/null +++ b/modules/nf-core/star/align/tests/main.nf.test.snap @@ -0,0 +1,769 @@ +{ + "homo_sapiens - paired_end - multiple - bam_sorted": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.sortedByCoord.out.bam:md5,ab07c21d63ab0a6c07d171d213c81d5a" + ] + ] + ], + "timestamp": "2023-12-04T18:01:19.968225733" + }, + "homo_sapiens - paired_end - multiple - wig": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:29:01.857804" + }, + "homo_sapiens - paired_end - arriba - tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,5155c9fd1f787ad6d7d80987fb06219c" + ] + ] + ], + "timestamp": "2023-12-04T17:56:12.347549723" + }, + "homo_sapiens - single_end - wig": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:22:55.24701" + }, + "homo_sapiens - paired_end - sam": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:23:33.383818" + }, + "homo_sapiens - paired_end - arriba - versions": { + "content": [ + [ + "versions.yml:md5,2e6b6d8809f5a17f38f4d27c45dcb22f" + ] + ], + "timestamp": "2023-12-04T17:56:12.431212643" + }, + "homo_sapiens - paired_end - multiple - bedgraph": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test.Signal.Unique.str1.out.bg:md5,d7bf8b70b436ca048a62513e1d0ece3a", + "test.Signal.UniqueMultiple.str1.out.bg:md5,686d58493b9eb445b56ace4d67f76ef6" + ] + ] + ] + ], + "timestamp": "2023-12-04T18:01:20.07119229" + }, + "homo_sapiens - paired_end - read_per_gene_tab": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:23:33.368841" + }, + "homo_sapiens - paired_end - arriba - bedgraph": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:07.102537" + }, + "homo_sapiens - single_end - junction": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:22:55.185369" + }, + "homo_sapiens - paired_end - arriba - spl_junc_tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,5155c9fd1f787ad6d7d80987fb06219c" + ] + ] + ], + "timestamp": "2023-12-04T17:56:12.268388251" + }, + "homo_sapiens - single_end - sam": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:22:55.216183" + }, + "homo_sapiens - paired_end - fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:23:33.327236" + }, + "homo_sapiens - single_end - versions": { + "content": [ + [ + "versions.yml:md5,2e6b6d8809f5a17f38f4d27c45dcb22f" + ] + ], + "timestamp": "2023-12-04T17:53:26.664210196" + }, + "homo_sapiens - paired_end - multiple - log_out": { + "content": [ + "test.Log.out" + ], + "timestamp": "2023-11-23T13:29:01.022176" + }, + "homo_sapiens - paired_end - arriba - fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:07.15277" + }, + "homo_sapiens - paired_end - multiple - junction": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:29:01.52923" + }, + "homo_sapiens - paired_end - multiple - spl_junc_tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,069877e053714e23010fe4e1c003b4a2" + ] + ] + ], + "timestamp": "2023-12-04T18:01:20.189486201" + }, + "homo_sapiens - paired_end - starfusion - log_final": { + "content": [ + "test.Log.final.out" + ], + "timestamp": "2023-11-23T13:27:55.905883" + }, + "homo_sapiens - paired_end - starfusion - fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.192302" + }, + "homo_sapiens - paired_end - multiple - sam": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:29:01.661837" + }, + "homo_sapiens - paired_end - multiple - log_final": { + "content": [ + "test.Log.final.out" + ], + "timestamp": "2023-11-23T13:29:00.966417" + }, + "homo_sapiens - paired_end - starfusion - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.out.bam:md5,bcad07b838f6762fc01eea52b5cd3f84" + ] + ] + ], + "timestamp": "2023-12-04T17:59:58.53235164" + }, + "homo_sapiens - paired_end - arriba - junction": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:07.202776" + }, + "homo_sapiens - single_end - bedgraph": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + [ + "test.Signal.Unique.str1.out.bg:md5,c56fc1472776fb927eaf62d973da5f9a", + "test.Signal.UniqueMultiple.str1.out.bg:md5,e93373cf6f2a2a9506e2efdb260cdd4f" + ] + ] + ] + ], + "timestamp": "2023-12-04T17:53:26.394863748" + }, + "homo_sapiens - paired_end - arriba - read_per_gene_tab": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:07.251962" + }, + "homo_sapiens - paired_end - starfusion - bam_sorted": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.040843" + }, + "homo_sapiens - single_end - bam_unsorted": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:22:55.154172" + }, + "homo_sapiens - paired_end - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.sortedByCoord.out.bam:md5,b9ee1c607e07323bc1652ef3babb543f" + ] + ] + ], + "timestamp": "2023-12-04T17:54:11.934832258" + }, + "homo_sapiens - paired_end - arriba - bam_transcript": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:06.998817" + }, + "homo_sapiens - paired_end - log_out": { + "content": [ + "test.Log.out" + ], + "timestamp": "2023-11-23T13:23:33.259699" + }, + "homo_sapiens - paired_end - arriba - log_out": { + "content": [ + "test.Log.out" + ], + "timestamp": "2023-11-23T13:25:06.849451" + }, + "homo_sapiens - paired_end - multiple - versions": { + "content": [ + [ + "versions.yml:md5,2e6b6d8809f5a17f38f4d27c45dcb22f" + ] + ], + "timestamp": "2023-12-04T18:01:20.393705142" + }, + "homo_sapiens - paired_end - starfusion - bam_transcript": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.082408" + }, + "homo_sapiens - paired_end - starfusion - tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,19c3faa1bfa9a0cc5e4c45f17065b53a" + ] + ] + ], + "timestamp": "2023-12-04T17:59:58.818041322" + }, + "homo_sapiens - single_end - fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:22:55.175307" + }, + "homo_sapiens - paired_end - tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,844af19ab0fc8cd9a3f75228445aca0d" + ] + ] + ], + "timestamp": "2023-12-04T17:54:12.255481058" + }, + "homo_sapiens - paired_end - starfusion - bedgraph": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.155413" + }, + "homo_sapiens - single_end - bam_transcript": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:22:55.144852" + }, + "homo_sapiens - paired_end - versions": { + "content": [ + [ + "versions.yml:md5,2e6b6d8809f5a17f38f4d27c45dcb22f" + ] + ], + "timestamp": "2023-12-04T17:54:12.343840482" + }, + "homo_sapiens - paired_end - multiple - tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,069877e053714e23010fe4e1c003b4a2" + ] + ] + ], + "timestamp": "2023-12-04T18:01:20.291692062" + }, + "homo_sapiens - single_end - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.Aligned.sortedByCoord.out.bam:md5,c6cfaccaf91bc7fdabed3cfe236d4535" + ] + ] + ], + "timestamp": "2023-12-04T17:53:26.265642675" + }, + "homo_sapiens - paired_end - arriba - wig": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:07.444214" + }, + "homo_sapiens - paired_end - log_progress": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Log.progress.out:md5,b2bd061d6cbaaf3d6d3b1fed547f69b8" + ] + ] + ], + "timestamp": "2023-12-04T17:54:12.126063825" + }, + "homo_sapiens - paired_end - arriba - log_final": { + "content": [ + "test.Log.final.out" + ], + "timestamp": "2023-11-23T13:25:06.829799" + }, + "homo_sapiens - paired_end - bam_unsorted": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:23:33.300509" + }, + "homo_sapiens - paired_end - arriba - sam": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:07.300383" + }, + "homo_sapiens - paired_end - multiple - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.sortedByCoord.out.bam:md5,ab07c21d63ab0a6c07d171d213c81d5a" + ] + ] + ], + "timestamp": "2023-12-04T18:01:19.851247126" + }, + "homo_sapiens - paired_end - multiple - fastq": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:29:01.462257" + }, + "homo_sapiens - single_end - bam_sorted": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.Aligned.sortedByCoord.out.bam:md5,c6cfaccaf91bc7fdabed3cfe236d4535" + ] + ] + ], + "timestamp": "2023-12-04T17:53:26.335457371" + }, + "homo_sapiens - paired_end - arriba - bam_sorted": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:06.94699" + }, + "homo_sapiens - paired_end - starfusion - junction": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Chimeric.out.junction:md5,c10ef219f4a30e83711b995bc5e40dba" + ] + ] + ], + "timestamp": "2023-12-04T17:59:58.641115828" + }, + "homo_sapiens - single_end - tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.SJ.out.tab:md5,75a516ab950fb958f40b29996474949c" + ] + ] + ], + "timestamp": "2023-12-04T17:53:26.580593434" + }, + "homo_sapiens - paired_end - starfusion - versions": { + "content": [ + [ + "versions.yml:md5,2e6b6d8809f5a17f38f4d27c45dcb22f" + ] + ], + "timestamp": "2023-12-04T17:59:58.907317103" + }, + "homo_sapiens - paired_end - multiple - bam_unsorted": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:29:01.330463" + }, + "homo_sapiens - paired_end - arriba - log_progress": { + "content": [ + "test.Log.progress.out" + ], + "timestamp": "2023-11-23T13:25:06.86866" + }, + "homo_sapiens - paired_end - bedgraph": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test.Signal.Unique.str1.out.bg:md5,d7bf8b70b436ca048a62513e1d0ece3a", + "test.Signal.UniqueMultiple.str1.out.bg:md5,686d58493b9eb445b56ace4d67f76ef6" + ] + ] + ] + ], + "timestamp": "2023-12-04T17:54:12.064121304" + }, + "homo_sapiens - paired_end - starfusion - bam_unsorted": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.118974" + }, + "homo_sapiens - paired_end - starfusion - read_per_gene_tab": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.264699" + }, + "homo_sapiens - paired_end - multiple - log_progress": { + "content": [ + "test.Log.progress.out" + ], + "timestamp": "2023-11-23T13:29:01.076947" + }, + "homo_sapiens - paired_end - arriba - bam_unsorted": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:25:07.050409" + }, + "homo_sapiens - paired_end - bam_sorted": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.sortedByCoord.out.bam:md5,b9ee1c607e07323bc1652ef3babb543f" + ] + ] + ], + "timestamp": "2023-12-04T17:54:12.002180537" + }, + "homo_sapiens - single_end - spl_junc_tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.SJ.out.tab:md5,75a516ab950fb958f40b29996474949c" + ] + ] + ], + "timestamp": "2023-12-04T17:53:26.50932751" + }, + "homo_sapiens - paired_end - starfusion - spl_junc_tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,19c3faa1bfa9a0cc5e4c45f17065b53a" + ] + ] + ], + "timestamp": "2023-12-04T17:59:58.731699486" + }, + "homo_sapiens - single_end - log_out": { + "content": [ + "test.Log.out" + ], + "timestamp": "2023-11-23T13:22:55.126286" + }, + "homo_sapiens - paired_end - log_final": { + "content": [ + "test.Log.final.out" + ], + "timestamp": "2023-11-23T13:23:33.253884" + }, + "homo_sapiens - single_end - log_final": { + "content": [ + "test.Log.final.out" + ], + "timestamp": "2023-11-23T13:22:55.11799" + }, + "homo_sapiens - paired_end - bam_transcript": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:23:33.287684" + }, + "homo_sapiens - paired_end - starfusion - log_progress": { + "content": [ + "test.Log.progress.out" + ], + "timestamp": "2023-11-23T13:27:55.971484" + }, + "homo_sapiens - paired_end - multiple - bam_transcript": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:29:01.264176" + }, + "homo_sapiens - paired_end - multiple - read_per_gene_tab": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:29:01.596406" + }, + "homo_sapiens - single_end - read_per_gene_tab": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:22:55.205936" + }, + "homo_sapiens - paired_end - junction": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:23:33.340653" + }, + "homo_sapiens - paired_end - spl_junc_tab": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,844af19ab0fc8cd9a3f75228445aca0d" + ] + ] + ], + "timestamp": "2023-12-04T17:54:12.185730856" + }, + "homo_sapiens - paired_end - starfusion - sam": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.300637" + }, + "homo_sapiens - paired_end - arriba - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.out.bam:md5,c1b1747f5873f2d17762725636e891d5" + ] + ] + ], + "timestamp": "2023-12-04T17:56:12.190560178" + }, + "homo_sapiens - single_end - log_progress": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.Log.progress.out:md5,b2bd061d6cbaaf3d6d3b1fed547f69b8" + ] + ] + ], + "timestamp": "2023-12-04T17:53:26.450352138" + }, + "homo_sapiens - paired_end - starfusion - wig": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:27:56.422018" + }, + "homo_sapiens - paired_end - wig": { + "content": [ + [ + + ] + ], + "timestamp": "2023-11-23T13:23:33.429457" + }, + "homo_sapiens - paired_end - starfusion - log_out": { + "content": [ + "test.Log.out" + ], + "timestamp": "2023-11-23T13:27:55.93945" + } +} \ No newline at end of file diff --git a/modules/nf-core/star/align/tests/nextflow.arriba.config b/modules/nf-core/star/align/tests/nextflow.arriba.config new file mode 100644 index 00000000..2324b9e5 --- /dev/null +++ b/modules/nf-core/star/align/tests/nextflow.arriba.config @@ -0,0 +1,14 @@ +process { + + withName: STAR_GENOMEGENERATE { + ext.args = '--genomeSAindexNbases 9' + } + + withName: STAR_ALIGN { + ext.args = '--readFilesCommand zcat --outSAMtype BAM Unsorted --outSAMunmapped Within --outBAMcompression 0 --outFilterMultimapNmax 50 --peOverlapNbasesMin 10 --alignSplicedMateMapLminOverLmate 0.5 --alignSJstitchMismatchNmax 5 -1 5 5 --chimSegmentMin 10 --chimOutType WithinBAM HardClip --chimJunctionOverhangMin 10 --chimScoreDropMax 30 --chimScoreJunctionNonGTAG 0 --chimScoreSeparation 1 --chimSegmentReadGapMax 3 --chimMultimapNmax 50' + } + +} + +// Fix chown issue for the output star folder +docker.runOptions = '--platform=linux/amd64 -u $(id -u):$(id -g)' diff --git a/modules/nf-core/star/align/tests/nextflow.config b/modules/nf-core/star/align/tests/nextflow.config new file mode 100644 index 00000000..c4ac5808 --- /dev/null +++ b/modules/nf-core/star/align/tests/nextflow.config @@ -0,0 +1,14 @@ +process { + + withName: STAR_GENOMEGENERATE { + ext.args = '--genomeSAindexNbases 9' + } + + withName: STAR_ALIGN { + ext.args = '--readFilesCommand zcat --outSAMtype BAM SortedByCoordinate --outWigType bedGraph --outWigStrand Unstranded' + } + +} + +// Fix chown issue for the output star folder +docker.runOptions = '--platform=linux/amd64 -u $(id -u):$(id -g)' diff --git a/modules/nf-core/star/align/tests/nextflow.starfusion.config b/modules/nf-core/star/align/tests/nextflow.starfusion.config new file mode 100644 index 00000000..467b6497 --- /dev/null +++ b/modules/nf-core/star/align/tests/nextflow.starfusion.config @@ -0,0 +1,14 @@ +process { + + withName: STAR_GENOMEGENERATE { + ext.args = '--genomeSAindexNbases 9' + } + + withName: STAR_ALIGN { + ext.args = '--readFilesCommand zcat --outSAMtype BAM Unsorted --outReadsUnmapped None --twopassMode Basic --outSAMstrandField intronMotif --outSAMunmapped Within --chimSegmentMin 12 --chimJunctionOverhangMin 8 --chimOutJunctionFormat 1 --alignSJDBoverhangMin 10 --alignMatesGapMax 100000 --alignIntronMax 100000 --alignSJstitchMismatchNmax 5 -1 5 5 --chimMultimapScoreRange 3 --chimScoreJunctionNonGTAG -4 --chimMultimapNmax 20 --chimNonchimScoreDropMin 10 --peOverlapNbasesMin 12 --peOverlapMMp 0.1 --alignInsertionFlush Right --alignSplicedMateMapLminOverLmate 0 --alignSplicedMateMapLmin 30' + } + +} + +// Fix chown issue for the output star folder +docker.runOptions = '--platform=linux/amd64 -u $(id -u):$(id -g)' diff --git a/modules/nf-core/star/align/tests/tags.yml b/modules/nf-core/star/align/tests/tags.yml new file mode 100644 index 00000000..8beace16 --- /dev/null +++ b/modules/nf-core/star/align/tests/tags.yml @@ -0,0 +1,2 @@ +star/align: + - modules/nf-core/star/align/** diff --git a/subworkflows/nf-core/fastq_align_star/main.nf b/subworkflows/nf-core/fastq_align_star/main.nf new file mode 100644 index 00000000..00d553d9 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/main.nf @@ -0,0 +1,68 @@ +include { STAR_ALIGN } from '../../../modules/nf-core/star/align/main' +include { BAM_SORT_STATS_SAMTOOLS as BAM_SORT_STATS_SAMTOOLS_GENOME } from '../bam_sort_stats_samtools/main' +include { BAM_SORT_STATS_SAMTOOLS as BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME } from '../bam_sort_stats_samtools/main' + + +workflow FASTQ_ALIGN_STAR { + + take: + ch_reads // channel: [ val(meta), [ path(reads) ] ] + ch_index // channel: [ path(index) ] + ch_gtf // channel: [ path(gtf) ] + val_star_ignore_sjdbgtf // boolean: when using pre-built STAR indices do not re-extract and use splice junctions from the GTF file + val_seq_platform // string : sequencing platform + val_seq_center // string : sequencing center + ch_fasta // channel: [ val(meta), path(fasta) ] + ch_transcripts_fasta // channel: [ val(meta), path(fasta) ] + + main: + + ch_versions = Channel.empty() + + // + // Map reads with STAR + // + STAR_ALIGN ( ch_reads, ch_index, ch_gtf, val_star_ignore_sjdbgtf, val_seq_platform, val_seq_center ) + ch_versions = ch_versions.mix(STAR_ALIGN.out.versions.first()) + + // + // Sort, index BAM file and run samtools stats, flagstat and idxstats + // + BAM_SORT_STATS_SAMTOOLS_GENOME ( STAR_ALIGN.out.bam, ch_fasta ) + ch_versions = ch_versions.mix(BAM_SORT_STATS_SAMTOOLS_GENOME.out.versions) + + // + // Sort, index BAM file and run samtools stats, flagstat and idxstats + // + // Only runs when '--quantMode TranscriptomeSAM' is set in args and + // STAR_ALIGN.out.bam_transcript is populated + // + + BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME ( STAR_ALIGN.out.bam_transcript, ch_transcripts_fasta ) + ch_versions = ch_versions.mix(BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME.out.versions) + + emit: + + orig_bam = STAR_ALIGN.out.bam // channel: [ val(meta), path(bam) ] + log_final = STAR_ALIGN.out.log_final // channel: [ val(meta), path(log_final) ] + log_out = STAR_ALIGN.out.log_out // channel: [ val(meta), path(log_out) ] + log_progress = STAR_ALIGN.out.log_progress // channel: [ val(meta), path(log_progress) ] + bam_sorted = STAR_ALIGN.out.bam_sorted // channel: [ val(meta), path(bam) ] + fastq = STAR_ALIGN.out.fastq // channel: [ val(meta), path(fastq) ] + tab = STAR_ALIGN.out.tab // channel: [ val(meta), path(tab) ] + orig_bam_transcript = STAR_ALIGN.out.bam_transcript // channel: [ val(meta), path(bam) ] + + bam = BAM_SORT_STATS_SAMTOOLS_GENOME.out.bam // channel: [ val(meta), path(bam) ] + bai = BAM_SORT_STATS_SAMTOOLS_GENOME.out.bai // channel: [ val(meta), path(bai) ] + stats = BAM_SORT_STATS_SAMTOOLS_GENOME.out.stats // channel: [ val(meta), path(stats) ] + flagstat = BAM_SORT_STATS_SAMTOOLS_GENOME.out.flagstat // channel: [ val(meta), path(flagstat) ] + idxstats = BAM_SORT_STATS_SAMTOOLS_GENOME.out.idxstats // channel: [ val(meta), path(idxstats) ] + + bam_transcript = BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME.out.bam // channel: [ val(meta), path(bam) ] + bai_transcript = BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME.out.bai // channel: [ val(meta), path(bai) ] + stats_transcript = BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME.out.stats // channel: [ val(meta), path(stats) ] + flagstat_transcript = BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME.out.flagstat // channel: [ val(meta), path(flagstat) ] + idxstats_transcript = BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME.out.idxstats // channel: [ val(meta), path(idxstats) ] + + versions = ch_versions // channel: [ path(versions.yml) ] +} diff --git a/subworkflows/nf-core/fastq_align_star/meta.yml b/subworkflows/nf-core/fastq_align_star/meta.yml new file mode 100644 index 00000000..796d3e4b --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/meta.yml @@ -0,0 +1,133 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: "fastq_align_star" +description: Align reads to a reference genome using bowtie2 then sort with samtools +keywords: + - align + - fasta + - genome + - reference +components: + - star/align + - samtools/sort + - samtools/index + - samtools/stats + - samtools/idxstats + - samtools/flagstat + - bam_sort_stats_samtools +input: + - ch_reads: + description: | + List of input FastQ files of size 1 and 2 for single-end and paired-end data, + respectively. + Structure: [ val(meta), [ path(reads) ] ] + - ch_index: + type: directory + description: STAR genome index + pattern: "star" + - ch_gtf: + type: file + description: | + GTF file used to set the splice junctions with the --sjdbGTFfile flag + pattern: "*.gtf" + - val_star_ignore_sjdbgtf: + type: boolean + description: | + If true the --sjdbGTFfile flag is set + pattern: "true|false" + - val_seq_platform: + type: string + description: | + Sequencing platform to be added to the bam header using the --outSAMattrRGline flag + - val_seq_center: + type: string + description: | + Sequencing center to be added to the bam header using the --outSAMattrRGline flag + - ch_fasta: + type: file + description: Reference genome fasta file + pattern: "*.{fasta,fa,fna}" + - ch_transcripts_fasta: + type: file + description: Optional reference genome fasta file + pattern: "*.{fasta,fa,fna}" +output: + - orig_bam: + description: | + Output BAM file containing read alignments + Structure: [ val(meta), path(bam) ] + - log_final: + description: | + STAR final log file + Structure: [ val(meta), path(log_final) ] + - log_out: + description: | + STAR log out file + Structure: [ val(meta), path(log_out) ] + - log_progress: + description: | + STAR log progress file + Structure: [ val(meta), path(log_progress) ] + - bam_sorted: + description: | + Sorted BAM file of read alignments (optional) + Structure: [ val(meta), path(bam) ] + - orig_bam_transcript: + description: | + Output BAM file of transcriptome alignment (optional) + Structure: [ val(meta), path(bam) ] + - fastq: + description: | + Unmapped FastQ files (optional) + Structure: [ val(meta), path(fastq) ] + - tab: + description: | + STAR output tab file(s) (optional) + Structure: [ val(meta), path(tab) ] + - bam: + description: | + BAM file ordered by samtools + Structure: [ val(meta), path(bam) ] + - bai: + description: | + BAI index of the ordered BAM file + Structure: [ val(meta), path(bai) ] + - 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) ] + - bam_transcript: + description: | + Transcriptome-level BAM file ordered by samtools (optional) + Structure: [ val(meta), path(bam) ] + - bai_transcript: + description: | + Transcriptome-level BAI index of the ordered BAM file (optional) + Structure: [ val(meta), path(bai) ] + - stats_transcript: + description: | + Transcriptome-level file containing samtools stats output (optional) + Structure: [ val(meta), path(stats) ] + - flagstat_transcript: + description: | + Transcriptome-level file containing samtools flagstat output (optional) + Structure: [ val(meta), path(flagstat) ] + - idxstats_transcript: + description: | + Transcriptome-level file containing samtools idxstats output (optional) + Structure: [ val(meta), path(idxstats) ] + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@JoseEspinosa" +maintainers: + - "@JoseEspinosa" diff --git a/subworkflows/nf-core/fastq_align_star/nextflow.config b/subworkflows/nf-core/fastq_align_star/nextflow.config new file mode 100644 index 00000000..926eae71 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/nextflow.config @@ -0,0 +1,10 @@ +// IMPORTANT: Add this configuration to your modules.config + +process { + withName: ".*:FASTQ_ALIGN_STAR:BAM_SORT_STATS_SAMTOOLS_GENOME:.*" { + ext.prefix = {"${meta.id}_genome"} + } + withName: ".*:FASTQ_ALIGN_STAR:BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME:.*" { + ext.prefix = {"${meta.id}_transcriptome"} + } +} diff --git a/subworkflows/nf-core/fastq_align_star/tests/main.nf.test b/subworkflows/nf-core/fastq_align_star/tests/main.nf.test new file mode 100644 index 00000000..2c512c96 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/tests/main.nf.test @@ -0,0 +1,262 @@ +nextflow_workflow { + + name "Test Subworkflow FASTQ_ALIGN_STAR" + script "../main.nf" + workflow "FASTQ_ALIGN_STAR" + + tag "subworkflows" + tag "subworkflows_nfcore" + tag "subworkflows/fastq_align_star" + tag "star/align" + tag "star/genomegenerate" + tag "rsem/preparereference" + tag "subworkflows/bam_sort_stats_samtools" + + setup { + run("STAR_GENOMEGENERATE") { + script "../../../../modules/nf-core/star/genomegenerate/main.nf" + process { + """ + input[0] = Channel.of([ + [ id:'test_fasta' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[1] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + """ + } + } + } + + test("homo_sapiens - fastq - single_end") { + config "./nextflow.config" + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = true // star_ignore_sjdbgtf + input[4] = 'illumina' // seq_platform + input[5] = false // seq_center + input[6] = Channel.of([ + [ id:'test_fasta' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[7] = Channel.of([[:], []]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out.orig_bam).match('orig_bam_single_end')}, + { assert snapshot(workflow.out.bam_sorted).match('bam_sorted_single_end')}, + { assert snapshot(workflow.out.fastq).match('fastq_single_end')}, + { assert snapshot(workflow.out.tab).match('tab_single_end')}, + { assert snapshot(workflow.out.orig_bam_transcript).match('orig_bam_transcript_single_end')}, + { assert snapshot(workflow.out.bam).match('bam_single_end')}, + { assert snapshot(workflow.out.bai).match('bai_single_end')}, + { assert snapshot(workflow.out.stats).match('stats_single_end')}, + { assert snapshot(workflow.out.flagstat).match('flagstat_single_end')}, + { assert snapshot(workflow.out.idxstats).match('idxstats_single_end')}, + { assert snapshot(workflow.out.bam_transcript).match('bam_transcript_single_end')}, + { assert snapshot(workflow.out.bai_transcript).match('bai_transcript_single_end')}, + { assert snapshot(workflow.out.stats_transcript).match('stats_transcript_single_end')}, + { assert snapshot(workflow.out.flagstat_transcript).match('flagstat_transcript_single_end')}, + { assert snapshot(workflow.out.idxstats_transcript).match('idxstats_transcript_single_end')}, + { assert path(workflow.out.log_out.get(0).get(1)).exists() }, + { assert path(workflow.out.log_final.get(0).get(1)).exists() }, + { assert path(workflow.out.log_progress.get(0).get(1)).exists() } + ) + } + } + + test("homo_sapiens - fastq - paired_end") { + config "./nextflow.config" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true) + ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = true // star_ignore_sjdbgtf + input[4] = 'illumina' // seq_platform + input[5] = false // seq_center + input[6] = Channel.of([ + [ id:'test_fasta' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[7] = Channel.of([[:], []]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out.orig_bam).match('orig_bam_paired_end')}, + { assert snapshot(workflow.out.bam_sorted).match('bam_sorted_paired_end')}, + { assert snapshot(workflow.out.fastq).match('fastq_paired_end')}, + { assert snapshot(workflow.out.tab).match('tab_paired_end')}, + { assert snapshot(workflow.out.orig_bam_transcript).match('orig_bam_transcript_paired_end')}, + { assert snapshot(workflow.out.bam).match('bam_paired_end')}, + { assert snapshot(workflow.out.bai).match('bai_paired_end')}, + { assert snapshot(workflow.out.stats).match('stats_paired_end')}, + { assert snapshot(workflow.out.flagstat).match('flagstat_paired_end')}, + { assert snapshot(workflow.out.idxstats).match('idxstats_paired_end')}, + { assert snapshot(workflow.out.bam_transcript).match('bam_transcript_paired_end')}, + { assert snapshot(workflow.out.bai_transcript).match('bai_transcript_paired_end')}, + { assert snapshot(workflow.out.stats_transcript).match('stats_transcript_paired_end')}, + { assert snapshot(workflow.out.flagstat_transcript).match('flagstat_transcript_paired_end')}, + { assert snapshot(workflow.out.idxstats_transcript).match('idxstats_transcript_paired_end')}, + { assert snapshot(workflow.out.idxstats_transcript).match('versions_paired_end')}, + { assert path(workflow.out.log_out.get(0).get(1)).exists() }, + { assert path(workflow.out.log_final.get(0).get(1)).exists() }, + { assert path(workflow.out.log_progress.get(0).get(1)).exists() } + ) + } + } + + test("homo_sapiens - fastq - paired_end - with_transcriptome") { + config "./with_transcripts.config" + + setup { + run("RSEM_PREPAREREFERENCE") { + script "../../../../modules/nf-core/rsem/preparereference/main.nf" + process { + """ + input[0] = channel.of(file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkifexists: true)) + input[1] = channel.of(file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkifexists: true)) + """ + } + } + } + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true) + ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = true // star_ignore_sjdbgtf + input[4] = 'illumina' // seq_platform + input[5] = false // seq_center + input[6] = Channel.of([ + [ id:'test_fasta' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[7] = RSEM_PREPAREREFERENCE.out.transcript_fasta.map{[[:], it]} + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out.orig_bam).match('orig_bam_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.bam_sorted).match('bam_sorted_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.fastq).match('fastq_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.tab).match('tab_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.orig_bam_transcript).match('orig_bam_transcript_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.bam).match('bam_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.bai).match('bai_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.stats).match('stats_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.flagstat).match('flagstat_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.idxstats).match('idxstats_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.bam_transcript).match('bam_transcript_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.bai_transcript).match('bai_transcript_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.stats_transcript).match('stats_transcript_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.flagstat_transcript).match('flagstat_transcript_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.idxstats_transcript).match('idxstats_transcript_paired_end_with_transcriptome')}, + { assert snapshot(workflow.out.idxstats_transcript).match('versions_paired_end_with_transcriptome')}, + { assert path(workflow.out.log_out.get(0).get(1)).exists() }, + { assert path(workflow.out.log_final.get(0).get(1)).exists() }, + { assert path(workflow.out.log_progress.get(0).get(1)).exists() } + ) + } + } + + test("homo_sapiens - fastq - paired_end - transcripts - no_transcriptome") { + config "./with_transcripts.config" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_rnaseq_2.fastq.gz', checkIfExists: true) + ] + ]) + input[1] = STAR_GENOMEGENERATE.out.index + input[2] = Channel.of([ + [ id:'test_gtf' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + input[3] = true // star_ignore_sjdbgtf + input[4] = 'illumina' // seq_platform + input[5] = false // seq_center + input[6] = Channel.of([ + [ id:'test_fasta' ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[7] = Channel.of([[:], []]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out.orig_bam).match('orig_bam_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.bam_sorted).match('bam_sorted_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.fastq).match('fastq_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.tab).match('tab_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.orig_bam_transcript).match('orig_bam_transcript_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.bam).match('bam_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.bai).match('bai_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.stats).match('stats_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.flagstat).match('flagstat_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.idxstats).match('idxstats_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.bam_transcript).match('bam_transcript_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.bai_transcript).match('bai_transcript_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.stats_transcript).match('stats_transcript_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.flagstat_transcript).match('flagstat_transcript_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.idxstats_transcript).match('idxstats_transcript_paired_end_transcripts_no_transcriptome')}, + { assert snapshot(workflow.out.idxstats_transcript).match('versions_paired_end_transcripts_no_transcriptome')}, + { assert path(workflow.out.log_out.get(0).get(1)).exists() }, + { assert path(workflow.out.log_final.get(0).get(1)).exists() }, + { assert path(workflow.out.log_progress.get(0).get(1)).exists() } + ) + } + } +} diff --git a/subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap new file mode 100644 index 00000000..989d38a6 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap @@ -0,0 +1,1010 @@ +{ + "flagstat_transcript_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,a204dee59ef8b7cd0f7d952a80119b77" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.836115665" + }, + "orig_bam_paired_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.out.bam:md5,51d2ef198d5725978a4b6da6fbec17dd" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.493635239" + }, + "tab_paired_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,844af19ab0fc8cd9a3f75228445aca0d" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.62565966" + }, + "stats_single_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.stats:md5,2b8eb6967b68f03584cc242499658e92" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:01:51.011841774" + }, + "bam_sorted_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.366823434" + }, + "idxstats_paired_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,107ca94dd426cc44db316f0d402307c5" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.799888732" + }, + "fastq_paired_end_with_transcriptome": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.404150611" + }, + "stats_transcript_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.92597042" + }, + "idxstats_transcript_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,4030919b4a05393dcd7e699d72725803" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.869017036" + }, + "flagstat_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,db0e25cd0b37d3030e807846c022199e" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.673278468" + }, + "bam_transcript_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.816422587" + }, + "bai_transcript_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.889271918" + }, + "idxstats_transcript_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,4030919b4a05393dcd7e699d72725803" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.933689327" + }, + "idxstats_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,107ca94dd426cc44db316f0d402307c5" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.717133215" + }, + "bai_paired_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,5e05259dc3e00965ed3ffaaf5c3b7e2a" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:10:08.920576" + }, + "stats_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,39273789abce501dc706fa94bbd0079d" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.583114732" + }, + "tab_single_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.SJ.out.tab:md5,75a516ab950fb958f40b29996474949c" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:01:50.81938497" + }, + "orig_bam_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.out.bam:md5,8bb13b5b1530a4682d662f1a5c40ab88" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.324025875" + }, + "tab_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,844af19ab0fc8cd9a3f75228445aca0d" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.450949052" + }, + "bam_transcript_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.848680274" + }, + "bam_transcript_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,304982537be52d39f99c33e6079297ff" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:12:26.792244" + }, + "bai_transcript_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,6cf664f6eeb968efdebbc44edf5a4bcb" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:11:20.001206" + }, + "bai_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,8bd17c254a618d5ef0cc2642abc00e40" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:11:19.900054" + }, + "idxstats_transcript_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.998050296" + }, + "versions_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,4030919b4a05393dcd7e699d72725803" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:51.008404374" + }, + "bam_single_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam:md5,c1c390806279fee5f7f904c1bddd6937" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:09:07.255318" + }, + "idxstats_single_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.idxstats:md5,0d5a12e3e3ffdb15f1c6c50f02f22575" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:01:51.104899639" + }, + "orig_bam_transcript_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.646770561" + }, + "stats_transcript_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,8b4b458a77eb4ffb04a568de36ecb677" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T18:17:49.016776458" + }, + "orig_bam_transcript_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.toTranscriptome.out.bam:md5,deb116674bf9a17a8082dd4899b0f11f" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.500316187" + }, + "orig_bam_transcript_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.toTranscriptome.out.bam:md5,deb116674bf9a17a8082dd4899b0f11f" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.46731827" + }, + "orig_bam_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.Aligned.out.bam:md5,8bb13b5b1530a4682d662f1a5c40ab88" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.343819207" + }, + "bam_transcript_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,f4b96ef58a9e762495e8a3ed27541ddf" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:11:19.947042" + }, + "fastq_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.387908106" + }, + "stats_paired_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,39273789abce501dc706fa94bbd0079d" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.71383862" + }, + "flagstat_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,db0e25cd0b37d3030e807846c022199e" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.670712229" + }, + "flagstat_single_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.flagstat:md5,075e7a684a7ceb5fd1dae154f823128a" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:01:51.065241319" + }, + "bam_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,0e9f3d3c04cd1916f070e37aee7b1479" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:11:19.850548" + }, + "flagstat_transcript_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,a204dee59ef8b7cd0f7d952a80119b77" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.890160347" + }, + "flagstat_transcript_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.97328443" + }, + "versions_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,4030919b4a05393dcd7e699d72725803" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.905277179" + }, + "bam_sorted_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.369745857" + }, + "bam_sorted_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.548813329" + }, + "stats_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,39273789abce501dc706fa94bbd0079d" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.625556349" + }, + "bai_transcript_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,b713ac63c6114db4482fde48a87a3b55" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:12:26.840899" + }, + "orig_bam_single_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.Aligned.out.bam:md5,cd655e6c7309158d42fcfb202a6100e7" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:01:50.699345543" + }, + "tab_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.SJ.out.tab:md5,844af19ab0fc8cd9a3f75228445aca0d" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.431755269" + }, + "bam_paired_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,1d2371a1492623c665e7df1f377d30b1" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:10:08.892059" + }, + "bam_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,0e9f3d3c04cd1916f070e37aee7b1479" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:12:26.692602" + }, + "stats_transcript_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.945610051" + }, + "versions_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:38.025358383" + }, + "bai_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,8bd17c254a618d5ef0cc2642abc00e40" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:12:26.731803" + }, + "idxstats_paired_end_with_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.idxstats:md5,107ca94dd426cc44db316f0d402307c5" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.702727344" + }, + "orig_bam_transcript_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.449184828" + }, + "idxstats_transcript_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.992614899" + }, + "bai_transcript_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.897935922" + }, + "flagstat_paired_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.flagstat:md5,db0e25cd0b37d3030e807846c022199e" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.74949925" + }, + "stats_transcript_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.stats:md5,fa2f10820ffe578ebe7d5935155b4366" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.847385522" + }, + "bam_sorted_paired_end_with_transcriptome": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-16T11:04:06.3779095" + }, + "bai_single_end": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.bai:md5,73c7f3fe35663c287cb421f1c8b761ae" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-01T14:09:07.343206" + }, + "fastq_paired_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:37:37.594559814" + }, + "flagstat_transcript_single_end": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:36:01.971850654" + }, + "fastq_paired_end_transcripts_no_transcriptome": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-02-15T19:39:50.410098606" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_star/tests/nextflow.config b/subworkflows/nf-core/fastq_align_star/tests/nextflow.config new file mode 100644 index 00000000..6af49d58 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/tests/nextflow.config @@ -0,0 +1,21 @@ +process { + + publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" } + + withName: STAR_GENOMEGENERATE { + ext.args = '--genomeSAindexNbases 9' + } + + withName: STAR_ALIGN { + ext.args = '--readFilesCommand zcat' + } + + withName: '.*:BAM_SORT_STATS_SAMTOOLS_.*:SAMTOOLS_.*' { + ext.prefix = { "${meta.id}.sorted" } + } + + withName: '.*:BAM_SORT_STATS_SAMTOOLS_.*:BAM_STATS_SAMTOOLS:.*' { + ext.prefix = { "${meta.id}.sorted.bam" } + } + +} diff --git a/subworkflows/nf-core/fastq_align_star/tests/tags.yml b/subworkflows/nf-core/fastq_align_star/tests/tags.yml new file mode 100644 index 00000000..a919a2d1 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/fastq_align_star: + - subworkflows/nf-core/fastq_align_star/** diff --git a/subworkflows/nf-core/fastq_align_star/tests/with_transcripts.config b/subworkflows/nf-core/fastq_align_star/tests/with_transcripts.config new file mode 100644 index 00000000..62f15250 --- /dev/null +++ b/subworkflows/nf-core/fastq_align_star/tests/with_transcripts.config @@ -0,0 +1,21 @@ +process { + + publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" } + + withName: STAR_GENOMEGENERATE { + ext.args = '--genomeSAindexNbases 9' + } + + withName: STAR_ALIGN { + ext.args = '--readFilesCommand zcat --quantMode TranscriptomeSAM' + } + + withName: '.*:BAM_SORT_STATS_SAMTOOLS_.*:SAMTOOLS_.*' { + ext.prefix = { "${meta.id}.sorted" } + } + + withName: '.*:BAM_SORT_STATS_SAMTOOLS_.*:BAM_STATS_SAMTOOLS:.*' { + ext.prefix = { "${meta.id}.sorted.bam" } + } + +} From 7161b140a0cc494b8016f6bc451ee9e5d29537de Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 12:14:56 -0500 Subject: [PATCH 024/255] feat: Add STAR Alignment --- main.nf | 2 ++ nextflow_schema.json | 8 +++++++- workflows/nascent.nf | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/main.nf b/main.nf index 056f217b..1d7ee4fa 100644 --- a/main.nf +++ b/main.nf @@ -38,6 +38,7 @@ params.bwamem2_index = getGenomeAttribute('bwamem2') params.dragmap = getGenomeAttribute('dragmap') params.bowtie2_index = getGenomeAttribute('bowtie2') params.hisat2_index = getGenomeAttribute('hisat2') +params.star_index = null /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -69,6 +70,7 @@ workflow NFCORE_NASCENT { params.dragmap, params.bowtie2_index, params.hisat2_index, + params.star_index, ) emit: diff --git a/nextflow_schema.json b/nextflow_schema.json index 717c42d0..0ecb84ab 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -53,7 +53,7 @@ "type": "string", "default": "bwa", "fa_icon": "fas fa-puzzle-piece", - "enum": ["bwa", "bwamem2", "dragmap", "bowtie2", "hisat2"], + "enum": ["bwa", "bwamem2", "dragmap", "bowtie2", "hisat2", "star"], "description": "Specify aligner to be used to map reads to reference genome." }, "skip_alignment": { @@ -236,6 +236,12 @@ "fa_icon": "fas fa-copy", "help_text": "> **NB** If none provided, index will **NOT** be generated automatically from the FASTA reference. See nf-core/references if a custom index is needed." }, + "star_index": { + "type": "string", + "description": "Path to STAR indices.", + "fa_icon": "fas fa-copy", + "help_text": "> **NB** If none provided, index will **NOT** be generated automatically from the FASTA reference. See nf-core/references if a custom index is needed." + }, "save_reference": { "type": "boolean", "description": "If generated by the pipeline save the BWA index in the results directory.", diff --git a/workflows/nascent.nf b/workflows/nascent.nf index b78caa21..e5cd1666 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -14,7 +14,10 @@ include { COVERAGE_GRAPHS } from '../subworkflows/local/coverage_graphs.nf' include { TRANSCRIPT_INDENTIFICATION } from '../subworkflows/local/transcript_identification.nf' include { FASTP } from '../modules/nf-core/fastp/main' -include { UNTAR as UNTAR_HISAT2_INDEX } from '../modules/nf-core/untar/main' +include { + UNTAR as UNTAR_HISAT2_INDEX + UNTAR as UNTAR_STAR_INDEX +} from '../modules/nf-core/untar/main' include { SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_GENE SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_PREDICTED } from '../modules/nf-core/subread/featurecounts/main' @@ -32,6 +35,7 @@ include { methodsDescriptionText } from '../subworkflows/local/utils_nfcore_nasc include { FASTQ_ALIGN_BWA } from '../subworkflows/nf-core/fastq_align_bwa/main' include { FASTQ_ALIGN_BOWTIE2 } from '../subworkflows/nf-core/fastq_align_bowtie2/main' include { FASTQ_ALIGN_HISAT2 } from '../subworkflows/nf-core/fastq_align_hisat2/main' +include { FASTQ_ALIGN_STAR } from '../subworkflows/nf-core/fastq_align_star/main' include { BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS } from '../subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main' /* @@ -53,6 +57,7 @@ workflow NASCENT { ch_dragmap ch_bowtie2_index ch_hisat2_index + ch_star_index main: @@ -192,6 +197,33 @@ workflow NASCENT { ch_HISAT2_multiqc = FASTQ_ALIGN_HISAT2.out.summary ch_versions = ch_versions.mix(FASTQ_ALIGN_HISAT2.out.versions) + } else if (!params.skip_alignment && params.aligner == 'star') { + if (ch_star_index.endsWith('.tar.gz')) { + ch_star_index = UNTAR_STAR_INDEX ( [ [:], ch_star_index ] ).untar + ch_versions = ch_versions.mix(UNTAR_STAR_INDEX.out.versions) + } else { + // TODO Give the meta from basename or genome? + ch_star_index = [ [meta: "Genome"], file(ch_star_index) ] + } + + FASTQ_ALIGN_STAR ( + ch_reads, + ch_star_index, + PREPARE_GENOME.out.gtf, + false, + '', + '', // TODO params.seq_center ?: + ch_fasta, + [] + ) + ch_genome_bam = FASTQ_ALIGN_STAR.out.bam + ch_genome_bai = FASTQ_ALIGN_STAR.out.bai + ch_transcriptome_bam = FASTQ_ALIGN_STAR.out.bam_transcript + ch_star_log = FASTQ_ALIGN_STAR.out.log_final + ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.stats.collect{it[1]}) + ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.flagstat.collect{it[1]}) + ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.idxstats.collect{it[1]}) + ch_multiqc_files = ch_multiqc_files.mix(ch_star_log.collect{it[1]}) } if(params.with_umi) { From 6d27d2698699c7bd2cd5779166c8d8e87d22978a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 12:57:16 -0500 Subject: [PATCH 025/255] build: nf-core modules install star/genomegenerate --- modules.json | 5 + .../star/genomegenerate/environment.yml | 10 ++ modules/nf-core/star/genomegenerate/main.nf | 119 ++++++++++++++++++ modules/nf-core/star/genomegenerate/meta.yml | 53 ++++++++ .../star/genomegenerate/tests/main.nf.test | 115 +++++++++++++++++ .../genomegenerate/tests/main.nf.test.snap | 90 +++++++++++++ .../star/genomegenerate/tests/tags.yml | 2 + 7 files changed, 394 insertions(+) create mode 100644 modules/nf-core/star/genomegenerate/environment.yml create mode 100644 modules/nf-core/star/genomegenerate/main.nf create mode 100644 modules/nf-core/star/genomegenerate/meta.yml create mode 100644 modules/nf-core/star/genomegenerate/tests/main.nf.test create mode 100644 modules/nf-core/star/genomegenerate/tests/main.nf.test.snap create mode 100644 modules/nf-core/star/genomegenerate/tests/tags.yml diff --git a/modules.json b/modules.json index d11cc872..74ad3cf3 100644 --- a/modules.json +++ b/modules.json @@ -207,6 +207,11 @@ "git_sha": "a21faa6a3481af92a343a10926f59c189a2c16c9", "installed_by": ["fastq_align_star", "modules"] }, + "star/genomegenerate": { + "branch": "master", + "git_sha": "a21faa6a3481af92a343a10926f59c189a2c16c9", + "installed_by": ["modules"] + }, "subread/featurecounts": { "branch": "master", "git_sha": "f6bba1a67cdbb605f24d7a4e8dd383b0eec45b52", diff --git a/modules/nf-core/star/genomegenerate/environment.yml b/modules/nf-core/star/genomegenerate/environment.yml new file mode 100644 index 00000000..791f255e --- /dev/null +++ b/modules/nf-core/star/genomegenerate/environment.yml @@ -0,0 +1,10 @@ +name: star_genomegenerate +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::samtools=1.18 + - bioconda::htslib=1.18 + - bioconda::star=2.7.10a + - conda-forge::gawk=5.1.0 diff --git a/modules/nf-core/star/genomegenerate/main.nf b/modules/nf-core/star/genomegenerate/main.nf new file mode 100644 index 00000000..b8855715 --- /dev/null +++ b/modules/nf-core/star/genomegenerate/main.nf @@ -0,0 +1,119 @@ +process STAR_GENOMEGENERATE { + tag "$fasta" + label 'process_high' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/mulled-v2-1fa26d1ce03c295fe2fdcf85831a92fbcbd7e8c2:ded3841da0194af2701c780e9b3d653a85d27489-0' : + 'biocontainers/mulled-v2-1fa26d1ce03c295fe2fdcf85831a92fbcbd7e8c2:ded3841da0194af2701c780e9b3d653a85d27489-0' }" + + input: + tuple val(meta), path(fasta) + tuple val(meta2), path(gtf) + + output: + tuple val(meta), path("star") , emit: index + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def args_list = args.tokenize() + def memory = task.memory ? "--limitGenomeGenerateRAM ${task.memory.toBytes() - 100000000}" : '' + def include_gtf = gtf ? "--sjdbGTFfile $gtf" : '' + if (args_list.contains('--genomeSAindexNbases')) { + """ + mkdir star + STAR \\ + --runMode genomeGenerate \\ + --genomeDir star/ \\ + --genomeFastaFiles $fasta \\ + $include_gtf \\ + --runThreadN $task.cpus \\ + $memory \\ + $args + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + star: \$(STAR --version | sed -e "s/STAR_//g") + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//') + END_VERSIONS + """ + } else { + """ + samtools faidx $fasta + NUM_BASES=`gawk '{sum = sum + \$2}END{if ((log(sum)/log(2))/2 - 1 > 14) {printf "%.0f", 14} else {printf "%.0f", (log(sum)/log(2))/2 - 1}}' ${fasta}.fai` + + mkdir star + STAR \\ + --runMode genomeGenerate \\ + --genomeDir star/ \\ + --genomeFastaFiles $fasta \\ + $include_gtf \\ + --runThreadN $task.cpus \\ + --genomeSAindexNbases \$NUM_BASES \\ + $memory \\ + $args + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + star: \$(STAR --version | sed -e "s/STAR_//g") + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//') + END_VERSIONS + """ + } + + stub: + if (gtf) { + """ + mkdir star + touch star/Genome + touch star/Log.out + touch star/SA + touch star/SAindex + touch star/chrLength.txt + touch star/chrName.txt + touch star/chrNameLength.txt + touch star/chrStart.txt + touch star/exonGeTrInfo.tab + touch star/exonInfo.tab + touch star/geneInfo.tab + touch star/genomeParameters.txt + touch star/sjdbInfo.txt + touch star/sjdbList.fromGTF.out.tab + touch star/sjdbList.out.tab + touch star/transcriptInfo.tab + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + star: \$(STAR --version | sed -e "s/STAR_//g") + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//') + END_VERSIONS + """ + } else { + """ + mkdir star + touch star/Genome + touch star/Log.out + touch star/SA + touch star/SAindex + touch star/chrLength.txt + touch star/chrName.txt + touch star/chrNameLength.txt + touch star/chrStart.txt + touch star/genomeParameters.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + star: \$(STAR --version | sed -e "s/STAR_//g") + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//') + END_VERSIONS + """ + } +} diff --git a/modules/nf-core/star/genomegenerate/meta.yml b/modules/nf-core/star/genomegenerate/meta.yml new file mode 100644 index 00000000..1061e1b8 --- /dev/null +++ b/modules/nf-core/star/genomegenerate/meta.yml @@ -0,0 +1,53 @@ +name: star_genomegenerate +description: Create index for STAR +keywords: + - index + - fasta + - genome + - reference +tools: + - star: + description: | + STAR is a software package for mapping DNA sequences against + a large reference genome, such as the human genome. + homepage: https://github.com/alexdobin/STAR + manual: https://github.com/alexdobin/STAR/blob/master/doc/STARmanual.pdf + doi: 10.1093/bioinformatics/bts635 + licence: ["MIT"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - fasta: + type: file + description: Fasta file of the reference genome + - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'test' ] + - gtf: + type: file + description: GTF file of the reference genome +output: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - index: + type: directory + description: Folder containing the star index files + pattern: "star" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@kevinmenden" + - "@drpatelh" +maintainers: + - "@kevinmenden" + - "@drpatelh" diff --git a/modules/nf-core/star/genomegenerate/tests/main.nf.test b/modules/nf-core/star/genomegenerate/tests/main.nf.test new file mode 100644 index 00000000..c17c8ba4 --- /dev/null +++ b/modules/nf-core/star/genomegenerate/tests/main.nf.test @@ -0,0 +1,115 @@ +nextflow_process { + + name "Test Process STAR_GENOMEGENERATE" + script "../main.nf" + process "STAR_GENOMEGENERATE" + tag "modules" + tag "modules_nfcore" + tag "star" + tag "star/genomegenerate" + + test("fasta_gtf") { + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test_fasta' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[1] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.index[0][1]).listFiles().collect { it.getName() }.sort().toString()).match("fasta_gtf_index") }, + { assert snapshot(process.out.versions).match("fasta_gtf_versions") } + ) + } + } + + test("fasta_gtf_stub") { + + options '-stub' + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test_fasta' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[1] = Channel.of([ + [ id:'test_gtf' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.index[0][1]).listFiles().collect { it.getName() }.sort().toString()).match("fasta_gtf_stub_index") }, + { assert snapshot(process.out.versions).match("fasta_gtf_stub_versions") } + ) + } + } + + test("fasta") { + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test_fasta' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[1] = Channel.of([ [], [] ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.index[0][1]).listFiles().collect { it.getName() }.sort().toString()).match("fasta_index") }, + { assert snapshot(process.out.versions).match("fasta_versions") } + ) + } + + } + + test("fasta_stub") { + + options '-stub' + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test_fasta' ], + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + ]) + input[1] = Channel.of([ [], [] ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.index[0][1]).listFiles().collect { it.getName() }.sort().toString()).match("fasta_stub_index") }, + { assert snapshot(process.out.versions).match("fasta_stub_versions") } + ) + } + + } + +} diff --git a/modules/nf-core/star/genomegenerate/tests/main.nf.test.snap b/modules/nf-core/star/genomegenerate/tests/main.nf.test.snap new file mode 100644 index 00000000..5653d6e6 --- /dev/null +++ b/modules/nf-core/star/genomegenerate/tests/main.nf.test.snap @@ -0,0 +1,90 @@ +{ + "fasta_gtf_versions": { + "content": [ + [ + "versions.yml:md5,46b8f1f34bb7f23892cd1eb249ed4d7f" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:54:31.798555" + }, + "fasta_stub_versions": { + "content": [ + [ + "versions.yml:md5,46b8f1f34bb7f23892cd1eb249ed4d7f" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:55:07.521209" + }, + "fasta_gtf_stub_index": { + "content": [ + "[Genome, Log.out, SA, SAindex, chrLength.txt, chrName.txt, chrNameLength.txt, chrStart.txt, exonGeTrInfo.tab, exonInfo.tab, geneInfo.tab, genomeParameters.txt, sjdbInfo.txt, sjdbList.fromGTF.out.tab, sjdbList.out.tab, transcriptInfo.tab]" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:54:46.478098" + }, + "fasta_gtf_stub_versions": { + "content": [ + [ + "versions.yml:md5,46b8f1f34bb7f23892cd1eb249ed4d7f" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:54:46.491657" + }, + "fasta_index": { + "content": [ + "[Genome, Log.out, SA, SAindex, chrLength.txt, chrName.txt, chrNameLength.txt, chrStart.txt, genomeParameters.txt]" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:54:57.552329" + }, + "fasta_versions": { + "content": [ + [ + "versions.yml:md5,46b8f1f34bb7f23892cd1eb249ed4d7f" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:54:57.560541" + }, + "fasta_gtf_index": { + "content": [ + "[Genome, Log.out, SA, SAindex, chrLength.txt, chrName.txt, chrNameLength.txt, chrStart.txt, exonGeTrInfo.tab, exonInfo.tab, geneInfo.tab, genomeParameters.txt, sjdbInfo.txt, sjdbList.fromGTF.out.tab, sjdbList.out.tab, transcriptInfo.tab]" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:54:31.786814" + }, + "fasta_stub_index": { + "content": [ + "[Genome, Log.out, SA, SAindex, chrLength.txt, chrName.txt, chrNameLength.txt, chrStart.txt, genomeParameters.txt]" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-01T15:55:07.517472" + } +} \ No newline at end of file diff --git a/modules/nf-core/star/genomegenerate/tests/tags.yml b/modules/nf-core/star/genomegenerate/tests/tags.yml new file mode 100644 index 00000000..79f619bf --- /dev/null +++ b/modules/nf-core/star/genomegenerate/tests/tags.yml @@ -0,0 +1,2 @@ +star/genomegenerate: + - modules/nf-core/star/genomegenerate/** From 9916891bc42a14b86a6553f654103c1a46c48484 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 12:57:40 -0500 Subject: [PATCH 026/255] feat: Add basic STAR index generation --- nextflow_schema.json | 2 +- workflows/nascent.nf | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nextflow_schema.json b/nextflow_schema.json index 0ecb84ab..f6bd29c0 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -240,7 +240,7 @@ "type": "string", "description": "Path to STAR indices.", "fa_icon": "fas fa-copy", - "help_text": "> **NB** If none provided, index will **NOT** be generated automatically from the FASTA reference. See nf-core/references if a custom index is needed." + "help_text": "> **NB** If none provided, index will be generated automatically from the FASTA reference." }, "save_reference": { "type": "boolean", diff --git a/workflows/nascent.nf b/workflows/nascent.nf index e5cd1666..00f7244d 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -18,6 +18,7 @@ include { UNTAR as UNTAR_HISAT2_INDEX UNTAR as UNTAR_STAR_INDEX } from '../modules/nf-core/untar/main' +include { STAR_GENOMEGENERATE } from '../modules/nf-core/star/genomegenerate/main' include { SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_GENE SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_PREDICTED } from '../modules/nf-core/subread/featurecounts/main' @@ -198,7 +199,9 @@ workflow NASCENT { ch_HISAT2_multiqc = FASTQ_ALIGN_HISAT2.out.summary ch_versions = ch_versions.mix(FASTQ_ALIGN_HISAT2.out.versions) } else if (!params.skip_alignment && params.aligner == 'star') { - if (ch_star_index.endsWith('.tar.gz')) { + if(!ch_star_index) { + ch_star_index = STAR_GENOMEGENERATE ( ch_fasta, [ [:], ch_gtf ] ).index + } else if (ch_star_index.endsWith('.tar.gz')) { ch_star_index = UNTAR_STAR_INDEX ( [ [:], ch_star_index ] ).untar ch_versions = ch_versions.mix(UNTAR_STAR_INDEX.out.versions) } else { From df6c876b5d2e9aec8f264d95ef794180d9e798fe Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 15:17:42 -0500 Subject: [PATCH 027/255] fix: Copy over config from rnaseq --- conf/modules.config | 53 ++++++++++++++++++++++++++++++++++++++++++++ conf/test.config | 4 ++++ workflows/nascent.nf | 4 ++-- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index d28d3f4e..0f9cb48c 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -80,6 +80,59 @@ process { ] } + withName: 'STAR_ALIGN' { + ext.args = { + // Function to convert argument strings into a map + def argsToMap = { String args -> + args.split("\\s(?=--)").collectEntries { + def parts = it.trim().split(/\s+/, 2) + [(parts.first()): parts.last()] + } + } + + // Initialize the map with preconfigured values + def preset_args_map = argsToMap(""" + --quantMode TranscriptomeSAM + --twopassMode Basic + --outSAMtype BAM Unsorted + --readFilesCommand zcat + --runRNGseed 0 + --outFilterMultimapNmax 20 + --alignSJDBoverhangMin 1 + --outSAMattributes NH HI AS NM MD + --quantTranscriptomeBan Singleend + --outSAMstrandField intronMotif + ${params.save_unaligned ? '--outReadsUnmapped Fastx' : ''} + """.trim()) + + // Consolidate the extra arguments + def final_args_map = preset_args_map + (params.extra_star_align_args ? argsToMap(params.extra_star_align_args) : [:]) + + // Convert the map back to a list and then to a single string + final_args_map.collect { key, value -> "${key} ${value}" }.join(' ').trim() + } + + publishDir = [ + [ + path: { "${params.outdir}/${params.aligner}/log" }, + mode: params.publish_dir_mode, + pattern: '*.{out,tab}' + ], + [ + path: { params.save_align_intermeds ? "${params.outdir}/${params.aligner}" : params.outdir }, + mode: params.publish_dir_mode, + pattern: '*.bam', + saveAs: { params.save_align_intermeds ? it : null } + ], + [ + path: { params.save_unaligned ? "${params.outdir}/${params.aligner}/unmapped" : params.outdir }, + mode: params.publish_dir_mode, + pattern: '*.fastq.gz', + saveAs: { params.save_unaligned ? it : null } + ] + ] + } + if(params.with_umi) { withName: '.*:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:UMITOOLS_DEDUP' { ext.args = { [ diff --git a/conf/test.config b/conf/test.config index f902fe46..359dc093 100644 --- a/conf/test.config +++ b/conf/test.config @@ -35,6 +35,10 @@ params { } process { + withName: STAR_GENOMEGENERATE_IGENOMES { + ext.args = '--genomeSAindexNbases 9' + } + withName: 'PINTS_CALLER' { // HACK Tests fail after latest modules update ext.args = { "--disable-small" } diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 00f7244d..aac204fb 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -212,12 +212,12 @@ workflow NASCENT { FASTQ_ALIGN_STAR ( ch_reads, ch_star_index, - PREPARE_GENOME.out.gtf, + PREPARE_GENOME.out.gtf.map { [ [:], it ] }, false, '', '', // TODO params.seq_center ?: ch_fasta, - [] + Channel.of([[:], []]), ) ch_genome_bam = FASTQ_ALIGN_STAR.out.bam ch_genome_bai = FASTQ_ALIGN_STAR.out.bai From 95187c438688ca8b972659a1a25608d1b7f52242 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 17:25:11 -0500 Subject: [PATCH 028/255] ci: Use detect-nf-test-changes https://github.com/nf-core/phageannotator/blob/f9da24f4beb5775735a28d98327bd92755517a8a/.github/workflows/ci.yml --- .github/workflows/ci.yml | 135 +++++++++++++++++++++++++++------------ 1 file changed, 93 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f840f546..b102cc21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,52 +1,92 @@ -name: nf-core CI # This workflow runs the pipeline with the minimal test dataset to check that it completes without any syntax errors +name: nf-core CI on: - push: - branches: - - dev pull_request: release: types: [published] + merge_group: + types: + - checks_requested + branches: + - master + - dev env: NXF_ANSI_LOG: false + NFT_VER: "0.8.4" + NFT_WORKDIR: "~" + NFT_DIFF: "pdiff" + NFT_DIFF_ARGS: "--line-numbers --expand-tabs=2" concurrency: group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}" cancel-in-progress: true jobs: + changes: + name: Check for changes + runs-on: ubuntu-latest + outputs: + nf_test_files: ${{ steps.list.outputs.components }} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: List nf-test files + id: list + uses: adamrtalbot/detect-nf-test-changes@v0.0.2 + with: + head: ${{ github.sha }} + base: origin/${{ github.base_ref }} + include: .github/include.yaml + + - name: print list of nf-test files + run: | + echo ${{ steps.list.outputs.components }} + test: - name: nf-test ${{ matrix.profile }}-${{ matrix.NXF_VER }} - # Only run on push if this is the nf-core dev branch (merged PRs) - if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/nascent') }}" + name: ${{ matrix.nf_test_files }} ${{ matrix.profile }} NF-${{ matrix.NXF_VER }} + needs: [changes] + if: needs.changes.outputs.nf_test_files != '[]' runs-on: ubuntu-latest strategy: + fail-fast: false matrix: NXF_VER: - - "23.04.0" - "latest-everything" - profile: ["docker"] # TODO , "singularity", "conda"] + - "23.04" + nf_test_files: ["${{ fromJson(needs.changes.outputs.nf_test_files) }}"] + profile: + - "docker" + steps: - name: Check out pipeline code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@v4 + + - name: Install Nextflow + uses: nf-core/setup-nextflow@v2 + with: + version: "${{ matrix.NXF_VER }}" + + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + architecture: "x64" - - name: Cache Nextflow installation + - name: Install pdiff to see diff between nf-test snapshots + run: | + python -m pip install --upgrade pip + pip install pdiff + + - name: Cache nf-test installation id: cache-software uses: actions/cache@v3 with: path: | /usr/local/bin/nf-test /home/runner/.nf-test/nf-test.jar - key: nascent-${{ runner.os }}-${{ matrix.NXF_VER }} - - - name: Install Nextflow - uses: nf-core/setup-nextflow@v1 - with: - version: "${{ matrix.NXF_VER }}" - - - name: Disk space cleanup - uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + key: ${{ runner.os }}-${{ env.NFT_VER }}-nftest - name: Install nf-test if: steps.cache-software.outputs.cache-hit != 'true' @@ -54,32 +94,43 @@ jobs: wget -qO- https://code.askimed.com/install/nf-test | bash sudo mv nf-test /usr/local/bin/ - - name: Set up Singularity - if: matrix.profile == 'singularity' - uses: eWaterCycle/setup-singularity@v5 - with: - singularity-version: 3.7.1 - - - name: Set up miniconda - if: matrix.profile == 'conda' - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - channels: conda-forge,bioconda,defaults - python-version: ${{ matrix.python-version }} - - - name: Conda clean - if: matrix.profile == 'conda' - run: conda clean -a - - name: Run nf-test run: | - nf-test test \ - --profile=${{ matrix.profile }} \ - workflows/tests/*.nf.test \ - --tap=test.tap + nf-test test --verbose ${{ matrix.nf_test_files }} --profile "+${{ matrix.profile }}" --junitxml=test.xml --tap=test.tap - uses: pcolby/tap-summary@v1 with: path: >- test.tap + + - name: Output log on failure + if: failure() + run: | + sudo apt install bat > /dev/null + batcat --decorations=always --color=always ${{ github.workspace }}/.nf-test/tests/*/meta/nextflow.log + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + if: always() # always run even if the previous step fails + with: + report_paths: test.xml + + confirm-pass: + runs-on: ubuntu-latest + needs: + - changes + - test + if: always() + steps: + - name: All tests ok + if: ${{ !contains(needs.*.result, 'failure') }} + run: exit 0 + - name: One or more tests failed + if: ${{ contains(needs.*.result, 'failure') }} + run: exit 1 + + - name: debug-print + if: always() + run: | + echo "toJSON(needs) = ${{ toJSON(needs) }}" + echo "toJSON(needs.*.result) = ${{ toJSON(needs.*.result) }}" From 749d70376f50b5ef3b1657c3c23d04888e924310 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 17:27:01 -0500 Subject: [PATCH 029/255] test: Use testsDir "." Not sure how that snuck back in there --- nf-test.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nf-test.config b/nf-test.config index 1e242a13..9c1d57d3 100644 --- a/nf-test.config +++ b/nf-test.config @@ -1,6 +1,6 @@ config { - testsDir "tests" + testsDir "." workDir System.getenv("NFT_WORKDIR") ?: ".nf-test" configFile "tests/nextflow.config" From ca68e9b83fc535d4d45a1f9e34272579f23999f3 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 25 Apr 2024 17:27:30 -0500 Subject: [PATCH 030/255] test: Write basic STAR test --- workflows/tests/star.nf.test | 24 ++++++++++++++++++++++++ workflows/tests/star.nf.test.snap | 12 ++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 workflows/tests/star.nf.test create mode 100644 workflows/tests/star.nf.test.snap diff --git a/workflows/tests/star.nf.test b/workflows/tests/star.nf.test new file mode 100644 index 00000000..ab60135d --- /dev/null +++ b/workflows/tests/star.nf.test @@ -0,0 +1,24 @@ +nextflow_pipeline { + + name "Test Workflow main.nf with STAR" + script "../../main.nf" + tag "aligner" + tag "star" + + test("Should run with STAR (default)") { + + when { + params { + outdir = "$outputDir" + aligner = "star" + } + } + + then { + assert workflow.success + assert snapshot( + workflow.trace.tasks().size(), + ).match() + } + } +} diff --git a/workflows/tests/star.nf.test.snap b/workflows/tests/star.nf.test.snap new file mode 100644 index 00000000..2ce34c99 --- /dev/null +++ b/workflows/tests/star.nf.test.snap @@ -0,0 +1,12 @@ +{ + "Should run with STAR (default)": { + "content": [ + 139 + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-04-25T17:27:56.772645664" + } +} \ No newline at end of file From 994041453b89b61e1ccb7440d047ae1428499108 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 27 Apr 2024 10:55:08 -0500 Subject: [PATCH 031/255] fix: Make sure the gtf is unzipped --- workflows/nascent.nf | 5 ++++- workflows/tests/star.nf.test | 18 ++++++++++++++++++ workflows/tests/star.nf.test.snap | 10 ++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/workflows/nascent.nf b/workflows/nascent.nf index aac204fb..7c981005 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -200,7 +200,10 @@ workflow NASCENT { ch_versions = ch_versions.mix(FASTQ_ALIGN_HISAT2.out.versions) } else if (!params.skip_alignment && params.aligner == 'star') { if(!ch_star_index) { - ch_star_index = STAR_GENOMEGENERATE ( ch_fasta, [ [:], ch_gtf ] ).index + ch_star_index = STAR_GENOMEGENERATE ( + ch_fasta, + PREPARE_GENOME.out.gtf.map { [[:], it] } + ).index } else if (ch_star_index.endsWith('.tar.gz')) { ch_star_index = UNTAR_STAR_INDEX ( [ [:], ch_star_index ] ).untar ch_versions = ch_versions.mix(UNTAR_STAR_INDEX.out.versions) diff --git a/workflows/tests/star.nf.test b/workflows/tests/star.nf.test index ab60135d..5b15df14 100644 --- a/workflows/tests/star.nf.test +++ b/workflows/tests/star.nf.test @@ -21,4 +21,22 @@ nextflow_pipeline { ).match() } } + + test("Should run with gzipped gtf") { + + when { + params { + outdir = "$outputDir" + aligner = "star" + gtf = "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gtf.gz" + } + } + + then { + assert workflow.success + assert snapshot( + workflow.trace.tasks().size(), + ).match() + } + } } diff --git a/workflows/tests/star.nf.test.snap b/workflows/tests/star.nf.test.snap index 2ce34c99..e6e803ae 100644 --- a/workflows/tests/star.nf.test.snap +++ b/workflows/tests/star.nf.test.snap @@ -1,4 +1,14 @@ { + "Should run with gzipped gtf": { + "content": [ + 140 + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-04-27T12:40:13.788464472" + }, "Should run with STAR (default)": { "content": [ 139 From 3d4db1dcb7abcb675e2ef94ad59c2b1d9ffa623b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 7 May 2024 14:17:11 -0500 Subject: [PATCH 032/255] docs: Add info about the sample column concatinating group and replicate columns --- docs/usage.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/usage.md b/docs/usage.md index 79f2d223..213e4882 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -50,6 +50,12 @@ TREATMENT_REP3,AEG588A6_S6_L004_R1_001.fastq.gz, An [example samplesheet](../assets/samplesheet.csv) has been provided with the pipeline. +:::info +The sample column is essentially a concatenation of the group and replicate columns. If all values of sample have the same number of underscores, fields defined by these underscore-separated names may be used in the transcript identification produced by the pipeline, to regain the ability to represent different groupings. + +`GM_0h` and `GM_1h` would be grouped for example but `GM0h` and `GM1h` would go through individual transcript identification +::: + ## Alignment Options By default, the pipeline uses [BWA](https://bio-bwa.sourceforge.net/) (i.e. `--aligner bwa`) to map the raw FastQ reads to the reference genome. Research as to which aligner works best with Nascent Transcript and Transcription Start Site assays is pending. From c49e9d7b359c1d01b9e6062757b311699aab2009 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 1 Jul 2024 16:11:45 -0500 Subject: [PATCH 033/255] refactor: Pass bais to transcript identification for PINTS --- modules/local/grohmm/parametertuning/main.nf | 2 +- .../local/grohmm/transcriptcalling/main.nf | 2 +- .../nf-core/homer/maketagdirectory/main.nf | 4 ++-- modules/nf-core/pints/caller/main.nf | 2 +- .../local/transcript_identification.nf | 8 ++++---- subworkflows/nf-core/homer/groseq/main.nf | 2 +- workflows/nascent.nf | 20 +++++++++++++++---- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 89840878..b6785e4d 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -9,7 +9,7 @@ process GROHMM_PARAMETERTUNING { 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" input: - tuple val(meta), path(bam) + tuple val(meta), path(bams), path(bais) path gtf path tune_parameter_file diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index b656d0ee..e93c84bb 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -9,7 +9,7 @@ process GROHMM_TRANSCRIPTCALLING { 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" input: - tuple val(meta), path(bams) + tuple val(meta), path(bams), path(bais) path gtf path tuning_file diff --git a/modules/nf-core/homer/maketagdirectory/main.nf b/modules/nf-core/homer/maketagdirectory/main.nf index e70b31b3..9c35531d 100644 --- a/modules/nf-core/homer/maketagdirectory/main.nf +++ b/modules/nf-core/homer/maketagdirectory/main.nf @@ -10,7 +10,7 @@ process HOMER_MAKETAGDIRECTORY { 'biocontainers/mulled-v2-29293b111ffe5b4c1d1e14c711264aaed6b97b4a:594338b771cacf1623bd27772b5e12825f8835f2-0' }" input: - tuple val(meta), path(bam) + tuple val(meta), path(bams), path(bais) path fasta output: @@ -30,7 +30,7 @@ process HOMER_MAKETAGDIRECTORY { ${prefix}_tagdir \\ -genome $fasta \\ $args \\ - $bam + $bams cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index ae80e89d..fe423c06 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -8,7 +8,7 @@ process PINTS_CALLER { 'biocontainers/pypints:1.1.8--pyh7cba7a3_0' }" input: - tuple val(meta), path(bams) + tuple val(meta), path(bams), path(bais) val assay_type output: diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification.nf index 27c88707..14fda616 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification.nf @@ -13,7 +13,7 @@ include { BEDTOOLS_INTERSECT } from '../../modules/nf-core/bedtools/intersect/ma workflow TRANSCRIPT_INDENTIFICATION { take: - group_bams + group_bam_bai gtf fasta chrom_sizes @@ -26,7 +26,7 @@ workflow TRANSCRIPT_INDENTIFICATION { ch_tuning_file = params.tuning_file ? file(params.tuning_file, checkIfExists: true) : file("${projectDir}/assets/tuningparamstotest.csv") grohmm_td_plot = Channel.empty() if(!params.skip_grohmm && params.assay_type == "GROseq") { - GROHMM ( group_bams, gtf, ch_tuning_file ) + GROHMM ( group_bam_bai, gtf, ch_tuning_file ) ch_identification_bed = ch_identification_bed.mix(GROHMM.out.bed) grohmm_td_plot = GROHMM.out.td_plot ch_versions = ch_versions.mix(GROHMM.out.versions.first()) @@ -36,7 +36,7 @@ workflow TRANSCRIPT_INDENTIFICATION { homer_peaks = Channel.empty() homer_tagdir = Channel.empty() if(params.assay_type == "GROseq") { - HOMER_GROSEQ ( group_bams, fasta ) + HOMER_GROSEQ ( group_bam_bai, fasta ) ch_identification_bed = ch_identification_bed.mix(HOMER_GROSEQ.out.bed) homer_peaks = HOMER_GROSEQ.out.peaks homer_tagdir = HOMER_GROSEQ.out.tagdir @@ -45,7 +45,7 @@ workflow TRANSCRIPT_INDENTIFICATION { // TODO https://github.com/hyulab/PINTS/issues/15 - PINTS_CALLER ( group_bams, params.assay_type ) + PINTS_CALLER ( group_bam_bai, params.assay_type ) ch_versions = ch_versions.mix(PINTS_CALLER.out.versions.first()) // HACK Not sure if this is as good as reporting all of them, but it should // reduce the overall noise. diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index ad6f0bf1..2ee8dfa5 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -9,7 +9,7 @@ include { HOMER_POS2BED } from '../../../../modules/nf-core/homer/pos2b workflow HOMER_GROSEQ { take: - bam // channel: [ val(meta), [ reads ] ] + bam // channel: [ val(meta), [ bams ], [ bai ] ] fasta // file: /path/to/bwa/index/ main: diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 7c981005..ad585740 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -272,10 +272,22 @@ workflow NASCENT { [ fmeta, bam ] } .groupTuple(by: [0]) .map { it -> [ it[0], it[1].flatten() ] } - .set { ch_sort_bam } + .set { ch_group_bam } + // Group the index files with bams + ch_genome_bai.map { + meta, bai -> + fmeta = meta.findAll { it.key != 'read_group' } + // Split and take the first element + fmeta.id = fmeta.id.split('_')[0] + [ fmeta, bai ] } + .groupTuple(by: [0]) + .map { it -> [ it[0], it[1].flatten() ] } + .set { ch_group_bai } + + ch_group_bam_bai = ch_group_bam.join(ch_group_bai, by: [0]) TRANSCRIPT_INDENTIFICATION ( - ch_sort_bam, + ch_group_bam_bai, PREPARE_GENOME.out.gtf, PREPARE_GENOME.out.fasta, PREPARE_GENOME.out.chrom_sizes, @@ -286,7 +298,7 @@ workflow NASCENT { ch_versions = ch_versions.mix(TRANSCRIPT_INDENTIFICATION.out.versions) SUBREAD_FEATURECOUNTS_PREDICTED ( - ch_sort_bam.combine( + ch_group_bam.combine( BED2SAF ( TRANSCRIPT_INDENTIFICATION.out.transcript_beds ).saf.map { it[1] } @@ -295,7 +307,7 @@ workflow NASCENT { ch_versions = ch_versions.mix(SUBREAD_FEATURECOUNTS_PREDICTED.out.versions.first()) SUBREAD_FEATURECOUNTS_GENE ( - ch_sort_bam.combine(PREPARE_GENOME.out.gtf) + ch_group_bam.combine(PREPARE_GENOME.out.gtf) ) ch_versions = ch_versions.mix(SUBREAD_FEATURECOUNTS_GENE.out.versions.first()) From 2aeb3038f40cb722f1282fa66f790189262c21a5 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 1 Jul 2024 16:44:03 -0500 Subject: [PATCH 034/255] feat: Bump CHM13 fasta --- conf/igenomes.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/igenomes.config b/conf/igenomes.config index 4e8e502a..3daaba63 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -37,10 +37,10 @@ params { blacklist = "${projectDir}/assets/blacklists/hg38-blacklist.bed" } 'CHM13' { - fasta = "${params.igenomes_base}/Homo_sapiens/UCSC/CHM13/Sequence/WholeGenomeFasta/genome.fa" + fasta = "https://ftp.ncbi.nlm.nih.gov/genomes/all/GCF/009/914/755/GCF_009914755.1_T2T-CHM13v2.0/GCF_009914755.1_T2T-CHM13v2.0_genomic.fna.gz" bwa = "${params.igenomes_base}/Homo_sapiens/UCSC/CHM13/Sequence/BWAIndex/" bwamem2 = "${params.igenomes_base}/Homo_sapiens/UCSC/CHM13/Sequence/BWAmem2Index/" - gtf = "${params.igenomes_base}/Homo_sapiens/NCBI/CHM13/Annotation/Genes/genes.gtf" + gtf = "https://ftp.ncbi.nlm.nih.gov/genomes/all/GCF/009/914/755/GCF_009914755.1_T2T-CHM13v2.0/GCF_009914755.1_T2T-CHM13v2.0_genomic.gtf.gz" gff = "ftp://ftp.ncbi.nlm.nih.gov/genomes/all/GCF/009/914/755/GCF_009914755.1_T2T-CHM13v2.0/GCF_009914755.1_T2T-CHM13v2.0_genomic.gff.gz" mito_name = "chrM" } From 63f5074cb76631ba2b8fcc34a5e4ad5fc4bee1dc Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 8 Jul 2024 16:13:44 -0500 Subject: [PATCH 035/255] fix: Update CHM13 --- conf/igenomes.config | 7 ++----- nextflow_schema.json | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/conf/igenomes.config b/conf/igenomes.config index 3daaba63..bf92077a 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -37,11 +37,8 @@ params { blacklist = "${projectDir}/assets/blacklists/hg38-blacklist.bed" } 'CHM13' { - fasta = "https://ftp.ncbi.nlm.nih.gov/genomes/all/GCF/009/914/755/GCF_009914755.1_T2T-CHM13v2.0/GCF_009914755.1_T2T-CHM13v2.0_genomic.fna.gz" - bwa = "${params.igenomes_base}/Homo_sapiens/UCSC/CHM13/Sequence/BWAIndex/" - bwamem2 = "${params.igenomes_base}/Homo_sapiens/UCSC/CHM13/Sequence/BWAmem2Index/" - gtf = "https://ftp.ncbi.nlm.nih.gov/genomes/all/GCF/009/914/755/GCF_009914755.1_T2T-CHM13v2.0/GCF_009914755.1_T2T-CHM13v2.0_genomic.gtf.gz" - gff = "ftp://ftp.ncbi.nlm.nih.gov/genomes/all/GCF/009/914/755/GCF_009914755.1_T2T-CHM13v2.0/GCF_009914755.1_T2T-CHM13v2.0_genomic.gff.gz" + fasta = "https://s3-us-west-2.amazonaws.com/human-pangenomics/T2T/CHM13/assemblies/analysis_set/chm13v2.0.fa.gz" + gff = "https://s3-us-west-2.amazonaws.com/human-pangenomics/T2T/CHM13/assemblies/annotation/chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" mito_name = "chrM" } 'GRCm38' { diff --git a/nextflow_schema.json b/nextflow_schema.json index f6bd29c0..b7794d0b 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -190,7 +190,7 @@ "type": "string", "format": "file-path", "mimetype": "text/plain", - "pattern": "^\\S+\\.gff(\\.gz)?$", + "pattern": "^\\S+\\.gff(3)?(\\.gz)?$", "fa_icon": "fas fa-code-branch", "description": "Path to GFF3 annotation file.", "help_text": "This parameter must be specified if `--genome` or `--gtf` are not specified." From 4bd6a11a4ccfe2f7c0f837829df1678ee8ddf75f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 17 Jul 2024 11:06:08 -0500 Subject: [PATCH 036/255] chore: Update CHANGELOG --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f3649c1..3885ed01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,11 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [5bcfe4f](https://github.com/nf-core/nascent/commit/5bcfe4ff1729b89e9e5741c473d32168b836a57f) - Update pipeline template to [nf-core/tools 2.13](https://github.com/nf-core/tools/releases/tag/2.13) - [a3bc907](https://github.com/nf-core/nascent/commit/a3bc907e9afd9dd2a9572798fa16fbc781c3dcb0) - Update pipeline template to [nf-core/tools 2.13.1](https://github.com/nf-core/tools/releases/tag/2.13.1) -- [#140](https://github.com/nf-core/nascent/pull/140) - Add HISAT2 +- [#140](https://github.com/nf-core/nascent/pull/140) - Add HISAT2 aligner +- [#142](https://github.com/nf-core/nascent/pull/142) - Add STAR aligner ### Changed -- [[#137](https://github.com/nf-core/nascent/pull/137)] - Use singularity containers for PINTS +- [#137](https://github.com/nf-core/nascent/pull/137) - Use singularity containers for PINTS +- [#142](https://github.com/nf-core/nascent/pull/142) - Updated CHM13 references ## v2.2.0 - 2024-03-05 From c47db7e842df0d62b666e505cb77fe5491c91dac Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 17 Jul 2024 11:42:57 -0500 Subject: [PATCH 037/255] build: Add params.human-pandgenomics_base Co-authored-by: maxulysse --- conf/igenomes.config | 4 ++-- nextflow.config | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/igenomes.config b/conf/igenomes.config index bf92077a..9a76f199 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -37,8 +37,8 @@ params { blacklist = "${projectDir}/assets/blacklists/hg38-blacklist.bed" } 'CHM13' { - fasta = "https://s3-us-west-2.amazonaws.com/human-pangenomics/T2T/CHM13/assemblies/analysis_set/chm13v2.0.fa.gz" - gff = "https://s3-us-west-2.amazonaws.com/human-pangenomics/T2T/CHM13/assemblies/annotation/chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" + fasta = "${params.human-pangenomics_base}/T2T/CHM13/assemblies/analysis_set/chm13v2.0.fa.gz" + gff = "${params.human-pangenomics_base}/T2T/CHM13/assemblies/annotation/chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" mito_name = "chrM" } 'GRCm38' { diff --git a/nextflow.config b/nextflow.config index bfc46fa4..ec2292cd 100644 --- a/nextflow.config +++ b/nextflow.config @@ -35,6 +35,7 @@ params { genome = null igenomes_base = 's3://ngi-igenomes/igenomes/' igenomes_ignore = false + human-pangenomics_base = 'https://s3-us-west-2.amazonaws.com/human-pangenomics' save_reference = false From 25f8d5db1db18b3f6a88d296ac7919bc43de01ff Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Wed, 8 May 2024 13:59:00 +0000 Subject: [PATCH 038/255] Template update for nf-core/tools version 2.14.0 --- .editorconfig | 6 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/awsfulltest.yml | 10 +- .github/workflows/awstest.yml | 12 +- .github/workflows/ci.yml | 2 +- .github/workflows/download_pipeline.yml | 22 ++- .github/workflows/fix-linting.yml | 6 +- .github/workflows/linting.yml | 18 +- .github/workflows/linting_comment.yml | 2 +- .github/workflows/release-announcements.yml | 6 +- .nf-core.yml | 1 + .pre-commit-config.yaml | 3 + CHANGELOG.md | 2 +- README.md | 2 +- assets/multiqc_config.yml | 2 - conf/base.config | 7 - conf/test.config | 1 + conf/test_full.config | 1 + docs/usage.md | 2 + modules.json | 4 +- modules/nf-core/fastqc/main.nf | 6 + nextflow.config | 174 +++++++++--------- nextflow_schema.json | 7 + pyproject.toml | 15 -- .../utils_nfcore_nascent_pipeline/main.nf | 16 +- .../nf-core/utils_nfcore_pipeline/main.nf | 8 +- workflows/nascent.nf | 46 +++-- 27 files changed, 218 insertions(+), 165 deletions(-) delete mode 100644 pyproject.toml diff --git a/.editorconfig b/.editorconfig index dd9ffa53..72dda289 100644 --- a/.editorconfig +++ b/.editorconfig @@ -28,10 +28,6 @@ indent_style = unset [/assets/email*] indent_size = unset -# ignore Readme -[README.md] -indent_style = unset - -# ignore python +# ignore python and markdown [*.{py,md}] indent_style = unset diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b0071e65..e33f09a1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -18,7 +18,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/nasc - [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/nascent/tree/master/.github/CONTRIBUTING.md) - [ ] If necessary, also make a PR on the nf-core/nascent _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository. - [ ] Make sure your code lints (`nf-core lint`). -- [ ] Ensure the test suite passes (`nf-test test main.nf.test -profile test,docker`). +- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir `). - [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir `). - [ ] Usage Documentation in `docs/usage.md` is updated. - [ ] Output Documentation in `docs/output.md` is updated. diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index bdf5ec1d..60464fd9 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -8,12 +8,12 @@ on: types: [published] workflow_dispatch: jobs: - run-tower: + run-platform: name: Run AWS full tests if: github.repository == 'nf-core/nascent' runs-on: ubuntu-latest steps: - - name: Launch workflow via tower + - name: Launch workflow via Seqera Platform uses: seqeralabs/action-tower-launch@v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} @@ -30,7 +30,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: Tower debug log file + name: Seqera Platform debug log file path: | - tower_action_*.log - tower_action_*.json + seqera_platform_action_*.log + seqera_platform_action_*.json diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml index bf337a02..6c6c6458 100644 --- a/.github/workflows/awstest.yml +++ b/.github/workflows/awstest.yml @@ -5,13 +5,13 @@ name: nf-core AWS test on: workflow_dispatch: jobs: - run-tower: + run-platform: name: Run AWS tests if: github.repository == 'nf-core/nascent' runs-on: ubuntu-latest steps: - # Launch workflow using Tower CLI tool action - - name: Launch workflow via tower + # Launch workflow using Seqera Platform CLI tool action + - name: Launch workflow via Seqera Platform uses: seqeralabs/action-tower-launch@v2 with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} @@ -27,7 +27,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: Tower debug log file + name: Seqera Platform debug log file path: | - tower_action_*.log - tower_action_*.json + seqera_platform_action_*.log + seqera_platform_action_*.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b102cc21..0908a246 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: steps: - name: Check out pipeline code - uses: actions/checkout@v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Install Nextflow uses: nf-core/setup-nextflow@v2 diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml index 08622fd5..2d20d644 100644 --- a/.github/workflows/download_pipeline.yml +++ b/.github/workflows/download_pipeline.yml @@ -14,6 +14,8 @@ on: pull_request: types: - opened + - edited + - synchronize branches: - master pull_request_target: @@ -28,11 +30,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Nextflow - uses: nf-core/setup-nextflow@v1 + uses: nf-core/setup-nextflow@v2 - - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 + - name: Disk space cleanup + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + + - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 with: - python-version: "3.11" + python-version: "3.12" architecture: "x64" - uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7 with: @@ -65,8 +70,17 @@ jobs: - name: Inspect download run: tree ./${{ env.REPOTITLE_LOWERCASE }} - - name: Run the downloaded pipeline + - name: Run the downloaded pipeline (stub) + id: stub_run_pipeline + continue-on-error: true env: NXF_SINGULARITY_CACHEDIR: ./ NXF_SINGULARITY_HOME_MOUNT: true run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results + - name: Run the downloaded pipeline (stub run not supported) + id: run_pipeline + if: ${{ job.steps.stub_run_pipeline.status == failure() }} + env: + NXF_SINGULARITY_CACHEDIR: ./ + NXF_SINGULARITY_HOME_MOUNT: true + run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results diff --git a/.github/workflows/fix-linting.yml b/.github/workflows/fix-linting.yml index 1c6f70c9..b6b81b22 100644 --- a/.github/workflows/fix-linting.yml +++ b/.github/workflows/fix-linting.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: # Use the @nf-core-bot token to check out so we can push later - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 with: token: ${{ secrets.nf_core_bot_auth_token }} @@ -32,9 +32,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }} # Install and run pre-commit - - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 + - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 with: - python-version: 3.11 + python-version: "3.12" - name: Install pre-commit run: pip install pre-commit diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 073e1876..a3fb2541 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -14,12 +14,12 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - - name: Set up Python 3.11 - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 + - name: Set up Python 3.12 + uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 with: - python-version: 3.11 + python-version: "3.12" cache: "pip" - name: Install pre-commit @@ -32,14 +32,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out pipeline code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Install Nextflow - uses: nf-core/setup-nextflow@v1 + uses: nf-core/setup-nextflow@v2 - - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 + - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 with: - python-version: "3.11" + python-version: "3.12" architecture: "x64" - name: Install dependencies @@ -60,7 +60,7 @@ jobs: - name: Upload linting log file artifact if: ${{ always() }} - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4 with: name: linting-logs path: | diff --git a/.github/workflows/linting_comment.yml b/.github/workflows/linting_comment.yml index b706875f..40acc23f 100644 --- a/.github/workflows/linting_comment.yml +++ b/.github/workflows/linting_comment.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download lint results - uses: dawidd6/action-download-artifact@f6b0bace624032e30a85a8fd9c1a7f8f611f5737 # v3 + uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3 with: workflow: linting.yml workflow_conclusion: completed diff --git a/.github/workflows/release-announcements.yml b/.github/workflows/release-announcements.yml index d468aeaa..03ecfcf7 100644 --- a/.github/workflows/release-announcements.yml +++ b/.github/workflows/release-announcements.yml @@ -12,7 +12,7 @@ jobs: - name: get topics and convert to hashtags id: get_topics run: | - curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' >> $GITHUB_OUTPUT + echo "topics=$(curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ')" >> $GITHUB_OUTPUT - uses: rzr/fediverse-action@master with: @@ -25,13 +25,13 @@ jobs: Please see the changelog: ${{ github.event.release.html_url }} - ${{ steps.get_topics.outputs.GITHUB_OUTPUT }} #nfcore #openscience #nextflow #bioinformatics + ${{ steps.get_topics.outputs.topics }} #nfcore #openscience #nextflow #bioinformatics send-tweet: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5 + - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 with: python-version: "3.10" - name: Install dependencies diff --git a/.nf-core.yml b/.nf-core.yml index 89348e55..5f8b7413 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -1,4 +1,5 @@ repository_type: pipeline +nf_core_version: "2.14.0" lint: files_unchanged: - .github/workflows/linting.yml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af57081f..4dc0f1dc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,6 +3,9 @@ repos: rev: "v3.1.0" hooks: - id: prettier + additional_dependencies: + - prettier@3.2.5 + - repo: https://github.com/editorconfig-checker/editorconfig-checker.python rev: "2.7.3" hooks: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3885ed01..eff8694b 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). -## [Unreleased] +## v2.3.0dev - [date] ### Added diff --git a/README.md b/README.md index db8dbea2..f7fab470 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ [![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/) -[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://tower.nf/launch?pipeline=https://github.com/nf-core/nascent) +[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent) [![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core) diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 8390d866..44c6bde6 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -1,9 +1,7 @@ report_comment: > - This report has been generated by the nf-core/nascent analysis pipeline. For information about how to interpret these results, please see the documentation. - report_section_order: "nf-core-nascent-methods-description": order: -1000 diff --git a/conf/base.config b/conf/base.config index ec9b33a0..a043b531 100644 --- a/conf/base.config +++ b/conf/base.config @@ -57,11 +57,4 @@ process { errorStrategy = 'retry' maxRetries = 2 } - withName: 'FASTP'{ - cpus = { check_max( 12 * task.attempt, 'cpus' ) } - memory = { check_max( 4.GB * task.attempt, 'memory' ) } - } - withName:CUSTOM_DUMPSOFTWAREVERSIONS { - cache = false - } } diff --git a/conf/test.config b/conf/test.config index 359dc093..cc5193aa 100644 --- a/conf/test.config +++ b/conf/test.config @@ -20,6 +20,7 @@ params { max_time = '6.h' // Input data + // TODO params.pipelines_testdata_base_path + 'viralrecon/samplesheet/samplesheet_test_illumina_amplicon.csv' input = "${projectDir}/assets/samplesheet.csv" // Genome references diff --git a/conf/test_full.config b/conf/test_full.config index 96c60451..f5f1c5e6 100644 --- a/conf/test_full.config +++ b/conf/test_full.config @@ -15,6 +15,7 @@ params { config_profile_description = 'Full test dataset to check pipeline function' // Input data for full size test + // TODO params.pipelines_testdata_base_path + 'viralrecon/samplesheet/samplesheet_full_illumina_amplicon.csv' input = "${projectDir}/assets/samplesheet_full.csv" // Genome references diff --git a/docs/usage.md b/docs/usage.md index 213e4882..e96d2626 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -185,6 +185,8 @@ If `-profile` is not specified, the pipeline will run locally and expect all sof - A generic configuration profile to be used with [Charliecloud](https://hpc.github.io/charliecloud/) - `apptainer` - A generic configuration profile to be used with [Apptainer](https://apptainer.org/) +- `wave` + - A generic configuration profile to enable [Wave](https://seqera.io/wave/) containers. Use together with one of the above (requires Nextflow ` 24.03.0-edge` or later). - `conda` - A generic configuration profile to be used with [Conda](https://conda.io/docs/). Please only use Conda as a last resort i.e. when it's not possible to run the pipeline with Docker, Singularity, Podman, Shifter, Charliecloud, or Apptainer. diff --git a/modules.json b/modules.json index 74ad3cf3..3ac71c90 100644 --- a/modules.json +++ b/modules.json @@ -103,7 +103,7 @@ }, "fastqc": { "branch": "master", - "git_sha": "f4ae1d942bd50c5c0b9bd2de1393ce38315ba57c", + "git_sha": "285a50500f9e02578d90b3ce6382ea3c30216acd", "installed_by": ["modules"] }, "gffread": { @@ -283,7 +283,7 @@ }, "utils_nfcore_pipeline": { "branch": "master", - "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa", + "git_sha": "92de218a329bfc9a9033116eb5f65fd270e72ba3", "installed_by": ["subworkflows"] }, "utils_nfvalidation_plugin": { diff --git a/modules/nf-core/fastqc/main.nf b/modules/nf-core/fastqc/main.nf index 9e19a74c..d79f1c86 100644 --- a/modules/nf-core/fastqc/main.nf +++ b/modules/nf-core/fastqc/main.nf @@ -25,6 +25,11 @@ process FASTQC { def old_new_pairs = reads instanceof Path || reads.size() == 1 ? [[ reads, "${prefix}.${reads.extension}" ]] : reads.withIndex().collect { entry, index -> [ entry, "${prefix}_${index + 1}.${entry.extension}" ] } def rename_to = old_new_pairs*.join(' ').join(' ') def renamed_files = old_new_pairs.collect{ old_name, new_name -> new_name }.join(' ') + + def memory_in_mb = MemoryUnit.of("${task.memory}").toUnit('MB') + // FastQC memory value allowed range (100 - 10000) + def fastqc_memory = memory_in_mb > 10000 ? 10000 : (memory_in_mb < 100 ? 100 : memory_in_mb) + """ printf "%s %s\\n" $rename_to | while read old_name new_name; do [ -f "\${new_name}" ] || ln -s \$old_name \$new_name @@ -33,6 +38,7 @@ process FASTQC { fastqc \\ $args \\ --threads $task.cpus \\ + --memory $fastqc_memory \\ $renamed_files cat <<-END_VERSIONS > versions.yml diff --git a/nextflow.config b/nextflow.config index ec2292cd..bf354907 100644 --- a/nextflow.config +++ b/nextflow.config @@ -36,7 +36,6 @@ params { igenomes_base = 's3://ngi-igenomes/igenomes/' igenomes_ignore = false human-pangenomics_base = 'https://s3-us-west-2.amazonaws.com/human-pangenomics' - save_reference = false // MultiQC options @@ -47,15 +46,16 @@ params { multiqc_methods_description = null // Boilerplate options - outdir = null - publish_dir_mode = 'copy' - email = null - email_on_fail = null - plaintext_email = false - monochrome_logs = false - hook_url = null - help = false - version = false + outdir = null + publish_dir_mode = 'copy' + email = null + email_on_fail = null + plaintext_email = false + monochrome_logs = false + hook_url = null + help = false + version = false + pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/' // Config options config_profile_name = null @@ -91,103 +91,109 @@ try { } // Load nf-core/nascent custom profiles from different institutions. -// Warning: Uncomment only if a pipeline-specific institutional config already exists on nf-core/configs! -// try { -// includeConfig "${params.custom_config_base}/pipeline/nascent.config" -// } catch (Exception e) { -// System.err.println("WARNING: Could not load nf-core/config/nascent profiles: ${params.custom_config_base}/pipeline/nascent.config") -// } +try { + includeConfig "${params.custom_config_base}/pipeline/nascent.config" +} catch (Exception e) { + System.err.println("WARNING: Could not load nf-core/config/nascent profiles: ${params.custom_config_base}/pipeline/nascent.config") +} profiles { debug { - dumpHashes = true - process.beforeScript = 'echo $HOSTNAME' - cleanup = false + dumpHashes = true + process.beforeScript = 'echo $HOSTNAME' + cleanup = false nextflow.enable.configProcessNamesValidation = true } conda { - conda.enabled = true - docker.enabled = false - singularity.enabled = false - podman.enabled = false - shifter.enabled = false - charliecloud.enabled = false - channels = ['conda-forge', 'bioconda', 'defaults'] - apptainer.enabled = false + conda.enabled = true + docker.enabled = false + singularity.enabled = false + podman.enabled = false + shifter.enabled = false + charliecloud.enabled = false + conda.channels = ['conda-forge', 'bioconda', 'defaults'] + apptainer.enabled = false } mamba { - conda.enabled = true - conda.useMamba = true - docker.enabled = false - singularity.enabled = false - podman.enabled = false - shifter.enabled = false - charliecloud.enabled = false - apptainer.enabled = false + conda.enabled = true + conda.useMamba = true + docker.enabled = false + singularity.enabled = false + podman.enabled = false + shifter.enabled = false + charliecloud.enabled = false + apptainer.enabled = false } docker { - docker.enabled = true - conda.enabled = false - singularity.enabled = false - podman.enabled = false - shifter.enabled = false - charliecloud.enabled = false - apptainer.enabled = false - docker.runOptions = '-u $(id -u):$(id -g)' + docker.enabled = true + conda.enabled = false + singularity.enabled = false + podman.enabled = false + shifter.enabled = false + charliecloud.enabled = false + apptainer.enabled = false + docker.runOptions = '-u $(id -u):$(id -g)' } arm { - docker.runOptions = '-u $(id -u):$(id -g) --platform=linux/amd64' + docker.runOptions = '-u $(id -u):$(id -g) --platform=linux/amd64' } singularity { - singularity.enabled = true - singularity.autoMounts = true - conda.enabled = false - docker.enabled = false - podman.enabled = false - shifter.enabled = false - charliecloud.enabled = false - apptainer.enabled = false + singularity.enabled = true + singularity.autoMounts = true + conda.enabled = false + docker.enabled = false + podman.enabled = false + shifter.enabled = false + charliecloud.enabled = false + apptainer.enabled = false } podman { - podman.enabled = true - conda.enabled = false - docker.enabled = false - singularity.enabled = false - shifter.enabled = false - charliecloud.enabled = false - apptainer.enabled = false + podman.enabled = true + conda.enabled = false + docker.enabled = false + singularity.enabled = false + shifter.enabled = false + charliecloud.enabled = false + apptainer.enabled = false } shifter { - shifter.enabled = true - conda.enabled = false - docker.enabled = false - singularity.enabled = false - podman.enabled = false - charliecloud.enabled = false - apptainer.enabled = false + shifter.enabled = true + conda.enabled = false + docker.enabled = false + singularity.enabled = false + podman.enabled = false + charliecloud.enabled = false + apptainer.enabled = false } charliecloud { - charliecloud.enabled = true - conda.enabled = false - docker.enabled = false - singularity.enabled = false - podman.enabled = false - shifter.enabled = false - apptainer.enabled = false + charliecloud.enabled = true + conda.enabled = false + docker.enabled = false + singularity.enabled = false + podman.enabled = false + shifter.enabled = false + apptainer.enabled = false } apptainer { - apptainer.enabled = true - apptainer.autoMounts = true - conda.enabled = false - docker.enabled = false - singularity.enabled = false - podman.enabled = false - shifter.enabled = false - charliecloud.enabled = false + apptainer.enabled = true + apptainer.autoMounts = true + conda.enabled = false + docker.enabled = false + singularity.enabled = false + podman.enabled = false + shifter.enabled = false + charliecloud.enabled = false + } + wave { + apptainer.ociAutoPull = true + singularity.ociAutoPull = true + wave.enabled = true + wave.freeze = true + wave.strategy = 'conda,container' } gitpod { - executor.name = 'local' - executor.cpus = 4 - executor.memory = 8.GB + executor.name = 'local' + executor.cpus = 4 + executor.memory = 8.GB } test { includeConfig 'conf/test.config' } test_grocap { includeConfig 'conf/test_grocap.config' } diff --git a/nextflow_schema.json b/nextflow_schema.json index b7794d0b..5b14e1c5 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -456,6 +456,13 @@ "description": "Validation of parameters in lenient more.", "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)." + }, + "pipelines_testdata_base_path": { + "type": "string", + "fa_icon": "far fa-check-circle", + "description": "Base URL or local path to location of pipeline test dataset files", + "default": "https://raw.githubusercontent.com/nf-core/test-datasets/", + "hidden": true } } } diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 56110621..00000000 --- a/pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ -# Config file for Python. Mostly used to configure linting of bin/*.py with Ruff. -# Should be kept the same as nf-core/tools to avoid fighting with template synchronisation. -[tool.ruff] -line-length = 120 -target-version = "py38" -cache-dir = "~/.cache/ruff" - -[tool.ruff.lint] -select = ["I", "E1", "E4", "E7", "E9", "F", "UP", "N"] - -[tool.ruff.lint.isort] -known-first-party = ["nf_core"] - -[tool.ruff.lint.per-file-ignores] -"__init__.py" = ["E402", "F401"] diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index acb9b605..2988d8ac 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -140,6 +140,10 @@ workflow PIPELINE_COMPLETION { imNotification(summary_params, hook_url) } } + + workflow.onError { + log.error "Pipeline failed. Please refer to troubleshooting docs: https://nf-co.re/docs/usage/troubleshooting" + } } /* @@ -230,8 +234,16 @@ def methodsDescriptionText(mqc_methods_yaml) { meta["manifest_map"] = 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.
    • " + if (meta.manifest_map.doi) { + // Using a loop to handle multiple DOIs + // Removing `https://doi.org/` to handle pipelines using DOIs vs DOI resolvers + // Removing ` ` since the manifest.doi is a string and not a proper list + def temp_doi_ref = "" + String[] manifest_doi = meta.manifest_map.doi.tokenize(",") + for (String doi_ref: manifest_doi) temp_doi_ref += "(doi: ${doi_ref.replace("https://doi.org/", "").replace(" ", "")}), " + meta["doi_text"] = temp_doi_ref.substring(0, temp_doi_ref.length() - 2) + } else meta["doi_text"] = "" + 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"] = "" diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf index a8b55d6f..14558c39 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf @@ -65,9 +65,15 @@ def checkProfileProvided(nextflow_cli_args) { // Citation string for pipeline // def workflowCitation() { + def temp_doi_ref = "" + String[] manifest_doi = workflow.manifest.doi.tokenize(",") + // Using a loop to handle multiple DOIs + // Removing `https://doi.org/` to handle pipelines using DOIs vs DOI resolvers + // Removing ` ` since the manifest.doi is a string and not a proper list + for (String doi_ref: manifest_doi) temp_doi_ref += " https://doi.org/${doi_ref.replace('https://doi.org/', '').replace(' ', '')}\n" return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + "* The pipeline\n" + - " ${workflow.manifest.doi}\n\n" + + temp_doi_ref + "\n" + "* The nf-core framework\n" + " https://doi.org/10.1038/s41587-020-0439-x\n\n" + "* Software dependencies\n" + diff --git a/workflows/nascent.nf b/workflows/nascent.nf index ad585740..f50a2106 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -315,22 +315,44 @@ workflow NASCENT { // Collate and save software versions // softwareVersionsToYAML(ch_versions) - .collectFile(storeDir: "${params.outdir}/pipeline_info", name: 'nf_core_pipeline_software_mqc_versions.yml', sort: true, newLine: true) - .set { ch_collated_versions } + .collectFile( + storeDir: "${params.outdir}/pipeline_info", + name: 'nf_core_pipeline_software_mqc_versions.yml', + sort: true, + newLine: true + ).set { ch_collated_versions } // // MODULE: MultiQC // - ch_multiqc_config = Channel.fromPath("$projectDir/assets/multiqc_config.yml", checkIfExists: true) - ch_multiqc_custom_config = params.multiqc_config ? Channel.fromPath(params.multiqc_config, checkIfExists: true) : Channel.empty() - ch_multiqc_logo = params.multiqc_logo ? Channel.fromPath(params.multiqc_logo, checkIfExists: true) : Channel.empty() - summary_params = paramsSummaryMap(workflow, parameters_schema: "nextflow_schema.json") - ch_workflow_summary = Channel.value(paramsSummaryMultiqc(summary_params)) - ch_multiqc_custom_methods_description = params.multiqc_methods_description ? file(params.multiqc_methods_description, checkIfExists: true) : file("$projectDir/assets/methods_description_template.yml", checkIfExists: true) - ch_methods_description = Channel.value(methodsDescriptionText(ch_multiqc_custom_methods_description)) - ch_multiqc_files = ch_multiqc_files.mix(ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) - ch_multiqc_files = ch_multiqc_files.mix(ch_collated_versions) - ch_multiqc_files = ch_multiqc_files.mix(ch_methods_description.collectFile(name: 'methods_description_mqc.yaml', sort: false)) + ch_multiqc_config = Channel.fromPath( + "$projectDir/assets/multiqc_config.yml", checkIfExists: true) + ch_multiqc_custom_config = params.multiqc_config ? + Channel.fromPath(params.multiqc_config, checkIfExists: true) : + Channel.empty() + ch_multiqc_logo = params.multiqc_logo ? + Channel.fromPath(params.multiqc_logo, checkIfExists: true) : + Channel.empty() + + summary_params = paramsSummaryMap( + workflow, parameters_schema: "nextflow_schema.json") + ch_workflow_summary = Channel.value(paramsSummaryMultiqc(summary_params)) + + ch_multiqc_custom_methods_description = params.multiqc_methods_description ? + file(params.multiqc_methods_description, checkIfExists: true) : + file("$projectDir/assets/methods_description_template.yml", checkIfExists: true) + ch_methods_description = Channel.value( + methodsDescriptionText(ch_multiqc_custom_methods_description)) + + ch_multiqc_files = ch_multiqc_files.mix( + ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) + ch_multiqc_files = ch_multiqc_files.mix(ch_collated_versions) + ch_multiqc_files = ch_multiqc_files.mix( + ch_methods_description.collectFile( + name: 'methods_description_mqc.yaml', + sort: true + ) + ) ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip.collect{it[1]}.ifEmpty([])) ch_multiqc_files = ch_multiqc_files.mix(ch_bowtie2_multiqc.collect{it[1]}.ifEmpty([])) From 5522aabfa0a730943222370c006d817008e2cde4 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Thu, 9 May 2024 11:43:32 +0000 Subject: [PATCH 039/255] Template update for nf-core/tools version 2.14.1 --- .github/workflows/linting.yml | 1 - .nf-core.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index a3fb2541..1fcafe88 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -20,7 +20,6 @@ jobs: uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 with: python-version: "3.12" - cache: "pip" - name: Install pre-commit run: pip install pre-commit diff --git a/.nf-core.yml b/.nf-core.yml index 5f8b7413..6df9b1da 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -1,5 +1,5 @@ repository_type: pipeline -nf_core_version: "2.14.0" +nf_core_version: "2.14.1" lint: files_unchanged: - .github/workflows/linting.yml From 25d88038b5c28118a71d7bee51caf5df89186dbd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 11:08:24 -0500 Subject: [PATCH 040/255] style: Try to fix linting --- conf/igenomes.config | 4 ++-- nextflow.config | 2 +- nextflow_schema.json | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/conf/igenomes.config b/conf/igenomes.config index 9a76f199..722f6720 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -37,8 +37,8 @@ params { blacklist = "${projectDir}/assets/blacklists/hg38-blacklist.bed" } 'CHM13' { - fasta = "${params.human-pangenomics_base}/T2T/CHM13/assemblies/analysis_set/chm13v2.0.fa.gz" - gff = "${params.human-pangenomics_base}/T2T/CHM13/assemblies/annotation/chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" + fasta = "${params.human_pangenomics_base}/T2T/CHM13/assemblies/analysis_set/chm13v2.0.fa.gz" + gff = "${params.human_pangenomics_base}/T2T/CHM13/assemblies/annotation/chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" mito_name = "chrM" } 'GRCm38' { diff --git a/nextflow.config b/nextflow.config index bf354907..34f30c80 100644 --- a/nextflow.config +++ b/nextflow.config @@ -35,7 +35,7 @@ params { genome = null igenomes_base = 's3://ngi-igenomes/igenomes/' igenomes_ignore = false - human-pangenomics_base = 'https://s3-us-west-2.amazonaws.com/human-pangenomics' + human_pangenomics_base = 'https://s3-us-west-2.amazonaws.com/human-pangenomics' save_reference = false // MultiQC options diff --git a/nextflow_schema.json b/nextflow_schema.json index 5b14e1c5..1c9e3fe0 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -262,6 +262,13 @@ "fa_icon": "fas fa-ban", "hidden": true, "help_text": "Do not load `igenomes.config` when running the pipeline. You may choose this option if you observe clashes between custom parameters and those supplied in `igenomes.config`." + }, + "human_pangenomics_base": { + "type": "string", + "description": "Directory / URL base for CHM13 references.", + "default": "https://s3-us-west-2.amazonaws.com/human-pangenomics", + "fa_icon": "fas fa-cloud-download-alt", + "hidden": true } } }, From 0280009eaebe1368088ff3c11f84791423a32075 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 11:16:24 -0500 Subject: [PATCH 041/255] build: Remove extra "groseq" workflow --- modules.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.json b/modules.json index 3ac71c90..bd648af9 100644 --- a/modules.json +++ b/modules.json @@ -124,22 +124,22 @@ "homer/findpeaks": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["groseq", "homer/groseq"] + "installed_by": ["homer/groseq"] }, "homer/maketagdirectory": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["groseq", "homer/groseq"] + "installed_by": ["homer/groseq"] }, "homer/makeucscfile": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["groseq", "homer/groseq"] + "installed_by": ["homer/groseq"] }, "homer/pos2bed": { "branch": "master", "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["groseq", "homer/groseq"] + "installed_by": ["homer/groseq"] }, "multiqc": { "branch": "master", From 47ba2f458874175adabb9b0c0426a1f4cbbb6b64 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 11:18:14 -0500 Subject: [PATCH 042/255] chore: nf-core modules update --- modules.json | 78 +- modules/nf-core/bedtools/genomecov/main.nf | 4 + .../bedtools/genomecov/tests/main.nf.test | 92 +- .../genomecov/tests/main.nf.test.snap | 131 +- .../nf-core/bedtools/merge/tests/main.nf.test | 34 + .../bedtools/merge/tests/main.nf.test.snap | 35 + .../bedtools/merge/tests/nextflow.config | 7 + modules/nf-core/bedtools/merge/tests/tags.yml | 2 + .../nf-core/bedtools/sort/tests/main.nf.test | 58 + .../bedtools/sort/tests/main.nf.test.snap | 68 + .../bedtools/sort/tests/nextflow.config | 8 + modules/nf-core/bedtools/sort/tests/tags.yml | 2 + modules/nf-core/bowtie2/align/main.nf | 2 +- modules/nf-core/bowtie2/align/meta.yml | 43 +- modules/nf-core/bwa/index/environment.yml | 2 +- modules/nf-core/bwa/index/main.nf | 4 +- modules/nf-core/bwa/index/meta.yml | 3 +- modules/nf-core/bwa/index/tests/main.nf.test | 4 +- .../nf-core/bwa/index/tests/main.nf.test.snap | 10 +- modules/nf-core/bwa/mem/environment.yml | 6 +- modules/nf-core/bwa/mem/main.nf | 4 +- modules/nf-core/bwa/mem/meta.yml | 2 +- modules/nf-core/bwa/mem/tests/main.nf.test | 45 +- .../nf-core/bwa/mem/tests/main.nf.test.snap | 303 +--- .../nf-core/bwamem2/index/tests/main.nf.test | 31 + .../bwamem2/index/tests/main.nf.test.snap | 47 + modules/nf-core/bwamem2/index/tests/tags.yml | 2 + modules/nf-core/bwamem2/mem/environment.yml | 4 +- modules/nf-core/bwamem2/mem/main.nf | 43 +- modules/nf-core/bwamem2/mem/meta.yml | 27 + .../nf-core/bwamem2/mem/tests/main.nf.test | 86 +- .../bwamem2/mem/tests/main.nf.test.snap | 50 +- modules/nf-core/cat/cat/main.nf | 1 - modules/nf-core/cat/cat/tests/main.nf.test | 29 +- .../nf-core/cat/cat/tests/main.nf.test.snap | 92 +- modules/nf-core/cat/fastq/environment.yml | 2 +- modules/nf-core/cat/fastq/main.nf | 11 +- modules/nf-core/cat/fastq/tests/main.nf.test | 138 +- .../nf-core/cat/fastq/tests/main.nf.test.snap | 207 +++ .../custom/getchromsizes/environment.yml | 3 +- modules/nf-core/custom/getchromsizes/main.nf | 7 +- .../custom/getchromsizes/tests/main.nf.test | 51 +- .../getchromsizes/tests/main.nf.test.snap | 140 +- modules/nf-core/dragmap/align/main.nf | 40 +- modules/nf-core/dragmap/align/meta.yml | 13 +- .../nf-core/dragmap/align/tests/main.nf.test | 63 +- .../dragmap/align/tests/main.nf.test.snap | 60 +- .../dragmap/hashtable/dragmap-hashtable.diff | 25 - .../nf-core/dragmap/hashtable/environment.yml | 2 +- modules/nf-core/dragmap/hashtable/main.nf | 15 +- modules/nf-core/dragmap/hashtable/meta.yml | 4 +- .../dragmap/hashtable/tests/main.nf.test | 69 + .../dragmap/hashtable/tests/main.nf.test.snap | 16 + .../nf-core/dragmap/hashtable/tests/tags.yml | 2 + modules/nf-core/fastp/main.nf | 23 +- modules/nf-core/fastp/meta.yml | 6 +- modules/nf-core/fastp/tests/main.nf.test | 827 ++++------ modules/nf-core/fastp/tests/main.nf.test.snap | 1361 ++++++++++++++--- .../fastp/tests/nextflow.interleaved.config | 5 + ...low.config => nextflow.save_failed.config} | 3 +- modules/nf-core/gffread/environment.yml | 2 +- modules/nf-core/gffread/main.nf | 49 +- modules/nf-core/gffread/meta.yml | 21 +- modules/nf-core/gffread/tests/main.nf.test | 180 ++- .../nf-core/gffread/tests/main.nf.test.snap | 276 +++- .../gffread/tests/nextflow-fasta.config | 5 + .../gffread/tests/nextflow-gff3.config | 5 + modules/nf-core/gunzip/environment.yml | 4 +- modules/nf-core/gunzip/main.nf | 17 +- modules/nf-core/gunzip/meta.yml | 1 + modules/nf-core/gunzip/tests/main.nf.test | 85 + .../nf-core/gunzip/tests/main.nf.test.snap | 103 ++ modules/nf-core/gunzip/tests/nextflow.config | 5 + modules/nf-core/hisat2/align/main.nf | 19 + .../nf-core/hisat2/align/tests/main.nf.test | 202 +++ .../hisat2/align/tests/main.nf.test.snap | 338 +++- modules/nf-core/homer/findpeaks/main.nf | 13 + .../homer/findpeaks/tests/main.nf.test | 73 + .../homer/findpeaks/tests/main.nf.test.snap | 68 + .../homer/findpeaks/tests/nextflow.config | 8 + .../nf-core/homer/findpeaks/tests/tags.yml | 2 + .../homer/maketagdirectory/environment.yml | 2 +- .../nf-core/homer/maketagdirectory/main.nf | 4 +- .../homer/maketagdirectory/tests/bed.config | 3 + .../homer/maketagdirectory/tests/main.nf.test | 97 ++ .../maketagdirectory/tests/main.nf.test.snap | 185 +++ .../homer/maketagdirectory/tests/sam.config | 3 + .../homer/maketagdirectory/tests/tags.yml | 2 + .../nf-core/homer/pos2bed/tests/main.nf.test | 82 + .../homer/pos2bed/tests/main.nf.test.snap | 68 + .../homer/pos2bed/tests/nextflow.config | 5 + modules/nf-core/homer/pos2bed/tests/tags.yml | 2 + modules/nf-core/multiqc/environment.yml | 2 +- modules/nf-core/multiqc/main.nf | 10 +- modules/nf-core/multiqc/meta.yml | 13 + modules/nf-core/multiqc/tests/main.nf.test | 6 + .../nf-core/multiqc/tests/main.nf.test.snap | 18 +- modules/nf-core/preseq/lcextrap/main.nf | 15 +- .../preseq/lcextrap/tests/main.nf.test | 46 + .../preseq/lcextrap/tests/main.nf.test.snap | 130 ++ modules/nf-core/rseqc/inferexperiment/main.nf | 11 + .../rseqc/inferexperiment/tests/main.nf.test | 32 +- .../inferexperiment/tests/main.nf.test.snap | 39 +- .../nf-core/rseqc/readdistribution/main.nf | 11 + .../rseqc/readdistribution/tests/main.nf.test | 30 +- .../readdistribution/tests/main.nf.test.snap | 39 +- modules/nf-core/rseqc/readduplication/main.nf | 14 + .../rseqc/readduplication/tests/main.nf.test | 36 +- .../readduplication/tests/main.nf.test.snap | 119 +- .../nf-core/samtools/flagstat/environment.yml | 4 +- modules/nf-core/samtools/flagstat/main.nf | 4 +- .../samtools/flagstat/tests/main.nf.test.snap | 6 +- .../nf-core/samtools/idxstats/environment.yml | 4 +- modules/nf-core/samtools/idxstats/main.nf | 4 +- .../samtools/idxstats/tests/main.nf.test.snap | 6 +- .../nf-core/samtools/index/environment.yml | 4 +- modules/nf-core/samtools/index/main.nf | 4 +- .../samtools/index/tests/main.nf.test.snap | 18 +- modules/nf-core/samtools/sort/environment.yml | 4 +- modules/nf-core/samtools/sort/main.nf | 4 +- .../nf-core/samtools/sort/tests/main.nf.test | 16 +- .../samtools/sort/tests/main.nf.test.snap | 198 +-- .../nf-core/samtools/stats/environment.yml | 4 +- modules/nf-core/samtools/stats/main.nf | 4 +- .../samtools/stats/tests/main.nf.test.snap | 24 +- modules/nf-core/subread/featurecounts/main.nf | 12 + .../subread/featurecounts/tests/main.nf.test | 85 +- .../featurecounts/tests/main.nf.test.snap | 207 +++ modules/nf-core/umitools/dedup/main.nf | 1 + .../nf-core/umitools/dedup/tests/main.nf.test | 108 +- .../umitools/dedup/tests/main.nf.test.snap | 98 +- modules/nf-core/untar/environment.yml | 4 +- modules/nf-core/untar/main.nf | 29 +- modules/nf-core/untar/tests/main.nf.test | 50 +- modules/nf-core/untar/tests/main.nf.test.snap | 156 +- .../bam_dedup_stats_samtools_umitools/main.nf | 1 + .../meta.yml | 4 + .../tests/main.nf.test | 40 +- .../tests/main.nf.test.snap | 174 ++- .../tests/main.nf.test | 76 +- .../tests/main.nf.test.snap | 348 ++++- .../bam_stats_samtools/tests/main.nf.test | 116 +- .../tests/main.nf.test.snap | 340 +++- .../nf-core/fastq_align_bowtie2/meta.yml | 2 +- .../fastq_align_bowtie2/tests/main.nf.test | 94 +- .../tests/main.nf.test.snap | 32 +- .../fastq_align_bwa/tests/main.nf.test.snap | 88 +- .../nf-core/fastq_align_hisat2/main.nf | 1 - .../fastq_align_hisat2/tests/main.nf.test | 134 +- .../tests/main.nf.test.snap | 612 +++++--- 150 files changed, 7946 insertions(+), 2126 deletions(-) create mode 100644 modules/nf-core/bedtools/merge/tests/main.nf.test create mode 100644 modules/nf-core/bedtools/merge/tests/main.nf.test.snap create mode 100644 modules/nf-core/bedtools/merge/tests/nextflow.config create mode 100644 modules/nf-core/bedtools/merge/tests/tags.yml create mode 100644 modules/nf-core/bedtools/sort/tests/main.nf.test create mode 100644 modules/nf-core/bedtools/sort/tests/main.nf.test.snap create mode 100644 modules/nf-core/bedtools/sort/tests/nextflow.config create mode 100644 modules/nf-core/bedtools/sort/tests/tags.yml create mode 100644 modules/nf-core/bwamem2/index/tests/main.nf.test create mode 100644 modules/nf-core/bwamem2/index/tests/main.nf.test.snap create mode 100644 modules/nf-core/bwamem2/index/tests/tags.yml delete mode 100644 modules/nf-core/dragmap/hashtable/dragmap-hashtable.diff create mode 100644 modules/nf-core/dragmap/hashtable/tests/main.nf.test create mode 100644 modules/nf-core/dragmap/hashtable/tests/main.nf.test.snap create mode 100644 modules/nf-core/dragmap/hashtable/tests/tags.yml create mode 100644 modules/nf-core/fastp/tests/nextflow.interleaved.config rename modules/nf-core/fastp/tests/{nextflow.config => nextflow.save_failed.config} (50%) create mode 100644 modules/nf-core/gffread/tests/nextflow-fasta.config create mode 100644 modules/nf-core/gffread/tests/nextflow-gff3.config create mode 100644 modules/nf-core/gunzip/tests/nextflow.config create mode 100644 modules/nf-core/homer/findpeaks/tests/main.nf.test create mode 100644 modules/nf-core/homer/findpeaks/tests/main.nf.test.snap create mode 100644 modules/nf-core/homer/findpeaks/tests/nextflow.config create mode 100644 modules/nf-core/homer/findpeaks/tests/tags.yml create mode 100644 modules/nf-core/homer/maketagdirectory/tests/bed.config create mode 100644 modules/nf-core/homer/maketagdirectory/tests/main.nf.test create mode 100644 modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap create mode 100644 modules/nf-core/homer/maketagdirectory/tests/sam.config create mode 100644 modules/nf-core/homer/maketagdirectory/tests/tags.yml create mode 100644 modules/nf-core/homer/pos2bed/tests/main.nf.test create mode 100644 modules/nf-core/homer/pos2bed/tests/main.nf.test.snap create mode 100644 modules/nf-core/homer/pos2bed/tests/nextflow.config create mode 100644 modules/nf-core/homer/pos2bed/tests/tags.yml diff --git a/modules.json b/modules.json index bd648af9..da2b9985 100644 --- a/modules.json +++ b/modules.json @@ -17,7 +17,7 @@ }, "bedtools/genomecov": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "1ceaa8ba4d0fd886dbca0e545815d905b7407de7", "installed_by": ["modules"] }, "bedtools/intersect": { @@ -27,17 +27,17 @@ }, "bedtools/merge": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "a5377837fe9013bde89de8689829e83e84086536", "installed_by": ["modules"] }, "bedtools/sort": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "571a5feac4c9ce0a8df0bc15b94230e7f3e8db47", "installed_by": ["modules"] }, "bowtie2/align": { "branch": "master", - "git_sha": "0fe30831abbc2ed115e46e92330edf38f56edc3d", + "git_sha": "e4bad511789f16d0df39ee306b2cd50418365048", "installed_by": ["fastq_align_bowtie2"] }, "bowtie2/build": { @@ -47,37 +47,37 @@ }, "bwa/index": { "branch": "master", - "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5", + "git_sha": "e0ff65e1fb313677de09f5f477ae3da30ce19b7b", "installed_by": ["modules"] }, "bwa/mem": { "branch": "master", - "git_sha": "b97197968ac12dde2463fa54541f6350c46f2035", + "git_sha": "e0ff65e1fb313677de09f5f477ae3da30ce19b7b", "installed_by": ["fastq_align_bwa"] }, "bwamem2/index": { "branch": "master", - "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5", + "git_sha": "7081e04c18de9480948d34513a1c1e2d0fa9126d", "installed_by": ["modules"] }, "bwamem2/mem": { "branch": "master", - "git_sha": "1e2b7fb7106852388610c0360d234b0829eb980e", + "git_sha": "3afb95b2e15fc4a2347470255a7ef654f650c8ec", "installed_by": ["modules"] }, "cat/cat": { "branch": "master", - "git_sha": "81f27e75847087865299cc46605deb3b09b4e0a2", + "git_sha": "c60c14b285b89bdd0607e371417dadb80385ad6e", "installed_by": ["modules"] }, "cat/fastq": { "branch": "master", - "git_sha": "02fd5bd7275abad27aad32d5c852e0a9b1b98882", + "git_sha": "1ceaa8ba4d0fd886dbca0e545815d905b7407de7", "installed_by": ["modules"] }, "custom/getchromsizes": { "branch": "master", - "git_sha": "1b0ffa4e5aed5b7e3cd4311af31bd3b2c8345051", + "git_sha": "1ceaa8ba4d0fd886dbca0e545815d905b7407de7", "installed_by": ["modules"] }, "deeptools/bamcoverage": { @@ -87,18 +87,18 @@ }, "dragmap/align": { "branch": "master", - "git_sha": "3c77ca9aac783e76c3614a06db3bfe4fef619bde", + "git_sha": "dd2757cc22c5de8943fa38ba7cd6f8cc1eb65ac1", "installed_by": ["modules"], "patch": "modules/nf-core/dragmap/align/dragmap-align.diff" }, "dragmap/hashtable": { "branch": "master", - "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5", + "git_sha": "ae9e01cb5e77faada314047e78423b22b4f5bbc5", "installed_by": ["modules"] }, "fastp": { "branch": "master", - "git_sha": "003920c7f9a8ae19b69a97171922880220bedf56", + "git_sha": "1ceaa8ba4d0fd886dbca0e545815d905b7407de7", "installed_by": ["modules"] }, "fastqc": { @@ -108,27 +108,27 @@ }, "gffread": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "6c996d7fbe0816dcbb68ce587ad5f873313682a1", "installed_by": ["modules"] }, "gunzip": { "branch": "master", - "git_sha": "3a5fef109d113b4997c9822198664ca5f2716208", + "git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d", "installed_by": ["modules"] }, "hisat2/align": { "branch": "master", - "git_sha": "400037f54de4b0c42712ec5a499d9fd9e66250d1", + "git_sha": "2c6b1144ed58b6184ad58fc4e6b6a90219b4bf4f", "installed_by": ["fastq_align_hisat2"] }, "homer/findpeaks": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08", "installed_by": ["homer/groseq"] }, "homer/maketagdirectory": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08", "installed_by": ["homer/groseq"] }, "homer/makeucscfile": { @@ -138,12 +138,12 @@ }, "homer/pos2bed": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08", "installed_by": ["homer/groseq"] }, "multiqc": { "branch": "master", - "git_sha": "b7ebe95761cd389603f9cc0e0dc384c0f663815a", + "git_sha": "b80f5fd12ff7c43938f424dd76392a2704fa2396", "installed_by": ["modules"] }, "pints/caller": { @@ -159,47 +159,47 @@ }, "preseq/lcextrap": { "branch": "master", - "git_sha": "9a88058962c0ee1715f2ad0e017c37e0cd75e532", + "git_sha": "2c6b1144ed58b6184ad58fc4e6b6a90219b4bf4f", "installed_by": ["modules"] }, "rseqc/inferexperiment": { "branch": "master", - "git_sha": "41f4baa439663b9027727d83a3293db93bad3f8c", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", "installed_by": ["modules"] }, "rseqc/readdistribution": { "branch": "master", - "git_sha": "d5f5ce9474983fe0973b26c39728b5c57b13c8d4", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", "installed_by": ["modules"] }, "rseqc/readduplication": { "branch": "master", - "git_sha": "41f4baa439663b9027727d83a3293db93bad3f8c", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", "installed_by": ["modules"] }, "samtools/flagstat": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", + "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", "installed_by": ["bam_stats_samtools"] }, "samtools/idxstats": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", + "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", "installed_by": ["bam_stats_samtools"] }, "samtools/index": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", + "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools"] }, "samtools/sort": { "branch": "master", - "git_sha": "4352dbdb09ec40db71e9b172b97a01dcf5622c26", + "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", "installed_by": ["bam_sort_stats_samtools"] }, "samtools/stats": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", + "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", "installed_by": ["bam_stats_samtools"] }, "star/align": { @@ -214,17 +214,17 @@ }, "subread/featurecounts": { "branch": "master", - "git_sha": "f6bba1a67cdbb605f24d7a4e8dd383b0eec45b52", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", "installed_by": ["modules"] }, "umitools/dedup": { "branch": "master", - "git_sha": "3bd4f34e3093c2a16e6a8eefc22242b9b94641db", + "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", "installed_by": ["bam_dedup_stats_samtools_umitools"] }, "untar": { "branch": "master", - "git_sha": "e719354ba77df0a1bd310836aa2039b45c29d620", + "git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d", "installed_by": ["modules"] } } @@ -233,12 +233,12 @@ "nf-core": { "bam_dedup_stats_samtools_umitools": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", + "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", "installed_by": ["subworkflows"] }, "bam_sort_stats_samtools": { "branch": "master", - "git_sha": "4352dbdb09ec40db71e9b172b97a01dcf5622c26", + "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", "installed_by": [ "fastq_align_bowtie2", "fastq_align_bwa", @@ -248,22 +248,22 @@ }, "bam_stats_samtools": { "branch": "master", - "git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62", + "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools"] }, "fastq_align_bowtie2": { "branch": "master", - "git_sha": "0fe30831abbc2ed115e46e92330edf38f56edc3d", + "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", "installed_by": ["subworkflows"] }, "fastq_align_bwa": { "branch": "master", - "git_sha": "b97197968ac12dde2463fa54541f6350c46f2035", + "git_sha": "e0ff65e1fb313677de09f5f477ae3da30ce19b7b", "installed_by": ["subworkflows"] }, "fastq_align_hisat2": { "branch": "master", - "git_sha": "701ae347c4508fba1b7d65262596f278b6a11cb6", + "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", "installed_by": ["subworkflows"] }, "fastq_align_star": { diff --git a/modules/nf-core/bedtools/genomecov/main.nf b/modules/nf-core/bedtools/genomecov/main.nf index 7a4d9c45..954e8913 100644 --- a/modules/nf-core/bedtools/genomecov/main.nf +++ b/modules/nf-core/bedtools/genomecov/main.nf @@ -11,6 +11,7 @@ process BEDTOOLS_GENOMECOV { tuple val(meta), path(intervals), val(scale) path sizes val extension + val sort output: tuple val(meta), path("*.${extension}"), emit: genomecov @@ -26,6 +27,7 @@ process BEDTOOLS_GENOMECOV { if (!args_list.contains('-bg') && (scale > 0 && scale != 1)) { args += " -bg" } + def sort_cmd = sort ? '| bedtools sort' : '' def prefix = task.ext.prefix ?: "${meta.id}" if (intervals.name =~ /\.bam/) { @@ -34,6 +36,7 @@ process BEDTOOLS_GENOMECOV { genomecov \\ -ibam $intervals \\ $args \\ + $sort_cmd \\ > ${prefix}.${extension} cat <<-END_VERSIONS > versions.yml @@ -48,6 +51,7 @@ process BEDTOOLS_GENOMECOV { -i $intervals \\ -g $sizes \\ $args \\ + $sort_cmd \\ > ${prefix}.${extension} cat <<-END_VERSIONS > versions.yml diff --git a/modules/nf-core/bedtools/genomecov/tests/main.nf.test b/modules/nf-core/bedtools/genomecov/tests/main.nf.test index 21e69aed..16a03492 100644 --- a/modules/nf-core/bedtools/genomecov/tests/main.nf.test +++ b/modules/nf-core/bedtools/genomecov/tests/main.nf.test @@ -9,19 +9,20 @@ nextflow_process { tag "bedtools" tag "bedtools/genomecov" - test("sarscov2 - no scale") { + test("sarscov2 - no scale") { when { process { - """ + """ input[0] = [ [ id:'test' ], // meta map - file(params.test_data['sarscov2']['illumina']['test_paired_end_bam'], checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.bam", checkIfExists: true), 1 ] // sizes input[1] = [] // extension input[2] = "txt" + input[3] = true """ } } @@ -29,25 +30,25 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match("no_scale") } + { assert snapshot(process.out).match() } ) } - } test("sarscov2 - dummy sizes") { when { process { - """ + """ input[0] = [ [ id:'test'], - file(params.test_data['sarscov2']['illumina']['test_paired_end_bam'], checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.bam", checkIfExists: true), 0.5 ] // sizes input[1] = file('dummy_chromosome_sizes') // extension input[2] = 'txt' + input[3] = false """ } } @@ -55,25 +56,25 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match("dummy_sizes") } + { assert snapshot(process.out).match() } ) } - } test("sarscov2 - scale") { when { process { - """ + """ input[0] = [ [ id:'test'], - file(params.test_data['sarscov2']['genome']['baits_bed'], checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/baits.bed", checkIfExists: true), 0.5 ] // sizes - input[1] = file(params.test_data['sarscov2']['genome']['genome_sizes'], checkIfExists: true) + input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.sizes", checkIfExists: true) // extension input[2] = 'txt' + input[3] = false """ } } @@ -81,27 +82,55 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match("scale") } + { assert snapshot(process.out).match() } ) } - } - test("stub") { + test("sarscov2 - no scale - stub") { options "-stub" when { process { - """ + """ input[0] = [ [ id:'test' ], // meta map - file(params.test_data['sarscov2']['illumina']['test_paired_end_bam'], checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.bam", checkIfExists: true), 1 ] // sizes input[1] = [] // extension + input[2] = "txt" + input[3] = true + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("sarscov2 - dummy sizes - stub") { + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.bam", checkIfExists: true), + 0.5 + ] + // sizes + input[1] = file('dummy_chromosome_sizes') + // extension input[2] = 'txt' + input[3] = false """ } } @@ -109,10 +138,37 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(file(process.out.genomecov[0][1]).name).match("stub") } + { assert snapshot(process.out).match() } ) } + } + + test("sarscov2 - scale - stub") { + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/baits.bed", checkIfExists: true), + 0.5 + ] + // sizes + input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.sizes", checkIfExists: true) + // extension + input[2] = 'txt' + input[3] = false + """ + } + } + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } } } diff --git a/modules/nf-core/bedtools/genomecov/tests/main.nf.test.snap b/modules/nf-core/bedtools/genomecov/tests/main.nf.test.snap index 8f9191e4..da6dbe87 100644 --- a/modules/nf-core/bedtools/genomecov/tests/main.nf.test.snap +++ b/modules/nf-core/bedtools/genomecov/tests/main.nf.test.snap @@ -1,5 +1,5 @@ { - "dummy_sizes": { + "sarscov2 - dummy sizes": { "content": [ { "0": [ @@ -26,9 +26,13 @@ ] } ], - "timestamp": "2023-12-05T17:35:58.35232" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T11:59:33.898146" }, - "no_scale": { + "sarscov2 - no scale - stub": { "content": [ { "0": [ @@ -36,7 +40,7 @@ { "id": "test" }, - "test.coverage.txt:md5,66083198daca6c001d328ba9616e9b53" + "test.coverage.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], "1": [ @@ -47,7 +51,7 @@ { "id": "test" }, - "test.coverage.txt:md5,66083198daca6c001d328ba9616e9b53" + "test.coverage.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], "versions": [ @@ -55,15 +59,46 @@ ] } ], - "timestamp": "2023-12-05T17:35:51.142496" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T11:59:52.483371" }, - "stub": { + "sarscov2 - scale": { "content": [ - "test.coverage.txt" + { + "0": [ + [ + { + "id": "test" + }, + "test.coverage.txt:md5,de3c59c0ea123bcdbbad27bc0a0a601e" + ] + ], + "1": [ + "versions.yml:md5,5fd44452613992a6f71f2c73d2e117f2" + ], + "genomecov": [ + [ + { + "id": "test" + }, + "test.coverage.txt:md5,de3c59c0ea123bcdbbad27bc0a0a601e" + ] + ], + "versions": [ + "versions.yml:md5,5fd44452613992a6f71f2c73d2e117f2" + ] + } ], - "timestamp": "2023-12-05T17:36:13.084709" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T11:59:43.69501" }, - "scale": { + "sarscov2 - scale - stub": { "content": [ { "0": [ @@ -71,7 +106,7 @@ { "id": "test" }, - "test.coverage.txt:md5,de3c59c0ea123bcdbbad27bc0a0a601e" + "test.coverage.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], "1": [ @@ -82,7 +117,73 @@ { "id": "test" }, - "test.coverage.txt:md5,de3c59c0ea123bcdbbad27bc0a0a601e" + "test.coverage.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,5fd44452613992a6f71f2c73d2e117f2" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:00:09.930036" + }, + "sarscov2 - no scale": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.coverage.txt:md5,66083198daca6c001d328ba9616e9b53" + ] + ], + "1": [ + "versions.yml:md5,5fd44452613992a6f71f2c73d2e117f2" + ], + "genomecov": [ + [ + { + "id": "test" + }, + "test.coverage.txt:md5,66083198daca6c001d328ba9616e9b53" + ] + ], + "versions": [ + "versions.yml:md5,5fd44452613992a6f71f2c73d2e117f2" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T11:59:25.448817" + }, + "sarscov2 - dummy sizes - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.coverage.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,5fd44452613992a6f71f2c73d2e117f2" + ], + "genomecov": [ + [ + { + "id": "test" + }, + "test.coverage.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], "versions": [ @@ -90,6 +191,10 @@ ] } ], - "timestamp": "2023-12-05T17:36:05.962006" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:00:01.086433" } } \ No newline at end of file diff --git a/modules/nf-core/bedtools/merge/tests/main.nf.test b/modules/nf-core/bedtools/merge/tests/main.nf.test new file mode 100644 index 00000000..95dba8e5 --- /dev/null +++ b/modules/nf-core/bedtools/merge/tests/main.nf.test @@ -0,0 +1,34 @@ +nextflow_process { + + name "Test Process BEDTOOLS_MERGE" + script "../main.nf" + config "./nextflow.config" + process "BEDTOOLS_MERGE" + + tag "modules" + tag "modules_nfcore" + tag "bedtools" + tag "bedtools/merge" + + test("test_bedtools_merge") { + + when { + process { + """ + input[0] = [ [ id:'test'], + file(params.test_data['sarscov2']['genome']['test_bed'], checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + +} \ No newline at end of file diff --git a/modules/nf-core/bedtools/merge/tests/main.nf.test.snap b/modules/nf-core/bedtools/merge/tests/main.nf.test.snap new file mode 100644 index 00000000..ee6c4e63 --- /dev/null +++ b/modules/nf-core/bedtools/merge/tests/main.nf.test.snap @@ -0,0 +1,35 @@ +{ + "test_bedtools_merge": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test_out.bed:md5,0cf6ed2b6f470cd44a247da74ca4fe4e" + ] + ], + "1": [ + "versions.yml:md5,2d134badb4cd1e4e903696c7967f28d6" + ], + "bed": [ + [ + { + "id": "test" + }, + "test_out.bed:md5,0cf6ed2b6f470cd44a247da74ca4fe4e" + ] + ], + "versions": [ + "versions.yml:md5,2d134badb4cd1e4e903696c7967f28d6" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-18T17:07:09.721153" + } +} \ No newline at end of file diff --git a/modules/nf-core/bedtools/merge/tests/nextflow.config b/modules/nf-core/bedtools/merge/tests/nextflow.config new file mode 100644 index 00000000..16444e98 --- /dev/null +++ b/modules/nf-core/bedtools/merge/tests/nextflow.config @@ -0,0 +1,7 @@ +process { + + withName: BEDTOOLS_MERGE { + ext.prefix = { "${meta.id}_out" } + } + +} diff --git a/modules/nf-core/bedtools/merge/tests/tags.yml b/modules/nf-core/bedtools/merge/tests/tags.yml new file mode 100644 index 00000000..60c8cad1 --- /dev/null +++ b/modules/nf-core/bedtools/merge/tests/tags.yml @@ -0,0 +1,2 @@ +bedtools/merge: + - "modules/nf-core/bedtools/merge/**" diff --git a/modules/nf-core/bedtools/sort/tests/main.nf.test b/modules/nf-core/bedtools/sort/tests/main.nf.test new file mode 100644 index 00000000..b1f36dd9 --- /dev/null +++ b/modules/nf-core/bedtools/sort/tests/main.nf.test @@ -0,0 +1,58 @@ +nextflow_process { + + name "Test Process BEDTOOLS_SORT" + script "../main.nf" + config "./nextflow.config" + process "BEDTOOLS_SORT" + + tag "modules" + tag "modules_nfcore" + tag "bedtools" + tag "bedtools/sort" + + test("test_bedtools_sort") { + + when { + process { + """ + input[0] = [ [ id:'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true) + ] + input[1] = [] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + + + test("test_bedtools_sort_with_genome") { + + when { + process { + """ + input[0] = [ [ id:'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true) + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta.fai', checkIfExists: true) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + +} \ No newline at end of file diff --git a/modules/nf-core/bedtools/sort/tests/main.nf.test.snap b/modules/nf-core/bedtools/sort/tests/main.nf.test.snap new file mode 100644 index 00000000..f10e8b98 --- /dev/null +++ b/modules/nf-core/bedtools/sort/tests/main.nf.test.snap @@ -0,0 +1,68 @@ +{ + "test_bedtools_sort_with_genome": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test_out.testtext:md5,fe4053cf4de3aebbdfc3be2efb125a74" + ] + ], + "1": [ + "versions.yml:md5,cdbae2c7ebc41e534aaf0835779061f8" + ], + "sorted": [ + [ + { + "id": "test" + }, + "test_out.testtext:md5,fe4053cf4de3aebbdfc3be2efb125a74" + ] + ], + "versions": [ + "versions.yml:md5,cdbae2c7ebc41e534aaf0835779061f8" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-19T10:13:11.830452" + }, + "test_bedtools_sort": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test_out.testtext:md5,fe4053cf4de3aebbdfc3be2efb125a74" + ] + ], + "1": [ + "versions.yml:md5,cdbae2c7ebc41e534aaf0835779061f8" + ], + "sorted": [ + [ + { + "id": "test" + }, + "test_out.testtext:md5,fe4053cf4de3aebbdfc3be2efb125a74" + ] + ], + "versions": [ + "versions.yml:md5,cdbae2c7ebc41e534aaf0835779061f8" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-19T10:16:40.535947" + } +} \ No newline at end of file diff --git a/modules/nf-core/bedtools/sort/tests/nextflow.config b/modules/nf-core/bedtools/sort/tests/nextflow.config new file mode 100644 index 00000000..f203c99c --- /dev/null +++ b/modules/nf-core/bedtools/sort/tests/nextflow.config @@ -0,0 +1,8 @@ +process { + + withName: BEDTOOLS_SORT { + ext.prefix = { "${meta.id}_out" } + ext.suffix = "testtext" + } + +} \ No newline at end of file diff --git a/modules/nf-core/bedtools/sort/tests/tags.yml b/modules/nf-core/bedtools/sort/tests/tags.yml new file mode 100644 index 00000000..47c85eea --- /dev/null +++ b/modules/nf-core/bedtools/sort/tests/tags.yml @@ -0,0 +1,2 @@ +bedtools/sort: + - "modules/nf-core/bedtools/sort/**" diff --git a/modules/nf-core/bowtie2/align/main.nf b/modules/nf-core/bowtie2/align/main.nf index 96a7027d..809525ad 100644 --- a/modules/nf-core/bowtie2/align/main.nf +++ b/modules/nf-core/bowtie2/align/main.nf @@ -1,6 +1,6 @@ process BOWTIE2_ALIGN { tag "$meta.id" - label "process_high" + label 'process_high' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? diff --git a/modules/nf-core/bowtie2/align/meta.yml b/modules/nf-core/bowtie2/align/meta.yml index e66811d0..38610e0e 100644 --- a/modules/nf-core/bowtie2/align/meta.yml +++ b/modules/nf-core/bowtie2/align/meta.yml @@ -36,6 +36,15 @@ input: type: file description: Bowtie2 genome index files pattern: "*.ebwt" + - meta3: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'test', single_end:false ] + - fasta: + type: file + description: Bowtie2 genome fasta file + pattern: "*.fasta" - save_unaligned: type: boolean description: | @@ -46,22 +55,38 @@ input: description: use samtools sort (true) or samtools view (false) pattern: "true or false" output: - - aligned: + - sam: type: file - description: Output BAM/SAM file containing read alignments - pattern: "*.{bam,sam}" - - versions: + description: Output SAM file containing read alignments + pattern: "*.sam" + - bam: type: file - description: File containing software versions - pattern: "versions.yml" - - fastq: + description: Output BAM file containing read alignments + pattern: "*.bam" + - cram: type: file - description: Unaligned FastQ files - pattern: "*.fastq.gz" + description: Output CRAM file containing read alignments + pattern: "*.cram" + - csi: + type: file + description: Output SAM/BAM index for large inputs + pattern: "*.csi" + - crai: + type: file + description: Output CRAM index + pattern: "*.crai" - log: type: file description: Aligment log pattern: "*.log" + - fastq: + type: file + description: Unaligned FastQ files + pattern: "*.fastq.gz" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@joseespinosa" - "@drpatelh" diff --git a/modules/nf-core/bwa/index/environment.yml b/modules/nf-core/bwa/index/environment.yml index 5d3cb323..126e0034 100644 --- a/modules/nf-core/bwa/index/environment.yml +++ b/modules/nf-core/bwa/index/environment.yml @@ -4,4 +4,4 @@ channels: - bioconda - defaults dependencies: - - bioconda::bwa=0.7.17 + - bioconda::bwa=0.7.18 diff --git a/modules/nf-core/bwa/index/main.nf b/modules/nf-core/bwa/index/main.nf index 24b5a2ea..2e48b6ca 100644 --- a/modules/nf-core/bwa/index/main.nf +++ b/modules/nf-core/bwa/index/main.nf @@ -4,8 +4,8 @@ process BWA_INDEX { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/bwa:0.7.17--hed695b0_7' : - 'biocontainers/bwa:0.7.17--hed695b0_7' }" + 'https://depot.galaxyproject.org/singularity/bwa:0.7.18--he4a0461_0' : + 'biocontainers/bwa:0.7.18--he4a0461_0' }" input: tuple val(meta), path(fasta) diff --git a/modules/nf-core/bwa/index/meta.yml b/modules/nf-core/bwa/index/meta.yml index 730628d0..6bbc87a6 100644 --- a/modules/nf-core/bwa/index/meta.yml +++ b/modules/nf-core/bwa/index/meta.yml @@ -11,7 +11,7 @@ tools: BWA is a software package for mapping DNA sequences against a large reference genome, such as the human genome. homepage: http://bio-bwa.sourceforge.net/ - documentation: http://www.htslib.org/doc/samtools.html + documentation: https://bio-bwa.sourceforge.net/bwa.shtml arxiv: arXiv:1303.3997 licence: ["GPL-3.0-or-later"] input: @@ -43,3 +43,4 @@ authors: maintainers: - "@drpatelh" - "@maxulysse" + - "@gallvp" diff --git a/modules/nf-core/bwa/index/tests/main.nf.test b/modules/nf-core/bwa/index/tests/main.nf.test index 5fc8d496..af33e73c 100644 --- a/modules/nf-core/bwa/index/tests/main.nf.test +++ b/modules/nf-core/bwa/index/tests/main.nf.test @@ -15,7 +15,7 @@ nextflow_process { """ input[0] = [ [id: 'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -29,5 +29,5 @@ nextflow_process { } } - + } diff --git a/modules/nf-core/bwa/index/tests/main.nf.test.snap b/modules/nf-core/bwa/index/tests/main.nf.test.snap index e51ad5bf..7c8f0465 100644 --- a/modules/nf-core/bwa/index/tests/main.nf.test.snap +++ b/modules/nf-core/bwa/index/tests/main.nf.test.snap @@ -17,7 +17,7 @@ ] ], "1": [ - "versions.yml:md5,0f20525da90e7489a7ebb02adca3265f" + "versions.yml:md5,a64462ac7dfb21f4ade9b02e7f65c5bb" ], "index": [ [ @@ -34,10 +34,14 @@ ] ], "versions": [ - "versions.yml:md5,0f20525da90e7489a7ebb02adca3265f" + "versions.yml:md5,a64462ac7dfb21f4ade9b02e7f65c5bb" ] } ], - "timestamp": "2023-10-17T17:20:20.180927714" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-05-16T11:40:09.925307" } } \ No newline at end of file diff --git a/modules/nf-core/bwa/mem/environment.yml b/modules/nf-core/bwa/mem/environment.yml index 3f136d0a..3aa9f0cc 100644 --- a/modules/nf-core/bwa/mem/environment.yml +++ b/modules/nf-core/bwa/mem/environment.yml @@ -4,7 +4,7 @@ channels: - bioconda - defaults dependencies: - - bwa=0.7.17 + - bwa=0.7.18 # renovate: datasource=conda depName=bioconda/samtools - - samtools=1.19.2 - - htslib=1.19.1 + - samtools=1.20 + - htslib=1.20.0 diff --git a/modules/nf-core/bwa/mem/main.nf b/modules/nf-core/bwa/mem/main.nf index d8bd2815..9c815f0c 100644 --- a/modules/nf-core/bwa/mem/main.nf +++ b/modules/nf-core/bwa/mem/main.nf @@ -4,8 +4,8 @@ process BWA_MEM { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-fe8faa35dbf6dc65a0f7f5d4ea12e31a79f73e40:a34558545ae1413d94bde4578787ebef08027945-0' : - 'biocontainers/mulled-v2-fe8faa35dbf6dc65a0f7f5d4ea12e31a79f73e40:a34558545ae1413d94bde4578787ebef08027945-0' }" + 'https://depot.galaxyproject.org/singularity/mulled-v2-fe8faa35dbf6dc65a0f7f5d4ea12e31a79f73e40:1bd8542a8a0b42e0981337910954371d0230828e-0' : + 'biocontainers/mulled-v2-fe8faa35dbf6dc65a0f7f5d4ea12e31a79f73e40:1bd8542a8a0b42e0981337910954371d0230828e-0' }" input: tuple val(meta) , path(reads) diff --git a/modules/nf-core/bwa/mem/meta.yml b/modules/nf-core/bwa/mem/meta.yml index 1532c261..b126dd86 100644 --- a/modules/nf-core/bwa/mem/meta.yml +++ b/modules/nf-core/bwa/mem/meta.yml @@ -14,7 +14,7 @@ tools: BWA is a software package for mapping DNA sequences against a large reference genome, such as the human genome. homepage: http://bio-bwa.sourceforge.net/ - documentation: http://www.htslib.org/doc/samtools.html + documentation: https://bio-bwa.sourceforge.net/bwa.shtml arxiv: arXiv:1303.3997 licence: ["GPL-3.0-or-later"] input: diff --git a/modules/nf-core/bwa/mem/tests/main.nf.test b/modules/nf-core/bwa/mem/tests/main.nf.test index 1fa9b56d..463b76f8 100644 --- a/modules/nf-core/bwa/mem/tests/main.nf.test +++ b/modules/nf-core/bwa/mem/tests/main.nf.test @@ -44,7 +44,14 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.cram, + process.out.csi, + process.out.crai, + process.out.versions, + file(process.out.bam[0][1]).name + ).match() + } ) } @@ -85,7 +92,14 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.cram, + process.out.csi, + process.out.crai, + process.out.versions, + file(process.out.bam[0][1]).name + ).match() + } ) } @@ -127,7 +141,14 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.cram, + process.out.csi, + process.out.crai, + process.out.versions, + file(process.out.bam[0][1]).name + ).match() + } ) } @@ -169,7 +190,14 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.cram, + process.out.csi, + process.out.crai, + process.out.versions, + file(process.out.bam[0][1]).name + ).match() + } ) } @@ -211,7 +239,14 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.cram, + process.out.csi, + process.out.crai, + process.out.versions, + file(process.out.bam[0][1]).name + ).match() + } ) } diff --git a/modules/nf-core/bwa/mem/tests/main.nf.test.snap b/modules/nf-core/bwa/mem/tests/main.nf.test.snap index 0d1bdb41..038ee7b7 100644 --- a/modules/nf-core/bwa/mem/tests/main.nf.test.snap +++ b/modules/nf-core/bwa/mem/tests/main.nf.test.snap @@ -1,295 +1,140 @@ { "Single-End": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": true - }, - "test.bam:md5,a74710a0345b4717bb4431bf9c257120" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - - ], - "4": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ], - "bam": [ - [ - { - "id": "test", - "single_end": true - }, - "test.bam:md5,a74710a0345b4717bb4431bf9c257120" - ] - ], - "crai": [ - - ], - "cram": [ - - ], - "csi": [ - - ], - "versions": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ] - } + [ + + ], + [ + + ], + [ + + ], + [ + "versions.yml:md5,478b816fbd37871f5e8c617833d51d80" + ], + "test.bam" ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-14T14:14:56.820798254" + "timestamp": "2024-05-20T08:44:32.953673185" }, "Single-End Sort": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": true - }, - "test.bam:md5,cb1e038bc4d990683fa485d632550b54" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - - ], - "4": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ], - "bam": [ - [ - { - "id": "test", - "single_end": true - }, - "test.bam:md5,cb1e038bc4d990683fa485d632550b54" - ] - ], - "crai": [ - - ], - "cram": [ - - ], - "csi": [ - - ], - "versions": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ] - } + [ + + ], + [ + + ], + [ + + ], + [ + "versions.yml:md5,478b816fbd37871f5e8c617833d51d80" + ], + "test.bam" ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-14T14:15:20.271428534" + "timestamp": "2024-05-20T08:44:45.27066093" }, "Paired-End": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam:md5,aea123a3828a99da1906126355f15a12" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - - ], - "4": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ], - "bam": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam:md5,aea123a3828a99da1906126355f15a12" - ] - ], - "crai": [ - - ], - "cram": [ - - ], - "csi": [ - - ], - "versions": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ] - } + [ + + ], + [ + + ], + [ + + ], + [ + "versions.yml:md5,478b816fbd37871f5e8c617833d51d80" + ], + "test.bam" ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-14T14:15:38.264256823" + "timestamp": "2024-05-20T08:44:57.706852274" }, "Paired-End Sort": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam:md5,4682087bcdc3617384b375093fecd8dd" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - - ], - "4": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ], - "bam": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam:md5,4682087bcdc3617384b375093fecd8dd" - ] - ], - "crai": [ - - ], - "cram": [ - - ], - "csi": [ - - ], - "versions": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ] - } + [ + + ], + [ + + ], + [ + + ], + [ + "versions.yml:md5,478b816fbd37871f5e8c617833d51d80" + ], + "test.bam" ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-14T14:16:00.528642686" + "timestamp": "2024-05-20T08:45:10.376505036" }, "Single-end - stub": { "content": [ "test.bam", "test.csi", [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" + "versions.yml:md5,478b816fbd37871f5e8c617833d51d80" ] ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-15T09:50:33.238543011" + "timestamp": "2024-05-20T08:46:07.182072398" }, "Paired-End - no fasta": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam:md5,aea123a3828a99da1906126355f15a12" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - - ], - "4": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ], - "bam": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam:md5,aea123a3828a99da1906126355f15a12" - ] - ], - "crai": [ - - ], - "cram": [ - - ], - "csi": [ - - ], - "versions": [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" - ] - } + [ + + ], + [ + + ], + [ + + ], + [ + "versions.yml:md5,478b816fbd37871f5e8c617833d51d80" + ], + "test.bam" ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-14T14:40:16.345342005" + "timestamp": "2024-05-20T08:45:53.813076501" }, "Paired-end - stub": { "content": [ "test.bam", "test.csi", [ - "versions.yml:md5,c32f719a68bb2966c8511d808154d42d" + "versions.yml:md5,478b816fbd37871f5e8c617833d51d80" ] ], "meta": { "nf-test": "0.8.4", "nextflow": "23.10.1" }, - "timestamp": "2024-03-15T09:50:42.268673302" + "timestamp": "2024-05-20T08:46:18.412916364" } } \ No newline at end of file diff --git a/modules/nf-core/bwamem2/index/tests/main.nf.test b/modules/nf-core/bwamem2/index/tests/main.nf.test new file mode 100644 index 00000000..dbf11132 --- /dev/null +++ b/modules/nf-core/bwamem2/index/tests/main.nf.test @@ -0,0 +1,31 @@ +nextflow_process { + + name "Test Process BWAMEM2_INDEX" + tag "modules_nfcore" + tag "modules" + tag "bwamem2" + tag "bwamem2/index" + script "../main.nf" + process "BWAMEM2_INDEX" + + test("BWAMEM2 index") { + + when { + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } +} diff --git a/modules/nf-core/bwamem2/index/tests/main.nf.test.snap b/modules/nf-core/bwamem2/index/tests/main.nf.test.snap new file mode 100644 index 00000000..69b268ee --- /dev/null +++ b/modules/nf-core/bwamem2/index/tests/main.nf.test.snap @@ -0,0 +1,47 @@ +{ + "BWAMEM2 index": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + [ + "genome.fasta.0123:md5,b02870de80106104abcb03cd9463e7d8", + "genome.fasta.amb:md5,3a68b8b2287e07dd3f5f95f4344ba76e", + "genome.fasta.ann:md5,c32e11f6c859f166c7525a9c1d583567", + "genome.fasta.bwt.2bit.64:md5,d097a1b82dee375d41a1ea69895a9216", + "genome.fasta.pac:md5,983e3d2cd6f36e2546e6d25a0da78d66" + ] + ] + ], + "1": [ + "versions.yml:md5,9ffd13d12e7108ed15c58566bc4717d6" + ], + "index": [ + [ + { + "id": "test" + }, + [ + "genome.fasta.0123:md5,b02870de80106104abcb03cd9463e7d8", + "genome.fasta.amb:md5,3a68b8b2287e07dd3f5f95f4344ba76e", + "genome.fasta.ann:md5,c32e11f6c859f166c7525a9c1d583567", + "genome.fasta.bwt.2bit.64:md5,d097a1b82dee375d41a1ea69895a9216", + "genome.fasta.pac:md5,983e3d2cd6f36e2546e6d25a0da78d66" + ] + ] + ], + "versions": [ + "versions.yml:md5,9ffd13d12e7108ed15c58566bc4717d6" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.02.0" + }, + "timestamp": "2024-03-18T12:59:39.132616" + } +} \ No newline at end of file diff --git a/modules/nf-core/bwamem2/index/tests/tags.yml b/modules/nf-core/bwamem2/index/tests/tags.yml new file mode 100644 index 00000000..3953018e --- /dev/null +++ b/modules/nf-core/bwamem2/index/tests/tags.yml @@ -0,0 +1,2 @@ +bwamem2/index: + - modules/nf-core/bwamem2/index/** diff --git a/modules/nf-core/bwamem2/mem/environment.yml b/modules/nf-core/bwamem2/mem/environment.yml index 5cbed0e7..cbf06d39 100644 --- a/modules/nf-core/bwamem2/mem/environment.yml +++ b/modules/nf-core/bwamem2/mem/environment.yml @@ -6,5 +6,5 @@ channels: dependencies: - bwa-mem2=2.2.1 # renovate: datasource=conda depName=bioconda/samtools - - samtools=1.18 - - htslib=1.18 + - samtools=1.19.2 + - htslib=1.19.1 diff --git a/modules/nf-core/bwamem2/mem/main.nf b/modules/nf-core/bwamem2/mem/main.nf index b3874fc9..729428c4 100644 --- a/modules/nf-core/bwamem2/mem/main.nf +++ b/modules/nf-core/bwamem2/mem/main.nf @@ -4,17 +4,22 @@ process BWAMEM2_MEM { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-e5d375990341c5aef3c9aff74f96f66f65375ef6:6351200f24497efba12c219c2bea4bb0f69a9d47-0' : - 'biocontainers/mulled-v2-e5d375990341c5aef3c9aff74f96f66f65375ef6:6351200f24497efba12c219c2bea4bb0f69a9d47-0' }" + 'https://depot.galaxyproject.org/singularity/mulled-v2-e5d375990341c5aef3c9aff74f96f66f65375ef6:2d15960ccea84e249a150b7f5d4db3a42fc2d6c3-0' : + 'biocontainers/mulled-v2-e5d375990341c5aef3c9aff74f96f66f65375ef6:2d15960ccea84e249a150b7f5d4db3a42fc2d6c3-0' }" input: tuple val(meta), path(reads) tuple val(meta2), path(index) + tuple val(meta3), path(fasta) val sort_bam output: - tuple val(meta), path("*.bam"), emit: bam - path "versions.yml" , emit: versions + tuple val(meta), path("*.sam") , emit: sam , optional:true + tuple val(meta), path("*.bam") , emit: bam , optional:true + tuple val(meta), path("*.cram") , emit: cram, optional:true + tuple val(meta), path("*.crai") , emit: crai, optional:true + tuple val(meta), path("*.csi") , emit: csi , optional:true + path "versions.yml" , emit: versions when: task.ext.when == null || task.ext.when @@ -24,6 +29,13 @@ process BWAMEM2_MEM { def args2 = task.ext.args2 ?: '' def prefix = task.ext.prefix ?: "${meta.id}" def samtools_command = sort_bam ? 'sort' : 'view' + + def extension_pattern = /(--output-fmt|-O)+\s+(\S+)/ + def extension_matcher = (args2 =~ extension_pattern) + def extension = extension_matcher.getCount() > 0 ? extension_matcher[0][2].toLowerCase() : "bam" + def reference = fasta && extension=="cram" ? "--reference ${fasta}" : "" + if (!fasta && extension=="cram") error "Fasta reference is required for CRAM output" + """ INDEX=`find -L ./ -name "*.amb" | sed 's/\\.amb\$//'` @@ -33,7 +45,7 @@ process BWAMEM2_MEM { -t $task.cpus \\ \$INDEX \\ $reads \\ - | samtools $samtools_command $args2 -@ $task.cpus -o ${prefix}.bam - + | samtools $samtools_command $args2 -@ $task.cpus ${reference} -o ${prefix}.${extension} - cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -43,9 +55,28 @@ process BWAMEM2_MEM { """ stub: + + def args = task.ext.args ?: '' + def args2 = task.ext.args2 ?: '' def prefix = task.ext.prefix ?: "${meta.id}" + def samtools_command = sort_bam ? 'sort' : 'view' + def extension_pattern = /(--output-fmt|-O)+\s+(\S+)/ + def extension_matcher = (args2 =~ extension_pattern) + def extension = extension_matcher.getCount() > 0 ? extension_matcher[0][2].toLowerCase() : "bam" + def reference = fasta && extension=="cram" ? "--reference ${fasta}" : "" + if (!fasta && extension=="cram") error "Fasta reference is required for CRAM output" + + def create_index = "" + if (extension == "cram") { + create_index = "touch ${prefix}.crai" + } else if (extension == "bam") { + create_index = "touch ${prefix}.csi" + } + """ - touch ${prefix}.bam + touch ${prefix}.${extension} + ${create_index} + cat <<-END_VERSIONS > versions.yml "${task.process}": bwamem2: \$(echo \$(bwa-mem2 version 2>&1) | sed 's/.* //') diff --git a/modules/nf-core/bwamem2/mem/meta.yml b/modules/nf-core/bwamem2/mem/meta.yml index 04891b26..931f7129 100644 --- a/modules/nf-core/bwamem2/mem/meta.yml +++ b/modules/nf-core/bwamem2/mem/meta.yml @@ -37,6 +37,15 @@ input: type: file description: BWA genome index files pattern: "Directory containing BWA index *.{0132,amb,ann,bwt.2bit.64,pac}" + - meta3: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - fasta: + type: file + description: Reference genome in FASTA format + pattern: "*.{fa,fasta,fna}" - sort_bam: type: boolean description: use samtools sort (true) or samtools view (false) @@ -47,15 +56,33 @@ output: description: | Groovy Map containing sample information e.g. [ id:'test', single_end:false ] + - sam: + type: file + description: Output SAM file containing read alignments + pattern: "*.{sam}" - bam: type: file description: Output BAM file containing read alignments pattern: "*.{bam}" + - cram: + type: file + description: Output CRAM file containing read alignments + pattern: "*.{cram}" + - crai: + type: file + description: Index file for CRAM file + pattern: "*.{crai}" + - csi: + type: file + description: Index file for BAM file + pattern: "*.{csi}" - versions: type: file description: File containing software versions pattern: "versions.yml" authors: - "@maxulysse" + - "@matthdsm" maintainers: - "@maxulysse" + - "@matthdsm" diff --git a/modules/nf-core/bwamem2/mem/tests/main.nf.test b/modules/nf-core/bwamem2/mem/tests/main.nf.test index 026e140d..5e67f70b 100644 --- a/modules/nf-core/bwamem2/mem/tests/main.nf.test +++ b/modules/nf-core/bwamem2/mem/tests/main.nf.test @@ -10,14 +10,17 @@ nextflow_process { tag "bwamem2/mem" tag "bwamem2/index" - test("sarscov2 - fastq, index, false") { + test("sarscov2 - fastq, index, fasta, false") { setup { run("BWAMEM2_INDEX") { script "../../index/main.nf" process { """ - input[0] = [ [:], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) ] + input[0] = Channel.of([ + [:], // meta map + [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + ]) """ } } @@ -26,12 +29,13 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = Channel.of([ [ id:'test', single_end:true ], // meta map - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) - ] + [file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true)] + ]) input[1] = BWAMEM2_INDEX.out.index - input[2] = false + input[2] = Channel.of([[:], [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)]]) + input[3] = false """ } } @@ -48,14 +52,17 @@ nextflow_process { } - test("sarscov2 - fastq, index, true") { + test("sarscov2 - fastq, index, fasta, true") { setup { run("BWAMEM2_INDEX") { script "../../index/main.nf" process { """ - input[0] = [ [:], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) ] + input[0] = Channel.of([ + [:], // meta map + [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + ]) """ } } @@ -64,12 +71,13 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = Channel.of([ [ id:'test', single_end:true ], // meta map - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) - ] + [file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true)] + ]) input[1] = BWAMEM2_INDEX.out.index - input[2] = true + input[2] = Channel.of([[:], [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)]]) + input[3] = true """ } } @@ -86,14 +94,17 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], index, false") { + test("sarscov2 - [fastq1, fastq2], index, fasta, false") { setup { run("BWAMEM2_INDEX") { script "../../index/main.nf" process { """ - input[0] = [ [:], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) ] + input[0] = Channel.of([ + [:], // meta map + [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + ]) """ } } @@ -102,15 +113,16 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] - ] + ]) input[1] = BWAMEM2_INDEX.out.index - input[2] = false + input[2] = Channel.of([[:], [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)]]) + input[3] = false """ } } @@ -127,14 +139,17 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], index, true") { + test("sarscov2 - [fastq1, fastq2], index, fasta, true") { setup { run("BWAMEM2_INDEX") { script "../../index/main.nf" process { """ - input[0] = [ [:], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) ] + input[0] = Channel.of([ + [:], // meta map + [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + ]) """ } } @@ -143,15 +158,16 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] - ] + ]) input[1] = BWAMEM2_INDEX.out.index - input[2] = true + input[2] = Channel.of([[:], [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)]]) + input[3] = true """ } } @@ -168,7 +184,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], index, true - stub") { + test("sarscov2 - [fastq1, fastq2], index, fasta, true - stub") { options "-stub" @@ -177,7 +193,10 @@ nextflow_process { script "../../index/main.nf" process { """ - input[0] = [ [:], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) ] + input[0] = Channel.of([ + [:], // meta map + [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + ]) """ } } @@ -186,15 +205,16 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] - ] + ]) input[1] = BWAMEM2_INDEX.out.index - input[2] = true + input[2] = Channel.of([[:], [file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)]]) + input[3] = true """ } } diff --git a/modules/nf-core/bwamem2/mem/tests/main.nf.test.snap b/modules/nf-core/bwamem2/mem/tests/main.nf.test.snap index db7dd392..9fb1e69d 100644 --- a/modules/nf-core/bwamem2/mem/tests/main.nf.test.snap +++ b/modules/nf-core/bwamem2/mem/tests/main.nf.test.snap @@ -1,47 +1,67 @@ { - "sarscov2 - [fastq1, fastq2], index, true": { + "sarscov2 - [fastq1, fastq2], index, fasta, false": { "content": [ "test.bam", [ - "versions.yml:md5,f653bf29c6597481cd0345bd66aafd8a" + "versions.yml:md5,1c1a9566f189ec077b5179bbf453c51a" ] ], - "timestamp": "2023-12-04T11:49:07.89544697" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-19T13:13:18.890289958" }, - "sarscov2 - [fastq1, fastq2], index, false": { + "sarscov2 - [fastq1, fastq2], index, fasta, true - stub": { "content": [ "test.bam", [ - "versions.yml:md5,f653bf29c6597481cd0345bd66aafd8a" + "versions.yml:md5,1c1a9566f189ec077b5179bbf453c51a" ] ], - "timestamp": "2023-12-04T11:48:56.319355195" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-19T13:45:51.821633029" }, - "sarscov2 - [fastq1, fastq2], index, true - stub": { + "sarscov2 - [fastq1, fastq2], index, fasta, true": { "content": [ "test.bam", [ - "versions.yml:md5,f653bf29c6597481cd0345bd66aafd8a" + "versions.yml:md5,1c1a9566f189ec077b5179bbf453c51a" ] ], - "timestamp": "2023-12-04T11:49:17.499101941" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-19T13:13:36.458291078" }, - "sarscov2 - fastq, index, false": { + "sarscov2 - fastq, index, fasta, false": { "content": [ "test.bam", [ - "versions.yml:md5,f653bf29c6597481cd0345bd66aafd8a" + "versions.yml:md5,1c1a9566f189ec077b5179bbf453c51a" ] ], - "timestamp": "2023-12-04T11:48:31.351628851" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-19T13:12:44.084654507" }, - "sarscov2 - fastq, index, true": { + "sarscov2 - fastq, index, fasta, true": { "content": [ "test.bam", [ - "versions.yml:md5,f653bf29c6597481cd0345bd66aafd8a" + "versions.yml:md5,1c1a9566f189ec077b5179bbf453c51a" ] ], - "timestamp": "2023-12-04T11:48:43.978452504" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-19T13:13:01.763341681" } } \ No newline at end of file diff --git a/modules/nf-core/cat/cat/main.nf b/modules/nf-core/cat/cat/main.nf index adbdbd7b..2862c64c 100644 --- a/modules/nf-core/cat/cat/main.nf +++ b/modules/nf-core/cat/cat/main.nf @@ -76,4 +76,3 @@ def getFileSuffix(filename) { def match = filename =~ /^.*?((\.\w{1,5})?(\.\w{1,5}\.gz$))/ return match ? match[0][1] : filename.substring(filename.lastIndexOf('.')) } - diff --git a/modules/nf-core/cat/cat/tests/main.nf.test b/modules/nf-core/cat/cat/tests/main.nf.test index aaae04f9..fcee2d19 100644 --- a/modules/nf-core/cat/cat/tests/main.nf.test +++ b/modules/nf-core/cat/cat/tests/main.nf.test @@ -19,8 +19,8 @@ nextflow_process { [ [ id:'genome', single_end:true ], [ - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true), - file(params.test_data['sarscov2']['genome']['genome_sizes'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.sizes', checkIfExists: true) ] ] """ @@ -45,8 +45,8 @@ nextflow_process { [ [ id:'test', single_end:true ], [ - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true), - file(params.test_data['sarscov2']['genome']['genome_sizes'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.sizes', checkIfExists: true) ] ] """ @@ -72,8 +72,8 @@ nextflow_process { [ [ id:'test', single_end:true ], [ - file(params.test_data['sarscov2']['genome']['genome_gff3_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['genome']['contigs_genome_maf_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gff3.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/alignment/last/contigs.genome.maf.gz', checkIfExists: true) ] ] """ @@ -83,7 +83,8 @@ nextflow_process { def lines = path(process.out.file_out.get(0).get(1)).linesGzip assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot(lines[0..5]).match("test_cat_zipped_zipped_lines") }, + { assert snapshot(lines.size()).match("test_cat_zipped_zipped_size")} ) } } @@ -101,8 +102,8 @@ nextflow_process { [ [ id:'test', single_end:true ], [ - file(params.test_data['sarscov2']['genome']['genome_gff3_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['genome']['contigs_genome_maf_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gff3.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/alignment/last/contigs.genome.maf.gz', checkIfExists: true) ] ] """ @@ -130,8 +131,8 @@ nextflow_process { [ [ id:'test', single_end:true ], [ - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true), - file(params.test_data['sarscov2']['genome']['genome_sizes'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.sizes', checkIfExists: true) ] ] """ @@ -141,7 +142,8 @@ nextflow_process { def lines = path(process.out.file_out.get(0).get(1)).linesGzip assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot(lines[0..5]).match("test_cat_unzipped_zipped_lines") }, + { assert snapshot(lines.size()).match("test_cat_unzipped_zipped_size")} ) } } @@ -158,7 +160,7 @@ nextflow_process { [ [ id:'test', single_end:true ], [ - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] ] """ @@ -174,4 +176,3 @@ nextflow_process { } } } - diff --git a/modules/nf-core/cat/cat/tests/main.nf.test.snap b/modules/nf-core/cat/cat/tests/main.nf.test.snap index 0c9bfe8d..423571ba 100644 --- a/modules/nf-core/cat/cat/tests/main.nf.test.snap +++ b/modules/nf-core/cat/cat/tests/main.nf.test.snap @@ -1,4 +1,10 @@ { + "test_cat_unzipped_zipped_size": { + "content": [ + 375 + ], + "timestamp": "2023-10-16T14:33:08.049445686" + }, "test_cat_unzipped_unzipped": { "content": [ { @@ -61,36 +67,31 @@ ], "timestamp": "2023-10-16T14:32:49.642741302" }, - "test_cat_zipped_zipped": { + "test_cat_zipped_zipped_lines": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": true - }, - "test.gff3.gz:md5,c439d3b60e7bc03e8802a451a0d9a5d9" - ] - ], - "1": [ - "versions.yml:md5,115ed6177ebcff24eb99d503fa5ef894" - ], - "file_out": [ - [ - { - "id": "test", - "single_end": true - }, - "test.gff3.gz:md5,c439d3b60e7bc03e8802a451a0d9a5d9" - ] - ], - "versions": [ - "versions.yml:md5,115ed6177ebcff24eb99d503fa5ef894" - ] - } + [ + "MT192765.1\tGenbank\ttranscript\t259\t29667\t.\t+\t.\tID=unknown_transcript_1;geneID=orf1ab;gene_name=orf1ab", + "MT192765.1\tGenbank\tgene\t259\t21548\t.\t+\t.\tParent=unknown_transcript_1", + "MT192765.1\tGenbank\tCDS\t259\t13461\t.\t+\t0\tParent=unknown_transcript_1;exception=\"ribosomal slippage\";gbkey=CDS;gene=orf1ab;note=\"pp1ab;translated=by -1 ribosomal frameshift\";product=\"orf1ab polyprotein\";protein_id=QIK50426.1", + "MT192765.1\tGenbank\tCDS\t13461\t21548\t.\t+\t0\tParent=unknown_transcript_1;exception=\"ribosomal slippage\";gbkey=CDS;gene=orf1ab;note=\"pp1ab;translated=by -1 ribosomal frameshift\";product=\"orf1ab polyprotein\";protein_id=QIK50426.1", + "MT192765.1\tGenbank\tCDS\t21556\t25377\t.\t+\t0\tParent=unknown_transcript_1;gbkey=CDS;gene=S;note=\"structural protein\";product=\"surface glycoprotein\";protein_id=QIK50427.1", + "MT192765.1\tGenbank\tgene\t21556\t25377\t.\t+\t.\tParent=unknown_transcript_1" + ] + ], + "timestamp": "2023-10-16T14:32:33.629048645" + }, + "test_cat_unzipped_zipped_lines": { + "content": [ + [ + ">MT192765.1 Severe acute respiratory syndrome coronavirus 2 isolate SARS-CoV-2/human/USA/PC00101P/2020, complete genome", + "GTTTATACCTTCCCAGGTAACAAACCAACCAACTTTCGATCTCTTGTAGATCTGTTCTCTAAACGAACTTTAAAATCTGT", + "GTGGCTGTCACTCGGCTGCATGCTTAGTGCACTCACGCAGTATAATTAATAACTAATTACTGTCGTTGACAGGACACGAG", + "TAACTCGTCTATCTTCTGCAGGCTGCTTACGGTTTCGTCCGTGTTGCAGCCGATCATCAGCACATCTAGGTTTTGTCCGG", + "GTGTGACCGAAAGGTAAGATGGAGAGCCTTGTCCCTGGTTTCAACGAGAAAACACACGTCCAACTCAGTTTGCCTGTTTT", + "ACAGGTTCGCGACGTGCTCGTACGTGGCTTTGGAGACTCCGTGGAGGAGGTCTTATCAGAGGCACGTCAACATCTTAAAG" + ] ], - "timestamp": "2024-01-12T14:02:02.999254641" + "timestamp": "2023-10-16T14:33:08.038830506" }, "test_cat_one_file_unzipped_zipped_lines": { "content": [ @@ -105,41 +106,16 @@ ], "timestamp": "2023-10-16T14:33:21.39642399" }, - "test_cat_unzipped_zipped": { + "test_cat_zipped_zipped_size": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": true - }, - "cat.txt.gz:md5,f44b33a0e441ad58b2d3700270e2dbe2" - ] - ], - "1": [ - "versions.yml:md5,115ed6177ebcff24eb99d503fa5ef894" - ], - "file_out": [ - [ - { - "id": "test", - "single_end": true - }, - "cat.txt.gz:md5,f44b33a0e441ad58b2d3700270e2dbe2" - ] - ], - "versions": [ - "versions.yml:md5,115ed6177ebcff24eb99d503fa5ef894" - ] - } + 78 ], - "timestamp": "2024-01-12T14:08:26.948048418" + "timestamp": "2023-10-16T14:32:33.641869244" }, "test_cat_one_file_unzipped_zipped_size": { "content": [ 374 ], - "timestamp": "2024-01-12T14:10:22.445700266" + "timestamp": "2023-10-16T14:33:21.4094373" } -} +} \ No newline at end of file diff --git a/modules/nf-core/cat/fastq/environment.yml b/modules/nf-core/cat/fastq/environment.yml index bff93add..8c69b121 100644 --- a/modules/nf-core/cat/fastq/environment.yml +++ b/modules/nf-core/cat/fastq/environment.yml @@ -4,4 +4,4 @@ channels: - bioconda - defaults dependencies: - - conda-forge::sed=4.7 + - conda-forge::coreutils=8.30 diff --git a/modules/nf-core/cat/fastq/main.nf b/modules/nf-core/cat/fastq/main.nf index 3d963784..b68e5f91 100644 --- a/modules/nf-core/cat/fastq/main.nf +++ b/modules/nf-core/cat/fastq/main.nf @@ -53,9 +53,9 @@ process CAT_FASTQ { def prefix = task.ext.prefix ?: "${meta.id}" def readList = reads instanceof List ? reads.collect{ it.toString() } : [reads.toString()] if (meta.single_end) { - if (readList.size > 1) { + if (readList.size >= 1) { """ - touch ${prefix}.merged.fastq.gz + echo '' | gzip > ${prefix}.merged.fastq.gz cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -64,10 +64,10 @@ process CAT_FASTQ { """ } } else { - if (readList.size > 2) { + if (readList.size >= 2) { """ - touch ${prefix}_1.merged.fastq.gz - touch ${prefix}_2.merged.fastq.gz + echo '' | gzip > ${prefix}_1.merged.fastq.gz + echo '' | gzip > ${prefix}_2.merged.fastq.gz cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -76,5 +76,4 @@ process CAT_FASTQ { """ } } - } diff --git a/modules/nf-core/cat/fastq/tests/main.nf.test b/modules/nf-core/cat/fastq/tests/main.nf.test index dab2e14c..f88a78b6 100644 --- a/modules/nf-core/cat/fastq/tests/main.nf.test +++ b/modules/nf-core/cat/fastq/tests/main.nf.test @@ -1,3 +1,5 @@ +// NOTE The version snaps may not be consistant +// https://github.com/nf-core/modules/pull/4087#issuecomment-1767948035 nextflow_process { name "Test Process CAT_FASTQ" @@ -11,9 +13,6 @@ nextflow_process { test("test_cat_fastq_single_end") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -36,9 +35,6 @@ nextflow_process { test("test_cat_fastq_paired_end") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -63,9 +59,6 @@ nextflow_process { test("test_cat_fastq_single_end_same_name") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -88,9 +81,6 @@ nextflow_process { test("test_cat_fastq_paired_end_same_name") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -115,9 +105,129 @@ nextflow_process { test("test_cat_fastq_single_end_single_file") { when { - params { - outdir = "$outputDir" + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true)] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("test_cat_fastq_single_end - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true)] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("test_cat_fastq_paired_end - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test2_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test2_2.fastq.gz', checkIfExists: true)] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("test_cat_fastq_single_end_same_name - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true)] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("test_cat_fastq_paired_end_same_name - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true)] + ]) + """ } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("test_cat_fastq_single_end_single_file - stub") { + + options "-stub" + + when { process { """ input[0] = Channel.of([ diff --git a/modules/nf-core/cat/fastq/tests/main.nf.test.snap b/modules/nf-core/cat/fastq/tests/main.nf.test.snap index 43dfe28f..aec119a9 100644 --- a/modules/nf-core/cat/fastq/tests/main.nf.test.snap +++ b/modules/nf-core/cat/fastq/tests/main.nf.test.snap @@ -28,6 +28,10 @@ ] } ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2024-01-17T17:30:39.816981" }, "test_cat_fastq_single_end_same_name": { @@ -59,6 +63,10 @@ ] } ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2024-01-17T17:32:35.229332" }, "test_cat_fastq_single_end_single_file": { @@ -90,6 +98,10 @@ ] } ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2024-01-17T17:34:00.058829" }, "test_cat_fastq_paired_end_same_name": { @@ -127,8 +139,123 @@ ] } ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2024-01-17T17:33:33.031555" }, + "test_cat_fastq_single_end - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "1": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ], + "reads": [ + [ + { + "id": "test", + "single_end": true + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "versions": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:07:28.244999" + }, + "test_cat_fastq_paired_end_same_name - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "1": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ], + "reads": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "versions": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:07:57.070911" + }, + "test_cat_fastq_single_end_same_name - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "1": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ], + "reads": [ + [ + { + "id": "test", + "single_end": true + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "versions": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:07:46.796254" + }, "test_cat_fastq_paired_end": { "content": [ { @@ -164,6 +291,86 @@ ] } ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2024-01-17T17:32:02.270935" + }, + "test_cat_fastq_paired_end - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "1": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ], + "reads": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "versions": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:07:37.807553" + }, + "test_cat_fastq_single_end_single_file - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "1": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ], + "reads": [ + [ + { + "id": "test", + "single_end": true + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "versions": [ + "versions.yml:md5,d42d6e24d67004608495883e00bd501b" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:14:51.861264" } } \ No newline at end of file diff --git a/modules/nf-core/custom/getchromsizes/environment.yml b/modules/nf-core/custom/getchromsizes/environment.yml index 2a01695f..2ecd0128 100644 --- a/modules/nf-core/custom/getchromsizes/environment.yml +++ b/modules/nf-core/custom/getchromsizes/environment.yml @@ -4,4 +4,5 @@ channels: - bioconda - defaults dependencies: - - bioconda::samtools=1.16.1 + - bioconda::samtools=1.20 + - bioconda::htslib=1.20 diff --git a/modules/nf-core/custom/getchromsizes/main.nf b/modules/nf-core/custom/getchromsizes/main.nf index e8084ea2..3edf7c22 100644 --- a/modules/nf-core/custom/getchromsizes/main.nf +++ b/modules/nf-core/custom/getchromsizes/main.nf @@ -4,8 +4,8 @@ process CUSTOM_GETCHROMSIZES { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.16.1--h6899075_1' : - 'biocontainers/samtools:1.16.1--h6899075_1' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : + 'biocontainers/samtools:1.20--h50ea8bc_0' }" input: tuple val(meta), path(fasta) @@ -35,6 +35,9 @@ process CUSTOM_GETCHROMSIZES { """ touch ${fasta}.fai touch ${fasta}.sizes + if [[ "${fasta.extension}" == "gz" ]]; then + touch ${fasta}.gzi + fi cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/custom/getchromsizes/tests/main.nf.test b/modules/nf-core/custom/getchromsizes/tests/main.nf.test index 9f6b5640..2f741a4b 100644 --- a/modules/nf-core/custom/getchromsizes/tests/main.nf.test +++ b/modules/nf-core/custom/getchromsizes/tests/main.nf.test @@ -12,9 +12,6 @@ nextflow_process { test("test_custom_getchromsizes") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -31,15 +28,11 @@ nextflow_process { { assert snapshot(process.out).match() } ) } - } test("test_custom_getchromsizes_bgzip") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -56,7 +49,51 @@ nextflow_process { { assert snapshot(process.out).match() } ) } + } + + test("test_custom_getchromsizes - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } } + test("test_custom_getchromsizes_bgzip - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta.gz', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } } diff --git a/modules/nf-core/custom/getchromsizes/tests/main.nf.test.snap b/modules/nf-core/custom/getchromsizes/tests/main.nf.test.snap index 2e560bd3..c37b284d 100644 --- a/modules/nf-core/custom/getchromsizes/tests/main.nf.test.snap +++ b/modules/nf-core/custom/getchromsizes/tests/main.nf.test.snap @@ -1,4 +1,69 @@ { + "test_custom_getchromsizes_bgzip - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "genome.fasta.gz.sizes:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test" + }, + "genome.fasta.gz.fai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test" + }, + "genome.fasta.gz.gzi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" + ], + "fai": [ + [ + { + "id": "test" + }, + "genome.fasta.gz.fai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "gzi": [ + [ + { + "id": "test" + }, + "genome.fasta.gz.gzi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "sizes": [ + [ + { + "id": "test" + }, + "genome.fasta.gz.sizes:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:38:36.927106" + }, "test_custom_getchromsizes": { "content": [ { @@ -22,7 +87,7 @@ ], "3": [ - "versions.yml:md5,45a83c5f3dddbc5dcab30035169f7ce8" + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" ], "fai": [ [ @@ -44,11 +109,15 @@ ] ], "versions": [ - "versions.yml:md5,45a83c5f3dddbc5dcab30035169f7ce8" + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" ] } ], - "timestamp": "2024-01-17T17:48:35.562918" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-20T13:22:34.14237" }, "test_custom_getchromsizes_bgzip": { "content": [ @@ -78,7 +147,7 @@ ] ], "3": [ - "versions.yml:md5,45a83c5f3dddbc5dcab30035169f7ce8" + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" ], "fai": [ [ @@ -105,10 +174,69 @@ ] ], "versions": [ - "versions.yml:md5,45a83c5f3dddbc5dcab30035169f7ce8" + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-20T13:23:06.241379" + }, + "test_custom_getchromsizes - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "genome.fasta.sizes:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test" + }, + "genome.fasta.fai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" + ], + "fai": [ + [ + { + "id": "test" + }, + "genome.fasta.fai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "gzi": [ + + ], + "sizes": [ + [ + { + "id": "test" + }, + "genome.fasta.sizes:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,0d5a7c33bddcb1edad6bf0705b258e6f" ] } ], - "timestamp": "2024-01-17T17:49:02.562311" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T12:24:05.697845" } } \ No newline at end of file diff --git a/modules/nf-core/dragmap/align/main.nf b/modules/nf-core/dragmap/align/main.nf index eafa8697..40d1a52b 100644 --- a/modules/nf-core/dragmap/align/main.nf +++ b/modules/nf-core/dragmap/align/main.nf @@ -10,11 +10,16 @@ process DRAGMAP_ALIGN { input: tuple val(meta) , path(reads) tuple val(meta2), path(hashmap) + tuple val(meta3), path(fasta) val sort_bam output: - tuple val(meta), path("*.bam"), emit: bam - tuple val(meta), path('*.log'), emit: log + tuple val(meta), path("*.sam") , emit: sam , optional: true + tuple val(meta), path("*.bam") , emit: bam , optional: true + tuple val(meta), path("*.cram") , emit: cram , optional: true + tuple val(meta), path("*.crai") , emit: crai , optional: true + tuple val(meta), path("*.csi") , emit: csi , optional: true + tuple val(meta), path('*.log') , emit: log path "versions.yml" , emit: versions when: @@ -24,8 +29,13 @@ process DRAGMAP_ALIGN { def args = task.ext.args ?: '' def args2 = task.ext.args2 ?: '' def prefix = task.ext.prefix ?: "${meta.id}" - def reads_command = meta.single_end ? "-1 $reads" : "-1 ${reads[0]} -2 ${reads[1]}" - def samtools_command = sort_bam ? 'sort' : 'view' + def reads_command = meta.single_end ? "-1 $reads" : "-1 ${reads[0]} -2 ${reads[1]}" + def samtools_command = sort_bam ? 'sort' : 'view' + def extension_pattern = /(--output-fmt|-O)+\s+(\S+)/ + def extension_matcher = (args2 =~ extension_pattern) + def extension = extension_matcher.getCount() > 0 ? extension_matcher[0][2].toLowerCase() : "bam" + def reference = fasta && extension=="cram" ? "--reference ${fasta}" : "" + if (!fasta && extension=="cram") error "Fasta reference is required for CRAM output" """ dragen-os \\ @@ -34,7 +44,7 @@ process DRAGMAP_ALIGN { --num-threads $task.cpus \\ $reads_command \\ 2> >(tee ${prefix}.dragmap.log >&2) \\ - | samtools $samtools_command $args2 --threads $task.cpus -o ${prefix}.bam - + | samtools $samtools_command $args2 --threads $task.cpus ${reference} -o ${prefix}.${extension} - cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -45,9 +55,27 @@ process DRAGMAP_ALIGN { """ stub: + def args = task.ext.args ?: '' + def args2 = task.ext.args2 ?: '' def prefix = task.ext.prefix ?: "${meta.id}" + def reads_command = meta.single_end ? "-1 $reads" : "-1 ${reads[0]} -2 ${reads[1]}" + def samtools_command = sort_bam ? 'sort' : 'view' + def extension_pattern = /(--output-fmt|-O)+\s+(\S+)/ + def extension_matcher = (args2 =~ extension_pattern) + def extension = extension_matcher.getCount() > 0 ? extension_matcher[0][2].toLowerCase() : "bam" + def reference = fasta && extension=="cram" ? "--reference ${fasta}" : "" + if (!fasta && extension=="cram") error "Fasta reference is required for CRAM output" + + def create_index = "" + if (extension == "cram") { + create_index = "touch ${prefix}.crai" + } else if (extension == "bam") { + create_index = "touch ${prefix}.csi" + } + """ - touch ${prefix}.bam + touch ${prefix}.${extension} + ${create_index} touch ${prefix}.log cat <<-END_VERSIONS > versions.yml diff --git a/modules/nf-core/dragmap/align/meta.yml b/modules/nf-core/dragmap/align/meta.yml index f0def755..2270bd33 100644 --- a/modules/nf-core/dragmap/align/meta.yml +++ b/modules/nf-core/dragmap/align/meta.yml @@ -33,6 +33,15 @@ input: type: file description: DRAGMAP hash table pattern: "Directory containing DRAGMAP hash table *.{cmp,.bin,.txt}" + - meta3: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome'] + - fasta: + type: file + description: Genome fasta reference files + pattern: "*.{fa,fasta,fna}" output: - bam: type: file @@ -43,6 +52,6 @@ output: description: File containing software versions pattern: "versions.yml" authors: - - "@Emiller88" + - "@edmundmiller" maintainers: - - "@Emiller88" + - "@edmundmiller" diff --git a/modules/nf-core/dragmap/align/tests/main.nf.test b/modules/nf-core/dragmap/align/tests/main.nf.test index c90c78f3..d688c291 100644 --- a/modules/nf-core/dragmap/align/tests/main.nf.test +++ b/modules/nf-core/dragmap/align/tests/main.nf.test @@ -7,8 +7,9 @@ nextflow_process { tag "modules_nfcore" tag "dragmap" tag "dragmap/align" + tag "dragmap/hashtable" - test("sarscov2 - fastq, hashtable, false") { + test("sarscov2 - fastq, hashtable, fasta, false") { setup { run("DRAGMAP_HASHTABLE") { @@ -17,7 +18,7 @@ nextflow_process { """ input[0] = [ [id:'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -29,10 +30,11 @@ nextflow_process { """ input[0] = [ [ id:'test', single_end:true ], // meta map - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] input[1] = DRAGMAP_HASHTABLE.out.hashmap - input[2] = false //sort + input[2] = [[id:'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = false //sort """ } } @@ -50,7 +52,7 @@ nextflow_process { } - test("sarscov2 - fastq, hashtable, true") { + test("sarscov2 - fastq, hashtable, fasta, true") { setup { run("DRAGMAP_HASHTABLE") { @@ -59,7 +61,7 @@ nextflow_process { """ input[0] = [ [id:'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -71,10 +73,11 @@ nextflow_process { """ input[0] = [ [ id:'test', single_end:true ], // meta map - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] input[1] = DRAGMAP_HASHTABLE.out.hashmap - input[2] = true //sort + input[2] = [[id:'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = true //sort """ } } @@ -92,7 +95,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], hashtable, false") { + test("sarscov2 - [fastq1, fastq2], hashtable, fasta, false") { setup { run("DRAGMAP_HASHTABLE") { @@ -101,7 +104,7 @@ nextflow_process { """ input[0] = [ [id:'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -114,12 +117,13 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ] input[1] = DRAGMAP_HASHTABLE.out.hashmap - input[2] = false //sort + input[2] = [[id:'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = false //sort """ } } @@ -137,7 +141,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], hashtable, true") { + test("sarscov2 - [fastq1, fastq2], hashtable, fasta, true") { setup { run("DRAGMAP_HASHTABLE") { @@ -146,7 +150,7 @@ nextflow_process { """ input[0] = [ [id:'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -159,12 +163,13 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ] input[1] = DRAGMAP_HASHTABLE.out.hashmap - input[2] = true //sort + input[2] = [[id:'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = true //sort """ } } @@ -182,7 +187,7 @@ nextflow_process { } - test("homo_sapiens - [fastq1, fastq2], hashtable, true") { + test("homo_sapiens - [fastq1, fastq2], hashtable, fasta, true") { setup { run("DRAGMAP_HASHTABLE") { @@ -191,7 +196,7 @@ nextflow_process { """ input[0] = [ [id:'test'], - file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] """ } @@ -204,12 +209,13 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['homo_sapiens']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['homo_sapiens']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ] input[1] = DRAGMAP_HASHTABLE.out.hashmap - input[2] = true //sort + input[2] = [[id:'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = true //sort """ } } @@ -227,7 +233,7 @@ nextflow_process { } - test("sarscov2 - [fastq1, fastq2], hashtable, true - stub") { + test("sarscov2 - [fastq1, fastq2], hashtable, fasta, true - stub") { options "-stub" setup { @@ -237,7 +243,7 @@ nextflow_process { """ input[0] = [ [id:'test'], - file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) ] """ } @@ -250,12 +256,13 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map [ - file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ] input[1] = DRAGMAP_HASHTABLE.out.hashmap - input[2] = true //sort + input[2] = [[id:'test'],file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] + input[3] = true //sort """ } } diff --git a/modules/nf-core/dragmap/align/tests/main.nf.test.snap b/modules/nf-core/dragmap/align/tests/main.nf.test.snap index 32d88a27..4bd60ebf 100644 --- a/modules/nf-core/dragmap/align/tests/main.nf.test.snap +++ b/modules/nf-core/dragmap/align/tests/main.nf.test.snap @@ -1,5 +1,5 @@ { - "homo_sapiens - [fastq1, fastq2], hashtable, true": { + "sarscov2 - [fastq1, fastq2], hashtable, fasta, false": { "content": [ "test.bam", [ @@ -12,17 +12,13 @@ ], "versions.yml" ], - "timestamp": "2023-11-23T10:12:03.844836279" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-20T10:46:54.961203552" }, - "sarscov2 - [fastq1, fastq2], hashtable, true - stub": { - "content": [ - "test.bam", - "test.log", - "versions.yml" - ], - "timestamp": "2023-11-22T13:41:18.016853266" - }, - "sarscov2 - fastq, hashtable, false": { + "homo_sapiens - [fastq1, fastq2], hashtable, fasta, true": { "content": [ "test.bam", [ @@ -35,9 +31,13 @@ ], "versions.yml" ], - "timestamp": "2023-11-23T10:11:33.956661024" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-20T10:47:24.495131137" }, - "sarscov2 - fastq, hashtable, true": { + "sarscov2 - fastq, hashtable, fasta, true": { "content": [ "test.bam", [ @@ -50,9 +50,13 @@ ], "versions.yml" ], - "timestamp": "2023-11-23T10:11:40.270598375" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-20T10:46:42.57679755" }, - "sarscov2 - [fastq1, fastq2], hashtable, false": { + "sarscov2 - [fastq1, fastq2], hashtable, fasta, true": { "content": [ "test.bam", [ @@ -65,9 +69,25 @@ ], "versions.yml" ], - "timestamp": "2023-11-23T10:11:46.928978876" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-20T10:47:08.943445149" + }, + "sarscov2 - [fastq1, fastq2], hashtable, fasta, true - stub": { + "content": [ + "test.bam", + "test.log", + "versions.yml" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-20T10:47:38.346392133" }, - "sarscov2 - [fastq1, fastq2], hashtable, true": { + "sarscov2 - fastq, hashtable, fasta, false": { "content": [ "test.bam", [ @@ -80,6 +100,10 @@ ], "versions.yml" ], - "timestamp": "2023-11-23T10:11:53.506727278" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-03-20T10:46:28.406548681" } } \ No newline at end of file diff --git a/modules/nf-core/dragmap/hashtable/dragmap-hashtable.diff b/modules/nf-core/dragmap/hashtable/dragmap-hashtable.diff deleted file mode 100644 index a5823ce8..00000000 --- a/modules/nf-core/dragmap/hashtable/dragmap-hashtable.diff +++ /dev/null @@ -1,25 +0,0 @@ -Changes in module 'nf-core/dragmap/hashtable' ---- modules/nf-core/dragmap/hashtable/environment.yml -+++ modules/nf-core/dragmap/hashtable/environment.yml -@@ -4,4 +4,4 @@ - - bioconda - - defaults - dependencies: -- - bioconda::dragmap=1.3.0 -+ - bioconda::dragmap=1.2.1 - ---- modules/nf-core/dragmap/hashtable/main.nf -+++ modules/nf-core/dragmap/hashtable/main.nf -@@ -4,8 +4,8 @@ - - conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? -- 'https://depot.galaxyproject.org/singularity/dragmap:1.3.0--h72d16da_1': -- 'biocontainers/dragmap:1.3.0--h72d16da_1' }" -+ 'https://depot.galaxyproject.org/singularity/dragmap:1.2.1--h72d16da_1': -+ 'biocontainers/dragmap:1.2.1--h72d16da_1' }" - - input: - tuple val(meta), path(fasta) - -************************************************************ diff --git a/modules/nf-core/dragmap/hashtable/environment.yml b/modules/nf-core/dragmap/hashtable/environment.yml index 3c3d1404..254a7426 100644 --- a/modules/nf-core/dragmap/hashtable/environment.yml +++ b/modules/nf-core/dragmap/hashtable/environment.yml @@ -4,4 +4,4 @@ channels: - bioconda - defaults dependencies: - - bioconda::dragmap=1.2.1 + - bioconda::dragmap=1.3.0 diff --git a/modules/nf-core/dragmap/hashtable/main.nf b/modules/nf-core/dragmap/hashtable/main.nf index 604052f3..24792d7b 100644 --- a/modules/nf-core/dragmap/hashtable/main.nf +++ b/modules/nf-core/dragmap/hashtable/main.nf @@ -4,8 +4,8 @@ process DRAGMAP_HASHTABLE { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/dragmap:1.2.1--h72d16da_1': - 'biocontainers/dragmap:1.2.1--h72d16da_1' }" + 'https://depot.galaxyproject.org/singularity/dragmap:1.3.0--h91baf5a_3': + 'biocontainers/dragmap:1.3.0--h91baf5a_3' }" input: tuple val(meta), path(fasta) @@ -33,4 +33,15 @@ process DRAGMAP_HASHTABLE { dragmap: \$(echo \$(dragen-os --version 2>&1)) END_VERSIONS """ + + stub: + """ + mkdir dragmap + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + dragmap: \$(echo \$(dragen-os --version 2>&1)) + END_VERSIONS + """ + } diff --git a/modules/nf-core/dragmap/hashtable/meta.yml b/modules/nf-core/dragmap/hashtable/meta.yml index 8daca832..1d1f92f5 100644 --- a/modules/nf-core/dragmap/hashtable/meta.yml +++ b/modules/nf-core/dragmap/hashtable/meta.yml @@ -36,6 +36,6 @@ output: description: File containing software versions pattern: "versions.yml" authors: - - "@Emiller88" + - "@edmundmiller" maintainers: - - "@Emiller88" + - "@edmundmiller" diff --git a/modules/nf-core/dragmap/hashtable/tests/main.nf.test b/modules/nf-core/dragmap/hashtable/tests/main.nf.test new file mode 100644 index 00000000..47403991 --- /dev/null +++ b/modules/nf-core/dragmap/hashtable/tests/main.nf.test @@ -0,0 +1,69 @@ +nextflow_process { + + name "Test Process DRAGMAP_HASHTABLE" + script "../main.nf" + process "DRAGMAP_HASHTABLE" + tag "modules" + tag "modules_nfcore" + tag "dragmap" + tag "dragmap/hashtable" + + test("sarscov2 - fasta") { + + when { + + process { + """ + input[0] = [ + [id:'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + file(process.out.hashmap[0][1]).name, + file(process.out.versions[0]).name + ).match() + } + ) + } + + } + + test("sarscov2 - fasta - stub") { + + options "-stub" + when { + + process { + """ + input[0] = [ + [id:'test'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + file(process.out.hashmap[0][1]).name, + file(process.out.versions[0]).name + ).match() + } + ) + } + + } + + // TODO Add test using alt-masked bed file + // https://github.com/Illumina/dragmap#build-hash-table-using-an-alt-masked-bed-file + +} diff --git a/modules/nf-core/dragmap/hashtable/tests/main.nf.test.snap b/modules/nf-core/dragmap/hashtable/tests/main.nf.test.snap new file mode 100644 index 00000000..9b4b90d8 --- /dev/null +++ b/modules/nf-core/dragmap/hashtable/tests/main.nf.test.snap @@ -0,0 +1,16 @@ +{ + "sarscov2 - fasta - stub": { + "content": [ + "dragmap", + "versions.yml" + ], + "timestamp": "2023-11-22T13:42:22.53412378" + }, + "sarscov2 - fasta": { + "content": [ + "dragmap", + "versions.yml" + ], + "timestamp": "2023-11-22T12:53:25.493202451" + } +} \ No newline at end of file diff --git a/modules/nf-core/dragmap/hashtable/tests/tags.yml b/modules/nf-core/dragmap/hashtable/tests/tags.yml new file mode 100644 index 00000000..cd26117b --- /dev/null +++ b/modules/nf-core/dragmap/hashtable/tests/tags.yml @@ -0,0 +1,2 @@ +dragmap/hashtable: + - modules/nf-core/dragmap/hashtable/** diff --git a/modules/nf-core/fastp/main.nf b/modules/nf-core/fastp/main.nf index 2a3b679e..e1b9f565 100644 --- a/modules/nf-core/fastp/main.nf +++ b/modules/nf-core/fastp/main.nf @@ -10,6 +10,7 @@ process FASTP { input: tuple val(meta), path(reads) path adapter_fasta + val discard_trimmed_pass val save_trimmed_fail val save_merged @@ -18,9 +19,9 @@ process FASTP { tuple val(meta), path('*.json') , emit: json tuple val(meta), path('*.html') , emit: html tuple val(meta), path('*.log') , emit: log - path "versions.yml" , emit: versions tuple val(meta), path('*.fail.fastq.gz') , optional:true, emit: reads_fail tuple val(meta), path('*.merged.fastq.gz'), optional:true, emit: reads_merged + path "versions.yml" , emit: versions when: task.ext.when == null || task.ext.when @@ -29,7 +30,9 @@ process FASTP { def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" def adapter_list = adapter_fasta ? "--adapter_fasta ${adapter_fasta}" : "" - def fail_fastq = save_trimmed_fail && meta.single_end ? "--failed_out ${prefix}.fail.fastq.gz" : save_trimmed_fail && !meta.single_end ? "--unpaired1 ${prefix}_1.fail.fastq.gz --unpaired2 ${prefix}_2.fail.fastq.gz" : '' + def fail_fastq = save_trimmed_fail && meta.single_end ? "--failed_out ${prefix}.fail.fastq.gz" : save_trimmed_fail && !meta.single_end ? "--failed_out ${prefix}.paired.fail.fastq.gz --unpaired1 ${prefix}_1.fail.fastq.gz --unpaired2 ${prefix}_2.fail.fastq.gz" : '' + def out_fq1 = discard_trimmed_pass ?: ( meta.single_end ? "--out1 ${prefix}.fastp.fastq.gz" : "--out1 ${prefix}_1.fastp.fastq.gz" ) + def out_fq2 = discard_trimmed_pass ?: "--out2 ${prefix}_2.fastp.fastq.gz" // Added soft-links to original fastqs for consistent naming in MultiQC // Use single ended for interleaved. Add --interleaved_in in config. if ( task.ext.args?.contains('--interleaved_in') ) { @@ -59,7 +62,7 @@ process FASTP { fastp \\ --in1 ${prefix}.fastq.gz \\ - --out1 ${prefix}.fastp.fastq.gz \\ + $out_fq1 \\ --thread $task.cpus \\ --json ${prefix}.fastp.json \\ --html ${prefix}.fastp.html \\ @@ -81,8 +84,8 @@ process FASTP { fastp \\ --in1 ${prefix}_1.fastq.gz \\ --in2 ${prefix}_2.fastq.gz \\ - --out1 ${prefix}_1.fastp.fastq.gz \\ - --out2 ${prefix}_2.fastp.fastq.gz \\ + $out_fq1 \\ + $out_fq2 \\ --json ${prefix}.fastp.json \\ --html ${prefix}.fastp.html \\ $adapter_list \\ @@ -103,14 +106,16 @@ process FASTP { stub: def prefix = task.ext.prefix ?: "${meta.id}" def is_single_output = task.ext.args?.contains('--interleaved_in') || meta.single_end - def touch_reads = is_single_output ? "${prefix}.fastp.fastq.gz" : "${prefix}_1.fastp.fastq.gz ${prefix}_2.fastp.fastq.gz" - def touch_merged = (!is_single_output && save_merged) ? "touch ${prefix}.merged.fastq.gz" : "" + def touch_reads = (discard_trimmed_pass) ? "" : (is_single_output) ? "echo '' | gzip > ${prefix}.fastp.fastq.gz" : "echo '' | gzip > ${prefix}_1.fastp.fastq.gz ; echo '' | gzip > ${prefix}_2.fastp.fastq.gz" + def touch_merged = (!is_single_output && save_merged) ? "echo '' | gzip > ${prefix}.merged.fastq.gz" : "" + def touch_fail_fastq = (!save_trimmed_fail) ? "" : meta.single_end ? "echo '' | gzip > ${prefix}.fail.fastq.gz" : "echo '' | gzip > ${prefix}.paired.fail.fastq.gz ; echo '' | gzip > ${prefix}_1.fail.fastq.gz ; echo '' | gzip > ${prefix}_2.fail.fastq.gz" """ - touch $touch_reads + $touch_reads + $touch_fail_fastq + $touch_merged touch "${prefix}.fastp.json" touch "${prefix}.fastp.html" touch "${prefix}.fastp.log" - $touch_merged cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/fastp/meta.yml b/modules/nf-core/fastp/meta.yml index c22a16ab..8dfecc18 100644 --- a/modules/nf-core/fastp/meta.yml +++ b/modules/nf-core/fastp/meta.yml @@ -27,12 +27,16 @@ input: type: file description: File in FASTA format containing possible adapters to remove. pattern: "*.{fasta,fna,fas,fa}" + - discard_trimmed_pass: + type: boolean + description: Specify true to not write any reads that pass trimming thresholds. | + This can be used to use fastp for the output report only. - save_trimmed_fail: type: boolean description: Specify true to save files that failed to pass trimming thresholds ending in `*.fail.fastq.gz` - save_merged: type: boolean - description: Specify true to save all merged reads to the a file ending in `*.merged.fastq.gz` + description: Specify true to save all merged reads to a file ending in `*.merged.fastq.gz` output: - meta: type: map diff --git a/modules/nf-core/fastp/tests/main.nf.test b/modules/nf-core/fastp/tests/main.nf.test index 9b3f9a38..30dbb8aa 100644 --- a/modules/nf-core/fastp/tests/main.nf.test +++ b/modules/nf-core/fastp/tests/main.nf.test @@ -10,221 +10,290 @@ nextflow_process { test("test_fastp_single_end") { when { - params { - outdir = "$outputDir" - } + process { """ - adapter_fasta = [] - save_trimmed_fail = false - save_merged = false - input[0] = Channel.of([ [ id:'test', single_end:true ], [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = false + input[4] = false """ } } then { - def html_text = [ "Q20 bases:    ") }, - - { assert snapshot(process.out.versions).match("fastqc_versions_single") } + { assert process.success }, + // NOTE The report contains the date inside it, which means that the md5sum is stable per day, but not longer than that. So you can't md5sum it. + // looks like this:
    Mon 2 Oct 2023
    test.gz
    + // https://github.com/nf-core/modules/pull/3903#issuecomment-1743620039 + { assert process.out.html[0][1] ==~ ".*/test_fastqc.html" }, + { assert process.out.zip[0][1] ==~ ".*/test_fastqc.zip" }, + { assert path(process.out.html[0][1]).text.contains("") }, + { assert snapshot(process.out.versions).match() } ) } } @@ -54,16 +51,14 @@ nextflow_process { then { assertAll ( - { assert process.success }, - - { assert process.out.html[0][1][0] ==~ ".*/test_1_fastqc.html" }, - { assert process.out.html[0][1][1] ==~ ".*/test_2_fastqc.html" }, - { assert process.out.zip[0][1][0] ==~ ".*/test_1_fastqc.zip" }, - { assert process.out.zip[0][1][1] ==~ ".*/test_2_fastqc.zip" }, - { assert path(process.out.html[0][1][0]).text.contains("") }, - { assert path(process.out.html[0][1][1]).text.contains("") }, - - { assert snapshot(process.out.versions).match("fastqc_versions_paired") } + { assert process.success }, + { assert process.out.html[0][1][0] ==~ ".*/test_1_fastqc.html" }, + { assert process.out.html[0][1][1] ==~ ".*/test_2_fastqc.html" }, + { assert process.out.zip[0][1][0] ==~ ".*/test_1_fastqc.zip" }, + { assert process.out.zip[0][1][1] ==~ ".*/test_2_fastqc.zip" }, + { assert path(process.out.html[0][1][0]).text.contains("") }, + { assert path(process.out.html[0][1][1]).text.contains("") }, + { assert snapshot(process.out.versions).match() } ) } } @@ -83,13 +78,11 @@ nextflow_process { then { assertAll ( - { assert process.success }, - - { assert process.out.html[0][1] ==~ ".*/test_fastqc.html" }, - { assert process.out.zip[0][1] ==~ ".*/test_fastqc.zip" }, - { assert path(process.out.html[0][1]).text.contains("") }, - - { assert snapshot(process.out.versions).match("fastqc_versions_interleaved") } + { assert process.success }, + { assert process.out.html[0][1] ==~ ".*/test_fastqc.html" }, + { assert process.out.zip[0][1] ==~ ".*/test_fastqc.zip" }, + { assert path(process.out.html[0][1]).text.contains("") }, + { assert snapshot(process.out.versions).match() } ) } } @@ -109,13 +102,11 @@ nextflow_process { then { assertAll ( - { assert process.success }, - - { assert process.out.html[0][1] ==~ ".*/test_fastqc.html" }, - { assert process.out.zip[0][1] ==~ ".*/test_fastqc.zip" }, - { assert path(process.out.html[0][1]).text.contains("") }, - - { assert snapshot(process.out.versions).match("fastqc_versions_bam") } + { assert process.success }, + { assert process.out.html[0][1] ==~ ".*/test_fastqc.html" }, + { assert process.out.zip[0][1] ==~ ".*/test_fastqc.zip" }, + { assert path(process.out.html[0][1]).text.contains("") }, + { assert snapshot(process.out.versions).match() } ) } } @@ -138,22 +129,20 @@ nextflow_process { then { assertAll ( - { assert process.success }, - - { assert process.out.html[0][1][0] ==~ ".*/test_1_fastqc.html" }, - { assert process.out.html[0][1][1] ==~ ".*/test_2_fastqc.html" }, - { assert process.out.html[0][1][2] ==~ ".*/test_3_fastqc.html" }, - { assert process.out.html[0][1][3] ==~ ".*/test_4_fastqc.html" }, - { assert process.out.zip[0][1][0] ==~ ".*/test_1_fastqc.zip" }, - { assert process.out.zip[0][1][1] ==~ ".*/test_2_fastqc.zip" }, - { assert process.out.zip[0][1][2] ==~ ".*/test_3_fastqc.zip" }, - { assert process.out.zip[0][1][3] ==~ ".*/test_4_fastqc.zip" }, - { assert path(process.out.html[0][1][0]).text.contains("") }, - { assert path(process.out.html[0][1][1]).text.contains("") }, - { assert path(process.out.html[0][1][2]).text.contains("") }, - { assert path(process.out.html[0][1][3]).text.contains("") }, - - { assert snapshot(process.out.versions).match("fastqc_versions_multiple") } + { assert process.success }, + { assert process.out.html[0][1][0] ==~ ".*/test_1_fastqc.html" }, + { assert process.out.html[0][1][1] ==~ ".*/test_2_fastqc.html" }, + { assert process.out.html[0][1][2] ==~ ".*/test_3_fastqc.html" }, + { assert process.out.html[0][1][3] ==~ ".*/test_4_fastqc.html" }, + { assert process.out.zip[0][1][0] ==~ ".*/test_1_fastqc.zip" }, + { assert process.out.zip[0][1][1] ==~ ".*/test_2_fastqc.zip" }, + { assert process.out.zip[0][1][2] ==~ ".*/test_3_fastqc.zip" }, + { assert process.out.zip[0][1][3] ==~ ".*/test_4_fastqc.zip" }, + { assert path(process.out.html[0][1][0]).text.contains("") }, + { assert path(process.out.html[0][1][1]).text.contains("") }, + { assert path(process.out.html[0][1][2]).text.contains("") }, + { assert path(process.out.html[0][1][3]).text.contains("") }, + { assert snapshot(process.out.versions).match() } ) } } @@ -173,21 +162,18 @@ nextflow_process { then { assertAll ( - { assert process.success }, - - { assert process.out.html[0][1] ==~ ".*/mysample_fastqc.html" }, - { assert process.out.zip[0][1] ==~ ".*/mysample_fastqc.zip" }, - { assert path(process.out.html[0][1]).text.contains("") }, - - { assert snapshot(process.out.versions).match("fastqc_versions_custom_prefix") } + { assert process.success }, + { assert process.out.html[0][1] ==~ ".*/mysample_fastqc.html" }, + { assert process.out.zip[0][1] ==~ ".*/mysample_fastqc.zip" }, + { assert path(process.out.html[0][1]).text.contains("") }, + { assert snapshot(process.out.versions).match() } ) } } test("sarscov2 single-end [fastq] - stub") { - options "-stub" - + options "-stub" when { process { """ @@ -201,12 +187,123 @@ nextflow_process { then { assertAll ( - { assert process.success }, - { assert snapshot(process.out.html.collect { file(it[1]).getName() } + - process.out.zip.collect { file(it[1]).getName() } + - process.out.versions ).match("fastqc_stub") } + { assert process.success }, + { assert snapshot(process.out).match() } ) } } + test("sarscov2 paired-end [fastq] - stub") { + + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [id: 'test', single_end: false], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("sarscov2 interleaved [fastq] - stub") { + + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [id: 'test', single_end: false], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_interleaved.fastq.gz', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("sarscov2 paired-end [bam] - stub") { + + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [id: 'test', single_end: false], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("sarscov2 multiple [fastq] - stub") { + + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [id: 'test', single_end: false], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test2_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test2_2.fastq.gz', checkIfExists: true) ] + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("sarscov2 custom_prefix - stub") { + + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [ id:'mysample', single_end:true ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } } diff --git a/modules/nf-core/fastqc/tests/main.nf.test.snap b/modules/nf-core/fastqc/tests/main.nf.test.snap index 86f7c311..d5db3092 100644 --- a/modules/nf-core/fastqc/tests/main.nf.test.snap +++ b/modules/nf-core/fastqc/tests/main.nf.test.snap @@ -1,88 +1,392 @@ { - "fastqc_versions_interleaved": { + "sarscov2 custom_prefix": { "content": [ [ "versions.yml:md5,e1cc25ca8af856014824abd842e93978" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-01-31T17:40:07.293713" + "timestamp": "2024-07-22T11:02:16.374038" }, - "fastqc_stub": { + "sarscov2 single-end [fastq] - stub": { "content": [ - [ - "test.html", - "test.zip", - "versions.yml:md5,e1cc25ca8af856014824abd842e93978" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "html": [ + [ + { + "id": "test", + "single_end": true + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "zip": [ + [ + { + "id": "test", + "single_end": true + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-22T11:02:24.993809" + }, + "sarscov2 custom_prefix - stub": { + "content": [ + { + "0": [ + [ + { + "id": "mysample", + "single_end": true + }, + "mysample.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "mysample", + "single_end": true + }, + "mysample.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "html": [ + [ + { + "id": "mysample", + "single_end": true + }, + "mysample.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "zip": [ + [ + { + "id": "mysample", + "single_end": true + }, + "mysample.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-01-31T17:31:01.425198" + "timestamp": "2024-07-22T11:03:10.93942" }, - "fastqc_versions_multiple": { + "sarscov2 interleaved [fastq]": { "content": [ [ "versions.yml:md5,e1cc25ca8af856014824abd842e93978" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-01-31T17:40:55.797907" + "timestamp": "2024-07-22T11:01:42.355718" }, - "fastqc_versions_bam": { + "sarscov2 paired-end [bam]": { "content": [ [ "versions.yml:md5,e1cc25ca8af856014824abd842e93978" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-01-31T17:40:26.795862" + "timestamp": "2024-07-22T11:01:53.276274" }, - "fastqc_versions_single": { + "sarscov2 multiple [fastq]": { "content": [ [ "versions.yml:md5,e1cc25ca8af856014824abd842e93978" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-01-31T17:39:27.043675" + "timestamp": "2024-07-22T11:02:05.527626" }, - "fastqc_versions_paired": { + "sarscov2 paired-end [fastq]": { "content": [ [ "versions.yml:md5,e1cc25ca8af856014824abd842e93978" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-22T11:01:31.188871" + }, + "sarscov2 paired-end [fastq] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "zip": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-22T11:02:34.273566" + }, + "sarscov2 multiple [fastq] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "zip": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-01-31T17:39:47.584191" + "timestamp": "2024-07-22T11:03:02.304411" }, - "fastqc_versions_custom_prefix": { + "sarscov2 single-end [fastq]": { "content": [ [ "versions.yml:md5,e1cc25ca8af856014824abd842e93978" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-22T11:01:19.095607" + }, + "sarscov2 interleaved [fastq] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "zip": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-22T11:02:44.640184" + }, + "sarscov2 paired-end [bam] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,e1cc25ca8af856014824abd842e93978" + ], + "zip": [ + [ + { + "id": "test", + "single_end": false + }, + "test.zip:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-01-31T17:41:14.576531" + "timestamp": "2024-07-22T11:02:53.550742" } } \ No newline at end of file diff --git a/modules/nf-core/multiqc/environment.yml b/modules/nf-core/multiqc/environment.yml index 2121492d..f1cd99b0 100644 --- a/modules/nf-core/multiqc/environment.yml +++ b/modules/nf-core/multiqc/environment.yml @@ -1,7 +1,5 @@ -name: multiqc channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::multiqc=1.23 + - bioconda::multiqc=1.24.1 diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf index 459dfea5..b9ccebdb 100644 --- a/modules/nf-core/multiqc/main.nf +++ b/modules/nf-core/multiqc/main.nf @@ -3,8 +3,8 @@ process MULTIQC { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.23--pyhdfd78af_0' : - 'biocontainers/multiqc:1.23--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/multiqc:1.25--pyhdfd78af_0' : + 'biocontainers/multiqc:1.25--pyhdfd78af_0' }" input: path multiqc_files, stageAs: "?/*" @@ -25,9 +25,10 @@ process MULTIQC { script: def args = task.ext.args ?: '' + def prefix = task.ext.prefix ? "--filename ${task.ext.prefix}.html" : '' def config = multiqc_config ? "--config $multiqc_config" : '' def extra_config = extra_multiqc_config ? "--config $extra_multiqc_config" : '' - def logo = multiqc_logo ? /--cl-config 'custom_logo: "${multiqc_logo}"'/ : '' + def logo = multiqc_logo ? "--cl-config 'custom_logo: \"${multiqc_logo}\"'" : '' def replace = replace_names ? "--replace-names ${replace_names}" : '' def samples = sample_names ? "--sample-names ${sample_names}" : '' """ @@ -35,6 +36,7 @@ process MULTIQC { --force \\ $args \\ $config \\ + $prefix \\ $extra_config \\ $logo \\ $replace \\ diff --git a/modules/nf-core/multiqc/meta.yml b/modules/nf-core/multiqc/meta.yml index 382c08cb..b16c1879 100644 --- a/modules/nf-core/multiqc/meta.yml +++ b/modules/nf-core/multiqc/meta.yml @@ -1,5 +1,6 @@ name: multiqc -description: Aggregate results from bioinformatics analyses across many samples into a single report +description: Aggregate results from bioinformatics analyses across many samples into + a single report keywords: - QC - bioinformatics tools @@ -12,53 +13,59 @@ tools: homepage: https://multiqc.info/ documentation: https://multiqc.info/docs/ licence: ["GPL-3.0-or-later"] + identifier: biotools:multiqc input: - - multiqc_files: - type: file - description: | - List of reports / files recognised by MultiQC, for example the html and zip output of FastQC - - multiqc_config: - type: file - description: Optional config yml for MultiQC - pattern: "*.{yml,yaml}" - - extra_multiqc_config: - type: file - description: Second optional config yml for MultiQC. Will override common sections in multiqc_config. - pattern: "*.{yml,yaml}" - - multiqc_logo: - type: file - description: Optional logo file for MultiQC - pattern: "*.{png}" - - replace_names: - type: file - description: | - Optional two-column sample renaming file. First column a set of - patterns, second column a set of corresponding replacements. Passed via - MultiQC's `--replace-names` option. - pattern: "*.{tsv}" - - sample_names: - type: file - description: | - Optional TSV file with headers, passed to the MultiQC --sample_names - argument. - pattern: "*.{tsv}" + - - multiqc_files: + type: file + description: | + List of reports / files recognised by MultiQC, for example the html and zip output of FastQC + - - multiqc_config: + type: file + description: Optional config yml for MultiQC + pattern: "*.{yml,yaml}" + - - extra_multiqc_config: + type: file + description: Second optional config yml for MultiQC. Will override common sections + in multiqc_config. + pattern: "*.{yml,yaml}" + - - multiqc_logo: + type: file + description: Optional logo file for MultiQC + pattern: "*.{png}" + - - replace_names: + type: file + description: | + Optional two-column sample renaming file. First column a set of + patterns, second column a set of corresponding replacements. Passed via + MultiQC's `--replace-names` option. + pattern: "*.{tsv}" + - - sample_names: + type: file + description: | + Optional TSV file with headers, passed to the MultiQC --sample_names + argument. + pattern: "*.{tsv}" output: - report: - type: file - description: MultiQC report file - pattern: "multiqc_report.html" + - "*multiqc_report.html": + type: file + description: MultiQC report file + pattern: "multiqc_report.html" - data: - type: directory - description: MultiQC data dir - pattern: "multiqc_data" + - "*_data": + type: directory + description: MultiQC data dir + pattern: "multiqc_data" - plots: - type: file - description: Plots created by MultiQC - pattern: "*_data" + - "*_plots": + type: file + description: Plots created by MultiQC + pattern: "*_data" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@abhi18av" - "@bunop" diff --git a/modules/nf-core/multiqc/tests/main.nf.test b/modules/nf-core/multiqc/tests/main.nf.test index 6aa27f4c..33316a7d 100644 --- a/modules/nf-core/multiqc/tests/main.nf.test +++ b/modules/nf-core/multiqc/tests/main.nf.test @@ -8,6 +8,8 @@ nextflow_process { tag "modules_nfcore" tag "multiqc" + config "./nextflow.config" + test("sarscov2 single-end [fastqc]") { when { diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap index 45e95e5d..b779e469 100644 --- a/modules/nf-core/multiqc/tests/main.nf.test.snap +++ b/modules/nf-core/multiqc/tests/main.nf.test.snap @@ -2,7 +2,7 @@ "multiqc_versions_single": { "content": [ [ - "versions.yml:md5,87904cd321df21fac35d18f0fc01bb19" + "versions.yml:md5,8c8724363a5efe0c6f43ab34faa57efd" ] ], "meta": { @@ -17,7 +17,7 @@ "multiqc_report.html", "multiqc_data", "multiqc_plots", - "versions.yml:md5,87904cd321df21fac35d18f0fc01bb19" + "versions.yml:md5,8c8724363a5efe0c6f43ab34faa57efd" ] ], "meta": { @@ -29,7 +29,7 @@ "multiqc_versions_config": { "content": [ [ - "versions.yml:md5,87904cd321df21fac35d18f0fc01bb19" + "versions.yml:md5,8c8724363a5efe0c6f43ab34faa57efd" ] ], "meta": { @@ -38,4 +38,4 @@ }, "timestamp": "2024-07-10T11:26:56.709849369" } -} \ No newline at end of file +} diff --git a/modules/nf-core/multiqc/tests/nextflow.config b/modules/nf-core/multiqc/tests/nextflow.config new file mode 100644 index 00000000..c537a6a3 --- /dev/null +++ b/modules/nf-core/multiqc/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: 'MULTIQC' { + ext.prefix = null + } +} diff --git a/nextflow.config b/nextflow.config index 34f30c80..a4c286d2 100644 --- a/nextflow.config +++ b/nextflow.config @@ -54,48 +54,26 @@ params { monochrome_logs = false hook_url = null help = false + help_full = false + show_hidden = false version = false pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/' - // Config options config_profile_name = null config_profile_description = null + custom_config_version = 'master' custom_config_base = "https://raw.githubusercontent.com/nf-core/configs/${params.custom_config_version}" config_profile_contact = null config_profile_url = null - - // Max resource options - // Defaults only, expecting to be overwritten - max_memory = '128.GB' - max_cpus = 16 - max_time = '240.h' - // Schema validation default options - validationFailUnrecognisedParams = false - validationLenientMode = false - validationSchemaIgnoreParams = 'genomes,igenomes_base' - validationShowHiddenParams = false - validate_params = true - + validate_params = true + } // Load base.config by default for all pipelines includeConfig 'conf/base.config' -// Load nf-core custom profiles from different Institutions -try { - includeConfig "${params.custom_config_base}/nfcore_custom.config" -} catch (Exception e) { - System.err.println("WARNING: Could not load nf-core/config profiles: ${params.custom_config_base}/nfcore_custom.config") -} - -// Load nf-core/nascent custom profiles from different institutions. -try { - includeConfig "${params.custom_config_base}/pipeline/nascent.config" -} catch (Exception e) { - System.err.println("WARNING: Could not load nf-core/config/nascent profiles: ${params.custom_config_base}/pipeline/nascent.config") -} profiles { debug { dumpHashes = true @@ -110,7 +88,7 @@ profiles { podman.enabled = false shifter.enabled = false charliecloud.enabled = false - conda.channels = ['conda-forge', 'bioconda', 'defaults'] + conda.channels = ['conda-forge', 'bioconda'] apptainer.enabled = false } mamba { @@ -201,25 +179,23 @@ 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' +// Load nf-core custom profiles from different Institutions +includeConfig !System.getenv('NXF_OFFLINE') && params.custom_config_base ? "${params.custom_config_base}/nfcore_custom.config" : "/dev/null" -// Nextflow plugins -plugins { - id 'nf-validation@1.1.3' // Validation of pipeline parameters and creation of an input channel from a sample sheet -} +// Load nf-core/nascent custom profiles from different institutions. +// TODO nf-core: Optionally, you can add a pipeline-specific nf-core config at https://github.com/nf-core/configs +// includeConfig !System.getenv('NXF_OFFLINE') && params.custom_config_base ? "${params.custom_config_base}/pipeline/nascent.config" : "/dev/null" +// Set default registry for Apptainer, Docker, Podman, Charliecloud and Singularity independent of -profile +// Will not be used unless Apptainer / Docker / Podman / Charliecloud / 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' +charliecloud.registry = 'quay.io' // Load igenomes.config if required -if (!params.igenomes_ignore) { - includeConfig 'conf/igenomes.config' -} else { - params.genomes = [:] -} +includeConfig !params.igenomes_ignore ? 'conf/igenomes.config' : 'conf/igenomes_ignored.config' // Export these variables to prevent local Python/R libraries from conflicting with those in the container // The JULIA depot path has been adjusted to a fixed path `/usr/local/share/julia` that needs to be used for packages in the container. // See https://apeltzer.github.io/post/03-julia-lang-nextflow/ for details on that. Once we have a common agreement on where to keep Julia packages, this is adjustable. @@ -231,8 +207,15 @@ env { JULIA_DEPOT_PATH = "/usr/local/share/julia" } -// Capture exit codes from upstream processes when piping -process.shell = ['/bin/bash', '-euo', 'pipefail'] +// Set bash options +process.shell = """\ +bash + +set -e # Exit if a tool returns a non-zero status/exit code +set -u # Treat unset variables and parameters as an error +set -o pipefail # Returns the status of the last command to exit with a non-zero status or zero if all successfully execute +set -C # No clobber - prevent output redirection from overwriting files. +""" // Disable process selector warnings by default. Use debug profile to enable warnings. nextflow.enable.configProcessNamesValidation = false @@ -261,43 +244,47 @@ manifest { homePage = 'https://github.com/nf-core/nascent' description = """Global Run-On sequencing analysis pipeline""" mainScript = 'main.nf' - nextflowVersion = '!>=23.04.0' + nextflowVersion = '!>=24.04.2' version = '2.3.0dev' doi = '10.5281/zenodo.7245273' } -// Load modules.config for DSL2 module specific options -includeConfig 'conf/modules.config' +// Nextflow plugins +plugins { + id 'nf-schema@2.1.1' // Validation of pipeline parameters and creation of an input channel from a sample sheet +} + +validation { + defaultIgnoreParams = ["genomes"] + help { + enabled = true + command = "nextflow run $manifest.name -profile --input samplesheet.csv --outdir " + fullParameter = "help_full" + showHiddenParameter = "show_hidden" + beforeText = """ +-\033[2m----------------------------------------------------\033[0m- + \033[0;32m,--.\033[0;30m/\033[0;32m,-.\033[0m +\033[0;34m ___ __ __ __ ___ \033[0;32m/,-._.--~\'\033[0m +\033[0;34m |\\ | |__ __ / ` / \\ |__) |__ \033[0;33m} {\033[0m +\033[0;34m | \\| | \\__, \\__/ | \\ |___ \033[0;32m\\`-._,-`-,\033[0m + \033[0;32m`._,._,\'\033[0m +\033[0;35m ${manifest.name} ${manifest.version}\033[0m +-\033[2m----------------------------------------------------\033[0m- +""" + afterText = """${manifest.doi ? "* The pipeline\n" : ""}${manifest.doi.tokenize(",").collect { " https://doi.org/${it.trim().replace('https://doi.org/','')}"}.join("\n")}${manifest.doi ? "\n" : ""} +* The nf-core framework + https://doi.org/10.1038/s41587-020-0439-x -// Function to ensure that resource requirements don't go beyond -// a maximum limit -def check_max(obj, type) { - if (type == 'memory') { - try { - if (obj.compareTo(params.max_memory as nextflow.util.MemoryUnit) == 1) - return params.max_memory as nextflow.util.MemoryUnit - else - return obj - } catch (all) { - println " ### ERROR ### Max memory '${params.max_memory}' is not valid! Using default value: $obj" - return obj - } - } else if (type == 'time') { - try { - if (obj.compareTo(params.max_time as nextflow.util.Duration) == 1) - return params.max_time as nextflow.util.Duration - else - return obj - } catch (all) { - println " ### ERROR ### Max time '${params.max_time}' is not valid! Using default value: $obj" - return obj - } - } else if (type == 'cpus') { - try { - return Math.min( obj, params.max_cpus as int ) - } catch (all) { - println " ### ERROR ### Max cpus '${params.max_cpus}' is not valid! Using default value: $obj" - return obj - } +* Software dependencies + https://github.com/${manifest.name}/blob/master/CITATIONS.md +""" + } + summary { + beforeText = validation.help.beforeText + afterText = validation.help.afterText } } + +// Load modules.config for DSL2 module specific options +includeConfig 'conf/modules.config' + diff --git a/nextflow_schema.json b/nextflow_schema.json index 1c9e3fe0..735fa18e 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -1,10 +1,10 @@ { - "$schema": "http://json-schema.org/draft-07/schema", + "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "https://raw.githubusercontent.com/nf-core/nascent/master/nextflow_schema.json", "title": "nf-core/nascent pipeline parameters", "description": "Global Run-On sequencing analysis pipeline", "type": "object", - "definitions": { + "$defs": { "input_output_options": { "title": "Input/output options", "type": "object", @@ -248,14 +248,6 @@ "help_text": "If an alignment index is generated by the pipeline use this parameter to save it to your results folder. These can then be used for future pipeline runs, reducing processing times.", "fa_icon": "fas fa-save" }, - "igenomes_base": { - "type": "string", - "format": "directory-path", - "description": "Directory / URL base for iGenomes references.", - "default": "s3://ngi-igenomes/igenomes/", - "fa_icon": "fas fa-cloud-download-alt", - "hidden": true - }, "igenomes_ignore": { "type": "boolean", "description": "Do not load the iGenomes reference config.", @@ -263,6 +255,14 @@ "hidden": true, "help_text": "Do not load `igenomes.config` when running the pipeline. You may choose this option if you observe clashes between custom parameters and those supplied in `igenomes.config`." }, + "igenomes_base": { + "type": "string", + "format": "directory-path", + "description": "The base path to the igenomes reference files", + "fa_icon": "fas fa-ban", + "hidden": true, + "default": "s3://ngi-igenomes/igenomes/" + }, "human_pangenomics_base": { "type": "string", "description": "Directory / URL base for CHM13 references.", @@ -320,41 +320,6 @@ } } }, - "max_job_request_options": { - "title": "Max job request options", - "type": "object", - "fa_icon": "fab fa-acquisitions-incorporated", - "description": "Set the top limit for requested resources for any single job.", - "help_text": "If you are running on a smaller system, a pipeline step requesting more resources than are available may cause the Nextflow to stop the run with an error. These options allow you to cap the maximum resources requested by any single job so that the pipeline will run on your system.\n\nNote that you can not _increase_ the resources requested by any job using these options. For that you will need your own configuration file. See [the nf-core website](https://nf-co.re/usage/configuration) for details.", - "properties": { - "max_cpus": { - "type": "integer", - "description": "Maximum number of CPUs that can be requested for any single job.", - "default": 16, - "fa_icon": "fas fa-microchip", - "hidden": true, - "help_text": "Use to set an upper-limit for the CPU requirement for each process. Should be an integer e.g. `--max_cpus 1`" - }, - "max_memory": { - "type": "string", - "description": "Maximum amount of memory that can be requested for any single job.", - "default": "128.GB", - "fa_icon": "fas fa-memory", - "pattern": "^\\d+(\\.\\d+)?\\.?\\s*(K|M|G|T)?B$", - "hidden": true, - "help_text": "Use to set an upper-limit for the memory requirement for each process. Should be a string in the format integer-unit e.g. `--max_memory '8.GB'`" - }, - "max_time": { - "type": "string", - "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|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'`" - } - } - }, "generic_options": { "title": "Generic options", "type": "object", @@ -362,12 +327,6 @@ "description": "Less common options for the pipeline, typically set in a config file.", "help_text": "These options are common to all nf-core pipelines and allow you to customise some of the core preferences for how the pipeline runs.\n\nTypically these options would be set in a Nextflow config file loaded for all pipeline runs, such as `~/.nextflow/config`.", "properties": { - "help": { - "type": "boolean", - "description": "Display help text.", - "fa_icon": "fas fa-question-circle", - "hidden": true - }, "version": { "type": "boolean", "description": "Display version and exit.", @@ -443,27 +402,6 @@ "fa_icon": "fas fa-check-square", "hidden": true }, - "validationShowHiddenParams": { - "type": "boolean", - "fa_icon": "far fa-eye-slash", - "description": "Show all params when using `--help`", - "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.", - "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.", - "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)." - }, "pipelines_testdata_base_path": { "type": "string", "fa_icon": "far fa-check-circle", @@ -476,28 +414,25 @@ }, "allOf": [ { - "$ref": "#/definitions/input_output_options" - }, - { - "$ref": "#/definitions/alignment_options" + "$ref": "#/$defs/input_output_options" }, { - "$ref": "#/definitions/umi_options" + "$ref": "#/$defs/alignment_options" }, { - "$ref": "#/definitions/transcript_identification_options" + "$ref": "#/$defs/umi_options" }, { - "$ref": "#/definitions/reference_genome_options" + "$ref": "#/$defs/transcript_identification_options" }, { - "$ref": "#/definitions/institutional_config_options" + "$ref": "#/$defs/reference_genome_options" }, { - "$ref": "#/definitions/max_job_request_options" + "$ref": "#/$defs/institutional_config_options" }, { - "$ref": "#/definitions/generic_options" + "$ref": "#/$defs/generic_options" } ] } diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index ebbdba1b..60bdd1ce 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -8,17 +8,14 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -include { UTILS_NFVALIDATION_PLUGIN } from '../../nf-core/utils_nfvalidation_plugin' -include { paramsSummaryMap } from 'plugin/nf-validation' -include { fromSamplesheet } from 'plugin/nf-validation' -include { UTILS_NEXTFLOW_PIPELINE } from '../../nf-core/utils_nextflow_pipeline' +include { UTILS_NFSCHEMA_PLUGIN } from '../../nf-core/utils_nfschema_plugin' +include { paramsSummaryMap } from 'plugin/nf-schema' +include { samplesheetToList } from 'plugin/nf-schema' include { completionEmail } from '../../nf-core/utils_nfcore_pipeline' include { completionSummary } from '../../nf-core/utils_nfcore_pipeline' -include { dashedLine } from '../../nf-core/utils_nfcore_pipeline' -include { nfCoreLogo } from '../../nf-core/utils_nfcore_pipeline' include { imNotification } from '../../nf-core/utils_nfcore_pipeline' include { UTILS_NFCORE_PIPELINE } from '../../nf-core/utils_nfcore_pipeline' -include { workflowCitation } from '../../nf-core/utils_nfcore_pipeline' +include { UTILS_NEXTFLOW_PIPELINE } from '../../nf-core/utils_nextflow_pipeline' /* ======================================================================================== @@ -30,7 +27,6 @@ workflow PIPELINE_INITIALISATION { take: version // boolean: Display version and exit - help // boolean: Display help text validate_params // boolean: Boolean whether to validate parameters against the schema at runtime monochrome_logs // boolean: Do not use coloured log outputs nextflow_cli_args // array: List of positional nextflow CLI args @@ -51,20 +47,16 @@ workflow PIPELINE_INITIALISATION { workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1 ) + // // Validate parameters and generate parameter summary to stdout // - pre_help_text = nfCoreLogo(monochrome_logs) - post_help_text = '\n' + workflowCitation() + '\n' + dashedLine(monochrome_logs) - def String workflow_command = "nextflow run ${workflow.manifest.name} -profile --input samplesheet.csv --outdir " - UTILS_NFVALIDATION_PLUGIN ( - help, - workflow_command, - pre_help_text, - post_help_text, + UTILS_NFSCHEMA_PLUGIN ( + workflow, validate_params, - "nextflow_schema.json" + null ) + // // Check config provided to the pipeline @@ -80,8 +72,9 @@ workflow PIPELINE_INITIALISATION { // // Create channel from input file provided through params.input // + Channel - .fromSamplesheet("input") + .fromList(samplesheetToList(params.input, "${projectDir}/assets/schema_input.json")) .map { meta, fastq_1, fastq_2 -> if (!fastq_2) { @@ -91,8 +84,8 @@ workflow PIPELINE_INITIALISATION { } } .groupTuple() - .map { - validateInputSamplesheet(it) + .map { samplesheet -> + validateInputSamplesheet(samplesheet) } .map { meta, fastqs -> @@ -117,13 +110,13 @@ workflow PIPELINE_COMPLETION { email // string: email address email_on_fail // string: email address sent on pipeline failure plaintext_email // boolean: Send plain-text email instead of HTML + outdir // path: Path to output directory where results will be published monochrome_logs // boolean: Disable ANSI colour codes in log output hook_url // string: hook URL for notifications multiqc_report // string: Path to MultiQC report main: - summary_params = paramsSummaryMap(workflow, parameters_schema: "nextflow_schema.json") // @@ -131,11 +124,18 @@ workflow PIPELINE_COMPLETION { // workflow.onComplete { if (email || email_on_fail) { - completionEmail(summary_params, email, email_on_fail, plaintext_email, outdir, monochrome_logs, multiqc_report.toList()) + completionEmail( + summary_params, + email, + email_on_fail, + plaintext_email, + outdir, + monochrome_logs, + multiqc_report.toList() + ) } completionSummary(monochrome_logs) - if (hook_url) { imNotification(summary_params, hook_url) } @@ -165,7 +165,7 @@ def validateInputSamplesheet(input) { def (metas, fastqs) = input[1..2] // Check that multiple runs of the same sample are of the same datatype i.e. single-end / paired-end - def endedness_ok = metas.collect{ it.single_end }.unique().size == 1 + def endedness_ok = metas.collect{ meta -> meta.single_end }.unique().size == 1 if (!endedness_ok) { error("Please check input samplesheet -> Multiple runs of a sample must be of the same datatype i.e. single-end or paired-end: ${metas[0].id}") } @@ -197,7 +197,6 @@ def genomeExistsError() { error(error_string) } } - // // Generate methods description for MultiQC // @@ -272,8 +271,10 @@ def methodsDescriptionText(mqc_methods_yaml) { // Removing `https://doi.org/` to handle pipelines using DOIs vs DOI resolvers // Removing ` ` since the manifest.doi is a string and not a proper list def temp_doi_ref = "" - String[] manifest_doi = meta.manifest_map.doi.tokenize(",") - for (String doi_ref: manifest_doi) temp_doi_ref += "(doi: ${doi_ref.replace("https://doi.org/", "").replace(" ", "")}), " + def manifest_doi = meta.manifest_map.doi.tokenize(",") + manifest_doi.each { doi_ref -> + temp_doi_ref += "(doi: ${doi_ref.replace("https://doi.org/", "").replace(" ", "")}), " + } meta["doi_text"] = temp_doi_ref.substring(0, temp_doi_ref.length() - 2) } else meta["doi_text"] = "" 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.
    • " @@ -293,3 +294,4 @@ def methodsDescriptionText(mqc_methods_yaml) { return description_html.toString() } + diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf index ac31f28f..28e32b20 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf @@ -2,10 +2,6 @@ // Subworkflow with functionality that may be useful for any Nextflow pipeline // -import org.yaml.snakeyaml.Yaml -import groovy.json.JsonOutput -import nextflow.extension.FilesEx - /* ======================================================================================== SUBWORKFLOW DEFINITION @@ -58,7 +54,7 @@ workflow UTILS_NEXTFLOW_PIPELINE { // Generate version string // def getWorkflowVersion() { - String version_string = "" + def version_string = "" as String if (workflow.manifest.version) { def prefix_v = workflow.manifest.version[0] != 'v' ? 'v' : '' version_string += "${prefix_v}${workflow.manifest.version}" @@ -79,10 +75,10 @@ def dumpParametersToJSON(outdir) { def timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss') def filename = "params_${timestamp}.json" def temp_pf = new File(workflow.launchDir.toString(), ".${filename}") - def jsonStr = JsonOutput.toJson(params) - temp_pf.text = JsonOutput.prettyPrint(jsonStr) + def jsonStr = groovy.json.JsonOutput.toJson(params) + temp_pf.text = groovy.json.JsonOutput.prettyPrint(jsonStr) - FilesEx.copyTo(temp_pf.toPath(), "${outdir}/pipeline_info/params_${timestamp}.json") + nextflow.extension.FilesEx.copyTo(temp_pf.toPath(), "${outdir}/pipeline_info/params_${timestamp}.json") temp_pf.delete() } @@ -90,7 +86,7 @@ def dumpParametersToJSON(outdir) { // When running with -profile conda, warn if channels have not been set-up appropriately // def checkCondaChannels() { - Yaml parser = new Yaml() + def parser = new org.yaml.snakeyaml.Yaml() def channels = [] try { def config = parser.load("conda config --show channels".execute().text) @@ -102,14 +98,16 @@ def checkCondaChannels() { // Check that all channels are present // This channel list is ordered by required channel priority. - def required_channels_in_order = ['conda-forge', 'bioconda', 'defaults'] + def required_channels_in_order = ['conda-forge', 'bioconda'] def channels_missing = ((required_channels_in_order as Set) - (channels as Set)) as Boolean // Check that they are in the right order def channel_priority_violation = false - def n = required_channels_in_order.size() - for (int i = 0; i < n - 1; i++) { - channel_priority_violation |= !(channels.indexOf(required_channels_in_order[i]) < channels.indexOf(required_channels_in_order[i+1])) + + required_channels_in_order.eachWithIndex { channel, index -> + if (index < required_channels_in_order.size() - 1) { + channel_priority_violation |= !(channels.indexOf(channel) < channels.indexOf(required_channels_in_order[index+1])) + } } if (channels_missing | channel_priority_violation) { diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config b/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config index d0a926bf..a09572e5 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/nextflow.config @@ -3,7 +3,7 @@ manifest { author = """nf-core""" homePage = 'https://127.0.0.1' description = """Dummy pipeline""" - nextflowVersion = '!>=23.04.0' + nextflowVersion = '!>=23.04.0' version = '9.9.9' doi = 'https://doi.org/10.5281/zenodo.5070524' } diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf index 14558c39..cbd8495b 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf @@ -2,9 +2,6 @@ // Subworkflow with utility functions specific to the nf-core pipeline template // -import org.yaml.snakeyaml.Yaml -import nextflow.extension.FilesEx - /* ======================================================================================== SUBWORKFLOW DEFINITION @@ -34,7 +31,7 @@ workflow UTILS_NFCORE_PIPELINE { // Warn if a -profile or Nextflow config has not been provided to run the pipeline // def checkConfigProvided() { - valid_config = true + def valid_config = true as Boolean if (workflow.profile == 'standard' && workflow.configFiles.size() <= 1) { log.warn "[$workflow.manifest.name] You are attempting to run the pipeline without any custom configuration!\n\n" + "This will be dependent on your local compute environment but can be achieved via one or more of the following:\n" + @@ -66,11 +63,13 @@ def checkProfileProvided(nextflow_cli_args) { // def workflowCitation() { def temp_doi_ref = "" - String[] manifest_doi = workflow.manifest.doi.tokenize(",") + def manifest_doi = workflow.manifest.doi.tokenize(",") // Using a loop to handle multiple DOIs // Removing `https://doi.org/` to handle pipelines using DOIs vs DOI resolvers // Removing ` ` since the manifest.doi is a string and not a proper list - for (String doi_ref: manifest_doi) temp_doi_ref += " https://doi.org/${doi_ref.replace('https://doi.org/', '').replace(' ', '')}\n" + manifest_doi.each { doi_ref -> + temp_doi_ref += " https://doi.org/${doi_ref.replace('https://doi.org/', '').replace(' ', '')}\n" + } return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + "* The pipeline\n" + temp_doi_ref + "\n" + @@ -84,7 +83,7 @@ def workflowCitation() { // Generate workflow version string // def getWorkflowVersion() { - String version_string = "" + def version_string = "" as String if (workflow.manifest.version) { def prefix_v = workflow.manifest.version[0] != 'v' ? 'v' : '' version_string += "${prefix_v}${workflow.manifest.version}" @@ -102,8 +101,8 @@ def getWorkflowVersion() { // Get software versions for pipeline // def processVersionsFromYAML(yaml_file) { - Yaml yaml = new Yaml() - versions = yaml.load(yaml_file).collectEntries { k, v -> [ k.tokenize(':')[-1], v ] } + def yaml = new org.yaml.snakeyaml.Yaml() + def versions = yaml.load(yaml_file).collectEntries { k, v -> [ k.tokenize(':')[-1], v ] } return yaml.dumpAsMap(versions).trim() } @@ -124,7 +123,7 @@ def workflowVersionToYAML() { def softwareVersionsToYAML(ch_versions) { return ch_versions .unique() - .map { processVersionsFromYAML(it) } + .map { version -> processVersionsFromYAML(version) } .unique() .mix(Channel.of(workflowVersionToYAML())) } @@ -134,19 +133,19 @@ def softwareVersionsToYAML(ch_versions) { // def paramsSummaryMultiqc(summary_params) { def summary_section = '' - for (group in summary_params.keySet()) { + summary_params.keySet().each { group -> def group_params = summary_params.get(group) // This gets the parameters of that particular group if (group_params) { summary_section += "

    $group

    \n" summary_section += "
    \n" - for (param in group_params.keySet()) { + group_params.keySet().sort().each { param -> summary_section += "
    $param
    ${group_params.get(param) ?: 'N/A'}
    \n" } summary_section += "
    \n" } } - String yaml_file_text = "id: '${workflow.manifest.name.replace('/','-')}-summary'\n" + def yaml_file_text = "id: '${workflow.manifest.name.replace('/','-')}-summary'\n" as String yaml_file_text += "description: ' - this information is collected when the pipeline is started.'\n" yaml_file_text += "section_name: '${workflow.manifest.name} Workflow Summary'\n" yaml_file_text += "section_href: 'https://github.com/${workflow.manifest.name}'\n" @@ -161,7 +160,7 @@ def paramsSummaryMultiqc(summary_params) { // nf-core logo // def nfCoreLogo(monochrome_logs=true) { - Map colors = logColours(monochrome_logs) + def colors = logColours(monochrome_logs) as Map String.format( """\n ${dashedLine(monochrome_logs)} @@ -180,7 +179,7 @@ def nfCoreLogo(monochrome_logs=true) { // Return dashed line // def dashedLine(monochrome_logs=true) { - Map colors = logColours(monochrome_logs) + def colors = logColours(monochrome_logs) as Map return "-${colors.dim}----------------------------------------------------${colors.reset}-" } @@ -188,7 +187,7 @@ def dashedLine(monochrome_logs=true) { // ANSII colours used for terminal logging // def logColours(monochrome_logs=true) { - Map colorcodes = [:] + def colorcodes = [:] as Map // Reset / Meta colorcodes['reset'] = monochrome_logs ? '' : "\033[0m" @@ -287,7 +286,7 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi } def summary = [:] - for (group in summary_params.keySet()) { + summary_params.keySet().sort().each { group -> summary << summary_params[group] } @@ -344,10 +343,10 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi def sendmail_html = sendmail_template.toString() // Send the HTML e-mail - Map colors = logColours(monochrome_logs) + def colors = logColours(monochrome_logs) as Map if (email_address) { try { - if (plaintext_email) { throw GroovyException('Send plaintext e-mail, not HTML') } + if (plaintext_email) { throw new org.codehaus.groovy.GroovyException('Send plaintext e-mail, not HTML') } // Try to send HTML e-mail using sendmail def sendmail_tf = new File(workflow.launchDir.toString(), ".sendmail_tmp.html") sendmail_tf.withWriter { w -> w << sendmail_html } @@ -364,13 +363,13 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi // Write summary e-mail HTML to a file def output_hf = new File(workflow.launchDir.toString(), ".pipeline_report.html") output_hf.withWriter { w -> w << email_html } - FilesEx.copyTo(output_hf.toPath(), "${outdir}/pipeline_info/pipeline_report.html"); + nextflow.extension.FilesEx.copyTo(output_hf.toPath(), "${outdir}/pipeline_info/pipeline_report.html"); output_hf.delete() // Write summary e-mail TXT to a file def output_tf = new File(workflow.launchDir.toString(), ".pipeline_report.txt") output_tf.withWriter { w -> w << email_txt } - FilesEx.copyTo(output_tf.toPath(), "${outdir}/pipeline_info/pipeline_report.txt"); + nextflow.extension.FilesEx.copyTo(output_tf.toPath(), "${outdir}/pipeline_info/pipeline_report.txt"); output_tf.delete() } @@ -378,7 +377,7 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi // Print pipeline summary on completion // def completionSummary(monochrome_logs=true) { - Map colors = logColours(monochrome_logs) + def colors = logColours(monochrome_logs) as Map if (workflow.success) { if (workflow.stats.ignoredCount == 0) { log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Pipeline completed successfully${colors.reset}-" @@ -395,7 +394,7 @@ def completionSummary(monochrome_logs=true) { // def imNotification(summary_params, hook_url) { def summary = [:] - for (group in summary_params.keySet()) { + summary_params.keySet().sort().each { group -> summary << summary_params[group] } diff --git a/subworkflows/nf-core/utils_nfschema_plugin/main.nf b/subworkflows/nf-core/utils_nfschema_plugin/main.nf new file mode 100644 index 00000000..4994303e --- /dev/null +++ b/subworkflows/nf-core/utils_nfschema_plugin/main.nf @@ -0,0 +1,46 @@ +// +// Subworkflow that uses the nf-schema plugin to validate parameters and render the parameter summary +// + +include { paramsSummaryLog } from 'plugin/nf-schema' +include { validateParameters } from 'plugin/nf-schema' + +workflow UTILS_NFSCHEMA_PLUGIN { + + take: + input_workflow // workflow: the workflow object used by nf-schema to get metadata from the workflow + validate_params // boolean: validate the parameters + parameters_schema // string: path to the parameters JSON schema. + // this has to be the same as the schema given to `validation.parametersSchema` + // when this input is empty it will automatically use the configured schema or + // "${projectDir}/nextflow_schema.json" as default. This input should not be empty + // for meta pipelines + + main: + + // + // Print parameter summary to stdout. This will display the parameters + // that differ from the default given in the JSON schema + // + if(parameters_schema) { + log.info paramsSummaryLog(input_workflow, parameters_schema:parameters_schema) + } else { + log.info paramsSummaryLog(input_workflow) + } + + // + // Validate the parameters using nextflow_schema.json or the schema + // given via the validation.parametersSchema configuration option + // + if(validate_params) { + if(parameters_schema) { + validateParameters(parameters_schema:parameters_schema) + } else { + validateParameters() + } + } + + emit: + dummy_emit = true +} + diff --git a/subworkflows/nf-core/utils_nfschema_plugin/meta.yml b/subworkflows/nf-core/utils_nfschema_plugin/meta.yml new file mode 100644 index 00000000..f7d9f028 --- /dev/null +++ b/subworkflows/nf-core/utils_nfschema_plugin/meta.yml @@ -0,0 +1,35 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: "utils_nfschema_plugin" +description: Run nf-schema to validate parameters and create a summary of changed parameters +keywords: + - validation + - JSON schema + - plugin + - parameters + - summary +components: [] +input: + - input_workflow: + type: object + description: | + The workflow object of the used pipeline. + This object contains meta data used to create the params summary log + - validate_params: + type: boolean + description: Validate the parameters and error if invalid. + - parameters_schema: + type: string + description: | + Path to the parameters JSON schema. + This has to be the same as the schema given to the `validation.parametersSchema` config + option. When this input is empty it will automatically use the configured schema or + "${projectDir}/nextflow_schema.json" as default. The schema should not be given in this way + for meta pipelines. +output: + - dummy_emit: + type: boolean + description: Dummy emit to make nf-core subworkflows lint happy +authors: + - "@nvnieuwk" +maintainers: + - "@nvnieuwk" diff --git a/subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test b/subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test new file mode 100644 index 00000000..842dc432 --- /dev/null +++ b/subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test @@ -0,0 +1,117 @@ +nextflow_workflow { + + name "Test Subworkflow UTILS_NFSCHEMA_PLUGIN" + script "../main.nf" + workflow "UTILS_NFSCHEMA_PLUGIN" + + tag "subworkflows" + tag "subworkflows_nfcore" + tag "subworkflows/utils_nfschema_plugin" + tag "plugin/nf-schema" + + config "./nextflow.config" + + test("Should run nothing") { + + when { + + params { + test_data = '' + } + + workflow { + """ + validate_params = false + input[0] = workflow + input[1] = validate_params + input[2] = "" + """ + } + } + + then { + assertAll( + { assert workflow.success } + ) + } + } + + test("Should validate params") { + + when { + + params { + test_data = '' + outdir = 1 + } + + workflow { + """ + validate_params = true + input[0] = workflow + input[1] = validate_params + input[2] = "" + """ + } + } + + then { + assertAll( + { assert workflow.failed }, + { assert workflow.stdout.any { it.contains('ERROR ~ Validation of pipeline parameters failed!') } } + ) + } + } + + test("Should run nothing - custom schema") { + + when { + + params { + test_data = '' + } + + workflow { + """ + validate_params = false + input[0] = workflow + input[1] = validate_params + input[2] = "${projectDir}/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow_schema.json" + """ + } + } + + then { + assertAll( + { assert workflow.success } + ) + } + } + + test("Should validate params - custom schema") { + + when { + + params { + test_data = '' + outdir = 1 + } + + workflow { + """ + validate_params = true + input[0] = workflow + input[1] = validate_params + input[2] = "${projectDir}/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow_schema.json" + """ + } + } + + then { + assertAll( + { assert workflow.failed }, + { assert workflow.stdout.any { it.contains('ERROR ~ Validation of pipeline parameters failed!') } } + ) + } + } +} diff --git a/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow.config b/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow.config new file mode 100644 index 00000000..0907ac58 --- /dev/null +++ b/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow.config @@ -0,0 +1,8 @@ +plugins { + id "nf-schema@2.1.0" +} + +validation { + parametersSchema = "${projectDir}/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow_schema.json" + monochromeLogs = true +} \ No newline at end of file diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/nextflow_schema.json b/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow_schema.json similarity index 95% rename from subworkflows/nf-core/utils_nfvalidation_plugin/tests/nextflow_schema.json rename to subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow_schema.json index 7626c1c9..331e0d2f 100644 --- a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/nextflow_schema.json +++ b/subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow_schema.json @@ -1,10 +1,10 @@ { - "$schema": "http://json-schema.org/draft-07/schema", + "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "https://raw.githubusercontent.com/./master/nextflow_schema.json", "title": ". pipeline parameters", "description": "", "type": "object", - "definitions": { + "$defs": { "input_output_options": { "title": "Input/output options", "type": "object", @@ -87,10 +87,10 @@ }, "allOf": [ { - "$ref": "#/definitions/input_output_options" + "$ref": "#/$defs/input_output_options" }, { - "$ref": "#/definitions/generic_options" + "$ref": "#/$defs/generic_options" } ] } diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/main.nf b/subworkflows/nf-core/utils_nfvalidation_plugin/main.nf deleted file mode 100644 index 2585b65d..00000000 --- a/subworkflows/nf-core/utils_nfvalidation_plugin/main.nf +++ /dev/null @@ -1,62 +0,0 @@ -// -// Subworkflow that uses the nf-validation plugin to render help text and parameter summary -// - -/* -======================================================================================== - IMPORT NF-VALIDATION PLUGIN -======================================================================================== -*/ - -include { paramsHelp } from 'plugin/nf-validation' -include { paramsSummaryLog } from 'plugin/nf-validation' -include { validateParameters } from 'plugin/nf-validation' - -/* -======================================================================================== - SUBWORKFLOW DEFINITION -======================================================================================== -*/ - -workflow UTILS_NFVALIDATION_PLUGIN { - - take: - print_help // boolean: print help - workflow_command // string: default commmand used to run pipeline - pre_help_text // string: string to be printed before help text and summary log - post_help_text // string: string to be printed after help text and summary log - validate_params // boolean: validate parameters - schema_filename // path: JSON schema file, null to use default value - - main: - - log.debug "Using schema file: ${schema_filename}" - - // Default values for strings - pre_help_text = pre_help_text ?: '' - post_help_text = post_help_text ?: '' - workflow_command = workflow_command ?: '' - - // - // Print help message if needed - // - if (print_help) { - log.info pre_help_text + paramsHelp(workflow_command, parameters_schema: schema_filename) + post_help_text - System.exit(0) - } - - // - // Print parameter summary to stdout - // - log.info pre_help_text + paramsSummaryLog(workflow, parameters_schema: schema_filename) + post_help_text - - // - // Validate parameters relative to the parameter JSON schema - // - if (validate_params){ - validateParameters(parameters_schema: schema_filename) - } - - emit: - dummy_emit = true -} diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml b/subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml deleted file mode 100644 index 3d4a6b04..00000000 --- a/subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml +++ /dev/null @@ -1,44 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json -name: "UTILS_NFVALIDATION_PLUGIN" -description: Use nf-validation to initiate and validate a pipeline -keywords: - - utility - - pipeline - - initialise - - validation -components: [] -input: - - print_help: - type: boolean - description: | - Print help message and exit - - workflow_command: - type: string - description: | - The command to run the workflow e.g. "nextflow run main.nf" - - pre_help_text: - type: string - description: | - Text to print before the help message - - post_help_text: - type: string - description: | - Text to print after the help message - - validate_params: - type: boolean - description: | - Validate the parameters and error if invalid. - - schema_filename: - type: string - description: | - The filename of the schema to validate against. -output: - - dummy_emit: - type: boolean - description: | - Dummy emit to make nf-core subworkflows lint happy -authors: - - "@adamrtalbot" -maintainers: - - "@adamrtalbot" - - "@maxulysse" diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test deleted file mode 100644 index 5784a33f..00000000 --- a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test +++ /dev/null @@ -1,200 +0,0 @@ -nextflow_workflow { - - name "Test Workflow UTILS_NFVALIDATION_PLUGIN" - script "../main.nf" - workflow "UTILS_NFVALIDATION_PLUGIN" - tag "subworkflows" - tag "subworkflows_nfcore" - tag "plugin/nf-validation" - tag "'plugin/nf-validation'" - tag "utils_nfvalidation_plugin" - tag "subworkflows/utils_nfvalidation_plugin" - - test("Should run nothing") { - - when { - - params { - monochrome_logs = true - test_data = '' - } - - workflow { - """ - help = false - workflow_command = null - pre_help_text = null - post_help_text = null - validate_params = false - schema_filename = "$moduleTestDir/nextflow_schema.json" - - input[0] = help - input[1] = workflow_command - input[2] = pre_help_text - input[3] = post_help_text - input[4] = validate_params - input[5] = schema_filename - """ - } - } - - then { - assertAll( - { assert workflow.success } - ) - } - } - - test("Should run help") { - - - when { - - params { - monochrome_logs = true - test_data = '' - } - workflow { - """ - help = true - workflow_command = null - pre_help_text = null - post_help_text = null - validate_params = false - schema_filename = "$moduleTestDir/nextflow_schema.json" - - input[0] = help - input[1] = workflow_command - input[2] = pre_help_text - input[3] = post_help_text - input[4] = validate_params - input[5] = schema_filename - """ - } - } - - then { - assertAll( - { assert workflow.success }, - { assert workflow.exitStatus == 0 }, - { assert workflow.stdout.any { it.contains('Input/output options') } }, - { assert workflow.stdout.any { it.contains('--outdir') } } - ) - } - } - - test("Should run help with command") { - - when { - - params { - monochrome_logs = true - test_data = '' - } - workflow { - """ - help = true - workflow_command = "nextflow run noorg/doesntexist" - pre_help_text = null - post_help_text = null - validate_params = false - schema_filename = "$moduleTestDir/nextflow_schema.json" - - input[0] = help - input[1] = workflow_command - input[2] = pre_help_text - input[3] = post_help_text - input[4] = validate_params - input[5] = schema_filename - """ - } - } - - then { - assertAll( - { assert workflow.success }, - { assert workflow.exitStatus == 0 }, - { assert workflow.stdout.any { it.contains('nextflow run noorg/doesntexist') } }, - { assert workflow.stdout.any { it.contains('Input/output options') } }, - { assert workflow.stdout.any { it.contains('--outdir') } } - ) - } - } - - test("Should run help with extra text") { - - - when { - - params { - monochrome_logs = true - test_data = '' - } - workflow { - """ - help = true - workflow_command = "nextflow run noorg/doesntexist" - pre_help_text = "pre-help-text" - post_help_text = "post-help-text" - validate_params = false - schema_filename = "$moduleTestDir/nextflow_schema.json" - - input[0] = help - input[1] = workflow_command - input[2] = pre_help_text - input[3] = post_help_text - input[4] = validate_params - input[5] = schema_filename - """ - } - } - - then { - assertAll( - { assert workflow.success }, - { assert workflow.exitStatus == 0 }, - { assert workflow.stdout.any { it.contains('pre-help-text') } }, - { assert workflow.stdout.any { it.contains('nextflow run noorg/doesntexist') } }, - { assert workflow.stdout.any { it.contains('Input/output options') } }, - { assert workflow.stdout.any { it.contains('--outdir') } }, - { assert workflow.stdout.any { it.contains('post-help-text') } } - ) - } - } - - test("Should validate params") { - - when { - - params { - monochrome_logs = true - test_data = '' - outdir = 1 - } - workflow { - """ - help = false - workflow_command = null - pre_help_text = null - post_help_text = null - validate_params = true - schema_filename = "$moduleTestDir/nextflow_schema.json" - - input[0] = help - input[1] = workflow_command - input[2] = pre_help_text - input[3] = post_help_text - input[4] = validate_params - input[5] = schema_filename - """ - } - } - - then { - assertAll( - { assert workflow.failed }, - { assert workflow.stdout.any { it.contains('ERROR ~ ERROR: Validation of pipeline parameters failed!') } } - ) - } - } -} diff --git a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml b/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml deleted file mode 100644 index 60b1cfff..00000000 --- a/subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml +++ /dev/null @@ -1,2 +0,0 @@ -subworkflows/utils_nfvalidation_plugin: - - subworkflows/nf-core/utils_nfvalidation_plugin/** diff --git a/tests/nextflow.config b/tests/nextflow.config index 3aba030e..97eb3736 100644 --- a/tests/nextflow.config +++ b/tests/nextflow.config @@ -18,7 +18,7 @@ process { // Impose same minimum Nextflow version as the pipeline for testing manifest { - nextflowVersion = '!>=23.04.0' + nextflowVersion = '!>=24.04.2' } // Disable all Nextflow reporting options diff --git a/workflows/nascent.nf b/workflows/nascent.nf index db08a147..68848ad0 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -25,7 +25,7 @@ include { include { FASTQC } from '../modules/nf-core/fastqc/main' include { MULTIQC } from '../modules/nf-core/multiqc/main' -include { paramsSummaryMap } from 'plugin/nf-validation' +include { paramsSummaryMap } from 'plugin/nf-schema' include { paramsSummaryMultiqc } from '../subworkflows/nf-core/utils_nfcore_pipeline' include { softwareVersionsToYAML } from '../subworkflows/nf-core/utils_nfcore_pipeline' include { methodsDescriptionText } from '../subworkflows/local/utils_nfcore_nascent_pipeline' @@ -64,7 +64,6 @@ workflow NASCENT { ch_versions = Channel.empty() ch_multiqc_files = Channel.empty() - // // SUBWORKFLOW: Uncompress and prepare reference genome files // @@ -318,11 +317,12 @@ workflow NASCENT { softwareVersionsToYAML(ch_versions) .collectFile( storeDir: "${params.outdir}/pipeline_info", - name: 'nf_core_pipeline_software_mqc_versions.yml', + name: 'nf_core_' + 'pipeline_software_' + 'mqc_' + 'versions.yml', sort: true, newLine: true ).set { ch_collated_versions } + // // MODULE: MultiQC // @@ -335,9 +335,12 @@ workflow NASCENT { Channel.fromPath(params.multiqc_logo, checkIfExists: true) : Channel.empty() + summary_params = paramsSummaryMap( workflow, parameters_schema: "nextflow_schema.json") ch_workflow_summary = Channel.value(paramsSummaryMultiqc(summary_params)) + ch_multiqc_files = ch_multiqc_files.mix( + ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) ch_multiqc_custom_methods_description = params.multiqc_methods_description ? file(params.multiqc_methods_description, checkIfExists: true) : @@ -345,8 +348,6 @@ workflow NASCENT { ch_methods_description = Channel.value( methodsDescriptionText(ch_multiqc_custom_methods_description)) - ch_multiqc_files = ch_multiqc_files.mix( - ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) ch_multiqc_files = ch_multiqc_files.mix(ch_collated_versions) ch_multiqc_files = ch_multiqc_files.mix( ch_methods_description.collectFile( @@ -380,9 +381,9 @@ workflow NASCENT { [], ) - emit: - multiqc_report = MULTIQC.out.report.toList() // channel: /path/to/multiqc_report.html + emit:multiqc_report = MULTIQC.out.report.toList() // channel: /path/to/multiqc_report.html versions = ch_versions // channel: [ path(versions.yml) ] + } /* From b4ac8c51b659e3b82cbb44c6a74c40e81a191669 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Wed, 9 Oct 2024 11:06:47 +0000 Subject: [PATCH 102/255] Template update for nf-core/tools version 3.0.1 --- .editorconfig | 4 - .github/CONTRIBUTING.md | 2 +- .github/workflows/awsfulltest.yml | 6 +- .github/workflows/linting.yml | 4 +- .nf-core.yml | 2 +- .prettierignore | 1 - docs/output.md | 1 - modules.json | 6 +- modules/nf-core/multiqc/environment.yml | 2 +- modules/nf-core/multiqc/main.nf | 4 +- .../nf-core/multiqc/tests/main.nf.test.snap | 26 +- nextflow.config | 6 +- .../utils_nfcore_nascent_pipeline/main.nf | 12 +- .../nf-core/utils_nextflow_pipeline/main.nf | 46 ++- .../nf-core/utils_nfcore_pipeline/main.nf | 279 ++++++++++-------- 15 files changed, 207 insertions(+), 194 deletions(-) diff --git a/.editorconfig b/.editorconfig index e1058815..72dda289 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,7 +11,6 @@ indent_style = space [*.{md,yml,yaml,html,css,scss,js}] indent_size = 2 - # These files are edited and tested upstream in nf-core/modules [/modules/nf-core/**] charset = unset @@ -26,12 +25,9 @@ insert_final_newline = unset trim_trailing_whitespace = unset indent_style = unset - - [/assets/email*] indent_size = unset - # ignore python and markdown [*.{py,md}] indent_style = unset diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0f47dcf5..7c6ec34e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -90,7 +90,7 @@ Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json ### Default processes resource requirements -Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels. +Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/main/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels. The process resources can be passed on to the tool dynamically within the process with the `${task.cpus}` and `${task.memory}` variables in the `script:` block. diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index 31e9142f..0980ae1d 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -14,16 +14,18 @@ on: jobs: run-platform: name: Run AWS full tests - if: github.repository == 'nf-core/nascent' && github.event.review.state == 'approved' + # run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered + if: github.repository == 'nf-core/nascent' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - uses: octokit/request-action@v2.x id: check_approvals with: - route: GET /repos/${{ github.repository }}/pulls/${{ github.event.review.number }}/reviews + route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - id: test_variables + if: github.event_name != 'workflow_dispatch' run: | JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}' CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length') diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index b882838a..a502573c 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -42,10 +42,10 @@ jobs: architecture: "x64" - name: read .nf-core.yml - uses: pietrobolcato/action-read-yaml@1.0.0 + uses: pietrobolcato/action-read-yaml@1.1.0 id: read_yml with: - config: ${{ github.workspace }}/.nf-core.yaml + config: ${{ github.workspace }}/.nf-core.yml - name: Install dependencies run: | diff --git a/.nf-core.yml b/.nf-core.yml index 44001c7a..5e9dfab6 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -5,7 +5,7 @@ lint: - .github/workflows/linting.yml - LICENSE - assets/email_template.html -nf_core_version: 3.0.0 +nf_core_version: 3.0.1 org_path: null repository_type: pipeline template: diff --git a/.prettierignore b/.prettierignore index 610e5069..437d763d 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,3 @@ - email_template.html adaptivecard.json slackreport.json diff --git a/docs/output.md b/docs/output.md index dd20f74a..4b251dbe 100644 --- a/docs/output.md +++ b/docs/output.md @@ -38,7 +38,6 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d - [Quantification](#quantification) - [featureCounts](#featurecounts) - Read counting relative to gene biotype - [MultiQC](#multiqc) - Aggregate report describing results and QC from the whole pipeline - - [Pipeline information](#pipeline-information) - Report metrics generated during the workflow execution ## Preprocessing diff --git a/modules.json b/modules.json index 823421fe..0762dead 100644 --- a/modules.json +++ b/modules.json @@ -249,7 +249,7 @@ }, "untar": { "branch": "master", - "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", + "git_sha": "b8d36829fa84b6e404364abff787e8b07f6d058c", "installed_by": ["modules"] } } @@ -308,12 +308,12 @@ }, "utils_nextflow_pipeline": { "branch": "master", - "git_sha": "d20fb2a9cc3e2835e9d067d1046a63252eb17352", + "git_sha": "9d05360da397692321d377b6102d2fb22507c6ef", "installed_by": ["subworkflows"] }, "utils_nfcore_pipeline": { "branch": "master", - "git_sha": "2fdce49d30c0254f76bc0f13c55c17455c1251ab", + "git_sha": "772684d9d66f37b650c8ba5146ac1ee3ecba2acb", "installed_by": ["subworkflows"] }, "utils_nfschema_plugin": { diff --git a/modules/nf-core/multiqc/environment.yml b/modules/nf-core/multiqc/environment.yml index f1cd99b0..6f5b867b 100644 --- a/modules/nf-core/multiqc/environment.yml +++ b/modules/nf-core/multiqc/environment.yml @@ -2,4 +2,4 @@ channels: - conda-forge - bioconda dependencies: - - bioconda::multiqc=1.24.1 + - bioconda::multiqc=1.25.1 diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf index b9ccebdb..9724d2f3 100644 --- a/modules/nf-core/multiqc/main.nf +++ b/modules/nf-core/multiqc/main.nf @@ -3,8 +3,8 @@ process MULTIQC { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.25--pyhdfd78af_0' : - 'biocontainers/multiqc:1.25--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/multiqc:1.25.1--pyhdfd78af_0' : + 'biocontainers/multiqc:1.25.1--pyhdfd78af_0' }" input: path multiqc_files, stageAs: "?/*" diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap index b779e469..2fcbb5ff 100644 --- a/modules/nf-core/multiqc/tests/main.nf.test.snap +++ b/modules/nf-core/multiqc/tests/main.nf.test.snap @@ -2,14 +2,14 @@ "multiqc_versions_single": { "content": [ [ - "versions.yml:md5,8c8724363a5efe0c6f43ab34faa57efd" + "versions.yml:md5,41f391dcedce7f93ca188f3a3ffa0916" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-10T12:41:34.562023" + "timestamp": "2024-10-02T17:51:46.317523" }, "multiqc_stub": { "content": [ @@ -17,25 +17,25 @@ "multiqc_report.html", "multiqc_data", "multiqc_plots", - "versions.yml:md5,8c8724363a5efe0c6f43ab34faa57efd" + "versions.yml:md5,41f391dcedce7f93ca188f3a3ffa0916" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-10T11:27:11.933869532" + "timestamp": "2024-10-02T17:52:20.680978" }, "multiqc_versions_config": { "content": [ [ - "versions.yml:md5,8c8724363a5efe0c6f43ab34faa57efd" + "versions.yml:md5,41f391dcedce7f93ca188f3a3ffa0916" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-10T11:26:56.709849369" + "timestamp": "2024-10-02T17:52:09.185842" } -} +} \ No newline at end of file diff --git a/nextflow.config b/nextflow.config index a4c286d2..97650be7 100644 --- a/nextflow.config +++ b/nextflow.config @@ -58,6 +58,7 @@ params { show_hidden = false version = false pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/' + // Config options config_profile_name = null config_profile_description = null @@ -66,9 +67,9 @@ params { custom_config_base = "https://raw.githubusercontent.com/nf-core/configs/${params.custom_config_version}" config_profile_contact = null config_profile_url = null + // Schema validation default options validate_params = true - } // Load base.config by default for all pipelines @@ -185,6 +186,7 @@ includeConfig !System.getenv('NXF_OFFLINE') && params.custom_config_base ? "${pa // Load nf-core/nascent custom profiles from different institutions. // TODO nf-core: Optionally, you can add a pipeline-specific nf-core config at https://github.com/nf-core/configs // includeConfig !System.getenv('NXF_OFFLINE') && params.custom_config_base ? "${params.custom_config_base}/pipeline/nascent.config" : "/dev/null" + // Set default registry for Apptainer, Docker, Podman, Charliecloud and Singularity independent of -profile // Will not be used unless Apptainer / Docker / Podman / Charliecloud / Singularity are enabled // Set to your registry if you have a mirror of containers @@ -196,6 +198,7 @@ charliecloud.registry = 'quay.io' // Load igenomes.config if required includeConfig !params.igenomes_ignore ? 'conf/igenomes.config' : 'conf/igenomes_ignored.config' + // Export these variables to prevent local Python/R libraries from conflicting with those in the container // The JULIA depot path has been adjusted to a fixed path `/usr/local/share/julia` that needs to be used for packages in the container. // See https://apeltzer.github.io/post/03-julia-lang-nextflow/ for details on that. Once we have a common agreement on where to keep Julia packages, this is adjustable. @@ -287,4 +290,3 @@ validation { // Load modules.config for DSL2 module specific options includeConfig 'conf/modules.config' - diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index 60bdd1ce..60b1d1fa 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -18,9 +18,9 @@ include { UTILS_NFCORE_PIPELINE } from '../../nf-core/utils_nfcore_pipeline' include { UTILS_NEXTFLOW_PIPELINE } from '../../nf-core/utils_nextflow_pipeline' /* -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SUBWORKFLOW TO INITIALISE PIPELINE -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ workflow PIPELINE_INITIALISATION { @@ -99,9 +99,9 @@ workflow PIPELINE_INITIALISATION { } /* -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SUBWORKFLOW FOR PIPELINE COMPLETION -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ workflow PIPELINE_COMPLETION { @@ -147,9 +147,9 @@ workflow PIPELINE_COMPLETION { } /* -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FUNCTIONS -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ // // Check and validate pipeline parameters diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf index 28e32b20..2b0dc67a 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf @@ -3,13 +3,12 @@ // /* -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SUBWORKFLOW DEFINITION -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ workflow UTILS_NEXTFLOW_PIPELINE { - take: print_version // boolean: print version dump_parameters // boolean: dump parameters @@ -22,7 +21,7 @@ workflow UTILS_NEXTFLOW_PIPELINE { // Print workflow version and exit on --version // if (print_version) { - log.info "${workflow.manifest.name} ${getWorkflowVersion()}" + log.info("${workflow.manifest.name} ${getWorkflowVersion()}") System.exit(0) } @@ -45,9 +44,9 @@ workflow UTILS_NEXTFLOW_PIPELINE { } /* -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FUNCTIONS -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ // @@ -72,11 +71,11 @@ def getWorkflowVersion() { // Dump pipeline parameters to a JSON file // def dumpParametersToJSON(outdir) { - def timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss') - def filename = "params_${timestamp}.json" - def temp_pf = new File(workflow.launchDir.toString(), ".${filename}") - def jsonStr = groovy.json.JsonOutput.toJson(params) - temp_pf.text = groovy.json.JsonOutput.prettyPrint(jsonStr) + def timestamp = new java.util.Date().format('yyyy-MM-dd_HH-mm-ss') + def filename = "params_${timestamp}.json" + def temp_pf = new File(workflow.launchDir.toString(), ".${filename}") + def jsonStr = groovy.json.JsonOutput.toJson(params) + temp_pf.text = groovy.json.JsonOutput.prettyPrint(jsonStr) nextflow.extension.FilesEx.copyTo(temp_pf.toPath(), "${outdir}/pipeline_info/params_${timestamp}.json") temp_pf.delete() @@ -91,9 +90,14 @@ def checkCondaChannels() { try { def config = parser.load("conda config --show channels".execute().text) channels = config.channels - } catch(NullPointerException | IOException e) { - log.warn "Could not verify conda channel configuration." - return + } + catch (NullPointerException e) { + log.warn("Could not verify conda channel configuration.") + return null + } + catch (IOException e) { + log.warn("Could not verify conda channel configuration.") + return null } // Check that all channels are present @@ -106,19 +110,13 @@ def checkCondaChannels() { required_channels_in_order.eachWithIndex { channel, index -> if (index < required_channels_in_order.size() - 1) { - channel_priority_violation |= !(channels.indexOf(channel) < channels.indexOf(required_channels_in_order[index+1])) + channel_priority_violation |= !(channels.indexOf(channel) < channels.indexOf(required_channels_in_order[index + 1])) } } if (channels_missing | channel_priority_violation) { - log.warn "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + - " There is a problem with your Conda configuration!\n\n" + - " You will need to set-up the conda-forge and bioconda channels correctly.\n" + - " Please refer to https://bioconda.github.io/\n" + - " The observed channel order is \n" + - " ${channels}\n" + - " but the following channel order is required:\n" + - " ${required_channels_in_order}\n" + - "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + log.warn( + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + " There is a problem with your Conda configuration!\n\n" + " You will need to set-up the conda-forge and bioconda channels correctly.\n" + " Please refer to https://bioconda.github.io/\n" + " The observed channel order is \n" + " ${channels}\n" + " but the following channel order is required:\n" + " ${required_channels_in_order}\n" + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) } } diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf index cbd8495b..b78273ca 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf @@ -3,13 +3,12 @@ // /* -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SUBWORKFLOW DEFINITION -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ workflow UTILS_NFCORE_PIPELINE { - take: nextflow_cli_args @@ -22,9 +21,9 @@ workflow UTILS_NFCORE_PIPELINE { } /* -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FUNCTIONS -======================================================================================== +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ // @@ -33,12 +32,9 @@ workflow UTILS_NFCORE_PIPELINE { def checkConfigProvided() { def valid_config = true as Boolean if (workflow.profile == 'standard' && workflow.configFiles.size() <= 1) { - log.warn "[$workflow.manifest.name] You are attempting to run the pipeline without any custom configuration!\n\n" + - "This will be dependent on your local compute environment but can be achieved via one or more of the following:\n" + - " (1) Using an existing pipeline profile e.g. `-profile docker` or `-profile singularity`\n" + - " (2) Using an existing nf-core/configs for your Institution e.g. `-profile crick` or `-profile uppmax`\n" + - " (3) Using your own local custom config e.g. `-c /path/to/your/custom.config`\n\n" + - "Please refer to the quick start section and usage docs for the pipeline.\n " + log.warn( + "[${workflow.manifest.name}] You are attempting to run the pipeline without any custom configuration!\n\n" + "This will be dependent on your local compute environment but can be achieved via one or more of the following:\n" + " (1) Using an existing pipeline profile e.g. `-profile docker` or `-profile singularity`\n" + " (2) Using an existing nf-core/configs for your Institution e.g. `-profile crick` or `-profile uppmax`\n" + " (3) Using your own local custom config e.g. `-c /path/to/your/custom.config`\n\n" + "Please refer to the quick start section and usage docs for the pipeline.\n " + ) valid_config = false } return valid_config @@ -49,12 +45,14 @@ def checkConfigProvided() { // def checkProfileProvided(nextflow_cli_args) { if (workflow.profile.endsWith(',')) { - error "The `-profile` option cannot end with a trailing comma, please remove it and re-run the pipeline!\n" + - "HINT: A common mistake is to provide multiple values separated by spaces e.g. `-profile test, docker`.\n" + error( + "The `-profile` option cannot end with a trailing comma, please remove it and re-run the pipeline!\n" + "HINT: A common mistake is to provide multiple values separated by spaces e.g. `-profile test, docker`.\n" + ) } if (nextflow_cli_args[0]) { - log.warn "nf-core pipelines do not accept positional arguments. The positional argument `${nextflow_cli_args[0]}` has been detected.\n" + - "HINT: A common mistake is to provide multiple values separated by spaces e.g. `-profile test, docker`.\n" + log.warn( + "nf-core pipelines do not accept positional arguments. The positional argument `${nextflow_cli_args[0]}` has been detected.\n" + "HINT: A common mistake is to provide multiple values separated by spaces e.g. `-profile test, docker`.\n" + ) } } @@ -70,13 +68,7 @@ def workflowCitation() { manifest_doi.each { doi_ref -> temp_doi_ref += " https://doi.org/${doi_ref.replace('https://doi.org/', '').replace(' ', '')}\n" } - return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + - "* The pipeline\n" + - temp_doi_ref + "\n" + - "* The nf-core framework\n" + - " https://doi.org/10.1038/s41587-020-0439-x\n\n" + - "* Software dependencies\n" + - " https://github.com/${workflow.manifest.name}/blob/master/CITATIONS.md" + return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + "* The pipeline\n" + temp_doi_ref + "\n" + "* The nf-core framework\n" + " https://doi.org/10.1038/s41587-020-0439-x\n\n" + "* Software dependencies\n" + " https://github.com/${workflow.manifest.name}/blob/master/CITATIONS.md" } // @@ -102,7 +94,7 @@ def getWorkflowVersion() { // def processVersionsFromYAML(yaml_file) { def yaml = new org.yaml.snakeyaml.Yaml() - def versions = yaml.load(yaml_file).collectEntries { k, v -> [ k.tokenize(':')[-1], v ] } + def versions = yaml.load(yaml_file).collectEntries { k, v -> [k.tokenize(':')[-1], v] } return yaml.dumpAsMap(versions).trim() } @@ -112,8 +104,8 @@ def processVersionsFromYAML(yaml_file) { def workflowVersionToYAML() { return """ Workflow: - $workflow.manifest.name: ${getWorkflowVersion()} - Nextflow: $workflow.nextflow.version + ${workflow.manifest.name}: ${getWorkflowVersion()} + Nextflow: ${workflow.nextflow.version} """.stripIndent().trim() } @@ -121,11 +113,7 @@ def workflowVersionToYAML() { // Get channel of software versions used in pipeline in YAML format // def softwareVersionsToYAML(ch_versions) { - return ch_versions - .unique() - .map { version -> processVersionsFromYAML(version) } - .unique() - .mix(Channel.of(workflowVersionToYAML())) + return ch_versions.unique().map { version -> processVersionsFromYAML(version) }.unique().mix(Channel.of(workflowVersionToYAML())) } // @@ -133,25 +121,31 @@ def softwareVersionsToYAML(ch_versions) { // def paramsSummaryMultiqc(summary_params) { def summary_section = '' - summary_params.keySet().each { group -> - def group_params = summary_params.get(group) // This gets the parameters of that particular group - if (group_params) { - summary_section += "

    $group

    \n" - summary_section += "
    \n" - group_params.keySet().sort().each { param -> - summary_section += "
    $param
    ${group_params.get(param) ?: 'N/A'}
    \n" + summary_params + .keySet() + .each { group -> + def group_params = summary_params.get(group) + // This gets the parameters of that particular group + if (group_params) { + summary_section += "

    ${group}

    \n" + summary_section += "
    \n" + group_params + .keySet() + .sort() + .each { param -> + summary_section += "
    ${param}
    ${group_params.get(param) ?: 'N/A'}
    \n" + } + summary_section += "
    \n" } - summary_section += "
    \n" } - } - def yaml_file_text = "id: '${workflow.manifest.name.replace('/','-')}-summary'\n" as String - yaml_file_text += "description: ' - this information is collected when the pipeline is started.'\n" - yaml_file_text += "section_name: '${workflow.manifest.name} Workflow Summary'\n" - yaml_file_text += "section_href: 'https://github.com/${workflow.manifest.name}'\n" - yaml_file_text += "plot_type: 'html'\n" - yaml_file_text += "data: |\n" - yaml_file_text += "${summary_section}" + def yaml_file_text = "id: '${workflow.manifest.name.replace('/', '-')}-summary'\n" as String + yaml_file_text += "description: ' - this information is collected when the pipeline is started.'\n" + yaml_file_text += "section_name: '${workflow.manifest.name} Workflow Summary'\n" + yaml_file_text += "section_href: 'https://github.com/${workflow.manifest.name}'\n" + yaml_file_text += "plot_type: 'html'\n" + yaml_file_text += "data: |\n" + yaml_file_text += "${summary_section}" return yaml_file_text } @@ -199,54 +193,54 @@ def logColours(monochrome_logs=true) { colorcodes['hidden'] = monochrome_logs ? '' : "\033[8m" // Regular Colors - colorcodes['black'] = monochrome_logs ? '' : "\033[0;30m" - colorcodes['red'] = monochrome_logs ? '' : "\033[0;31m" - colorcodes['green'] = monochrome_logs ? '' : "\033[0;32m" - colorcodes['yellow'] = monochrome_logs ? '' : "\033[0;33m" - colorcodes['blue'] = monochrome_logs ? '' : "\033[0;34m" - colorcodes['purple'] = monochrome_logs ? '' : "\033[0;35m" - colorcodes['cyan'] = monochrome_logs ? '' : "\033[0;36m" - colorcodes['white'] = monochrome_logs ? '' : "\033[0;37m" + colorcodes['black'] = monochrome_logs ? '' : "\033[0;30m" + colorcodes['red'] = monochrome_logs ? '' : "\033[0;31m" + colorcodes['green'] = monochrome_logs ? '' : "\033[0;32m" + colorcodes['yellow'] = monochrome_logs ? '' : "\033[0;33m" + colorcodes['blue'] = monochrome_logs ? '' : "\033[0;34m" + colorcodes['purple'] = monochrome_logs ? '' : "\033[0;35m" + colorcodes['cyan'] = monochrome_logs ? '' : "\033[0;36m" + colorcodes['white'] = monochrome_logs ? '' : "\033[0;37m" // Bold - colorcodes['bblack'] = monochrome_logs ? '' : "\033[1;30m" - colorcodes['bred'] = monochrome_logs ? '' : "\033[1;31m" - colorcodes['bgreen'] = monochrome_logs ? '' : "\033[1;32m" - colorcodes['byellow'] = monochrome_logs ? '' : "\033[1;33m" - colorcodes['bblue'] = monochrome_logs ? '' : "\033[1;34m" - colorcodes['bpurple'] = monochrome_logs ? '' : "\033[1;35m" - colorcodes['bcyan'] = monochrome_logs ? '' : "\033[1;36m" - colorcodes['bwhite'] = monochrome_logs ? '' : "\033[1;37m" + colorcodes['bblack'] = monochrome_logs ? '' : "\033[1;30m" + colorcodes['bred'] = monochrome_logs ? '' : "\033[1;31m" + colorcodes['bgreen'] = monochrome_logs ? '' : "\033[1;32m" + colorcodes['byellow'] = monochrome_logs ? '' : "\033[1;33m" + colorcodes['bblue'] = monochrome_logs ? '' : "\033[1;34m" + colorcodes['bpurple'] = monochrome_logs ? '' : "\033[1;35m" + colorcodes['bcyan'] = monochrome_logs ? '' : "\033[1;36m" + colorcodes['bwhite'] = monochrome_logs ? '' : "\033[1;37m" // Underline - colorcodes['ublack'] = monochrome_logs ? '' : "\033[4;30m" - colorcodes['ured'] = monochrome_logs ? '' : "\033[4;31m" - colorcodes['ugreen'] = monochrome_logs ? '' : "\033[4;32m" - colorcodes['uyellow'] = monochrome_logs ? '' : "\033[4;33m" - colorcodes['ublue'] = monochrome_logs ? '' : "\033[4;34m" - colorcodes['upurple'] = monochrome_logs ? '' : "\033[4;35m" - colorcodes['ucyan'] = monochrome_logs ? '' : "\033[4;36m" - colorcodes['uwhite'] = monochrome_logs ? '' : "\033[4;37m" + colorcodes['ublack'] = monochrome_logs ? '' : "\033[4;30m" + colorcodes['ured'] = monochrome_logs ? '' : "\033[4;31m" + colorcodes['ugreen'] = monochrome_logs ? '' : "\033[4;32m" + colorcodes['uyellow'] = monochrome_logs ? '' : "\033[4;33m" + colorcodes['ublue'] = monochrome_logs ? '' : "\033[4;34m" + colorcodes['upurple'] = monochrome_logs ? '' : "\033[4;35m" + colorcodes['ucyan'] = monochrome_logs ? '' : "\033[4;36m" + colorcodes['uwhite'] = monochrome_logs ? '' : "\033[4;37m" // High Intensity - colorcodes['iblack'] = monochrome_logs ? '' : "\033[0;90m" - colorcodes['ired'] = monochrome_logs ? '' : "\033[0;91m" - colorcodes['igreen'] = monochrome_logs ? '' : "\033[0;92m" - colorcodes['iyellow'] = monochrome_logs ? '' : "\033[0;93m" - colorcodes['iblue'] = monochrome_logs ? '' : "\033[0;94m" - colorcodes['ipurple'] = monochrome_logs ? '' : "\033[0;95m" - colorcodes['icyan'] = monochrome_logs ? '' : "\033[0;96m" - colorcodes['iwhite'] = monochrome_logs ? '' : "\033[0;97m" + colorcodes['iblack'] = monochrome_logs ? '' : "\033[0;90m" + colorcodes['ired'] = monochrome_logs ? '' : "\033[0;91m" + colorcodes['igreen'] = monochrome_logs ? '' : "\033[0;92m" + colorcodes['iyellow'] = monochrome_logs ? '' : "\033[0;93m" + colorcodes['iblue'] = monochrome_logs ? '' : "\033[0;94m" + colorcodes['ipurple'] = monochrome_logs ? '' : "\033[0;95m" + colorcodes['icyan'] = monochrome_logs ? '' : "\033[0;96m" + colorcodes['iwhite'] = monochrome_logs ? '' : "\033[0;97m" // Bold High Intensity - colorcodes['biblack'] = monochrome_logs ? '' : "\033[1;90m" - colorcodes['bired'] = monochrome_logs ? '' : "\033[1;91m" - colorcodes['bigreen'] = monochrome_logs ? '' : "\033[1;92m" - colorcodes['biyellow'] = monochrome_logs ? '' : "\033[1;93m" - colorcodes['biblue'] = monochrome_logs ? '' : "\033[1;94m" - colorcodes['bipurple'] = monochrome_logs ? '' : "\033[1;95m" - colorcodes['bicyan'] = monochrome_logs ? '' : "\033[1;96m" - colorcodes['biwhite'] = monochrome_logs ? '' : "\033[1;97m" + colorcodes['biblack'] = monochrome_logs ? '' : "\033[1;90m" + colorcodes['bired'] = monochrome_logs ? '' : "\033[1;91m" + colorcodes['bigreen'] = monochrome_logs ? '' : "\033[1;92m" + colorcodes['biyellow'] = monochrome_logs ? '' : "\033[1;93m" + colorcodes['biblue'] = monochrome_logs ? '' : "\033[1;94m" + colorcodes['bipurple'] = monochrome_logs ? '' : "\033[1;95m" + colorcodes['bicyan'] = monochrome_logs ? '' : "\033[1;96m" + colorcodes['biwhite'] = monochrome_logs ? '' : "\033[1;97m" return colorcodes } @@ -261,14 +255,15 @@ def attachMultiqcReport(multiqc_report) { mqc_report = multiqc_report.getVal() if (mqc_report.getClass() == ArrayList && mqc_report.size() >= 1) { if (mqc_report.size() > 1) { - log.warn "[$workflow.manifest.name] Found multiple reports from process 'MULTIQC', will use only one" + log.warn("[${workflow.manifest.name}] Found multiple reports from process 'MULTIQC', will use only one") } mqc_report = mqc_report[0] } } - } catch (all) { + } + catch (Exception all) { if (multiqc_report) { - log.warn "[$workflow.manifest.name] Could not attach MultiQC report to summary email" + log.warn("[${workflow.manifest.name}] Could not attach MultiQC report to summary email") } } return mqc_report @@ -280,26 +275,35 @@ def attachMultiqcReport(multiqc_report) { def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdir, monochrome_logs=true, multiqc_report=null) { // Set up the e-mail variables - def subject = "[$workflow.manifest.name] Successful: $workflow.runName" + def subject = "[${workflow.manifest.name}] Successful: ${workflow.runName}" if (!workflow.success) { - subject = "[$workflow.manifest.name] FAILED: $workflow.runName" + subject = "[${workflow.manifest.name}] FAILED: ${workflow.runName}" } def summary = [:] - summary_params.keySet().sort().each { group -> - summary << summary_params[group] - } + summary_params + .keySet() + .sort() + .each { group -> + summary << summary_params[group] + } def misc_fields = [:] misc_fields['Date Started'] = workflow.start misc_fields['Date Completed'] = workflow.complete misc_fields['Pipeline script file path'] = workflow.scriptFile misc_fields['Pipeline script hash ID'] = workflow.scriptId - if (workflow.repository) misc_fields['Pipeline repository Git URL'] = workflow.repository - if (workflow.commitId) misc_fields['Pipeline repository Git Commit'] = workflow.commitId - if (workflow.revision) misc_fields['Pipeline Git branch/tag'] = workflow.revision - misc_fields['Nextflow Version'] = workflow.nextflow.version - misc_fields['Nextflow Build'] = workflow.nextflow.build + if (workflow.repository) { + misc_fields['Pipeline repository Git URL'] = workflow.repository + } + if (workflow.commitId) { + misc_fields['Pipeline repository Git Commit'] = workflow.commitId + } + if (workflow.revision) { + misc_fields['Pipeline Git branch/tag'] = workflow.revision + } + misc_fields['Nextflow Version'] = workflow.nextflow.version + misc_fields['Nextflow Build'] = workflow.nextflow.build misc_fields['Nextflow Compile Timestamp'] = workflow.nextflow.timestamp def email_fields = [:] @@ -337,7 +341,7 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi // Render the sendmail template 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: "${workflow.projectDir}", mqcFile: mqc_report, mqcMaxSize: max_multiqc_email_size.toBytes() ] + def smail_fields = [email: email_address, subject: subject, email_txt: email_txt, email_html: email_html, projectDir: "${workflow.projectDir}", mqcFile: mqc_report, mqcMaxSize: max_multiqc_email_size.toBytes()] def sf = new File("${workflow.projectDir}/assets/sendmail_template.txt") def sendmail_template = engine.createTemplate(sf).make(smail_fields) def sendmail_html = sendmail_template.toString() @@ -346,30 +350,32 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi def colors = logColours(monochrome_logs) as Map if (email_address) { try { - if (plaintext_email) { throw new org.codehaus.groovy.GroovyException('Send plaintext e-mail, not HTML') } + if (plaintext_email) { +new org.codehaus.groovy.GroovyException('Send plaintext e-mail, not HTML') } // Try to send HTML e-mail using sendmail def sendmail_tf = new File(workflow.launchDir.toString(), ".sendmail_tmp.html") sendmail_tf.withWriter { w -> w << sendmail_html } - [ 'sendmail', '-t' ].execute() << sendmail_html - log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Sent summary e-mail to $email_address (sendmail)-" - } catch (all) { + ['sendmail', '-t'].execute() << sendmail_html + log.info("-${colors.purple}[${workflow.manifest.name}]${colors.green} Sent summary e-mail to ${email_address} (sendmail)-") + } + catch (Exception all) { // Catch failures and try with plaintext - def mail_cmd = [ 'mail', '-s', subject, '--content-type=text/html', email_address ] + def mail_cmd = ['mail', '-s', subject, '--content-type=text/html', email_address] mail_cmd.execute() << email_html - log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Sent summary e-mail to $email_address (mail)-" + log.info("-${colors.purple}[${workflow.manifest.name}]${colors.green} Sent summary e-mail to ${email_address} (mail)-") } } // Write summary e-mail HTML to a file def output_hf = new File(workflow.launchDir.toString(), ".pipeline_report.html") output_hf.withWriter { w -> w << email_html } - nextflow.extension.FilesEx.copyTo(output_hf.toPath(), "${outdir}/pipeline_info/pipeline_report.html"); + nextflow.extension.FilesEx.copyTo(output_hf.toPath(), "${outdir}/pipeline_info/pipeline_report.html") output_hf.delete() // Write summary e-mail TXT to a file def output_tf = new File(workflow.launchDir.toString(), ".pipeline_report.txt") output_tf.withWriter { w -> w << email_txt } - nextflow.extension.FilesEx.copyTo(output_tf.toPath(), "${outdir}/pipeline_info/pipeline_report.txt"); + nextflow.extension.FilesEx.copyTo(output_tf.toPath(), "${outdir}/pipeline_info/pipeline_report.txt") output_tf.delete() } @@ -380,12 +386,14 @@ def completionSummary(monochrome_logs=true) { def colors = logColours(monochrome_logs) as Map if (workflow.success) { if (workflow.stats.ignoredCount == 0) { - log.info "-${colors.purple}[$workflow.manifest.name]${colors.green} Pipeline completed successfully${colors.reset}-" - } else { - log.info "-${colors.purple}[$workflow.manifest.name]${colors.yellow} Pipeline completed successfully, but with errored process(es) ${colors.reset}-" + log.info("-${colors.purple}[${workflow.manifest.name}]${colors.green} Pipeline completed successfully${colors.reset}-") + } + else { + log.info("-${colors.purple}[${workflow.manifest.name}]${colors.yellow} Pipeline completed successfully, but with errored process(es) ${colors.reset}-") } - } else { - log.info "-${colors.purple}[$workflow.manifest.name]${colors.red} Pipeline completed with errors${colors.reset}-" + } + else { + log.info("-${colors.purple}[${workflow.manifest.name}]${colors.red} Pipeline completed with errors${colors.reset}-") } } @@ -394,21 +402,30 @@ def completionSummary(monochrome_logs=true) { // def imNotification(summary_params, hook_url) { def summary = [:] - summary_params.keySet().sort().each { group -> - summary << summary_params[group] - } + summary_params + .keySet() + .sort() + .each { group -> + summary << summary_params[group] + } def misc_fields = [:] - misc_fields['start'] = workflow.start - misc_fields['complete'] = workflow.complete - misc_fields['scriptfile'] = workflow.scriptFile - misc_fields['scriptid'] = workflow.scriptId - if (workflow.repository) misc_fields['repository'] = workflow.repository - if (workflow.commitId) misc_fields['commitid'] = workflow.commitId - if (workflow.revision) misc_fields['revision'] = workflow.revision - misc_fields['nxf_version'] = workflow.nextflow.version - misc_fields['nxf_build'] = workflow.nextflow.build - misc_fields['nxf_timestamp'] = workflow.nextflow.timestamp + misc_fields['start'] = workflow.start + misc_fields['complete'] = workflow.complete + misc_fields['scriptfile'] = workflow.scriptFile + misc_fields['scriptid'] = workflow.scriptId + if (workflow.repository) { + misc_fields['repository'] = workflow.repository + } + if (workflow.commitId) { + misc_fields['commitid'] = workflow.commitId + } + if (workflow.revision) { + misc_fields['revision'] = workflow.revision + } + misc_fields['nxf_version'] = workflow.nextflow.version + misc_fields['nxf_build'] = workflow.nextflow.build + misc_fields['nxf_timestamp'] = workflow.nextflow.timestamp def msg_fields = [:] msg_fields['version'] = getWorkflowVersion() @@ -433,13 +450,13 @@ def imNotification(summary_params, hook_url) { def json_message = json_template.toString() // POST - def post = new URL(hook_url).openConnection(); + def post = new URL(hook_url).openConnection() post.setRequestMethod("POST") post.setDoOutput(true) post.setRequestProperty("Content-Type", "application/json") - post.getOutputStream().write(json_message.getBytes("UTF-8")); - def postRC = post.getResponseCode(); - if (! postRC.equals(200)) { - log.warn(post.getErrorStream().getText()); + post.getOutputStream().write(json_message.getBytes("UTF-8")) + def postRC = post.getResponseCode() + if (!postRC.equals(200)) { + log.warn(post.getErrorStream().getText()) } } From a9ae47aba79bafbd7b103d8262232b257b45e845 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Fri, 11 Oct 2024 12:35:13 +0000 Subject: [PATCH 103/255] Template update for nf-core/tools version 3.0.2 --- .github/workflows/ci.yml | 54 ++++++++++++++++--- .../workflows/template_version_comment.yml | 21 ++++---- .gitignore | 1 + .nf-core.yml | 2 +- main.nf | 2 +- modules.json | 8 +-- modules/nf-core/multiqc/main.nf | 2 +- modules/nf-core/untar/environment.yml | 2 - modules/nf-core/untar/meta.yml | 43 ++++++++------- nextflow.config | 4 +- .../utils_nfcore_nascent_pipeline/main.nf | 4 +- .../nf-core/utils_nextflow_pipeline/main.nf | 30 ++++++----- .../nf-core/utils_nfcore_pipeline/main.nf | 10 ++-- workflows/nascent.nf | 2 - 14 files changed, 114 insertions(+), 71 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa110bc0..be150680 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,8 @@ on: env: NXF_ANSI_LOG: false + NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity + NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity NFT_VER: "0.9.0" NFT_WORKDIR: "~" NFT_DIFF: "pdiff" @@ -22,6 +24,9 @@ concurrency: jobs: test: + name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})" + # Only run on push if this is the nf-core dev branch (merged PRs) + if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/nascent') }}" runs-on: ubuntu-latest strategy: fail-fast: false @@ -29,20 +34,27 @@ jobs: NXF_VER: - "24.04.2" - "latest-everything" + profile: + - "conda" + - "docker" + - "singularity" + test_name: + - "test" + isMaster: + - ${{ github.base_ref == 'master' }} + # Exclude conda and singularity on dev + exclude: + - isMaster: false + profile: "conda" + - isMaster: false + profile: "singularity" shard: [1, 2, 3, 4] - profile: ["docker"] steps: - name: Check out pipeline code uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 with: fetch-depth: 0 - # - name: Set up JDK 11 - # uses: actions/setup-java@v2 - # with: - # java-version: "11" - # distribution: "adopt" - - uses: actions/setup-python@v4 with: python-version: "3.11" @@ -61,6 +73,34 @@ jobs: with: version: ${{ env.NFT_VER }} + - name: Set up Apptainer + if: matrix.profile == 'singularity' + uses: eWaterCycle/setup-apptainer@main + + - name: Set up Singularity + if: matrix.profile == 'singularity' + run: | + mkdir -p $NXF_SINGULARITY_CACHEDIR + mkdir -p $NXF_SINGULARITY_LIBRARYDIR + + - name: Set up Miniconda + if: matrix.profile == 'conda' + uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3 + with: + miniconda-version: "latest" + auto-update-conda: true + conda-solver: libmamba + channels: conda-forge,bioconda + + - name: Set up Conda + if: matrix.profile == 'conda' + run: | + echo $(realpath $CONDA)/condabin >> $GITHUB_PATH + echo $(realpath python) >> $GITHUB_PATH + + - name: Clean up Disk space + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) run: | nf-test test \ diff --git a/.github/workflows/template_version_comment.yml b/.github/workflows/template_version_comment.yml index 9dea41f0..e8aafe44 100644 --- a/.github/workflows/template_version_comment.yml +++ b/.github/workflows/template_version_comment.yml @@ -10,9 +10,11 @@ jobs: steps: - name: Check out pipeline code uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Read template version from .nf-core.yml - uses: pietrobolcato/action-read-yaml@1.0.0 + uses: nichmor/minimal-read-yaml@v0.0.2 id: read_yml with: config: ${{ github.workspace }}/.nf-core.yml @@ -24,20 +26,21 @@ jobs: - name: Check nf-core outdated id: nf_core_outdated - run: pip list --outdated | grep nf-core + run: echo "OUTPUT=$(pip list --outdated | grep nf-core)" >> ${GITHUB_ENV} - name: Post nf-core template version comment uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2 if: | - ${{ steps.nf_core_outdated.outputs.stdout }} =~ 'nf-core' + contains(env.OUTPUT, 'nf-core') with: repo-token: ${{ secrets.NF_CORE_BOT_AUTH_TOKEN }} allow-repeats: false message: | - ## :warning: Newer version of the nf-core template is available. - - Your pipeline is using an old version of the nf-core template: ${{ steps.read_yml.outputs['nf_core_version'] }}. - Please update your pipeline to the latest version. - - For more documentation on how to update your pipeline, please see the [nf-core documentation](https://github.com/nf-core/tools?tab=readme-ov-file#sync-a-pipeline-with-the-template) and [Synchronisation documentation](https://nf-co.re/docs/contributing/sync). + > [!WARNING] + > Newer version of the nf-core template is available. + > + > Your pipeline is using an old version of the nf-core template: ${{ steps.read_yml.outputs['nf_core_version'] }}. + > Please update your pipeline to the latest version. + > + > For more documentation on how to update your pipeline, please see the [nf-core documentation](https://github.com/nf-core/tools?tab=readme-ov-file#sync-a-pipeline-with-the-template) and [Synchronisation documentation](https://nf-co.re/docs/contributing/sync). # diff --git a/.gitignore b/.gitignore index 089a4079..776b82fe 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ results/ testing/ testing* *.pyc +null/ .nf-test diff --git a/.nf-core.yml b/.nf-core.yml index 5e9dfab6..e8445cf8 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -5,7 +5,7 @@ lint: - .github/workflows/linting.yml - LICENSE - assets/email_template.html -nf_core_version: 3.0.1 +nf_core_version: 3.0.2 org_path: null repository_type: pipeline template: diff --git a/main.nf b/main.nf index dccfc8ae..53cc81c9 100644 --- a/main.nf +++ b/main.nf @@ -92,7 +92,7 @@ workflow { params.outdir, params.input ) - + // // WORKFLOW: Run main workflow // diff --git a/modules.json b/modules.json index 0762dead..a8ac8fa6 100644 --- a/modules.json +++ b/modules.json @@ -143,7 +143,7 @@ }, "multiqc": { "branch": "master", - "git_sha": "b80f5fd12ff7c43938f424dd76392a2704fa2396", + "git_sha": "cf17ca47590cc578dfb47db1c2a44ef86f89976d", "installed_by": ["modules"] }, "pints/caller": { @@ -249,7 +249,7 @@ }, "untar": { "branch": "master", - "git_sha": "b8d36829fa84b6e404364abff787e8b07f6d058c", + "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", "installed_by": ["modules"] } } @@ -308,12 +308,12 @@ }, "utils_nextflow_pipeline": { "branch": "master", - "git_sha": "9d05360da397692321d377b6102d2fb22507c6ef", + "git_sha": "3aa0aec1d52d492fe241919f0c6100ebf0074082", "installed_by": ["subworkflows"] }, "utils_nfcore_pipeline": { "branch": "master", - "git_sha": "772684d9d66f37b650c8ba5146ac1ee3ecba2acb", + "git_sha": "1b6b9a3338d011367137808b49b923515080e3ba", "installed_by": ["subworkflows"] }, "utils_nfschema_plugin": { diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf index 9724d2f3..cc0643e1 100644 --- a/modules/nf-core/multiqc/main.nf +++ b/modules/nf-core/multiqc/main.nf @@ -52,7 +52,7 @@ process MULTIQC { stub: """ mkdir multiqc_data - touch multiqc_plots + mkdir multiqc_plots touch multiqc_report.html cat <<-END_VERSIONS > versions.yml diff --git a/modules/nf-core/untar/environment.yml b/modules/nf-core/untar/environment.yml index 4f498244..c7794856 100644 --- a/modules/nf-core/untar/environment.yml +++ b/modules/nf-core/untar/environment.yml @@ -1,8 +1,6 @@ -name: untar channels: - conda-forge - bioconda - - defaults dependencies: - conda-forge::grep=3.11 - conda-forge::sed=4.8 diff --git a/modules/nf-core/untar/meta.yml b/modules/nf-core/untar/meta.yml index a9a2110f..290346b3 100644 --- a/modules/nf-core/untar/meta.yml +++ b/modules/nf-core/untar/meta.yml @@ -10,30 +10,33 @@ tools: Extract tar.gz files. documentation: https://www.gnu.org/software/tar/manual/ licence: ["GPL-3.0-or-later"] + identifier: "" input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - archive: - type: file - description: File to be untar - pattern: "*.{tar}.{gz}" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - archive: + type: file + description: File to be untar + pattern: "*.{tar}.{gz}" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - untar: - type: directory - description: Directory containing contents of archive - pattern: "*/" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - $prefix: + type: directory + description: Directory containing contents of archive + pattern: "*/" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@joseespinosa" - "@drpatelh" diff --git a/nextflow.config b/nextflow.config index 97650be7..76290558 100644 --- a/nextflow.config +++ b/nextflow.config @@ -276,10 +276,10 @@ validation { """ afterText = """${manifest.doi ? "* The pipeline\n" : ""}${manifest.doi.tokenize(",").collect { " https://doi.org/${it.trim().replace('https://doi.org/','')}"}.join("\n")}${manifest.doi ? "\n" : ""} * The nf-core framework - https://doi.org/10.1038/s41587-020-0439-x + https://doi.org/10.1038/s41587-020-0439-x * Software dependencies - https://github.com/${manifest.name}/blob/master/CITATIONS.md + https://github.com/${manifest.name}/blob/master/CITATIONS.md """ } summary { diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index 60b1d1fa..f8e1f61b 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -47,7 +47,6 @@ workflow PIPELINE_INITIALISATION { workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1 ) - // // Validate parameters and generate parameter summary to stdout // @@ -56,7 +55,6 @@ workflow PIPELINE_INITIALISATION { validate_params, null ) - // // Check config provided to the pipeline @@ -64,6 +62,7 @@ workflow PIPELINE_INITIALISATION { UTILS_NFCORE_PIPELINE ( nextflow_cli_args ) + // // Custom validation for pipeline parameters // @@ -110,7 +109,6 @@ workflow PIPELINE_COMPLETION { email // string: email address email_on_fail // string: email address sent on pipeline failure plaintext_email // boolean: Send plain-text email instead of HTML - outdir // path: Path to output directory where results will be published monochrome_logs // boolean: Disable ANSI colour codes in log output hook_url // string: hook URL for notifications diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf index 2b0dc67a..0fcbf7b3 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf @@ -3,9 +3,9 @@ // /* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SUBWORKFLOW DEFINITION -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ workflow UTILS_NEXTFLOW_PIPELINE { @@ -44,9 +44,9 @@ workflow UTILS_NEXTFLOW_PIPELINE { } /* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FUNCTIONS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ // @@ -106,17 +106,19 @@ def checkCondaChannels() { def channels_missing = ((required_channels_in_order as Set) - (channels as Set)) as Boolean // Check that they are in the right order - def channel_priority_violation = false - - required_channels_in_order.eachWithIndex { channel, index -> - if (index < required_channels_in_order.size() - 1) { - channel_priority_violation |= !(channels.indexOf(channel) < channels.indexOf(required_channels_in_order[index + 1])) - } - } + def channel_priority_violation = required_channels_in_order != channels.findAll { ch -> ch in required_channels_in_order } if (channels_missing | channel_priority_violation) { - log.warn( - "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + " There is a problem with your Conda configuration!\n\n" + " You will need to set-up the conda-forge and bioconda channels correctly.\n" + " Please refer to https://bioconda.github.io/\n" + " The observed channel order is \n" + " ${channels}\n" + " but the following channel order is required:\n" + " ${required_channels_in_order}\n" + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - ) + log.warn """\ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + There is a problem with your Conda configuration! + You will need to set-up the conda-forge and bioconda channels correctly. + Please refer to https://bioconda.github.io/ + The observed channel order is + ${channels} + but the following channel order is required: + ${required_channels_in_order} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + """.stripIndent(true) } } diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf index b78273ca..5cb7bafe 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf @@ -3,9 +3,9 @@ // /* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SUBWORKFLOW DEFINITION -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ workflow UTILS_NFCORE_PIPELINE { @@ -21,9 +21,9 @@ workflow UTILS_NFCORE_PIPELINE { } /* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FUNCTIONS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ // @@ -62,7 +62,7 @@ def checkProfileProvided(nextflow_cli_args) { def workflowCitation() { def temp_doi_ref = "" def manifest_doi = workflow.manifest.doi.tokenize(",") - // Using a loop to handle multiple DOIs + // Handling multiple DOIs // Removing `https://doi.org/` to handle pipelines using DOIs vs DOI resolvers // Removing ` ` since the manifest.doi is a string and not a proper list manifest_doi.each { doi_ref -> diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 68848ad0..d4675c1d 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -335,13 +335,11 @@ workflow NASCENT { Channel.fromPath(params.multiqc_logo, checkIfExists: true) : Channel.empty() - summary_params = paramsSummaryMap( workflow, parameters_schema: "nextflow_schema.json") ch_workflow_summary = Channel.value(paramsSummaryMultiqc(summary_params)) ch_multiqc_files = ch_multiqc_files.mix( ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) - ch_multiqc_custom_methods_description = params.multiqc_methods_description ? file(params.multiqc_methods_description, checkIfExists: true) : file("$projectDir/assets/methods_description_template.yml", checkIfExists: true) From 2cfe373f6556981ee6da1f6e02fdd8c3bc023894 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 13 Oct 2024 18:31:03 -0500 Subject: [PATCH 104/255] chore: Use assertAll in all tests --- .../grohmm/parametertuning/tests/main.nf.test | 5 ++++- .../transcriptcalling/tests/main.nf.test | 6 +++-- subworkflows/local/grohmm/tests/main.nf.test | 18 ++++++++++----- workflows/tests/aligner/bwa.nf.test | 22 ++++++++++++------- 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index 36925575..c80c61b4 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -28,7 +28,10 @@ nextflow_process { then { // FIXME Broken test - assert process.failed + assertAll( + { assert process.failed }, + { assert snapshot(process.out).match() } + ) } } diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test b/modules/local/grohmm/transcriptcalling/tests/main.nf.test index 21fdb8af..6b088542 100644 --- a/modules/local/grohmm/transcriptcalling/tests/main.nf.test +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test @@ -27,8 +27,10 @@ nextflow_process { } then { - // FIXME Broken test - assert process.failed + assertAll( + { assert process.failed }, + { assert snapshot(process.out).match() } + ) } } diff --git a/subworkflows/local/grohmm/tests/main.nf.test b/subworkflows/local/grohmm/tests/main.nf.test index c54ce88a..59b159d0 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test +++ b/subworkflows/local/grohmm/tests/main.nf.test @@ -27,8 +27,10 @@ nextflow_workflow { } then { - assert workflow.success - assert snapshot(workflow.out).match() + assertAll( + { assert workflow.success }, + { assert snapshot(workflow.out).match() } + ) } } @@ -55,8 +57,10 @@ nextflow_workflow { } then { - assert workflow.success - assert snapshot(workflow.out).match() + assertAll( + { assert workflow.success }, + { assert snapshot(workflow.out).match() } + ) } } @@ -84,8 +88,10 @@ nextflow_workflow { } then { - assert workflow.success - assert snapshot(workflow.out).match() + assertAll( + { assert workflow.success }, + { assert snapshot(workflow.out).match() } + ) } } diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index b8833f01..9add36bd 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -71,10 +71,13 @@ nextflow_pipeline { } then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - ).match() + assertAll( + { assert workflow.success }, + { assert snapshot( + workflow.trace.tasks().size(), + ).match() + } + ) } } @@ -91,10 +94,13 @@ nextflow_pipeline { } then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - ).match() + assertAll( + { assert workflow.success }, + { assert snapshot( + workflow.trace.tasks().size(), + ).match() + } + ) } } From 9e945e1b6db694279bced7e847354e279be4bf61 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 13 Oct 2024 20:30:15 -0500 Subject: [PATCH 105/255] fix(multiqc): Update groHMM plot fn --- assets/multiqc_config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 44c6bde6..71bf88ba 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -30,9 +30,11 @@ module_order: custom_data: grohmm_plot: section_name: "groHMM TD Plot" + description: "Transcription direction (TD) plot generated by groHMM" + plot_type: "image" sp: - my_custom_content_image: - fn: "./grohmm/*.tdplot.jpg" + grohmm_plot: + fn: "*.tdplot_mqc.jpg" ignore_images: false export_plots: true From a86ea1807512bd1e2238550d5e9092ce1f79f928 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 14 Oct 2024 09:13:58 -0500 Subject: [PATCH 106/255] fix: Remove custom FastQC section https://github.com/nf-core/rnaseq/issues/1303 --- assets/multiqc_config.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 71bf88ba..525f129a 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -20,13 +20,6 @@ run_modules: - featureCounts - homer -module_order: - - fastqc: - name: "FastQC (raw)" - info: "This section of the report shows FastQC results before adapter trimming." - path_filters: - - "./fastqc/*.zip" - custom_data: grohmm_plot: section_name: "groHMM TD Plot" From 252d59dd7e57e77a0aa8410b042112c080a2023d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 14 Oct 2024 12:31:25 -0500 Subject: [PATCH 107/255] chore(multiqc): Copy RNA-seq report order --- assets/multiqc_config.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 525f129a..c2263ca3 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -3,6 +3,29 @@ report_comment: > analysis pipeline. For information about how to interpret these results, please see the documentation. report_section_order: + fastqc: + order: 4004 + fastp: + order: 4003 + star: + order: 3000 + hisat2: + order: 3000 + samtools: + order: 3000 + featurecounts_biotype: + order: 3000 + picard: + order: 3000 + preseq: + order: 3000 + qualimap: + order: 3000 + rseqc: + order: 3000 + umitools: + order: 3000 + # Summaries "nf-core-nascent-methods-description": order: -1000 software_versions: From 64a51c283fdc3c25f4ff854eab59a280a60d2359 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 14 Oct 2024 13:08:57 -0500 Subject: [PATCH 108/255] chore: Add test profile as default to nf-test --- nf-test.config | 1 + 1 file changed, 1 insertion(+) diff --git a/nf-test.config b/nf-test.config index 261ec1c2..d8258c96 100644 --- a/nf-test.config +++ b/nf-test.config @@ -3,6 +3,7 @@ config { testsDir "." workDir System.getenv("NFT_WORKDIR") ?: ".nf-test" configFile "tests/nextflow.config" + profile "test" plugins { load "nft-bam@0.3.0" } From a989636e7d72d96fbe83e959c72862ff42880e48 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 20 Oct 2024 14:53:17 -0500 Subject: [PATCH 109/255] chore: Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07e1c640..684accc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,10 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#142](https://github.com/nf-core/nascent/pull/142) - Add STAR aligner - [#149](https://github.com/nf-core/nascent/pull/149) - Add Software citations to MultiQC +### Fixed + +- [#171](https://github.com/nf-core/nascent/pull/171) - Clean up MultiQC report + ### Changed - [#137](https://github.com/nf-core/nascent/pull/137) - Use singularity containers for PINTS - [#142](https://github.com/nf-core/nascent/pull/142) - Updated CHM13 references +- [#171](https://github.com/nf-core/nascent/pull/171) - Use assertAll in tests ## v2.2.0 - 2024-03-05 From 7ef0ecd7bb13e9ff8d6a105913a4280f716be040 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 13 Oct 2024 18:24:05 -0500 Subject: [PATCH 110/255] fix: Remove Access to undefined parameter `forwardStranded` warnings Related to #115 --- modules/local/dreg_prep/main.nf | 7 ++++++- subworkflows/local/coverage_graphs.nf | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index 3b3e1c68..7c640cf4 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -11,6 +11,7 @@ process DREG_PREP { input: tuple val(meta), path(bam_file), val(index) path sizes + val assay_type output: tuple val(meta), path("${prefix}.pos.bw"), path("${prefix}.neg.bw"), emit: dreg_bigwig @@ -21,6 +22,10 @@ process DREG_PREP { script: prefix = task.ext.prefix ?: "${meta.id}" + // NOTE https://github.com/hyulab/PINTS/blob/700f2c44b967413a19fc6b66bd876b53b6f31002/pints/io_engine.py#L436-L446 + def forwardStranded_assays = ["PROseq", "mNETseq"] + def forwardStranded = forwardStranded_assays.contains(assay_type) + if (meta.single_end) { """ echo "Creating BigWigs suitable as inputs to dREG" @@ -74,7 +79,7 @@ process DREG_PREP { echo "bedGraph to bigwig done" """ } else { - if (params.forwardStranded) { + if (forwardStranded) { """ samtools view -@ $task.cpus -bf 0x2 ${bam_file} | samtools sort -n -@ $task.cpus \\ > ${prefix}.dreg.bam diff --git a/subworkflows/local/coverage_graphs.nf b/subworkflows/local/coverage_graphs.nf index 5add10a7..a1628c16 100644 --- a/subworkflows/local/coverage_graphs.nf +++ b/subworkflows/local/coverage_graphs.nf @@ -61,7 +61,8 @@ workflow COVERAGE_GRAPHS { DREG_PREP ( bam_bai, - sizes + sizes, + params.assay_type, ) emit: From f458d8b6c7d880a5d1e2da149aa892c3ad1df232 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 15 Oct 2024 08:30:17 -0500 Subject: [PATCH 111/255] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07e1c640..322d56e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#137](https://github.com/nf-core/nascent/pull/137) - Use singularity containers for PINTS - [#142](https://github.com/nf-core/nascent/pull/142) - Updated CHM13 references +### Fixed + +- [#170](https://github.com/nf-core/nascent/pull/170) - Remove "Access to undefined parameter forwardStranded" warnings + ## v2.2.0 - 2024-03-05 ### Added From 1df35bdfd7b0f9a39384e3ed7632e6703b01e229 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 12 Sep 2024 10:45:51 -0500 Subject: [PATCH 112/255] style: Run styler --- bin/parameter_tuning.R | 154 +++++++++++++------------- bin/transcriptcalling_grohmm.R | 192 ++++++++++++++++----------------- 2 files changed, 173 insertions(+), 173 deletions(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 97bb9000..251cab70 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -8,76 +8,76 @@ suppressPackageStartupMessages(library(groHMM)) parser <- ArgumentParser(description = "Run groHMM on some bam files") parser$add_argument( - "-i", - "--bam_files", - type = "character", - nargs = "+", - metavar = "path", - help = "GRO SEQ data in bam files.", - required = TRUE + "-i", + "--bam_files", + type = "character", + nargs = "+", + metavar = "path", + help = "GRO SEQ data in bam files.", + required = TRUE ) parser$add_argument( - "-t", - "--tuning_file", - type = "character", - default = NULL, - metavar = "path", - help = "File with tuning parameters and error rates." + "-t", + "--tuning_file", + type = "character", + default = NULL, + metavar = "path", + help = "File with tuning parameters and error rates." ) parser$add_argument( - "-o", - "--outdir", - type = "character", - default = "./", - metavar = "path", - help = "Output directory." + "-o", + "--outdir", + type = "character", + default = "./", + metavar = "path", + help = "Output directory." ) parser$add_argument( - "-l", - "--ltprobb", - type = "integer", - default = -200, - metavar = "integer", - help = cat( - "Log-transformed transition probability of switching from transcribed + "-l", + "--ltprobb", + type = "integer", + default = -200, + metavar = "integer", + help = cat( + "Log-transformed transition probability of switching from transcribed state to non-transcribed state" - ) + ) ) parser$add_argument( - "-u", - "--uts", - type = "integer", - default = 5, - metavar = "integer", - help = cat( - "Variance of the emission probability for reads in the + "-u", + "--uts", + type = "integer", + default = 5, + metavar = "integer", + help = cat( + "Variance of the emission probability for reads in the non-transcribed state, respectively." - ) + ) ) parser$add_argument( - "-p", - "--outprefix", - type = "character", - default = "grohmm", - metavar = "string", - help = "Output prefix." + "-p", + "--outprefix", + type = "character", + default = "grohmm", + metavar = "string", + help = "Output prefix." ) parser$add_argument( - "-g", - "--gtf", - type = "character", - default = NULL, - metavar = "string", - help = "GTF File to create TxDb", - required = TRUE + "-g", + "--gtf", + type = "character", + default = NULL, + metavar = "string", + help = "GTF File to create TxDb", + required = TRUE ) parser$add_argument( - "-c", - "--cores", - type = "integer", - default = 1, - metavar = "integer", - help = "Number of cores." + "-c", + "--cores", + type = "integer", + default = 1, + metavar = "integer", + help = "Number of cores." ) args <- parser$parse_args() @@ -85,29 +85,29 @@ args <- parser$parse_args() setwd(args$outdir) if (is.null(args$bam_files)) { - print_help(args) - stop("Please provide a bam file", call. = FALSE) + print_help(args) + stop("Please provide a bam file", call. = FALSE) } if (is.null(args$tuning_file)) { - print_help(args) - stop("Please provide a tuning file", call. = FALSE) + print_help(args) + stop("Please provide a tuning file", call. = FALSE) } # Read in bam file. if (file.exists(args$outdir) == FALSE) { - dir.create(args$outdir, recursive = TRUE) + dir.create(args$outdir, recursive = TRUE) } setwd(args$outdir) # CHANGE BASED ON PAIRED OR SINGLE END alignments <- c() for (bam in args$bam_files) { - alignments <- append( - alignments, - as(readGAlignments(bam), "GRanges") - ) - alignments <- keepStandardChromosomes(alignments, pruning.mode = "coarse") + alignments <- append( + alignments, + as(readGAlignments(bam), "GRanges") + ) + alignments <- keepStandardChromosomes(alignments, pruning.mode = "coarse") } print("Input transcript annotations") @@ -115,9 +115,9 @@ kg_db <- makeTxDbFromGFF(args$gtf) kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( - kg_tx, - keytype = "gene_id", - mc.cores = args$cores + kg_tx, + keytype = "gene_id", + mc.cores = args$cores ) print("Finished consensus annotations") @@ -125,12 +125,12 @@ print("Finished consensus annotations") tune <- read.csv(args$tuning_file) evals <- mclapply(seq_len(nrow(tune)), function(x) { - hmm <- detectTranscripts( - reads = alignments, - LtProbB = tune$LtProbB[x], UTS = tune$UTS[x] - ) - e <- evaluateHMMInAnnotations(hmm$transcripts, kg_consensus) - e$eval + hmm <- detectTranscripts( + reads = alignments, + LtProbB = tune$LtProbB[x], UTS = tune$UTS[x] + ) + e <- evaluateHMMInAnnotations(hmm$transcripts, kg_consensus) + e$eval }, mc.cores = args$cores, mc.silent = TRUE) tune <- cbind(tune, do.call(rbind, evals)) @@ -149,10 +149,10 @@ citation("AnnotationDbi") r_log_file <- "R_sessionInfo.log" if (file.exists(r_log_file) == FALSE) { - sink(r_log_file) - a <- sessionInfo() - print(a) - sink() + sink(r_log_file) + a <- sessionInfo() + print(a) + sink() } ################################################################################ diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index bdd4c7e7..3c99c8bd 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -8,76 +8,76 @@ suppressPackageStartupMessages(library(groHMM)) parser <- ArgumentParser(description = "Run groHMM on some bam files") parser$add_argument( - "-i", - "--bam_files", - type = "character", - nargs = "+", - metavar = "path", - help = "GRO SEQ data in bam files.", - required = TRUE + "-i", + "--bam_files", + type = "character", + nargs = "+", + metavar = "path", + help = "GRO SEQ data in bam files.", + required = TRUE ) parser$add_argument( - "-t", - "--tuning_file", - type = "character", - default = NULL, - metavar = "path", - help = "File with tuning parameters and error rates." + "-t", + "--tuning_file", + type = "character", + default = NULL, + metavar = "path", + help = "File with tuning parameters and error rates." ) parser$add_argument( - "-o", - "--outdir", - type = "character", - default = "./", - metavar = "path", - help = "Output directory." + "-o", + "--outdir", + type = "character", + default = "./", + metavar = "path", + help = "Output directory." ) parser$add_argument( - "-l", - "--ltprobb", - type = "integer", - default = -200, - metavar = "integer", - help = cat( - "Log-transformed transition probability of switching from transcribed + "-l", + "--ltprobb", + type = "integer", + default = -200, + metavar = "integer", + help = cat( + "Log-transformed transition probability of switching from transcribed state to non-transcribed state" - ) + ) ) parser$add_argument( - "-u", - "--uts", - type = "integer", - default = 5, - metavar = "integer", - help = cat( - "Variance of the emission probability for reads in the + "-u", + "--uts", + type = "integer", + default = 5, + metavar = "integer", + help = cat( + "Variance of the emission probability for reads in the non-transcribed state, respectively." - ) + ) ) parser$add_argument( - "-p", - "--outprefix", - type = "character", - default = "grohmm", - metavar = "string", - help = "Output prefix." + "-p", + "--outprefix", + type = "character", + default = "grohmm", + metavar = "string", + help = "Output prefix." ) parser$add_argument( - "-g", - "--gtf", - type = "character", - default = NULL, - metavar = "string", - help = "GTF File to create TxDb", - required = TRUE + "-g", + "--gtf", + type = "character", + default = NULL, + metavar = "string", + help = "GTF File to create TxDb", + required = TRUE ) parser$add_argument( - "-c", - "--cores", - type = "integer", - default = 1, - metavar = "integer", - help = "Number of cores." + "-c", + "--cores", + type = "integer", + default = 1, + metavar = "integer", + help = "Number of cores." ) args <- parser$parse_args() @@ -87,41 +87,41 @@ setwd(args$outdir) # Load alignment files alignments <- c() for (bam in args$bam_files) { - alignments <- append( - alignments, - as(readGAlignments(bam), "GRanges") - ) - alignments <- keepStandardChromosomes(alignments, pruning.mode = "coarse") + alignments <- append( + alignments, + as(readGAlignments(bam), "GRanges") + ) + alignments <- keepStandardChromosomes(alignments, pruning.mode = "coarse") } # Call annotations > DEFAULT VALUES ASSIGNED if (is.null(args$tuning_file)) { - hmm_result <- detectTranscripts( - alignments, - LtProbB = args$ltprobb, - UTS = args$uts, - threshold = 1 - ) # Uses either inputted or default values + hmm_result <- detectTranscripts( + alignments, + LtProbB = args$ltprobb, + UTS = args$uts, + threshold = 1 + ) # Uses either inputted or default values } else { - tune <- read.csv(args$tuning_file) - # Minimum error - uts <- tune[which.min(tune$errorRate), "UTS"] - lt_probb <- tune[which.min(tune$errorRate), "LtProbB"] - hmm_result <- detectTranscripts( - alignments, - LtProbB = lt_probb, - UTS = uts, - threshold = 1 - ) + tune <- read.csv(args$tuning_file) + # Minimum error + uts <- tune[which.min(tune$errorRate), "UTS"] + lt_probb <- tune[which.min(tune$errorRate), "LtProbB"] + hmm_result <- detectTranscripts( + alignments, + LtProbB = lt_probb, + UTS = uts, + threshold = 1 + ) } tx_hmm <- hmm_result$transcripts write.table( - tx_hmm, - file = paste(args$outprefix, - ".transcripts.txt", - sep = "" - ) + tx_hmm, + file = paste(args$outprefix, + ".transcripts.txt", + sep = "" + ) ) print("Input transcript annotations") @@ -129,9 +129,9 @@ kg_db <- makeTxDbFromGFF(args$gtf) kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( - kg_tx, - keytype = "gene_id", - mc.cores = args$cores + kg_tx, + keytype = "gene_id", + mc.cores = args$cores ) print("Finished consensus annotations") @@ -144,15 +144,15 @@ capture.output(e$eval, file = paste0(args$outprefix, ".eval.txt")) # repairing with annotations get_expressed_annotations <- function(features, reads) { - f_limit <- limitToXkb(features) - count <- countOverlaps(f_limit, reads) - features <- features[count != 0, ] - return(features[(quantile(width(features), .05) < width(features)) & - (width(features) < quantile(width(features), .95)), ]) + f_limit <- limitToXkb(features) + count <- countOverlaps(f_limit, reads) + features <- features[count != 0, ] + return(features[(quantile(width(features), .05) < width(features)) & + (width(features) < quantile(width(features), .95)), ]) } con_expressed <- get_expressed_annotations( - features = kg_consensus, - reads = alignments + features = kg_consensus, + reads = alignments ) b_plus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "+") b_minus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "-") @@ -160,8 +160,8 @@ tx_broken <- c(b_plus, b_minus) tx_final <- combineTranscripts(tx_broken, kg_consensus) td_final <- getTxDensity(tx_final, con_expressed, mc.cores = args$cores) export( - tx_final, - con = paste(args$outprefix, ".final.transcripts.bed", sep = "") + tx_final, + con = paste(args$outprefix, ".final.transcripts.bed", sep = "") ) capture.output(td_final, file = paste0(args$outprefix, ".tdFinal.txt")) # Output plot @@ -185,10 +185,10 @@ citation("AnnotationDbi") r_log_file <- "R_sessionInfo.log" if (file.exists(r_log_file) == FALSE) { - sink(r_log_file) - a <- sessionInfo() - print(a) - sink() + sink(r_log_file) + a <- sessionInfo() + print(a) + sink() } ################################################################################ From f7ddbb625425a25648f2687043f84b495c83f820 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 13 Sep 2024 11:06:33 -0500 Subject: [PATCH 113/255] test: Write grohmm tests --- .../grohmm/skip_tuning/main.nf.test | 49 +++++++++++++++++++ .../grohmm/tuning/main.nf.test | 48 ++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test create mode 100644 workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test diff --git a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test new file mode 100644 index 00000000..b9d975bd --- /dev/null +++ b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test @@ -0,0 +1,49 @@ +nextflow_pipeline { + + name "groHMM" + script "../../../main.nf" + tag "groHMM" + + test("Should be able to skip tuning") { + + when { + params { + outdir = "$outputDir" + skip_grohmm = false + skip_tuning = true + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/transcript_identification/grohmm/cd4.eval.txt"), + path("$outputDir/transcript_identification/grohmm/cd4.final.transcripts.bed"), + path("$outputDir/transcript_identification/grohmm/cd4.tdFinal.txt"), + path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.jpg").exists(), + path("$outputDir/transcript_identification/grohmm/cd4.transcripts.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.eval.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.final.transcripts.bed"), + path("$outputDir/transcript_identification/grohmm/jurkat.tdFinal.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.jpg").exists(), + path("$outputDir/transcript_identification/grohmm/jurkat.transcripts.txt"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test new file mode 100644 index 00000000..09053601 --- /dev/null +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -0,0 +1,48 @@ +nextflow_pipeline { + name "groHMM" + script "../../../main.nf" + tag "groHMM" + + test("Should run with defaults") { + when { + params { + outdir = "$outputDir" + skip_grohmm = false + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/transcript_identification/grohmm/cd4.eval.txt"), + path("$outputDir/transcript_identification/grohmm/cd4.final.transcripts.bed"), + path("$outputDir/transcript_identification/grohmm/cd4.tdFinal.txt"), + path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.jpg").exists(), + path("$outputDir/transcript_identification/grohmm/cd4.transcripts.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.eval.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.final.transcripts.bed"), + path("$outputDir/transcript_identification/grohmm/jurkat.tdFinal.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.jpg").exists(), + path("$outputDir/transcript_identification/grohmm/jurkat.transcripts.txt"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + ).match("output_files") + } + ) + } + } +} From 21ba6f7f291cec0d88e6cd88fbd2e1f61b8e9f2b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 11 Sep 2024 17:50:02 -0500 Subject: [PATCH 114/255] fix(grohmm): bam => bams --- modules/local/grohmm/parametertuning/main.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index b6785e4d..14bceae3 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -25,7 +25,7 @@ process GROHMM_PARAMETERTUNING { def prefix = task.ext.prefix ?: "${meta.id}" """ parameter_tuning.R \\ - --bam_file ${bam} \\ + --bam_file ${bams} \\ --tuning_file ${tune_parameter_file} \\ --outprefix ${prefix} \\ --gtf $gtf \\ From 39265aa1790292acc4bbd4c0255b8c1b910e73a7 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 12 Sep 2024 12:36:40 -0500 Subject: [PATCH 115/255] fix(grohmm): Link up tuning files and samples --- modules/local/grohmm/parametertuning/main.nf | 2 +- modules/local/grohmm/transcriptcalling/main.nf | 3 +-- subworkflows/local/grohmm/main.nf | 8 +++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 14bceae3..3f2f0f50 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -14,7 +14,7 @@ process GROHMM_PARAMETERTUNING { path tune_parameter_file output: - path "*.tuning.csv" , emit: tuning + tuple val(meta), path("*.tuning.csv"), emit: tuning path "versions.yml", emit: versions when: diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index e93c84bb..a21b9022 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -9,9 +9,8 @@ process GROHMM_TRANSCRIPTCALLING { 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" input: - tuple val(meta), path(bams), path(bais) + tuple val(meta), path(bams), path(bais), path(tuning_file) path gtf - path tuning_file output: tuple val(meta), path("*.transcripts.txt"), emit: transcripts diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 0c6d04ba..7a488a81 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -18,7 +18,7 @@ workflow GROHMM { ch_versions = Channel.empty() - ch_tuning = [] + ch_tuning = Channel.empty() if(!params.skip_tuning) { GROHMM_PARAMETERTUNING ( @@ -27,13 +27,15 @@ workflow GROHMM { tuning_file ) ch_tuning = GROHMM_PARAMETERTUNING.out.tuning + ch_bams_bais_tuning = bams_bais.join(ch_tuning) ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) + } else { + ch_bams_bais_tuning = bams_bais.join(ch_tuning) } GROHMM_TRANSCRIPTCALLING ( - bams_bais, + [ch_bams_bais_tuning, []], gtf, - ch_tuning ) ch_versions = ch_versions.mix(GROHMM_TRANSCRIPTCALLING.out.versions.first()) From f431c7389ca297555e31ffef7998221e7cf1611e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 13 Sep 2024 13:42:36 -0500 Subject: [PATCH 116/255] refactor(grohmm): Add notes of brainstorming --- .../local/grohmm/transcriptcalling/main.nf | 4 ++- subworkflows/local/grohmm/main.nf | 32 ++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index a21b9022..62947b17 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -9,8 +9,10 @@ process GROHMM_TRANSCRIPTCALLING { 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" input: - tuple val(meta), path(bams), path(bais), path(tuning_file) + tuple val(meta), path(bams), path(bais) path gtf + val UTS + val LtProbB output: tuple val(meta), path("*.transcripts.txt"), emit: transcripts diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 7a488a81..ca7f4b13 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -3,7 +3,6 @@ */ include { GROHMM_TRANSCRIPTCALLING } from '../../../modules/local/grohmm/transcriptcalling/main.nf' -include { GROHMM_PARAMETERTUNING } from '../../../modules/local/grohmm/parametertuning/main.nf' /* * Note meta refers to all merged files @@ -20,6 +19,37 @@ workflow GROHMM { ch_tuning = Channel.empty() + // If a tuning file is provided, run transcriptcalling once + if(tuning_file) { + // TODO Find minimum + // uts <- tune[which.min(tune$errorRate), "UTS"] + // lt_probb <- tune[which.min(tune$errorRate), "LtProbB"] + GROHMM_TRANSCRIPTCALLING( + bam_bais, + gtf, + minimum_uts, + minimum_ltprobb, + ) + } else { + // Run transcriptcalling eval for each tuning param + // Should avoid a tuning file with a row for everything + // 5..45 by 5 for UTS is what we had currently + // -100..-400 by 50 for LtProbB + GROHMM_PARAMETERTUNING ( + bam_bais, + gtf, + ch_uts, + ch_ltprobb, + ) + // TODO CollectFile the tuning + // TODO Find the minimum values + // TODO Need to decide if windowAnalysis is important + // https://github.com/Functional-Genomics-Lab/groseq-analysis/blob/9b69519c41232fd653a2b2726e32d91b49abeb7e/research/groHMM2.R#L62C7-L62C21 + // If it is need to rerun transcriptcalling without it + } + + + if(!params.skip_tuning) { GROHMM_PARAMETERTUNING ( bams_bais, From 727fdd10cfa6f1401993d1f531a659f8c2130f1a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 14 Sep 2024 15:58:33 -0500 Subject: [PATCH 117/255] feat: Add grohmm min and max tuning params --- conf/test.config | 7 ++- .../local/grohmm/transcriptcalling/main.nf | 4 +- nextflow.config | 6 ++- nextflow_schema.json | 29 ++++++++++- subworkflows/local/grohmm/main.nf | 49 ++++++------------- 5 files changed, 57 insertions(+), 38 deletions(-) diff --git a/conf/test.config b/conf/test.config index dd68aa6a..7f46f87a 100644 --- a/conf/test.config +++ b/conf/test.config @@ -33,7 +33,12 @@ params { assay_type = "GROseq" skip_grohmm = true // FIXME Fails due to higher memory requirements - tuning_file = "${projectDir}/tests/config/tuningparams_small.csv" + // tuning_file = "${projectDir}/tests/config/tuningparams_small.csv" + tuning_file = null + grohmm_min_uts = 5 + grohmm_max_uts = 10 + grohmm_min_ltprobb = -100 + grohmm_max_ltprobb = -150 filter_bed = "${projectDir}/tests/config/unwanted_region.bed" intersect_bed = "${projectDir}/tests/config/wanted_region.bed" } diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 62947b17..f65d1c2f 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -28,13 +28,13 @@ process GROHMM_TRANSCRIPTCALLING { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" - def tuning = tuning_file ? "--tuning_file ${tuning_file}" : "" """ transcriptcalling_grohmm.R \\ --bam_file ${bams} \\ - $tuning \\ --outprefix ${prefix} \\ --gtf $gtf \\ + --uts $UTS \\ + --ltprobb $LtProbB \\ --outdir ./ \\ --cores $task.cpus \\ $args diff --git a/nextflow.config b/nextflow.config index 76290558..e1cfc965 100644 --- a/nextflow.config +++ b/nextflow.config @@ -25,8 +25,12 @@ params { // Transcript identification method assay_type = null skip_grohmm = false - skip_tuning = false tuning_file = null + grohmm_min_uts = 5 + grohmm_max_uts = 45 + // Depends on how you look at this one... But I figured most will ignore the negative + grohmm_min_ltprobb = -100 + grohmm_max_ltprobb = -400 filter_bed = null intersect_bed = null diff --git a/nextflow_schema.json b/nextflow_schema.json index 735fa18e..02574536 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -126,7 +126,34 @@ "skip_grohmm": { "type": "boolean", "description": "Skip groHMM all together", - "fa_icon": "fas fa-eye-slash" + "fa_icon": "fas fa-eye-slash", + "default": false + }, + "grohmm_min_uts": { + "type": "integer", + "description": "Minimum number of UTs to use for groHMM.", + "fa_icon": "fas fa-sort-amount-desc", + "default": 5 + }, + "grohmm_max_uts": { + "type": "integer", + "description": "Maximum number of UTs to use for groHMM.", + "fa_icon": "fas fa-sort-amount-desc", + "default": 45 + }, + "grohmm_min_ltprobb": { + "type": "integer", + "description": "Minimum LTProbB value to use for groHMM.", + "fa_icon": "fas fa-sort-amount-desc", + "help_text": "Depends on how you look at this one, which is the minimum and maximum... But I figured most will ignore the negative, so we went with absolute values.", + "default": -100 + }, + "grohmm_max_ltprobb": { + "type": "integer", + "description": "Maximum LTProbB value to use for groHMM.", + "fa_icon": "fas fa-sort-amount-desc", + "help_text": "Depends on how you look at this one, which is the minimum and maximum... But I figured most will ignore the negative, so we went with absolute values.", + "default": -400 }, "tuning_file": { "type": "string", diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index ca7f4b13..88d04a1e 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -20,23 +20,25 @@ workflow GROHMM { ch_tuning = Channel.empty() // If a tuning file is provided, run transcriptcalling once - if(tuning_file) { - // TODO Find minimum - // uts <- tune[which.min(tune$errorRate), "UTS"] - // lt_probb <- tune[which.min(tune$errorRate), "LtProbB"] - GROHMM_TRANSCRIPTCALLING( - bam_bais, - gtf, - minimum_uts, - minimum_ltprobb, - ) - } else { + // if(tuning_file) { + // TODO Find minimum + // uts <- tune[which.min(tune$errorRate), "UTS"] + // lt_probb <- tune[which.min(tune$errorRate), "LtProbB"] + // GROHMM_TRANSCRIPTCALLING ( + // bams_bais, + // gtf, + // minimum_uts, + // minimum_ltprobb, + // ) + // } else { // Run transcriptcalling eval for each tuning param // Should avoid a tuning file with a row for everything // 5..45 by 5 for UTS is what we had currently + ch_uts = channel.of((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) // -100..-400 by 50 for LtProbB - GROHMM_PARAMETERTUNING ( - bam_bais, + ch_ltprobb = channel.of((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)).view() + GROHMM_TRANSCRIPTCALLING ( + bams_bais, gtf, ch_uts, ch_ltprobb, @@ -46,27 +48,8 @@ workflow GROHMM { // TODO Need to decide if windowAnalysis is important // https://github.com/Functional-Genomics-Lab/groseq-analysis/blob/9b69519c41232fd653a2b2726e32d91b49abeb7e/research/groHMM2.R#L62C7-L62C21 // If it is need to rerun transcriptcalling without it - } - - - - if(!params.skip_tuning) { - GROHMM_PARAMETERTUNING ( - bams_bais, - gtf, - tuning_file - ) - ch_tuning = GROHMM_PARAMETERTUNING.out.tuning - ch_bams_bais_tuning = bams_bais.join(ch_tuning) - ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) - } else { - ch_bams_bais_tuning = bams_bais.join(ch_tuning) - } + // } - GROHMM_TRANSCRIPTCALLING ( - [ch_bams_bais_tuning, []], - gtf, - ) ch_versions = ch_versions.mix(GROHMM_TRANSCRIPTCALLING.out.versions.first()) emit: From bb5948856eba51c21eb74cbccab54a46d61d21b6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Sep 2024 14:10:16 -0500 Subject: [PATCH 118/255] fix: of => fromList --- subworkflows/local/grohmm/main.nf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 88d04a1e..f8ae0c16 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -34,9 +34,9 @@ workflow GROHMM { // Run transcriptcalling eval for each tuning param // Should avoid a tuning file with a row for everything // 5..45 by 5 for UTS is what we had currently - ch_uts = channel.of((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) + ch_uts = channel.fromList((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) // -100..-400 by 50 for LtProbB - ch_ltprobb = channel.of((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)).view() + ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)).view() GROHMM_TRANSCRIPTCALLING ( bams_bais, gtf, From ab20315d3b8d579eff8315641d00dbc5235d2443 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Sep 2024 16:30:31 -0500 Subject: [PATCH 119/255] refactor(grohmm): Use parameter tuning split --- bin/parameter_tuning.R | 55 ++++++++------------ modules/local/grohmm/parametertuning/main.nf | 10 ++-- subworkflows/local/grohmm/main.nf | 9 +++- 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 251cab70..d2ecf910 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -88,19 +88,9 @@ if (is.null(args$bam_files)) { print_help(args) stop("Please provide a bam file", call. = FALSE) } -if (is.null(args$tuning_file)) { - print_help(args) - stop("Please provide a tuning file", call. = FALSE) -} - - -# Read in bam file. -if (file.exists(args$outdir) == FALSE) { - dir.create(args$outdir, recursive = TRUE) -} -setwd(args$outdir) -# CHANGE BASED ON PAIRED OR SINGLE END +# Load alignment files +# TODO? CHANGE BASED ON PAIRED OR SINGLE END alignments <- c() for (bam in args$bam_files) { alignments <- append( @@ -121,32 +111,33 @@ kg_consensus <- makeConsensusAnnotations( ) print("Finished consensus annotations") -# TUNING -tune <- read.csv(args$tuning_file) - -evals <- mclapply(seq_len(nrow(tune)), function(x) { - hmm <- detectTranscripts( - reads = alignments, - LtProbB = tune$LtProbB[x], UTS = tune$UTS[x] - ) - e <- evaluateHMMInAnnotations(hmm$transcripts, kg_consensus) - e$eval -}, mc.cores = args$cores, mc.silent = TRUE) - -tune <- cbind(tune, do.call(rbind, evals)) -write.csv(tune, file = paste0(args$outprefix, ".tuning.csv")) +############ +## TUNING ## +############ +print("Starting tuning run") +hmm <- detectTranscripts( + reads = alignments, + LtProbB = args$ltprobb, + UTS = args$uts +) +print("Evaluating") +e <- evaluateHMMInAnnotations(hmm$transcripts, kg_consensus) +print(e) +print(e$eval) +write.csv(e$eval, file = paste0(args$outprefix, ".tuning.csv")) -# CITE PACKAGES USED +######################## +## CITE PACKAGES USED ## +######################## citation("groHMM") citation("GenomicFeatures") citation("GenomicAlignments") citation("AnnotationDbi") -## R SESSION INFO ## -################################################ -################################################ - +#################### +## R SESSION INFO ## +#################### r_log_file <- "R_sessionInfo.log" if (file.exists(r_log_file) == FALSE) { sink(r_log_file) @@ -154,5 +145,3 @@ if (file.exists(r_log_file) == FALSE) { print(a) sink() } - -################################################################################ diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 3f2f0f50..c882ecd3 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,5 +1,5 @@ process GROHMM_PARAMETERTUNING { - tag "$meta.id" + tag "$meta.id|$UTS|$LtProbB" label 'process_high' label 'process_long' @@ -11,7 +11,8 @@ process GROHMM_PARAMETERTUNING { input: tuple val(meta), path(bams), path(bais) path gtf - path tune_parameter_file + val UTS + val LtProbB output: tuple val(meta), path("*.tuning.csv"), emit: tuning @@ -22,13 +23,14 @@ process GROHMM_PARAMETERTUNING { script: def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" + def prefix = task.ext.prefix ?: "${meta.id}_${UTS}_${LtProbB}" """ parameter_tuning.R \\ --bam_file ${bams} \\ - --tuning_file ${tune_parameter_file} \\ --outprefix ${prefix} \\ --gtf $gtf \\ + --uts $UTS \\ + --ltprobb $LtProbB \\ --outdir ./ \\ --cores $task.cpus \\ $args diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index f8ae0c16..2b417ef9 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -37,13 +37,18 @@ workflow GROHMM { ch_uts = channel.fromList((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) // -100..-400 by 50 for LtProbB ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)).view() - GROHMM_TRANSCRIPTCALLING ( + GROHMM_PARAMETERTUNING ( bams_bais, gtf, ch_uts, ch_ltprobb, ) - // TODO CollectFile the tuning + .tuning + .collectFile( + name: "${params.outdir}/transcript_identification/grohmm/${item[0].id}_tuning.csv", + keepHeader: true, + skip: 1, + ) // TODO Find the minimum values // TODO Need to decide if windowAnalysis is important // https://github.com/Functional-Genomics-Lab/groseq-analysis/blob/9b69519c41232fd653a2b2726e32d91b49abeb7e/research/groHMM2.R#L62C7-L62C21 From 6e0b9a8b81f9fcd26e0fd7c2a1a1b8276389b0c2 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Sep 2024 16:34:00 -0500 Subject: [PATCH 120/255] fix(grohmm): Use windowAnalysis Apparently we weren't doing this. It's in the guidelines and in Shayne's scripts --- bin/parameter_tuning.R | 6 +++++- subworkflows/local/grohmm/main.nf | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index d2ecf910..8c513a6a 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -115,16 +115,20 @@ print("Finished consensus annotations") ## TUNING ## ############ print("Starting tuning run") +Fp <- windowAnalysis(alignments, strand = "+", windowSize = 50) +Fm <- windowAnalysis(alignments, strand = "-", windowSize = 50) hmm <- detectTranscripts( + Fp = Fp, + Fm = Fm, reads = alignments, LtProbB = args$ltprobb, UTS = args$uts ) print("Evaluating") e <- evaluateHMMInAnnotations(hmm$transcripts, kg_consensus) +print(e$eval) print(e) -print(e$eval) write.csv(e$eval, file = paste0(args$outprefix, ".tuning.csv")) ######################## diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 2b417ef9..8466c885 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -50,9 +50,6 @@ workflow GROHMM { skip: 1, ) // TODO Find the minimum values - // TODO Need to decide if windowAnalysis is important - // https://github.com/Functional-Genomics-Lab/groseq-analysis/blob/9b69519c41232fd653a2b2726e32d91b49abeb7e/research/groHMM2.R#L62C7-L62C21 - // If it is need to rerun transcriptcalling without it // } ch_versions = ch_versions.mix(GROHMM_TRANSCRIPTCALLING.out.versions.first()) From 114136cc558255b9a4e46a9e516b6ee748f013a0 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Sep 2024 17:02:27 -0500 Subject: [PATCH 121/255] refactor: Setup transcript calling --- bin/transcriptcalling_grohmm.R | 25 +++++------ .../local/grohmm/transcriptcalling/main.nf | 7 +--- subworkflows/local/grohmm/main.nf | 42 ++++++++++--------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index 3c99c8bd..d6995b52 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -96,13 +96,15 @@ for (bam in args$bam_files) { # Call annotations > DEFAULT VALUES ASSIGNED if (is.null(args$tuning_file)) { + # Use user supplied values or defaults hmm_result <- detectTranscripts( alignments, LtProbB = args$ltprobb, UTS = args$uts, threshold = 1 - ) # Uses either inputted or default values + ) } else { + # Use tuning file and take the minimum values tune <- read.csv(args$tuning_file) # Minimum error uts <- tune[which.min(tune$errorRate), "UTS"] @@ -115,6 +117,8 @@ if (is.null(args$tuning_file)) { ) } +# NOTE TUNING IN A DIFFERENT SCRIPT + tx_hmm <- hmm_result$transcripts write.table( tx_hmm, @@ -140,9 +144,8 @@ e <- evaluateHMMInAnnotations(tx_hmm, kg_consensus) # Save as txt file capture.output(e$eval, file = paste0(args$outprefix, ".eval.txt")) -# TUNING IN A DIFFERENT SCRIPT -# repairing with annotations +print("repairing with annotations") get_expressed_annotations <- function(features, reads) { f_limit <- limitToXkb(features) count <- countOverlaps(f_limit, reads) @@ -164,25 +167,25 @@ export( con = paste(args$outprefix, ".final.transcripts.bed", sep = "") ) capture.output(td_final, file = paste0(args$outprefix, ".tdFinal.txt")) -# Output plot +# 1. Output plot jpeg(file = paste0(args$outprefix, ".tdplot_mqc.jpg")) # 2. Create the plot td_final <- getTxDensity(tx_final, con_expressed, mc.cores = args$cores) - # 3. Close the file dev.off() -# CITE PACKAGES USED +######################## +## CITE PACKAGES USED ## +######################## citation("groHMM") citation("GenomicFeatures") citation("GenomicAlignments") citation("AnnotationDbi") -## R SESSION INFO ## -################################################ -################################################ - +#################### +## R SESSION INFO ## +#################### r_log_file <- "R_sessionInfo.log" if (file.exists(r_log_file) == FALSE) { sink(r_log_file) @@ -190,5 +193,3 @@ if (file.exists(r_log_file) == FALSE) { print(a) sink() } - -################################################################################ diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index f65d1c2f..d961f860 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -9,10 +9,8 @@ process GROHMM_TRANSCRIPTCALLING { 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" input: - tuple val(meta), path(bams), path(bais) + tuple val(meta), path(bams), path(bais), path(tuning) path gtf - val UTS - val LtProbB output: tuple val(meta), path("*.transcripts.txt"), emit: transcripts @@ -31,10 +29,9 @@ process GROHMM_TRANSCRIPTCALLING { """ transcriptcalling_grohmm.R \\ --bam_file ${bams} \\ + --tuning_file ${tuning_file} \\ --outprefix ${prefix} \\ --gtf $gtf \\ - --uts $UTS \\ - --ltprobb $LtProbB \\ --outdir ./ \\ --cores $task.cpus \\ $args diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 8466c885..337a5ef3 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -19,18 +19,7 @@ workflow GROHMM { ch_tuning = Channel.empty() - // If a tuning file is provided, run transcriptcalling once - // if(tuning_file) { - // TODO Find minimum - // uts <- tune[which.min(tune$errorRate), "UTS"] - // lt_probb <- tune[which.min(tune$errorRate), "LtProbB"] - // GROHMM_TRANSCRIPTCALLING ( - // bams_bais, - // gtf, - // minimum_uts, - // minimum_ltprobb, - // ) - // } else { + if(!tuning_file) { // Run transcriptcalling eval for each tuning param // Should avoid a tuning file with a row for everything // 5..45 by 5 for UTS is what we had currently @@ -43,15 +32,28 @@ workflow GROHMM { ch_uts, ch_ltprobb, ) - .tuning - .collectFile( - name: "${params.outdir}/transcript_identification/grohmm/${item[0].id}_tuning.csv", - keepHeader: true, - skip: 1, - ) - // TODO Find the minimum values - // } + .tuning + .collectFile( + name: "${params.outdir}/transcript_identification/grohmm/${item[0].id}_tuning.csv", + keepHeader: true, + skip: 1, + newLine: true, + ) + .set { ch_tuning } + + ch_bams_bais_tuning = bams_bais.join(ch_tuning, by: [0]) + + ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) + } else { + // If a tuning file is provided, run transcriptcalling once + // NOTE This doesn't really handle multiple "groups well" + ch_bams_bais_tuning = bams_bais.join(tuning_file) + } + GROHMM_TRANSCRIPTCALLING ( + ch_bams_bais_tuning, + gtf, + ) ch_versions = ch_versions.mix(GROHMM_TRANSCRIPTCALLING.out.versions.first()) emit: From d72402b5522cf16e91321456aba5680f12ab5ce0 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 18 Sep 2024 18:18:01 -0500 Subject: [PATCH 122/255] build: Build a seperate grohmm conda package --- .../local/grohmm/parametertuning/environment.yml | 14 ++++++++++++++ modules/local/grohmm/parametertuning/main.nf | 8 ++++---- .../local/grohmm/transcriptcalling/environment.yml | 14 ++++++++++++++ modules/local/grohmm/transcriptcalling/main.nf | 8 ++++---- 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 modules/local/grohmm/parametertuning/environment.yml create mode 100644 modules/local/grohmm/transcriptcalling/environment.yml diff --git a/modules/local/grohmm/parametertuning/environment.yml b/modules/local/grohmm/parametertuning/environment.yml new file mode 100644 index 00000000..e9f7efa5 --- /dev/null +++ b/modules/local/grohmm/parametertuning/environment.yml @@ -0,0 +1,14 @@ +name: grohmm +channels: + - https://repo.prefix.dev/bioinformaticsorphanage + - conda-forge + - bioconda +dependencies: + - conda-forge::r-base + - conda-forge::r-optparse + - conda-forge::r-argparse + - bioconda::bioconductor-genomicfeatures + # NOTE Can't use the official package because of + # https://github.com/dankoc/groHMM/issues/2 + # - bioconda::bioconductor-grohmm=1.28.0 + - bioinfoorphanage-grohmm diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index c882ecd3..8579c11e 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -3,10 +3,10 @@ process GROHMM_PARAMETERTUNING { label 'process_high' label 'process_long' - conda "conda-forge::r-base=4.1.1 conda-forge::r-optparse=1.7.1 conda-forge::r-argparse=2.1.3 bioconda::bioconductor-genomicfeatures=1.46.1 bioconda::bioconductor-grohmm=1.28.0" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' : - 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" + conda "${moduleDir}/environment.yml" + // container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + // 'https://depot.galaxyproject.org/singularity/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' : + // 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" input: tuple val(meta), path(bams), path(bais) diff --git a/modules/local/grohmm/transcriptcalling/environment.yml b/modules/local/grohmm/transcriptcalling/environment.yml new file mode 100644 index 00000000..e9f7efa5 --- /dev/null +++ b/modules/local/grohmm/transcriptcalling/environment.yml @@ -0,0 +1,14 @@ +name: grohmm +channels: + - https://repo.prefix.dev/bioinformaticsorphanage + - conda-forge + - bioconda +dependencies: + - conda-forge::r-base + - conda-forge::r-optparse + - conda-forge::r-argparse + - bioconda::bioconductor-genomicfeatures + # NOTE Can't use the official package because of + # https://github.com/dankoc/groHMM/issues/2 + # - bioconda::bioconductor-grohmm=1.28.0 + - bioinfoorphanage-grohmm diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index d961f860..527e8667 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -3,10 +3,10 @@ process GROHMM_TRANSCRIPTCALLING { label 'process_high' label 'process_long' - conda "conda-forge::r-base=4.1.1 conda-forge::r-optparse=1.7.1 conda-forge::r-argparse=2.1.3 bioconda::bioconductor-genomicfeatures=1.46.1 bioconda::bioconductor-grohmm=1.28.0" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' : - 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" + conda "${moduleDir}/environment.yml" + // container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + // 'https://depot.galaxyproject.org/singularity/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' : + // 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" input: tuple val(meta), path(bams), path(bais), path(tuning) From ce1c51255019362f1b1127c8709036ce13aa95ff Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 18 Sep 2024 18:33:32 -0500 Subject: [PATCH 123/255] chore: Add working --- subworkflows/local/grohmm/main.nf | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 337a5ef3..15b867b6 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -2,6 +2,7 @@ * Run parametertuning optionally, otherwise just run transcript calling */ +include { GROHMM_PARAMETERTUNING } from '../../../modules/local/grohmm/parametertuning/main.nf' include { GROHMM_TRANSCRIPTCALLING } from '../../../modules/local/grohmm/transcriptcalling/main.nf' /* @@ -19,7 +20,7 @@ workflow GROHMM { ch_tuning = Channel.empty() - if(!tuning_file) { + // if(!tuning_file) { // Run transcriptcalling eval for each tuning param // Should avoid a tuning file with a row for everything // 5..45 by 5 for UTS is what we had currently @@ -34,21 +35,21 @@ workflow GROHMM { ) .tuning .collectFile( - name: "${params.outdir}/transcript_identification/grohmm/${item[0].id}_tuning.csv", + name: "${params.outdir}/transcript_identification/grohmm/tuning.csv", keepHeader: true, skip: 1, newLine: true, ) - .set { ch_tuning } + .set { tuning } - ch_bams_bais_tuning = bams_bais.join(ch_tuning, by: [0]) + ch_bams_bais_tuning = bams_bais.join(tuning, by: [0]) ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) - } else { + // } else { // If a tuning file is provided, run transcriptcalling once // NOTE This doesn't really handle multiple "groups well" - ch_bams_bais_tuning = bams_bais.join(tuning_file) - } + // ch_bams_bais_tuning = bams_bais.join(tuning_file) + // } GROHMM_TRANSCRIPTCALLING ( ch_bams_bais_tuning, From 6ba858f5ab8941806dd758c8a6ee4d40fa7a2292 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 19 Sep 2024 10:02:59 -0500 Subject: [PATCH 124/255] build(grohmm): Add Seqera containers --- modules/local/grohmm/parametertuning/environment.yml | 8 ++++---- modules/local/grohmm/parametertuning/main.nf | 6 +++--- modules/local/grohmm/transcriptcalling/main.nf | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/local/grohmm/parametertuning/environment.yml b/modules/local/grohmm/parametertuning/environment.yml index e9f7efa5..bce9c898 100644 --- a/modules/local/grohmm/parametertuning/environment.yml +++ b/modules/local/grohmm/parametertuning/environment.yml @@ -4,10 +4,10 @@ channels: - conda-forge - bioconda dependencies: - - conda-forge::r-base - - conda-forge::r-optparse - - conda-forge::r-argparse - - bioconda::bioconductor-genomicfeatures + - conda-forge::r-base # =4.1.1 + - conda-forge::r-optparse # =1.7.1 + - conda-forge::r-argparse # =2.1.3 + - bioconda::bioconductor-genomicfeatures # =1.46.1 # NOTE Can't use the official package because of # https://github.com/dankoc/groHMM/issues/2 # - bioconda::bioconductor-grohmm=1.28.0 diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 8579c11e..c9ac0239 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -4,9 +4,9 @@ process GROHMM_PARAMETERTUNING { label 'process_long' conda "${moduleDir}/environment.yml" - // container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - // 'https://depot.galaxyproject.org/singularity/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' : - // 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : + 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" input: tuple val(meta), path(bams), path(bais) diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 527e8667..80edc07a 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -4,9 +4,9 @@ process GROHMM_TRANSCRIPTCALLING { label 'process_long' conda "${moduleDir}/environment.yml" - // container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - // 'https://depot.galaxyproject.org/singularity/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' : - // 'quay.io/biocontainers/mulled-v2-e9a6cb7894dd2753aff7d9446ea95c962cce8c46:0a46dae3241b1c4f02e46468f5d54eadcf64beca-0' }" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : + 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" input: tuple val(meta), path(bams), path(bais), path(tuning) From 46646f0e7f2a0abc7d7403507a1e652de5cf3d1a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 19 Sep 2024 17:32:32 -0500 Subject: [PATCH 125/255] test(grohmm): Add chr7 gtf --- .../grohmm/parametertuning/tests/main.nf.test | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index c80c61b4..da7c5338 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -4,7 +4,7 @@ nextflow_process { script "modules/local/grohmm/parametertuning/main.nf" process "GROHMM_PARAMETERTUNING" - test("Should run without a tuning file") { + test("Should run test data") { when { params { @@ -13,15 +13,19 @@ nextflow_process { process { """ input[0] = [ - [ id: 'mR1' ], - [ file("https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/sarscov2/illumina/bam/test.single_end.sorted.bam", checkIfExists: true), ] + [ id: 'Sall' ], + [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], + [] ] - // FIXME This needs to match up with s40 input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/sarscov2/genome/genome.gtf", + // "http://hgdownload.soe.ucsc.edu/goldenPath/hg19/bigZips/genes/hg19.refGene.gtf.gz", + // "${projectDir}/hg19.refGene.gtf", + "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", checkIfExists: true ) - input[2] = [] + input[2] = 30 + input[3] = -100 """ } } From 2ad3b9cc8b2787d748a9f3de1074d6f0aa9808fe Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 22 Sep 2024 21:14:51 -0500 Subject: [PATCH 126/255] test: Setup tests for grohmm --- .../grohmm/parametertuning/environment.yml | 2 +- modules/local/grohmm/parametertuning/main.nf | 1 + .../grohmm/parametertuning/tests/main.nf.test | 40 ++++++++++++++----- .../local/grohmm/transcriptcalling/main.nf | 2 +- .../transcriptcalling/tests/main.nf.test | 38 ++++++++++++++---- 5 files changed, 64 insertions(+), 19 deletions(-) diff --git a/modules/local/grohmm/parametertuning/environment.yml b/modules/local/grohmm/parametertuning/environment.yml index bce9c898..c77ab0b6 100644 --- a/modules/local/grohmm/parametertuning/environment.yml +++ b/modules/local/grohmm/parametertuning/environment.yml @@ -7,7 +7,7 @@ dependencies: - conda-forge::r-base # =4.1.1 - conda-forge::r-optparse # =1.7.1 - conda-forge::r-argparse # =2.1.3 - - bioconda::bioconductor-genomicfeatures # =1.46.1 + - bioconda::bioconductor-genomicfeatures=1.46.1 # NOTE Can't use the official package because of # https://github.com/dankoc/groHMM/issues/2 # - bioconda::bioconductor-grohmm=1.28.0 diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index c9ac0239..ba0db7ba 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,5 +1,6 @@ process GROHMM_PARAMETERTUNING { tag "$meta.id|$UTS|$LtProbB" + debug true label 'process_high' label 'process_long' diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index da7c5338..039c164a 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -4,8 +4,7 @@ nextflow_process { script "modules/local/grohmm/parametertuning/main.nf" process "GROHMM_PARAMETERTUNING" - test("Should run test data") { - + test("Should fail with a tuning file") { when { params { outdir = "$outputDir" @@ -16,16 +15,13 @@ nextflow_process { [ id: 'Sall' ], [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], - [] + [], + [], ] input[1] = file( - // "http://hgdownload.soe.ucsc.edu/goldenPath/hg19/bigZips/genes/hg19.refGene.gtf.gz", - // "${projectDir}/hg19.refGene.gtf", - "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", + "${projectDir}/modules/local/grohmm/parametertuning/tests/main.nf.test", checkIfExists: true ) - input[2] = 30 - input[3] = -100 """ } } @@ -37,9 +33,33 @@ nextflow_process { { assert snapshot(process.out).match() } ) } - } - // TODO Add a test for with a tuning file + test("Should run with a tuning file and without bai files") { + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [ id: 'Sall' ], + [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], + [], + file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), + ] + input[1] = file( + "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", + checkIfExists: true + ) + """ + } + } + then { + // TODO + assert process.failed + } + } } diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 80edc07a..f7df587f 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -9,7 +9,7 @@ process GROHMM_TRANSCRIPTCALLING { 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" input: - tuple val(meta), path(bams), path(bais), path(tuning) + tuple val(meta), path(bams), path(bais), path(tuning_file) path gtf output: diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test b/modules/local/grohmm/transcriptcalling/tests/main.nf.test index 6b088542..fc7d6e50 100644 --- a/modules/local/grohmm/transcriptcalling/tests/main.nf.test +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test @@ -4,8 +4,7 @@ nextflow_process { script "modules/local/grohmm/transcriptcalling/main.nf" process "GROHMM_TRANSCRIPTCALLING" - test("Should run without a tuning file") { - + test("Should fail without a tuning file") { when { params { outdir = "$outputDir" @@ -15,13 +14,14 @@ nextflow_process { input[0] = [ [ id: 'mR1' ], [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), - file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ] + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], + [], + [], ] input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/homo_sapiens/genome/genome.gtf", + "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", checkIfExists: true ) - input[2] = [] """ } } @@ -32,9 +32,33 @@ nextflow_process { { assert snapshot(process.out).match() } ) } - } - // TODO Add test with a tuning file + test("Should run with a tuning file") { + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [ id: 'mR1' ], + [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], + [], + file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), + ] + input[1] = file( + "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", + checkIfExists: true + ) + """ + } + } + + then { + assert process.success + } + } } From 65d16d03f22c0ce355c4b368265547f45b89d3a6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 22 Sep 2024 21:26:28 -0500 Subject: [PATCH 127/255] chore(grohmm): Add example tuning evals from tutorial --- tests/config/tuningparams_small.csv | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/config/tuningparams_small.csv b/tests/config/tuningparams_small.csv index 047b4186..e28ef149 100644 --- a/tests/config/tuningparams_small.csv +++ b/tests/config/tuningparams_small.csv @@ -1,3 +1,10 @@ -"LtProbB","UTS" --100,5 --200,5 +LtProbB,UTS,merged,dissociated,total,errorRate,txSize +-100,5,50,135,185,0.07769845,1391 +-100,10,61,177,238,0.07775237,2071 +-100,15,68,201,269,0.07441217,2625 +-200,5,64,47,111,0.06098901,830 +-200,10,74,65,139,0.06547339,1133 +-200,15,80,76,156,0.06643952,1358 +-300,5,69,22,91,0.05501814,664 +-300,10,82,30,112,0.06005362,875 +-300,15,90,41,131,0.06498016,1026 From e221791516e037604a0c4294661452b1dbe8b6a7 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 23 Sep 2024 10:34:51 -0500 Subject: [PATCH 128/255] fix(grohmm): Try removing any genes from "random" Chromosome --- bin/transcriptcalling_grohmm.R | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index d6995b52..6bcd5cd7 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -82,6 +82,8 @@ parser$add_argument( args <- parser$parse_args() +options(mc.cores = getCores(args$cores)) + setwd(args$outdir) # Load alignment files @@ -129,8 +131,13 @@ write.table( ) print("Input transcript annotations") -kg_db <- makeTxDbFromGFF(args$gtf) +kg_db <- makeTxDbFromGFF(args$gtf, format = "gtf") kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) +# TODO I wonder if I could speed things up by filtering by chromosome at the Nextflow level +# filter=list(tx_chrom="chr7")) +# exclude any transcripts that are located on chromosomes labeled with "random". +kg_tx <- kg_tx[grep("random", as.character(seqnames(kg_tx)), invert = TRUE), ] +print(kg_tx) print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( kg_tx, From 0691cba31e46097dd6c7dbdd54b11b9fc6b25a7e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 23 Sep 2024 17:01:48 -0500 Subject: [PATCH 129/255] test(grohmm): Use kgChr7 gtf --- modules/local/grohmm/parametertuning/tests/main.nf.test | 4 ++-- modules/local/grohmm/transcriptcalling/tests/main.nf.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index 039c164a..c86d126f 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -19,7 +19,7 @@ nextflow_process { [], ] input[1] = file( - "${projectDir}/modules/local/grohmm/parametertuning/tests/main.nf.test", + "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", checkIfExists: true ) """ @@ -50,7 +50,7 @@ nextflow_process { file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), ] input[1] = file( - "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", checkIfExists: true ) """ diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test b/modules/local/grohmm/transcriptcalling/tests/main.nf.test index fc7d6e50..06387b5d 100644 --- a/modules/local/grohmm/transcriptcalling/tests/main.nf.test +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test @@ -19,7 +19,7 @@ nextflow_process { [], ] input[1] = file( - "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", checkIfExists: true ) """ @@ -49,7 +49,7 @@ nextflow_process { file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), ] input[1] = file( - "${projectDir}/modules/local/grohmm/parametertuning/tests/hg19.chr7.refGene.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", checkIfExists: true ) """ From 692e688e0dc8ce56febede7ccef70e421ee505f9 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 10:50:35 -0500 Subject: [PATCH 130/255] test: Try it with refGene again --- modules/local/grohmm/parametertuning/tests/main.nf.test | 4 ++-- modules/local/grohmm/transcriptcalling/tests/main.nf.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index c86d126f..4c7fa796 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -19,7 +19,7 @@ nextflow_process { [], ] input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", + "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true ) """ @@ -50,7 +50,7 @@ nextflow_process { file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), ] input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", + "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true ) """ diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test b/modules/local/grohmm/transcriptcalling/tests/main.nf.test index 06387b5d..bc6d31e4 100644 --- a/modules/local/grohmm/transcriptcalling/tests/main.nf.test +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test @@ -19,7 +19,7 @@ nextflow_process { [], ] input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", + "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true ) """ @@ -49,7 +49,7 @@ nextflow_process { file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), ] input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/nascent/reference/kgChr7.gtf", + "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true ) """ From d9654915b8e9884f44127354b3a7ae91fd347da4 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 10:51:06 -0500 Subject: [PATCH 131/255] fix(grohmm): Set memory.limit --- bin/parameter_tuning.R | 10 ++++++++++ bin/transcriptcalling_grohmm.R | 13 +++++++++++-- modules/local/grohmm/transcriptcalling/main.nf | 5 +++-- tests/nextflow.config | 8 ++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 8c513a6a..0133390a 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -79,9 +79,19 @@ parser$add_argument( metavar = "integer", help = "Number of cores." ) +parser$add_argument( + "-m", + "--memory", + type = "integer", + default = 56000, + metavar = "integer", + help = "Amount of memory in MB" +) args <- parser$parse_args() +options(mc.cores = getCores(args$cores)) +memory.limit(size = args$memory) setwd(args$outdir) if (is.null(args$bam_files)) { diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index 6bcd5cd7..a006e783 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -79,11 +79,19 @@ parser$add_argument( metavar = "integer", help = "Number of cores." ) +parser$add_argument( + "-m", + "--memory", + type = "integer", + default = 56000, + metavar = "integer", + help = "Amount of memory in MB" +) args <- parser$parse_args() options(mc.cores = getCores(args$cores)) - +memory.limit(size = args$memory) setwd(args$outdir) # Load alignment files @@ -131,12 +139,13 @@ write.table( ) print("Input transcript annotations") -kg_db <- makeTxDbFromGFF(args$gtf, format = "gtf") +kg_db <- makeTxDbFromGFF(args$gtf) kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) # TODO I wonder if I could speed things up by filtering by chromosome at the Nextflow level # filter=list(tx_chrom="chr7")) # exclude any transcripts that are located on chromosomes labeled with "random". kg_tx <- kg_tx[grep("random", as.character(seqnames(kg_tx)), invert = TRUE), ] +print("Printing kg_tx.......") print(kg_tx) print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index f7df587f..8a6d35cd 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -5,8 +5,8 @@ process GROHMM_TRANSCRIPTCALLING { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : - 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" + 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : + 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" input: tuple val(meta), path(bams), path(bais), path(tuning_file) @@ -34,6 +34,7 @@ process GROHMM_TRANSCRIPTCALLING { --gtf $gtf \\ --outdir ./ \\ --cores $task.cpus \\ + --memory ${task.memory.toMega()} \\ $args cat <<-END_VERSIONS > versions.yml diff --git a/tests/nextflow.config b/tests/nextflow.config index 97eb3736..674e4eb7 100644 --- a/tests/nextflow.config +++ b/tests/nextflow.config @@ -48,4 +48,12 @@ process { // HACK Tests fail after latest modules update ext.args = { "--disable-small" } } + + // HACK https://stackoverflow.com/a/23419332 + // groHMM uses a lot of memory, so if we run things in parallel it'll start randomly killing jobs + withName: 'GROHMM_.*' { + cpus = 1 + memory = 30.GB + time = 2.h + } } From 013978d02ef5efc94d91085f2dd6bbd50706513a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 11:08:23 -0500 Subject: [PATCH 132/255] fix(grohmm): Remove keytype It's in the vignette but the actual function call and docs don't have a use for it. It just defaults to gene_id. https://github.com/bioinformaticsorphanage/groHMM/blob/86486c388d12a636041c1fc40d1308f96abb5161/R/makeConsensusAnnotations.R#L47-L53 --- bin/parameter_tuning.R | 1 - bin/transcriptcalling_grohmm.R | 2 +- modules/local/grohmm/parametertuning/main.nf | 5 +- .../grohmm/parametertuning/tests/main.nf.test | 41 +++---------- .../parametertuning/tests/main.nf.test.snap | 34 +++++++++++ .../transcriptcalling/tests/main.nf.test | 11 +++- .../transcriptcalling/tests/main.nf.test.snap | 58 +++++++++++++++++++ tests/nextflow.config | 8 --- 8 files changed, 113 insertions(+), 47 deletions(-) create mode 100644 modules/local/grohmm/parametertuning/tests/main.nf.test.snap create mode 100644 modules/local/grohmm/transcriptcalling/tests/main.nf.test.snap diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 0133390a..168ad777 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -116,7 +116,6 @@ kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( kg_tx, - keytype = "gene_id", mc.cores = args$cores ) print("Finished consensus annotations") diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index a006e783..62134e1b 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -142,6 +142,7 @@ print("Input transcript annotations") kg_db <- makeTxDbFromGFF(args$gtf) kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) # TODO I wonder if I could speed things up by filtering by chromosome at the Nextflow level +# https://github.com/google/deepvariant/issues/744 # filter=list(tx_chrom="chr7")) # exclude any transcripts that are located on chromosomes labeled with "random". kg_tx <- kg_tx[grep("random", as.character(seqnames(kg_tx)), invert = TRUE), ] @@ -150,7 +151,6 @@ print(kg_tx) print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( kg_tx, - keytype = "gene_id", mc.cores = args$cores ) print("Finished consensus annotations") diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index ba0db7ba..f4c3865f 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,13 +1,12 @@ process GROHMM_PARAMETERTUNING { tag "$meta.id|$UTS|$LtProbB" - debug true label 'process_high' label 'process_long' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : - 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" + 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : + 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" input: tuple val(meta), path(bams), path(bais) diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index 4c7fa796..4a6d615b 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -4,7 +4,7 @@ nextflow_process { script "modules/local/grohmm/parametertuning/main.nf" process "GROHMM_PARAMETERTUNING" - test("Should fail with a tuning file") { + test("Should run with defaults") { when { params { outdir = "$outputDir" @@ -16,50 +16,25 @@ nextflow_process { [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], [], - [], ] input[1] = file( "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true ) + input[2] = 5 + input[3] = -100 """ } } then { - // FIXME Broken test assertAll( - { assert process.failed }, - { assert snapshot(process.out).match() } + { assert process.success }, + { assert snapshot( + process.out.tuning, + ).match() }, + { assert snapshot(path(process.out.versions.get(0)).yaml).match("versions") }, ) } } - - test("Should run with a tuning file and without bai files") { - when { - params { - outdir = "$outputDir" - } - process { - """ - input[0] = [ - [ id: 'Sall' ], - [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), - file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], - [], - file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), - ] - input[1] = file( - "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", - checkIfExists: true - ) - """ - } - } - - then { - // TODO - assert process.failed - } - } } diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test.snap b/modules/local/grohmm/parametertuning/tests/main.nf.test.snap new file mode 100644 index 00000000..59516a3f --- /dev/null +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test.snap @@ -0,0 +1,34 @@ +{ + "versions": { + "content": [ + { + "GROHMM_PARAMETERTUNING": { + "r-base": "4.3.3", + "bioconductor-grohmm": "1.39.0" + } + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-24T11:44:17.664038682" + }, + "Should run with defaults": { + "content": [ + [ + [ + { + "id": "Sall" + }, + "Sall_5_-100.tuning.csv:md5,abe7dd590cb307eff7abb293eec38190" + ] + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-24T11:44:17.28827251" + } +} \ No newline at end of file diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test b/modules/local/grohmm/transcriptcalling/tests/main.nf.test index bc6d31e4..0395a6fc 100644 --- a/modules/local/grohmm/transcriptcalling/tests/main.nf.test +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test @@ -57,7 +57,16 @@ nextflow_process { } then { - assert process.success + assertAll( + { assert process.success }, + { assert snapshot( + process.out.transcripts, + process.out.eval, + process.out.transcripts_bed, + process.out.td, + ).match() }, + { assert snapshot(path(process.out.versions.get(0)).yaml).match("versions") }, + ) } } diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test.snap b/modules/local/grohmm/transcriptcalling/tests/main.nf.test.snap new file mode 100644 index 00000000..04482942 --- /dev/null +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test.snap @@ -0,0 +1,58 @@ +{ + "versions": { + "content": [ + { + "GROHMM_TRANSCRIPTCALLING": { + "r-base": "4.3.3", + "bioconductor-grohmm": "1.39.0" + } + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-24T11:27:57.580852329" + }, + "Should run with a tuning file": { + "content": [ + [ + [ + { + "id": "mR1" + }, + "mR1.transcripts.txt:md5,06690e4932d6f2d597c2f482fb0848d2" + ] + ], + [ + [ + { + "id": "mR1" + }, + "mR1.eval.txt:md5,4dc82be9170bf40cdb88e187d805f9df" + ] + ], + [ + [ + { + "id": "mR1" + }, + "mR1.final.transcripts.bed:md5,db367d8482ee6b88af176c35e58807d9" + ] + ], + [ + [ + { + "id": "mR1" + }, + "mR1.tdFinal.txt:md5,24d8292ec9f9ab8e2aac99fb6061d26c" + ] + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-24T11:27:57.184918004" + } +} \ No newline at end of file diff --git a/tests/nextflow.config b/tests/nextflow.config index 674e4eb7..97eb3736 100644 --- a/tests/nextflow.config +++ b/tests/nextflow.config @@ -48,12 +48,4 @@ process { // HACK Tests fail after latest modules update ext.args = { "--disable-small" } } - - // HACK https://stackoverflow.com/a/23419332 - // groHMM uses a lot of memory, so if we run things in parallel it'll start randomly killing jobs - withName: 'GROHMM_.*' { - cpus = 1 - memory = 30.GB - time = 2.h - } } From af3cba819077ad121bc1afcf729a5d83cfdba959 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 12:21:45 -0500 Subject: [PATCH 133/255] refactor(grohmm): Get jobs running for every set of possibilities --- conf/modules.config | 2 +- conf/test.config | 5 +++-- modules/local/grohmm/parametertuning/main.nf | 6 ++---- .../local/grohmm/parametertuning/tests/main.nf.test | 4 ++-- subworkflows/local/grohmm/main.nf | 11 +++++++---- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index ebb6cbe1..a38a87c0 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -367,7 +367,7 @@ process { ] } - withName: GROHMM_TRANSCRIPTCALLING { + withName: "GROHMM_.*" { publishDir = [ [ path: { "${params.outdir}/transcript_identification/grohmm" }, diff --git a/conf/test.config b/conf/test.config index 7f46f87a..52ee758d 100644 --- a/conf/test.config +++ b/conf/test.config @@ -35,10 +35,11 @@ params { skip_grohmm = true // FIXME Fails due to higher memory requirements // tuning_file = "${projectDir}/tests/config/tuningparams_small.csv" tuning_file = null + // Just run 2 jobs instead of 8 grohmm_min_uts = 5 - grohmm_max_uts = 10 + grohmm_max_uts = 5 grohmm_min_ltprobb = -100 - grohmm_max_ltprobb = -150 + grohmm_max_ltprobb = -100 filter_bed = "${projectDir}/tests/config/unwanted_region.bed" intersect_bed = "${projectDir}/tests/config/wanted_region.bed" } diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index f4c3865f..7cb8828f 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,5 +1,5 @@ process GROHMM_PARAMETERTUNING { - tag "$meta.id|$UTS|$LtProbB" + tag "$meta.id|$UTS| $LtProbB" label 'process_high' label 'process_long' @@ -9,10 +9,8 @@ process GROHMM_PARAMETERTUNING { 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" input: - tuple val(meta), path(bams), path(bais) + tuple val(meta), path(bams), path(bais), val(UTS), val(LtProbB) path gtf - val UTS - val LtProbB output: tuple val(meta), path("*.tuning.csv"), emit: tuning diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index 4a6d615b..022cb455 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -16,13 +16,13 @@ nextflow_process { [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], [], + 5, + -100, ] input[1] = file( "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true ) - input[2] = 5 - input[3] = -100 """ } } diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 15b867b6..145b362d 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -26,12 +26,15 @@ workflow GROHMM { // 5..45 by 5 for UTS is what we had currently ch_uts = channel.fromList((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) // -100..-400 by 50 for LtProbB - ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)).view() + ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)) + ch_bams_bais_uts_ltprobb = + bams_bais + .combine(ch_uts) + .combine(ch_ltprobb) + GROHMM_PARAMETERTUNING ( - bams_bais, + ch_bams_bais_uts_ltprobb, gtf, - ch_uts, - ch_ltprobb, ) .tuning .collectFile( From a5e2bcc0bd37446ab8d89723bb0b060750359cfd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 13:18:23 -0500 Subject: [PATCH 134/255] test(grohmm): Test the whole subworkflow --- subworkflows/local/grohmm/tests/main.nf.test | 101 +++++------------- .../local/grohmm/tests/main.nf.test.snap | 33 ++++++ 2 files changed, 59 insertions(+), 75 deletions(-) create mode 100644 subworkflows/local/grohmm/tests/main.nf.test.snap diff --git a/subworkflows/local/grohmm/tests/main.nf.test b/subworkflows/local/grohmm/tests/main.nf.test index 59b159d0..38115248 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test +++ b/subworkflows/local/grohmm/tests/main.nf.test @@ -1,6 +1,6 @@ nextflow_workflow { - name "Test Workflow GROHMM" + name "Test subworkflow GROHMM" script "../main.nf" workflow "GROHMM" @@ -8,81 +8,24 @@ nextflow_workflow { when { params { outdir = "$outputDir" - skip_tuning = true + grohmm_min_uts = 5 + grohmm_max_uts = 10 + grohmm_min_ltprobb = -100 + grohmm_max_ltprobb = -150 } workflow { """ - input[0] = [ - [ id: 'mR1' ], - [ file("https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/sarscov2/illumina/bam/test.single_end.sorted.bam", checkIfExists: true), ] - ] - // FIXME This needs to match up with s40 - input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/sarscov2/genome/genome.gtf", - checkIfExists: true - ) - input[2] = [] - """ - } - } - - then { - assertAll( - { assert workflow.success }, - { assert snapshot(workflow.out).match() } - ) - } - - } - - test("Should run with multiple bams") { - when { - params { - outdir = "$outputDir" - } - workflow { - """ - input[0] = [ - [ id: 'mR1' ], - [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), - file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ] - ] - input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/homo_sapiens/genome/genome.gtf", - checkIfExists: true - ) - input[2] = [] - """ - } - } - - then { - assertAll( - { assert workflow.success }, - { assert snapshot(workflow.out).match() } - ) - } - - } - - test("Should run with a tuning file") { - - when { - params { - outdir = "$outputDir" - } - workflow { - """ - input[0] = [ - [ id: 'mR1' ], + input[0] = Channel.of([ + [ id: 'Sall' ], [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), - file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ] - ] - input[1] = file( - "https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/homo_sapiens/genome/genome.gtf", - checkIfExists: true - ) - input[2] = file("https://raw.githubusercontent.com/nf-core/test-datasets/nascent/misc/tune.csv", checkIfExists: true) + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], + [], + ]) + input[1] = Channel.of([file( + "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", + checkIfExists: true + )]) + input[2] = Channel.of([]) """ } } @@ -90,10 +33,18 @@ nextflow_workflow { then { assertAll( { assert workflow.success }, - { assert snapshot(workflow.out).match() } + { assert snapshot( + workflow.trace.tasks().size(), + workflow.out.transcripts, + workflow.out.bed, + // workflow.out.td_plot, + ).match() + }, + { assert snapshot( + path(workflow.out.versions.get(0)).yaml) + .match("versions") + }, ) } - } - } diff --git a/subworkflows/local/grohmm/tests/main.nf.test.snap b/subworkflows/local/grohmm/tests/main.nf.test.snap new file mode 100644 index 00000000..ba71da17 --- /dev/null +++ b/subworkflows/local/grohmm/tests/main.nf.test.snap @@ -0,0 +1,33 @@ +{ + "versions": { + "content": [ + { + "GROHMM:GROHMM_PARAMETERTUNING": { + "r-base": "4.3.3", + "bioconductor-grohmm": "1.39.0" + } + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-24T12:58:04.996402914" + }, + "Should run without a tuning file": { + "content": [ + 1, + [ + + ], + [ + + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-24T12:58:04.685610798" + } +} \ No newline at end of file From 7807899d221707b3de56821d5743308cf131559f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 13:43:47 -0500 Subject: [PATCH 135/255] fix(grohmm): Give up on taking a tuning file Can't support everything, if you're gonna run groHMM, you're just going to run the tuning. If you want to minimize the runs, set the grohmm_{min,max}_uts, and grohmm_{min,max}_ltprobb variables to the desired values --- CHANGELOG.md | 4 ++ bin/parameter_tuning.R | 8 --- conf/test.config | 2 - nextflow.config | 1 - nextflow_schema.json | 15 ----- subworkflows/local/grohmm/main.nf | 59 ++++++++----------- subworkflows/local/grohmm/tests/main.nf.test | 11 ++-- .../local/grohmm/tests/main.nf.test.snap | 4 +- .../local/transcript_identification.nf | 3 +- tests/nextflow.config | 1 - .../grohmm/skip_tuning/main.nf.test | 3 +- 11 files changed, 40 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b134164..d09edad9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#170](https://github.com/nf-core/nascent/pull/170) - Remove "Access to undefined parameter forwardStranded" warnings +### Removed + +- Support for groHMM tuning files + ## v2.2.0 - 2024-03-05 ### Added diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 168ad777..f207c9bb 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -16,14 +16,6 @@ parser$add_argument( help = "GRO SEQ data in bam files.", required = TRUE ) -parser$add_argument( - "-t", - "--tuning_file", - type = "character", - default = NULL, - metavar = "path", - help = "File with tuning parameters and error rates." -) parser$add_argument( "-o", "--outdir", diff --git a/conf/test.config b/conf/test.config index 52ee758d..e841fb11 100644 --- a/conf/test.config +++ b/conf/test.config @@ -33,8 +33,6 @@ params { assay_type = "GROseq" skip_grohmm = true // FIXME Fails due to higher memory requirements - // tuning_file = "${projectDir}/tests/config/tuningparams_small.csv" - tuning_file = null // Just run 2 jobs instead of 8 grohmm_min_uts = 5 grohmm_max_uts = 5 diff --git a/nextflow.config b/nextflow.config index e1cfc965..36c88a4a 100644 --- a/nextflow.config +++ b/nextflow.config @@ -25,7 +25,6 @@ params { // Transcript identification method assay_type = null skip_grohmm = false - tuning_file = null grohmm_min_uts = 5 grohmm_max_uts = 45 // Depends on how you look at this one... But I figured most will ignore the negative diff --git a/nextflow_schema.json b/nextflow_schema.json index 02574536..60465a52 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -117,12 +117,6 @@ "R2_3" ] }, - "skip_tuning": { - "type": "boolean", - "description": "Skip groHMM tuning step as it can take a long time.", - "fa_icon": "fas fa-wrench", - "hidden": true - }, "skip_grohmm": { "type": "boolean", "description": "Skip groHMM all together", @@ -155,15 +149,6 @@ "help_text": "Depends on how you look at this one, which is the minimum and maximum... But I figured most will ignore the negative, so we went with absolute values.", "default": -400 }, - "tuning_file": { - "type": "string", - "format": "file-path", - "mimetype": "text/csv", - "pattern": "^\\S+\\.csv$", - "hidden": true, - "fa_icon": "fas fa-file-csv", - "description": "File of parameters to test for groHMM tuning" - }, "filter_bed": { "type": "string", "fa_icon": "fas fa-filter", diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 145b362d..67f2a8e5 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -12,47 +12,40 @@ workflow GROHMM { take: bams_bais gtf - tuning_file + // TODO Support rerunning with a tuning file + // tuning_file main: ch_versions = Channel.empty() - ch_tuning = Channel.empty() - - // if(!tuning_file) { - // Run transcriptcalling eval for each tuning param - // Should avoid a tuning file with a row for everything - // 5..45 by 5 for UTS is what we had currently - ch_uts = channel.fromList((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) - // -100..-400 by 50 for LtProbB - ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)) - ch_bams_bais_uts_ltprobb = - bams_bais - .combine(ch_uts) - .combine(ch_ltprobb) - - GROHMM_PARAMETERTUNING ( - ch_bams_bais_uts_ltprobb, - gtf, + // Run transcriptcalling eval for each tuning param + // Should avoid a tuning file with a row for everything + // 5..45 by 5 for UTS is what we had currently + ch_uts = channel.fromList((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) + // -100..-400 by 50 for LtProbB + ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)) + ch_bams_bais_uts_ltprobb = + bams_bais + .combine(ch_uts) + .combine(ch_ltprobb) + + GROHMM_PARAMETERTUNING ( + ch_bams_bais_uts_ltprobb, + gtf, + ) + .tuning + .collectFile( + name: "${params.outdir}/transcript_identification/grohmm/tuning.csv", + keepHeader: true, + skip: 1, + newLine: true, ) - .tuning - .collectFile( - name: "${params.outdir}/transcript_identification/grohmm/tuning.csv", - keepHeader: true, - skip: 1, - newLine: true, - ) - .set { tuning } + .set { ch_tuning } + ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) - ch_bams_bais_tuning = bams_bais.join(tuning, by: [0]) + ch_bams_bais_tuning = bams_bais.join(ch_tuning, by: [0]) - ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) - // } else { - // If a tuning file is provided, run transcriptcalling once - // NOTE This doesn't really handle multiple "groups well" - // ch_bams_bais_tuning = bams_bais.join(tuning_file) - // } GROHMM_TRANSCRIPTCALLING ( ch_bams_bais_tuning, diff --git a/subworkflows/local/grohmm/tests/main.nf.test b/subworkflows/local/grohmm/tests/main.nf.test index 38115248..bf1a4874 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test +++ b/subworkflows/local/grohmm/tests/main.nf.test @@ -4,14 +4,14 @@ nextflow_workflow { script "../main.nf" workflow "GROHMM" - test("Should run without a tuning file") { + test("Should run without a tuning file and multiplex") { when { params { outdir = "$outputDir" - grohmm_min_uts = 5 - grohmm_max_uts = 10 - grohmm_min_ltprobb = -100 - grohmm_max_ltprobb = -150 + grohmm_min_uts = 5 + grohmm_max_uts = 10 + grohmm_min_ltprobb = -100 + grohmm_max_ltprobb = -150 } workflow { """ @@ -25,7 +25,6 @@ nextflow_workflow { "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true )]) - input[2] = Channel.of([]) """ } } diff --git a/subworkflows/local/grohmm/tests/main.nf.test.snap b/subworkflows/local/grohmm/tests/main.nf.test.snap index ba71da17..f513363b 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test.snap +++ b/subworkflows/local/grohmm/tests/main.nf.test.snap @@ -14,7 +14,7 @@ }, "timestamp": "2024-09-24T12:58:04.996402914" }, - "Should run without a tuning file": { + "Should run without a tuning file and multiplex": { "content": [ 1, [ @@ -28,6 +28,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-09-24T12:58:04.685610798" + "timestamp": "2024-09-24T13:38:02.218159522" } } \ No newline at end of file diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification.nf index a13082b4..b1217a90 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification.nf @@ -23,10 +23,9 @@ workflow TRANSCRIPT_INDENTIFICATION { ch_versions = Channel.empty() ch_identification_bed = Channel.empty() - ch_tuning_file = params.tuning_file ? file(params.tuning_file, checkIfExists: true) : file("${projectDir}/assets/tuningparamstotest.csv") grohmm_td_plot = Channel.empty() if(!params.skip_grohmm && params.assay_type == "GROseq") { - GROHMM ( group_bam_bai, gtf, ch_tuning_file ) + GROHMM ( group_bam_bai, gtf ) ch_identification_bed = ch_identification_bed.mix(GROHMM.out.bed) grohmm_td_plot = GROHMM.out.td_plot ch_versions = ch_versions.mix(GROHMM.out.versions.first()) diff --git a/tests/nextflow.config b/tests/nextflow.config index 97eb3736..a029ac75 100644 --- a/tests/nextflow.config +++ b/tests/nextflow.config @@ -38,7 +38,6 @@ params { assay_type = "GROseq" skip_grohmm = true // FIXME Fails due to higher memory requirements - tuning_file = "${projectDir}/tests/config/tuningparams_small.csv" filter_bed = "${projectDir}/tests/config/unwanted_region.bed" intersect_bed = "${projectDir}/tests/config/wanted_region.bed" } diff --git a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test index b9d975bd..4885b0b7 100644 --- a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test @@ -4,6 +4,7 @@ nextflow_pipeline { script "../../../main.nf" tag "groHMM" + // TODO Support a tuning file test("Should be able to skip tuning") { when { @@ -16,7 +17,7 @@ nextflow_pipeline { then { assertAll( - { assert workflow.success }, + { assert workflow.failure }, { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), From d67acdee575760072af38ee3e468100d7eb4597f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 16:12:01 -0500 Subject: [PATCH 136/255] test(grohmm): Fix how the channel is created to avoid exhausting it https://midnighter.github.io/nextflow-gotchas/gotchas/singleton-channel/ --- subworkflows/local/grohmm/tests/main.nf.test | 2 +- subworkflows/local/grohmm/tests/main.nf.test.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subworkflows/local/grohmm/tests/main.nf.test b/subworkflows/local/grohmm/tests/main.nf.test index bf1a4874..905fbf5d 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test +++ b/subworkflows/local/grohmm/tests/main.nf.test @@ -24,7 +24,7 @@ nextflow_workflow { input[1] = Channel.of([file( "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true - )]) + )]).first() """ } } diff --git a/subworkflows/local/grohmm/tests/main.nf.test.snap b/subworkflows/local/grohmm/tests/main.nf.test.snap index f513363b..d5b4fa62 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test.snap +++ b/subworkflows/local/grohmm/tests/main.nf.test.snap @@ -16,7 +16,7 @@ }, "Should run without a tuning file and multiplex": { "content": [ - 1, + 4, [ ], @@ -28,6 +28,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-09-24T13:38:02.218159522" + "timestamp": "2024-09-24T16:07:41.806165357" } } \ No newline at end of file From 09212f9bf0b110e84bf308e1007bc26921c3b78e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 18:05:20 -0500 Subject: [PATCH 137/255] fix(grohmm): Get transcript calling running --- modules/local/grohmm/parametertuning/main.nf | 2 +- subworkflows/local/grohmm/main.nf | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 7cb8828f..b865f407 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,5 +1,5 @@ process GROHMM_PARAMETERTUNING { - tag "$meta.id|$UTS| $LtProbB" + tag "$meta.id|$UTS|$LtProbB" label 'process_high' label 'process_long' diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 67f2a8e5..f3f5b3b4 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -36,19 +36,28 @@ workflow GROHMM { ) .tuning .collectFile( - name: "${params.outdir}/transcript_identification/grohmm/tuning.csv", keepHeader: true, skip: 1, newLine: true, + storeDir: "${params.outdir}/transcript_identification/grohmm/", ) + { meta, file -> + filename = "${meta.id}.${meta.single_end ? 'SE': 'PE' }.tuning.csv" + [filename, file.text] + } + .map { path -> + meta = [ + id:path.getSimpleName(), + single_end: path.getName().split("\\.")[1] == 'SE' ? true : false + ] + [meta, file(path)] + } .set { ch_tuning } - ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) - - ch_bams_bais_tuning = bams_bais.join(ch_tuning, by: [0]) + ch_versions = ch_versions.mix(GROHMM_PARAMETERTUNING.out.versions.first()) GROHMM_TRANSCRIPTCALLING ( - ch_bams_bais_tuning, + bams_bais.join(ch_tuning, by: [0]), gtf, ) ch_versions = ch_versions.mix(GROHMM_TRANSCRIPTCALLING.out.versions.first()) From d2e40651d8a66d16c33ef15902d3c5c7191a798f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 24 Sep 2024 19:53:43 -0500 Subject: [PATCH 138/255] fix(grohmm): Clean up tuning file to match --- bin/parameter_tuning.R | 19 ++++++++++++++++++- bin/transcriptcalling_grohmm.R | 1 + subworkflows/local/grohmm/main.nf | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index f207c9bb..791e3e0e 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -116,6 +116,10 @@ print("Finished consensus annotations") ## TUNING ## ############ print("Starting tuning run") +tune <- data.frame( + LtProbB = args$ltprobb, + UTS = args$uts +) Fp <- windowAnalysis(alignments, strand = "+", windowSize = 50) Fm <- windowAnalysis(alignments, strand = "-", windowSize = 50) hmm <- detectTranscripts( @@ -127,10 +131,23 @@ hmm <- detectTranscripts( ) print("Evaluating") e <- evaluateHMMInAnnotations(hmm$transcripts, kg_consensus) + +# Extract evaluation metrics and convert to a data frame +eval_metrics <- as.data.frame(e$eval) + +# If eval_metrics is a list of lists, unlist it +if (is.list(eval_metrics[[1]])) { + eval_metrics <- as.data.frame(t(sapply(e$eval, unlist))) +} + +# Combine the tuning parameters with the evaluation metrics +tune <- cbind(tune, eval_metrics) + print(e$eval) print(e) -write.csv(e$eval, file = paste0(args$outprefix, ".tuning.csv")) +# Write the combined data to a CSV file without row names +write.csv(tune, file = paste0(args$outprefix, ".tuning.csv"), row.names = FALSE) ######################## ## CITE PACKAGES USED ## diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index 62134e1b..e5eeef55 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -91,6 +91,7 @@ parser$add_argument( args <- parser$parse_args() options(mc.cores = getCores(args$cores)) +## Windows Specific doesn't actually do anything memory.limit(size = args$memory) setwd(args$outdir) diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index f3f5b3b4..bec93af9 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -38,7 +38,7 @@ workflow GROHMM { .collectFile( keepHeader: true, skip: 1, - newLine: true, + newLine: false, storeDir: "${params.outdir}/transcript_identification/grohmm/", ) { meta, file -> From 2286b7aeee0b9afe210a65c7285c572a262c6a8a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 25 Sep 2024 16:02:11 -0500 Subject: [PATCH 139/255] fix(grohmm): Update groHMM with fix Now it handles when there are no broken transcripts(ie with a test dataset) --- bin/transcriptcalling_grohmm.R | 3 ++ conf/test.config | 5 ++-- .../grohmm/parametertuning/environment.yml | 4 +-- modules/local/grohmm/parametertuning/main.nf | 4 +-- .../grohmm/transcriptcalling/environment.yml | 2 +- .../local/grohmm/transcriptcalling/main.nf | 4 +-- .../grohmm/skip_tuning/main.nf.test | 28 +------------------ 7 files changed, 13 insertions(+), 37 deletions(-) diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index e5eeef55..5600ca54 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -120,6 +120,9 @@ if (is.null(args$tuning_file)) { # Minimum error uts <- tune[which.min(tune$errorRate), "UTS"] lt_probb <- tune[which.min(tune$errorRate), "LtProbB"] + # Print the minimums for debugging + cat("minimum uts:", uts) + cat("minimum lt_probb:", lt_probb) hmm_result <- detectTranscripts( alignments, LtProbB = lt_probb, diff --git a/conf/test.config b/conf/test.config index e841fb11..a7a9d6f1 100644 --- a/conf/test.config +++ b/conf/test.config @@ -33,11 +33,10 @@ params { assay_type = "GROseq" skip_grohmm = true // FIXME Fails due to higher memory requirements - // Just run 2 jobs instead of 8 grohmm_min_uts = 5 - grohmm_max_uts = 5 + grohmm_max_uts = 10 grohmm_min_ltprobb = -100 - grohmm_max_ltprobb = -100 + grohmm_max_ltprobb = -150 filter_bed = "${projectDir}/tests/config/unwanted_region.bed" intersect_bed = "${projectDir}/tests/config/wanted_region.bed" } diff --git a/modules/local/grohmm/parametertuning/environment.yml b/modules/local/grohmm/parametertuning/environment.yml index c77ab0b6..5972f503 100644 --- a/modules/local/grohmm/parametertuning/environment.yml +++ b/modules/local/grohmm/parametertuning/environment.yml @@ -7,8 +7,8 @@ dependencies: - conda-forge::r-base # =4.1.1 - conda-forge::r-optparse # =1.7.1 - conda-forge::r-argparse # =2.1.3 - - bioconda::bioconductor-genomicfeatures=1.46.1 + - bioconda::bioconductor-genomicfeatures # NOTE Can't use the official package because of # https://github.com/dankoc/groHMM/issues/2 # - bioconda::bioconductor-grohmm=1.28.0 - - bioinfoorphanage-grohmm + - bioinfoorphanage-grohmm=1.36.1 diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index b865f407..d2c2ae77 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -5,8 +5,8 @@ process GROHMM_PARAMETERTUNING { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : - 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" + 'oras://community.wave.seqera.io/library/grohmm:03357458e0821bcb' : + 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" input: tuple val(meta), path(bams), path(bais), val(UTS), val(LtProbB) diff --git a/modules/local/grohmm/transcriptcalling/environment.yml b/modules/local/grohmm/transcriptcalling/environment.yml index e9f7efa5..98febd37 100644 --- a/modules/local/grohmm/transcriptcalling/environment.yml +++ b/modules/local/grohmm/transcriptcalling/environment.yml @@ -11,4 +11,4 @@ dependencies: # NOTE Can't use the official package because of # https://github.com/dankoc/groHMM/issues/2 # - bioconda::bioconductor-grohmm=1.28.0 - - bioinfoorphanage-grohmm + - bioinfoorphanage-grohmm=1.36.1 diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 8a6d35cd..83105e4b 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -5,8 +5,8 @@ process GROHMM_TRANSCRIPTCALLING { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'oras://community.wave.seqera.io/library/grohmm:a660d9c3942c9b85' : - 'community.wave.seqera.io/library/grohmm:780b8693bdaa87b9' }" + 'oras://community.wave.seqera.io/library/grohmm:03357458e0821bcb' : + 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" input: tuple val(meta), path(bams), path(bais), path(tuning_file) diff --git a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test index 4885b0b7..f8cb4aa2 100644 --- a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test @@ -4,7 +4,6 @@ nextflow_pipeline { script "../../../main.nf" tag "groHMM" - // TODO Support a tuning file test("Should be able to skip tuning") { when { @@ -17,33 +16,8 @@ nextflow_pipeline { then { assertAll( + // TODO Support a tuning file { assert workflow.failure }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, - { assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/transcript_identification/grohmm/cd4.eval.txt"), - path("$outputDir/transcript_identification/grohmm/cd4.final.transcripts.bed"), - path("$outputDir/transcript_identification/grohmm/cd4.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.jpg").exists(), - path("$outputDir/transcript_identification/grohmm/cd4.transcripts.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.eval.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.final.transcripts.bed"), - path("$outputDir/transcript_identification/grohmm/jurkat.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.jpg").exists(), - path("$outputDir/transcript_identification/grohmm/jurkat.transcripts.txt"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // path("$outputDir/quantification/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } ) } } From 9388a21538ec392d7e172cb0ee8b544cc7557110 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 17 Oct 2024 10:20:48 -0500 Subject: [PATCH 140/255] Add consensus bed as output for testing --- bin/parameter_tuning.R | 2 ++ modules/local/grohmm/parametertuning/main.nf | 1 + .../local/grohmm/parametertuning/tests/main.nf.test | 3 ++- .../grohmm/parametertuning/tests/main.nf.test.snap | 13 +++++-------- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 791e3e0e..42d613e6 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -148,6 +148,8 @@ print(e) # Write the combined data to a CSV file without row names write.csv(tune, file = paste0(args$outprefix, ".tuning.csv"), row.names = FALSE) +# Write kg_consensus to a bed file for testing +export.bed(kg_consensus, con = paste0(args$outprefix, ".tuning.consensus.bed")) ######################## ## CITE PACKAGES USED ## diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index d2c2ae77..c682f912 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -14,6 +14,7 @@ process GROHMM_PARAMETERTUNING { output: tuple val(meta), path("*.tuning.csv"), emit: tuning + tuple val(meta), path("*.tuning.consensus.bed"), emit: bed path "versions.yml", emit: versions when: diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index 022cb455..c3b7117b 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -31,7 +31,8 @@ nextflow_process { assertAll( { assert process.success }, { assert snapshot( - process.out.tuning, + path(process.out.tuning[0][1]).readLines(), + path(process.out.bed[0][1]), ).match() }, { assert snapshot(path(process.out.versions.get(0)).yaml).match("versions") }, ) diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test.snap b/modules/local/grohmm/parametertuning/tests/main.nf.test.snap index 59516a3f..dce05f0a 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test.snap +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test.snap @@ -17,18 +17,15 @@ "Should run with defaults": { "content": [ [ - [ - { - "id": "Sall" - }, - "Sall_5_-100.tuning.csv:md5,abe7dd590cb307eff7abb293eec38190" - ] - ] + "\"LtProbB\",\"UTS\",\"merged\",\"dissociated\",\"total\",\"errorRate\",\"txSize\"", + "-100,5,33,123,156,0.0756180319922443,921" + ], + "Sall_5_-100.tuning.consensus.bed:md5,f3144b4ff6493a7ccef422aa4e160d46" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-09-24T11:44:17.28827251" + "timestamp": "2024-10-17T19:58:42.34659" } } \ No newline at end of file From b7567c8b45d3c4cbbc686ec17eafe271d5ffa50e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 25 Sep 2024 16:30:46 -0500 Subject: [PATCH 141/255] test(grohmm): Update all the snapshots --- .../local/grohmm/parametertuning/tests/main.nf.test | 1 + .../grohmm/transcriptcalling/tests/main.nf.test | 1 + .../grohmm/skip_tuning/main.nf.test | 4 ++-- .../grohmm/tuning/main.nf.test | 2 +- .../grohmm/tuning/main.nf.test.snap | 12 ++++++++++++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index c3b7117b..6e07ec48 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -3,6 +3,7 @@ nextflow_process { name "Test Process GROHMM_PARAMETERTUNING" script "modules/local/grohmm/parametertuning/main.nf" process "GROHMM_PARAMETERTUNING" + tag "grohmm" test("Should run with defaults") { when { diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test b/modules/local/grohmm/transcriptcalling/tests/main.nf.test index 0395a6fc..01a12c62 100644 --- a/modules/local/grohmm/transcriptcalling/tests/main.nf.test +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test @@ -3,6 +3,7 @@ nextflow_process { name "Test Process GROHMM_TRANSCRIPTCALLING" script "modules/local/grohmm/transcriptcalling/main.nf" process "GROHMM_TRANSCRIPTCALLING" + tag "groHMM" test("Should fail without a tuning file") { when { diff --git a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test index f8cb4aa2..5956948f 100644 --- a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test @@ -1,7 +1,7 @@ nextflow_pipeline { name "groHMM" - script "../../../main.nf" + script "../../../../../main.nf" tag "groHMM" test("Should be able to skip tuning") { @@ -17,7 +17,7 @@ nextflow_pipeline { then { assertAll( // TODO Support a tuning file - { assert workflow.failure }, + { assert workflow.failed }, ) } } diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index 09053601..ea23dc88 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -1,6 +1,6 @@ nextflow_pipeline { name "groHMM" - script "../../../main.nf" + script "../../../../../main.nf" tag "groHMM" test("Should run with defaults") { diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap new file mode 100644 index 00000000..e1c67f43 --- /dev/null +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -0,0 +1,12 @@ +{ + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GROHMM_PARAMETERTUNING={r-base=4.3.3, bioconductor-grohmm=1.39.0}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-26T03:52:06.649510139" + } +} \ No newline at end of file From baa008bae6458cc4649f3b4ffc5b7a41b8e18cec Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 26 Sep 2024 14:33:42 -0500 Subject: [PATCH 142/255] refactor(grohmm): Use each input Didn't know that was a thing! --- modules/local/grohmm/parametertuning/main.nf | 4 +++- subworkflows/local/grohmm/main.nf | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index c682f912..56cb707e 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -9,8 +9,10 @@ process GROHMM_PARAMETERTUNING { 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" input: - tuple val(meta), path(bams), path(bais), val(UTS), val(LtProbB) + tuple val(meta), path(bams), path(bais) path gtf + each UTS + each LtProbB output: tuple val(meta), path("*.tuning.csv"), emit: tuning diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index bec93af9..260e737d 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -25,14 +25,12 @@ workflow GROHMM { ch_uts = channel.fromList((params.grohmm_min_uts..params.grohmm_max_uts).step(5)) // -100..-400 by 50 for LtProbB ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)) - ch_bams_bais_uts_ltprobb = - bams_bais - .combine(ch_uts) - .combine(ch_ltprobb) GROHMM_PARAMETERTUNING ( - ch_bams_bais_uts_ltprobb, + bams_bais, gtf, + ch_uts, + ch_ltprobb, ) .tuning .collectFile( From d9e94aa986cc37bc2f3c1d56052973a96a9312fa Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 27 Sep 2024 08:50:34 -0500 Subject: [PATCH 143/255] feat(grohmm): Add Native MultiQC support --- bin/transcriptcalling_grohmm.R | 8 +++++--- modules/local/grohmm/parametertuning/environment.yml | 2 +- modules/local/grohmm/transcriptcalling/environment.yml | 2 +- modules/local/grohmm/transcriptcalling/main.nf | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index 5600ca54..e19cd244 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -181,19 +181,21 @@ b_plus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "+") b_minus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "-") tx_broken <- c(b_plus, b_minus) tx_final <- combineTranscripts(tx_broken, kg_consensus) -td_final <- getTxDensity(tx_final, con_expressed, mc.cores = args$cores) export( tx_final, con = paste(args$outprefix, ".final.transcripts.bed", sep = "") ) -capture.output(td_final, file = paste0(args$outprefix, ".tdFinal.txt")) # 1. Output plot jpeg(file = paste0(args$outprefix, ".tdplot_mqc.jpg")) -# 2. Create the plot +# 2. Create the plot and capture data td_final <- getTxDensity(tx_final, con_expressed, mc.cores = args$cores) # 3. Close the file dev.off() +capture.output(td_final, file = paste0(args$outprefix, ".tdFinal.txt")) +# Write the data used in the plot to a CSV file +data_to_write <- data.frame(x = td_final$x, profile = td_final$profile) +write.csv(data_to_write, file = paste0(args$outprefix, ".tdFinal_mqc.csv"), row.names = FALSE) ######################## ## CITE PACKAGES USED ## diff --git a/modules/local/grohmm/parametertuning/environment.yml b/modules/local/grohmm/parametertuning/environment.yml index 5972f503..9541fd45 100644 --- a/modules/local/grohmm/parametertuning/environment.yml +++ b/modules/local/grohmm/parametertuning/environment.yml @@ -11,4 +11,4 @@ dependencies: # NOTE Can't use the official package because of # https://github.com/dankoc/groHMM/issues/2 # - bioconda::bioconductor-grohmm=1.28.0 - - bioinfoorphanage-grohmm=1.36.1 + - bioinfoorphanage-grohmm=1.37.0 diff --git a/modules/local/grohmm/transcriptcalling/environment.yml b/modules/local/grohmm/transcriptcalling/environment.yml index 98febd37..7c33e90d 100644 --- a/modules/local/grohmm/transcriptcalling/environment.yml +++ b/modules/local/grohmm/transcriptcalling/environment.yml @@ -11,4 +11,4 @@ dependencies: # NOTE Can't use the official package because of # https://github.com/dankoc/groHMM/issues/2 # - bioconda::bioconductor-grohmm=1.28.0 - - bioinfoorphanage-grohmm=1.36.1 + - bioinfoorphanage-grohmm=1.37.0 diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 83105e4b..2b920842 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -18,6 +18,7 @@ process GROHMM_TRANSCRIPTCALLING { tuple val(meta), path("*.transcripts.bed"), emit: transcripts_bed tuple val(meta), path("*.tdFinal.txt") , emit: td tuple val(meta), path("*.tdplot_mqc.jpg") , emit: td_plot + tuple val(meta), path("*.tdFinal_mqc.csv") , emit: mqc_csv path "versions.yml" , emit: versions when: From a535c8c78ce9781f3ef62ac67e5a9ad6b2f1980f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 28 Sep 2024 11:33:42 -0500 Subject: [PATCH 144/255] fix(grohmm): Update labels for parametertuning Since these are are split into seperate jobs now, they're not "long"(longest I've seen one take is ~143 minutes). Adding arrays later because there's so many of them and they're the same --- modules/local/grohmm/parametertuning/main.nf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 56cb707e..0f11a54e 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,7 +1,8 @@ process GROHMM_PARAMETERTUNING { tag "$meta.id|$UTS|$LtProbB" label 'process_high' - label 'process_long' + label 'error_retry' + // array 10 conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? From 2f1c81c401c89a09860ee6bd1144e91689f0fa86 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 30 Sep 2024 11:15:11 -0500 Subject: [PATCH 145/255] chore: Add a note about the subworkflow functionality --- subworkflows/local/grohmm/tests/main.nf.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/subworkflows/local/grohmm/tests/main.nf.test b/subworkflows/local/grohmm/tests/main.nf.test index 905fbf5d..29382e3f 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test +++ b/subworkflows/local/grohmm/tests/main.nf.test @@ -3,6 +3,7 @@ nextflow_workflow { name "Test subworkflow GROHMM" script "../main.nf" workflow "GROHMM" + tag "grohmm" test("Should run without a tuning file and multiplex") { when { @@ -32,6 +33,7 @@ nextflow_workflow { then { assertAll( { assert workflow.success }, + // FIXME this snapshot reports nothing? Probably the test { assert snapshot( workflow.trace.tasks().size(), workflow.out.transcripts, From cd9151e4241518f1ce944927cabc067473744be2 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 6 Oct 2024 18:48:09 -0500 Subject: [PATCH 146/255] chore: oras => https --- modules/local/grohmm/parametertuning/main.nf | 2 +- modules/local/grohmm/transcriptcalling/main.nf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 0f11a54e..ffa13d70 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -6,7 +6,7 @@ process GROHMM_PARAMETERTUNING { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'oras://community.wave.seqera.io/library/grohmm:03357458e0821bcb' : + 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/b9/b929af5662486ba6ce2d27eb501e5c7ec71ca7dd8e333fe5d3dcf2803d87cf67/data' : 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" input: diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 2b920842..dfb1a731 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -5,7 +5,7 @@ process GROHMM_TRANSCRIPTCALLING { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'oras://community.wave.seqera.io/library/grohmm:03357458e0821bcb' : + 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/b9/b929af5662486ba6ce2d27eb501e5c7ec71ca7dd8e333fe5d3dcf2803d87cf67/data' : 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" input: From 26626fa07ba52e9719d547c318abbbc14e80c0f7 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 26 Sep 2024 14:33:42 -0500 Subject: [PATCH 147/255] refactor(grohmm): Use each input Didn't know that was a thing! --- modules/local/grohmm/parametertuning/tests/main.nf.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index 6e07ec48..eafdb9d9 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -17,13 +17,13 @@ nextflow_process { [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], [], - 5, - -100, ] input[1] = file( "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true ) + input[2] = 5 + input[3] = -100 """ } } From 9272060f1cf50e971768713ebb3ab0ac4e6deda1 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 7 Oct 2024 16:06:19 -0500 Subject: [PATCH 148/255] test(grohmm): Write a failing test With the help of cursor --- .../grohmm/parametertuning/tests/broken.gtf | 13 +++++++ .../parametertuning/tests/chm13_gtf.nf.test | 37 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 modules/local/grohmm/parametertuning/tests/broken.gtf create mode 100644 modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test diff --git a/modules/local/grohmm/parametertuning/tests/broken.gtf b/modules/local/grohmm/parametertuning/tests/broken.gtf new file mode 100644 index 00000000..a62cff54 --- /dev/null +++ b/modules/local/grohmm/parametertuning/tests/broken.gtf @@ -0,0 +1,13 @@ +chr1 source gene 1000 5000 . + . gene_id "gene1"; +chr1 source transcript 1000 5000 . + . gene_id "gene1"; transcript_id "transcript1"; +chr1 source exon 1000 2000 . + . gene_id "gene1"; transcript_id "transcript1"; exon_number "1"; +chr1 source exon 1500 2500 . + . gene_id "gene1"; transcript_id "transcript1"; exon_number "2"; +chr1 source CDS 1000 1500 . + 0 gene_id "gene1"; transcript_id "transcript1"; exon_number "1"; +chr1 source CDS 1500 2000 . + 0 gene_id "gene1"; transcript_id "transcript1"; exon_number "2"; + +chr1 source gene 6000 9000 . + . gene_id "gene2"; +chr1 source transcript 6000 9000 . + . gene_id "gene2"; transcript_id "transcript2"; +chr1 source exon 6000 7000 . + . gene_id "gene2"; transcript_id "transcript2"; exon_number "1"; +chr1 source exon 6500 8000 . + . gene_id "gene2"; transcript_id "transcript2"; exon_number "2"; +chr1 source CDS 6000 6500 . + 0 gene_id "gene2"; transcript_id "transcript2"; exon_number "1"; +chr1 source CDS 6500 7000 . + 0 gene_id "gene2"; transcript_id "transcript2"; exon_number "2"; diff --git a/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test new file mode 100644 index 00000000..e0d37e82 --- /dev/null +++ b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test @@ -0,0 +1,37 @@ +nextflow_process { + + name "Test Process GROHMM_PARAMETERTUNING" + script "../main.nf" + process "GROHMM_PARAMETERTUNING" + tag "groHMM" + + test("Should fail with overlapping exons in GTF") { + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [ id: 'Sall' ], + [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], + [], + ] + input[1] = file( + "https://gist.githubusercontent.com/edmundmiller/f9a31e300a90956d8aaff7ad6105e394/raw/99f6eff1ddb8ca9ac1cd766ea2fed9bb83919fb2/broke.gtf", + checkIfExists: true + ) + input[2] = 5 + input[3] = -100 + """ + } + } + + then { + assertAll( + { assert process.failed }, + ) + } + } +} From 3d5cf853c9a206ff5248df74e6078bdc46aa814e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 4 Oct 2024 11:20:09 -0500 Subject: [PATCH 149/255] fix(grohmm): Update to work with CHM13 refactor: Clean up code more --- bin/parameter_tuning.R | 59 ++++++++++++++++++- main.nf | 2 +- .../parametertuning/tests/chm13_gtf.nf.test | 8 ++- .../tests/chm13_gtf.nf.test.snap | 16 +++++ .../parametertuning/tests/main.nf.test.snap | 6 +- .../grohmm/tuning/main.nf.test | 1 + 6 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test.snap diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 42d613e6..73c7e5f2 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -103,11 +103,64 @@ for (bam in args$bam_files) { } print("Input transcript annotations") -kg_db <- makeTxDbFromGFF(args$gtf) -kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) +# Import the GTF file using rtracklayer +gtf <- import(args$gtf) + +# Exclude any transcripts located on chromosomes labeled with "random" +gtf <- gtf[!grepl("random", seqnames(gtf)), ] + +# Extract transcript-level features +transcripts_gtf <- gtf[gtf$type == "transcript", ] +# Extract exon features +exons_gtf <- gtf[gtf$type == "exon", ] + +# Ensure that the 'transcript_id' and 'gene_id' columns are present +if (!all(c("transcript_id", "gene_id") %in% names(mcols(exons_gtf)))) { + stop("The GTF file lacks 'transcript_id' or 'gene_id' in its attributes.") +} + +# Group exons by transcript_id +exons_by_transcript <- split(exons_gtf, exons_gtf$transcript_id) + +# Diagnostic prints +print(paste("Number of transcripts:", length(exons_by_transcript))) + +# Reduce exons to create transcript ranges +transcripts_ranges <- GenomicRanges::reduce(exons_by_transcript) +transcripts_ranges <- unlist(transcripts_ranges, use.names = TRUE) + +# Diagnostic prints after reduction +print(paste("Number of transcripts_ranges after reduction:", length(transcripts_ranges))) + +# Create mapping dataframe +mapping_df <- data.frame( + transcript_id = names(transcripts_ranges), + gene_id = vapply(exons_by_transcript[names(transcripts_ranges)], function(x) unique(x$gene_id)[1], character(1)), + stringsAsFactors = FALSE +) + +# Check for length mismatch +if (nrow(mapping_df) != length(transcripts_ranges)) { + stop(paste("Length mismatch between mapping_df and transcripts_ranges:", nrow(mapping_df), length(transcripts_ranges))) +} + +# Assign metadata +mcols(transcripts_ranges)$transcript_id <- mapping_df$transcript_id +mcols(transcripts_ranges)$gene_id <- mapping_df$gene_id + +# Assign seqnames and strand from the exons +seqnames(transcripts_ranges) <- seqnames(exons_gtf[match(names(transcripts_ranges), exons_gtf$transcript_id)]) +strand(transcripts_ranges) <- strand(exons_gtf[match(names(transcripts_ranges), exons_gtf$transcript_id)]) + +# Ensure that seqlevels are set correctly +seqlevels(transcripts_ranges) <- seqlevels(gtf) + +# Remove any transcripts with NA values +transcripts_ranges <- transcripts_ranges[!is.na(start(transcripts_ranges)) & !is.na(end(transcripts_ranges))] + print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( - kg_tx, + transcripts_ranges, mc.cores = args$cores ) print("Finished consensus annotations") diff --git a/main.nf b/main.nf index 53cc81c9..a7c8547b 100644 --- a/main.nf +++ b/main.nf @@ -15,7 +15,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -include { NASCENT } from './workflows/nascent' +include { NASCENT } from './workflows/nascent' include { PIPELINE_INITIALISATION } from './subworkflows/local/utils_nfcore_nascent_pipeline' include { PIPELINE_COMPLETION } from './subworkflows/local/utils_nfcore_nascent_pipeline' include { getGenomeAttribute } from './subworkflows/local/utils_nfcore_nascent_pipeline' diff --git a/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test index e0d37e82..0d27d847 100644 --- a/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test +++ b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test @@ -5,7 +5,7 @@ nextflow_process { process "GROHMM_PARAMETERTUNING" tag "groHMM" - test("Should fail with overlapping exons in GTF") { + test("Should pass with overlapping exons in GTF") { when { params { outdir = "$outputDir" @@ -30,7 +30,11 @@ nextflow_process { then { assertAll( - { assert process.failed }, + { assert process.success }, + { assert snapshot( + path(process.out.tuning[0][1]).readLines(), + path(process.out.bed[0][1]), + ).match() }, ) } } diff --git a/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test.snap b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test.snap new file mode 100644 index 00000000..a7e892f2 --- /dev/null +++ b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test.snap @@ -0,0 +1,16 @@ +{ + "Should pass with overlapping exons in GTF": { + "content": [ + [ + "\"LtProbB\",\"UTS\",\"merged\",\"dissociated\",\"total\",\"errorRate\",\"txSize\"", + "-100,5,0,0,0,0,921" + ], + "Sall_5_-100.tuning.consensus.bed:md5,90bcbcd2a2fbd8e2c3602152d89d1cd5" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-10-17T20:16:00.717011" + } +} \ No newline at end of file diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test.snap b/modules/local/grohmm/parametertuning/tests/main.nf.test.snap index dce05f0a..f68dce3f 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test.snap +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test.snap @@ -18,14 +18,14 @@ "content": [ [ "\"LtProbB\",\"UTS\",\"merged\",\"dissociated\",\"total\",\"errorRate\",\"txSize\"", - "-100,5,33,123,156,0.0756180319922443,921" + "-100,5,10,0,10,0.00617665225447807,921" ], - "Sall_5_-100.tuning.consensus.bed:md5,f3144b4ff6493a7ccef422aa4e160d46" + "Sall_5_-100.tuning.consensus.bed:md5,013b67a2aef7956b6400a61d413f65a8" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-10-17T19:58:42.34659" + "timestamp": "2024-10-17T20:21:05.448531" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index ea23dc88..921079cc 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -2,6 +2,7 @@ nextflow_pipeline { name "groHMM" script "../../../../../main.nf" tag "groHMM" + // triggers 'bin/parameter_tuning.R', 'bin/transcriptcalling_grohmm.R' test("Should run with defaults") { when { From b8548a3def136ce6fbb6e8d9a561285535c5553b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 4 Oct 2024 18:37:20 -0500 Subject: [PATCH 150/255] refactor: Replace jpg with png --- assets/multiqc_config.yml | 2 +- bin/transcriptcalling_grohmm.R | 7 ++++++- docs/output.md | 2 +- modules/local/grohmm/transcriptcalling/main.nf | 2 +- .../transcript_indentification/grohmm/tuning/main.nf.test | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index c2263ca3..60f73877 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -50,7 +50,7 @@ custom_data: plot_type: "image" sp: grohmm_plot: - fn: "*.tdplot_mqc.jpg" + fn: "*.tdplot_mqc.png" ignore_images: false export_plots: true diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index e19cd244..883daa18 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -186,7 +186,12 @@ export( con = paste(args$outprefix, ".final.transcripts.bed", sep = "") ) # 1. Output plot -jpeg(file = paste0(args$outprefix, ".tdplot_mqc.jpg")) +png( + file = paste0(args$outprefix, ".tdplot_mqc.png"), + width = 800, + height = 600, res = 300 +) + # 2. Create the plot and capture data td_final <- getTxDensity(tx_final, con_expressed, mc.cores = args$cores) # 3. Close the file diff --git a/docs/output.md b/docs/output.md index 4b251dbe..22715b8a 100644 --- a/docs/output.md +++ b/docs/output.md @@ -326,7 +326,7 @@ For more information about how PINTS works, see the paper [A comparison of exper - `*.eval.txt`: Evaluation of HMM Annotations - `*.final.transcripts.bed`: Predicted transcripts - `*.tdFinal.txt`: Final quality metrics - - `*.tdplot_mqc.jpg`: TD plot included in MultiQC + - `*.tdplot_mqc.png`: TD plot included in MultiQC - `*.transcripts.txt`: Predicted transcripts in txt form - `*.tuning.csv`: The tuning csv that was used diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index dfb1a731..7935daae 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -17,7 +17,7 @@ process GROHMM_TRANSCRIPTCALLING { tuple val(meta), path("*.eval.txt") , emit: eval tuple val(meta), path("*.transcripts.bed"), emit: transcripts_bed tuple val(meta), path("*.tdFinal.txt") , emit: td - tuple val(meta), path("*.tdplot_mqc.jpg") , emit: td_plot + tuple val(meta), path("*.tdplot_mqc.png") , emit: td_plot tuple val(meta), path("*.tdFinal_mqc.csv") , emit: mqc_csv path "versions.yml" , emit: versions diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index 921079cc..90c84a15 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -30,12 +30,12 @@ nextflow_pipeline { path("$outputDir/transcript_identification/grohmm/cd4.eval.txt"), path("$outputDir/transcript_identification/grohmm/cd4.final.transcripts.bed"), path("$outputDir/transcript_identification/grohmm/cd4.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.jpg").exists(), + path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.png").exists(), path("$outputDir/transcript_identification/grohmm/cd4.transcripts.txt"), path("$outputDir/transcript_identification/grohmm/jurkat.eval.txt"), path("$outputDir/transcript_identification/grohmm/jurkat.final.transcripts.bed"), path("$outputDir/transcript_identification/grohmm/jurkat.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.jpg").exists(), + path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.png").exists(), path("$outputDir/transcript_identification/grohmm/jurkat.transcripts.txt"), // FIXME Not determinstic because of the order of files // Add to the other tests when fixed From 0c7a9ba0d83045e23571f84ca9e1478f12ea7cf6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 9 Oct 2024 16:30:30 -0500 Subject: [PATCH 151/255] test: Remove skip_tuning test --- .../grohmm/skip_tuning/main.nf.test | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test diff --git a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test deleted file mode 100644 index 5956948f..00000000 --- a/workflows/tests/transcript_indentification/grohmm/skip_tuning/main.nf.test +++ /dev/null @@ -1,24 +0,0 @@ -nextflow_pipeline { - - name "groHMM" - script "../../../../../main.nf" - tag "groHMM" - - test("Should be able to skip tuning") { - - when { - params { - outdir = "$outputDir" - skip_grohmm = false - skip_tuning = true - } - } - - then { - assertAll( - // TODO Support a tuning file - { assert workflow.failed }, - ) - } - } -} From 09587789746789967fc48e40d8875937564ab00d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 9 Oct 2024 17:42:02 -0500 Subject: [PATCH 152/255] test: Bump snapshot --- .../grohmm/tuning/main.nf.test.snap | 122 +++++++++++++++++- 1 file changed, 120 insertions(+), 2 deletions(-) diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index e1c67f43..5796458e 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -1,12 +1,130 @@ { + "output_files": { + "content": [ + 215, + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + [ + "cd4_intersect.bed:md5,08e9166b4515fa76c7f624a5377d630f", + "jurkat_intersect.bed:md5,3f625c7e363f49f75bcac2d9316af2e0" + ], + [ + "cd4_filtered.bed:md5,bafed399a3f4d5d8363f40616bca4824", + "jurkat_filtered.bed:md5,ee570f28e2f347b66f085357e8ddba57" + ], + [ + "cd4_intersect.bed:md5,08e9166b4515fa76c7f624a5377d630f", + "jurkat_intersect.bed:md5,3f625c7e363f49f75bcac2d9316af2e0" + ], + [ + "cd4_filtered.bed:md5,bafed399a3f4d5d8363f40616bca4824", + "jurkat_filtered.bed:md5,ee570f28e2f347b66f085357e8ddba57" + ], + "cd4.eval.txt:md5,7f49f3b1211f9a2086a3df3b5932b14e", + "cd4.final.transcripts.bed:md5,51089857e6c7c0fa2259c9615e201564", + "cd4.tdFinal.txt:md5,4a40e320646af024b151d199fd442380", + true, + "cd4.transcripts.txt:md5,256b4b93c61506c8470d6c20e7043a85", + "jurkat.eval.txt:md5,7168cf089146b0752d6eb87836e91e34", + "jurkat.final.transcripts.bed:md5,2d560a6af857d69042e1fba09d8533d1", + "jurkat.tdFinal.txt:md5,f65dcec240c6c55f0fb077ed21f17285", + true, + "jurkat.transcripts.txt:md5,a601a4312e953e1adc05e18b7488c3b0", + true + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-10-09T17:31:48.135947809" + }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GROHMM_PARAMETERTUNING={r-base=4.3.3, bioconductor-grohmm=1.39.0}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWA_INDEX": { + "bwa": "0.7.18-r1243-dirty" + }, + "BWA_MEM": { + "bwa": "0.7.18-r1243-dirty", + "samtools": 1.2 + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GROHMM_PARAMETERTUNING": { + "r-base": "4.3.3", + "bioconductor-grohmm": "1.39.0" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-09-26T03:52:06.649510139" + "timestamp": "2024-10-09T17:31:48.111668358" } } \ No newline at end of file From d17d9df0e880da23bc56f5d7940cd7bfc2bbf0df Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 15 Oct 2024 08:38:10 -0500 Subject: [PATCH 153/255] Update CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d09edad9..90ba7f78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#137](https://github.com/nf-core/nascent/pull/137) - Use singularity containers for PINTS - [#142](https://github.com/nf-core/nascent/pull/142) - Updated CHM13 references - [#171](https://github.com/nf-core/nascent/pull/171) - Use assertAll in tests +- [#165](https://github.com/nf-core/nascent/pull/165) - groHMM overhaul. Removed R mclapply calls and replaced with Nextflow scatter gather for parameter tuning. This creates a job for each parameter set. ### Fixed @@ -29,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed -- Support for groHMM tuning files +- [[#165](https://github.com/nf-core/nascent/pull/165)] - Removed support for groHMM tuning files. ## v2.2.0 - 2024-03-05 From 3c947b05c948c2501dae3c2c92c9e61ce9e0af72 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 15 Oct 2024 14:54:52 -0500 Subject: [PATCH 154/255] docs: Update groHMM docs --- docs/usage.md | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/docs/usage.md b/docs/usage.md index 214ecea8..f1a5b4b9 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -79,7 +79,36 @@ The default transcript identification option is PINTS, and HOMER if the transcri ### GroHMM -When selecting GroHMM as an option, the pipeline by default tests a list of preset hold-out parameters to select for the combination of arguments which would result in the lowest possible error rate during the transcript identification process. The user may also choose to provide their own list of hold-out parameters to test, or skip the tuning process altogether due to time constraints. If the tuning process is skipped ('--skip_tuning') then the user may indicate the specific holdout parameters to use ('--uts' and '--ltprobb') or choose to use the default parameters. +groHMM is split into two steps: parameter tuning and transcript identification. + +When running the pipeline with groHMM as a transcript identification method, the pipeline will automatically perform a parameter tuning process. This process is unique to the groHMM transcript identification method and is designed to select the optimal hold-out parameters for the groHMM algorithm. See [this issue](https://github.com/dankoc/groHMM/issues/4) for more information. + +In the groHMM vignette, the code is ran using a single mclapply call, which is a scatter gather approach. This is not ideal for large datasets, because it ends up being bottlenecked by the memory available on your local machine. To improve this, we have written a Nextflow script that runs the pipeline with a scatter gather approach. This is done by running the pipeline with a single hold-out parameter, and then the next parameter, and so on. This is more memory efficient and scales better to larger datasets. The results are then combined then combined in the end as intended and used in the transcript identification process. + +#### groHMM Parameters + +> The detectTranscripts function also uses two hold-out parameters. These parameters, specified by the arguments LtProbB and UTS, represents the log-transformed transition probability of switching from transcribed state to non-transcribed state and variance of the emission probability for reads in the non-transcribed state, respectively. Holdout parameters are used to optimize the performance of HMM predictions on known genes. + +In the pipeline, the parameters are specified as follows: +grohmm_min_uts = 5 +grohmm_max_uts = 45 +grohmm_min_ltprobb = -100 +grohmm_max_ltprobb = -400 + +Which will then create a job for each parameter combination. For example (5,-100), (5,-150), (10,-100), (10,-150)... + +If you have indentified a good set of parameters, you can run the pipeline with those parameters by specifying, all 4 values. + +For example if you have indentified that the best parameters for your data are 15,-200: + +```json +{ + "grohmm_min_uts": 15, + "grohmm_max_uts": 15, + "grohmm_min_ltprobb": -200, + "grohmm_max_ltprobb": -200 +} +``` ## Running the pipeline From 2b2b90f228e0eaaae37242a562f9d2f81cc75686 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 16 Oct 2024 14:04:34 -0500 Subject: [PATCH 155/255] fix(grohmm): Try calling no more than 10 cores --- bin/parameter_tuning.R | 2 +- modules/local/grohmm/parametertuning/main.nf | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 73c7e5f2..167f1e04 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -161,7 +161,7 @@ transcripts_ranges <- transcripts_ranges[!is.na(start(transcripts_ranges)) & !is print("Collapse annotations in preparation for overlap") kg_consensus <- makeConsensusAnnotations( transcripts_ranges, - mc.cores = args$cores + mc.cores = min(args$cores, 10) # 10 the number they had hardcoded in the grohmm package for some reason ) print("Finished consensus annotations") diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index ffa13d70..fef7cab3 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,7 +1,6 @@ process GROHMM_PARAMETERTUNING { tag "$meta.id|$UTS|$LtProbB" label 'process_high' - label 'error_retry' // array 10 conda "${moduleDir}/environment.yml" From e1015538da6a7510636983a693299bdd9d61364a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 18 Oct 2024 10:08:33 -0500 Subject: [PATCH 156/255] chore: Add a custom makeConsensusAnnotations function --- bin/parameter_tuning.R | 151 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 150 insertions(+), 1 deletion(-) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index 167f1e04..f6e750f1 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -91,6 +91,155 @@ if (is.null(args$bam_files)) { stop("Please provide a bam file", call. = FALSE) } +#' makeConsensusAnnotations Makes a consensus annotation +#' +#' Makes a non-overlapping consensus annotation. Gene annotations are often +#' overalpping due to #' multiple isoforms for a gene. +#' In consensus annotation, isoforms are first reduced so that only +#' redundant intervals are used to represent a genomic interval for a gene, +#' i.e., a gene id. +#' Remaining unresolved annotations are further reduced by truncating 3' +#' end of annotations. +#' +#' Supports parallel processing using mclapply in the 'parallel' package. +#' To change the number of processors, use the argument 'mc.cores'. +#' +#' @param ar GRanges of annotations to be collapsed. +#' @param minGap Minimun gap between overlapped annotations after truncated. +#' Default: 1L +#' @param minWidth Minimun width of consensus annotations. Default: 1000L +#' @param ... Extra argument passed to mclapply. +#' @return Returns GRanges object of annotations. +#' @author Minho Chae +#' @examples +#' ## Not run: +#' # library(TxDb.Hsapiens.UCSC.hg19.knownGene) +#' # txdb <- TxDb.Hsapiens.UCSC.hg19.knownGene +#' # tx <- transcripts(txdb, columns=c("gene_id", "tx_id", "tx_name"), +#' filter=list(tx_chrom="chr7")) +#' # tx <- tx[grep("random", as.character(seqnames(tx)), invert=TRUE),] +#' # ca <- makeConsensusAnnotations(tx) +custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) { + # check missing gene_id + missing <- elementNROWS(mcols(ar)[,"gene_id"]) == 0 + if (any(missing)) { + ar <- ar[!missing,] + warning(sum(missing), " ranges do not have gene_id and they are + dropped") + } + + many <- elementNROWS(mcols(ar)[,"gene_id"]) > 1 + if (any(many)) { + ar <- ar[!many,] + warning(sum(many), " ranges have multiple gene_id and they are + dropped") + } + + ar_list <- split(ar, unlist(mcols(ar)[,"gene_id"])) + singles <- unlist(ar_list[elementNROWS(ar_list) == 1]) + isoforms <- ar_list[elementNROWS(ar_list) > 1] + + message("Reduce isoforms(", length(isoforms),") ... ", appendLF=FALSE) + isoforms <- GRangesList(mclapply(isoforms, function(x) { + # For mixed strands or chrom, choose the longest + if ((length(seqlevelsInUse(x)) > 1) || + (length(unique(strand(x))) > 1)) { + result <- x[which.max(width(x)), "gene_id"] + } else { + dx <- disjoin(x) + mcols(dx)$gene_id <- mcols(x)$gene_id[1] + olcnt <- countOverlaps(dx, x) + + multi <- dx[olcnt > 1] # Use the disjoint ranges + # covered more than once + if (length(multi) == 0) { # For non-overlapping isoforms, + # choose the longest + result <- x[which.max(width(x)), "gene_id"] + } else if (length(multi) == 1) { + result <- multi + } else { + reduced <- reduce(multi) + if (length(reduced) == 1) + result <- reduced + else (length(reduced) > 1) + result <- reduced[which.max(width(reduced)),] + + } + mcols(result)$gene_id <- mcols(x)$gene_id[1] + } + return(result) + }, ...)) + isoforms <- unlist(isoforms) + message("OK") + + # Check redundancy + isoforms <- removeRedundant(isoforms) + singles <- removeRedundant(singles) + + o <- findOverlaps(singles, isoforms, type="equal") + if(length(o) != 0) + singles <- singles[-queryHits(o),] + + o <- findOverlaps(singles, isoforms, type="within") + if(length(o) != 0) + singles <- singles[-queryHits(o),] + + o <- findOverlaps(isoforms, singles, type="within") + if(length(o) != 0) + isoforms <- isoforms[-queryHits(o),] + + noiso <- sort(c(isoforms, singles[,"gene_id"])) + message("Truncate overlapped ranges ... ", appendLF=FALSE) + # with different gene_ids + while(!isDisjoint(noiso)) { + ol <- findOverlaps(noiso, drop.self=TRUE, drop.redundant=TRUE) + ol_gr <- GRangesList(lapply(1:length(ol), function(x) { + sort(c(noiso[queryHits(ol)[x]], + noiso[subjectHits(ol)[x]])) + })) + + # Truncate 3' end + ol_gr <- unlist(endoapply(ol_gr, function(x) { + if (as.character(strand(x[1,])) == "+") { + end(x[1,]) <- start(x[2,]) - minGap + # first range's end is truncated + } else { + start(x[2,]) <- end(x[1,]) + minGap + # sencond range's end is truncated + } + x + })) + + # Remove any ranges with duplicated names since they already adujsted + # in the previous call + ol_gr <- ol_gr[!duplicated(names(ol_gr)),] + + noiso <- noiso[-unique(c(queryHits(ol), subjectHits(ol))),] + # update noiso + noiso <- c(noiso, ol_gr) + } + message("OK") + + noiso <- noiso[width(noiso) >= minWidth,] + return(sort(noiso)) +} + +removeRedundant <- function(annox) { + o <- findOverlaps(annox, drop.self=TRUE, type="equal", + drop.redundant=TRUE) + if(length(o) != 0) + annox <- annox[-subjectHits(o),] + + o <- findOverlaps(annox, drop.self=TRUE, type="within", + drop.redundant=TRUE) + if(length(o) != 0) + annox <- annox[-queryHits(o),] + + return(annox) +} + + + # Load alignment files # TODO? CHANGE BASED ON PAIRED OR SINGLE END alignments <- c() @@ -159,7 +308,7 @@ seqlevels(transcripts_ranges) <- seqlevels(gtf) transcripts_ranges <- transcripts_ranges[!is.na(start(transcripts_ranges)) & !is.na(end(transcripts_ranges))] print("Collapse annotations in preparation for overlap") -kg_consensus <- makeConsensusAnnotations( +kg_consensus <- custom_makeConsensusAnnotations( transcripts_ranges, mc.cores = min(args$cores, 10) # 10 the number they had hardcoded in the grohmm package for some reason ) From 3028ae195d6060202f1dd510149cd8ba14a9c99d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 18 Oct 2024 10:33:11 -0500 Subject: [PATCH 157/255] Try creating a custom makeConsensusAnnotations and setup test --- bin/custom_makeConsensusAnnotations | 174 ++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 bin/custom_makeConsensusAnnotations diff --git a/bin/custom_makeConsensusAnnotations b/bin/custom_makeConsensusAnnotations new file mode 100644 index 00000000..f6cada95 --- /dev/null +++ b/bin/custom_makeConsensusAnnotations @@ -0,0 +1,174 @@ +#' custom_makeConsensusAnnotations Makes a consensus annotation #' +#' Makes a non-overlapping consensus annotation. Gene annotations are often +#' overalpping due to #' multiple isoforms for a gene. +#' In consensus annotation, isoforms are first reduced so that only +#' redundant intervals are used to represent a genomic interval for a gene, +#' i.e., a gene id. +#' Remaining unresolved annotations are further reduced by truncating 3' +#' end of annotations. +#' +#' Supports parallel processing using mclapply in the 'parallel' package. +#' To change the number of processors, use the argument 'mc.cores'. +#' +#' @param ar GRanges of annotations to be collapsed. +#' @param minGap Minimun gap between overlapped annotations after truncated. +#' Default: 1L +#' @param minWidth Minimun width of consensus annotations. Default: 1000L +#' @param ... Extra argument passed to mclapply. +#' @return Returns GRanges object of annotations. +#' @author Minho Chae +#' @examples +#' ## Not run: +#' # library(TxDb.Hsapiens.UCSC.hg19.knownGene) +#' # txdb <- TxDb.Hsapiens.UCSC.hg19.knownGene +#' # tx <- transcripts(txdb, columns=c("gene_id", "tx_id", "tx_name"), +#' filter=list(tx_chrom="chr7")) +#' # tx <- tx[grep("random", as.character(seqnames(tx)), invert=TRUE),] +#' # ca <- makeConsensusAnnotations(tx) +custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) { + # Use subset instead of indexing to avoid copying + ar <- subset(ar, elementNROWS(mcols(ar)[,"gene_id"]) == 1) + if (length(ar) < length(ar)) { + warning(length(ar) - length(ar), " ranges were dropped due to missing or multiple gene_ids") + } + + # Use tapply instead of split to avoid creating intermediate lists + ar_list <- tapply(ar, mcols(ar)$gene_id, identity, simplify = FALSE) + singles <- ar_list[lengths(ar_list) == 1] + isoforms <- ar_list[lengths(ar_list) > 1] + + message("Reduce isoforms(", length(isoforms),") ... ", appendLF=FALSE) + isoforms <- mclapply(isoforms, function(x) { + # For mixed strands or chrom, choose the longest + if ((length(seqlevelsInUse(x)) > 1) || + (length(unique(strand(x))) > 1)) { + result <- x[which.max(width(x)), "gene_id"] + } else { + dx <- disjoin(x) + mcols(dx)$gene_id <- mcols(x)$gene_id[1] + olcnt <- countOverlaps(dx, x) + + multi <- dx[olcnt > 1] # Use the disjoint ranges + # covered more than once + if (length(multi) == 0) { # For non-overlapping isoforms, + # choose the longest + result <- x[which.max(width(x)), "gene_id"] + } else if (length(multi) == 1) { + result <- multi + } else { + reduced <- reduce(multi) + if (length(reduced) == 1) + result <- reduced + else (length(reduced) > 1) + result <- reduced[which.max(width(reduced)),] + + } + mcols(result)$gene_id <- mcols(x)$gene_id[1] + } + return(result) + }, ...) + isoforms <- unlist(GRangesList(isoforms)) + message("OK") + + # Combine removeRedundant operations + removeRedundant <- function(annox) { + o <- findOverlaps(annox, drop.self = TRUE, type = "any", drop.redundant = TRUE) + annox[-unique(c( + queryHits(o)[width(annox)[queryHits(o)] <= width(annox)[subjectHits(o)]], + subjectHits(o)[width(annox)[queryHits(o)] > width(annox)[subjectHits(o)]] + ))] + } + + isoforms <- removeRedundant(isoforms) + singles <- removeRedundant(do.call(c, singles)) + + # Use setdiff instead of multiple findOverlaps + singles <- setdiff(singles, isoforms) + + noiso <- sort(c(isoforms, singles)) + message("Truncate overlapped ranges ... ", appendLF=FALSE) +# Optimize the while loop + while(!isDisjoint(noiso)) { + ol <- findOverlaps(noiso, drop.self=TRUE, drop.redundant=TRUE) + ol_df <- as.data.frame(ol) + ol_df$strand <- as.character(strand(noiso)[ol_df$queryHits]) + + # Vectorized operations instead of lapply + ol_df$new_end <- ifelse(ol_df$strand == "+", + start(noiso)[ol_df$subjectHits] - minGap, + end(noiso)[ol_df$queryHits] + ) + ol_df$new_start <- ifelse(ol_df$strand == "+", + start(noiso)[ol_df$queryHits], + end(noiso)[ol_df$queryHits] + minGap + ) + + # Update ranges in one operation + noiso <- c( + noiso[-unique(c(ol_df$queryHits, ol_df$subjectHits))], + GRanges(seqnames(noiso)[ol_df$queryHits], + IRanges(ol_df$new_start, ol_df$new_end), + strand = ol_df$strand, + gene_id = mcols(noiso)$gene_id[ol_df$queryHits] + ) + ) + } + message("OK") + + subset(noiso, width >= minWidth) +} + +removeRedundant <- function(annox) { + o <- findOverlaps(annox, drop.self=TRUE, type="equal", + drop.redundant=TRUE) + if(length(o) != 0) + annox <- annox[-subjectHits(o),] + + o <- findOverlaps(annox, drop.self=TRUE, type="within", + drop.redundant=TRUE) + if(length(o) != 0) + annox <- annox[-queryHits(o),] + + return(annox) +} + + + +## TESTING +suppressPackageStartupMessages(library(groHMM)) +suppressPackageStartupMessages(library(testthat)) +suppressPackageStartupMessages(library(GenomicRanges)) +suppressPackageStartupMessages(library(rtracklayer)) + +test_that("custom_makeConsensusAnnotations maintains accuracy", { + # Load the GTF file + gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" + gtf <- import(gtf_url) + + # Extract transcripts from the GTF + transcripts <- gtf[gtf$type == "transcript"] + + # Create a sample GRanges object + set.seed(42) + n <- 100 + sample_ranges <- GRanges( + seqnames = "chr7", + ranges = IRanges( + start = sort(sample(1:max(end(transcripts)), n, replace = TRUE)), + width = sample(50:500, n, replace = TRUE) + ), + strand = sample(c("+", "-"), n, replace = TRUE), + gene_id = sample(transcripts$gene_id, n, replace = TRUE) + ) + print(sample_ranges) + + # Run both original and refactored functions + original_result <- groHMM::makeConsensusAnnotations(sample_ranges) + refactored_result <- custom_makeConsensusAnnotations(sample_ranges) + + # Compare results + expect_equal(length(original_result), length(refactored_result)) + expect_equal(sum(width(original_result)), sum(width(refactored_result))) + expect_equal(sort(unique(mcols(original_result)$gene_id)), + sort(unique(mcols(refactored_result)$gene_id))) +}) From d4ac91f83ec9f5ee1a9d2616e7d43563c3a60927 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 18 Oct 2024 10:57:11 -0500 Subject: [PATCH 158/255] Get custom running --- bin/custom_makeConsensusAnnotations | 82 ++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/bin/custom_makeConsensusAnnotations b/bin/custom_makeConsensusAnnotations index f6cada95..a37d54a1 100644 --- a/bin/custom_makeConsensusAnnotations +++ b/bin/custom_makeConsensusAnnotations @@ -34,7 +34,7 @@ custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) # Use tapply instead of split to avoid creating intermediate lists ar_list <- tapply(ar, mcols(ar)$gene_id, identity, simplify = FALSE) - singles <- ar_list[lengths(ar_list) == 1] + singles <- do.call(c, ar_list[lengths(ar_list) == 1]) isoforms <- ar_list[lengths(ar_list) > 1] message("Reduce isoforms(", length(isoforms),") ... ", appendLF=FALSE) @@ -70,24 +70,37 @@ custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) isoforms <- unlist(GRangesList(isoforms)) message("OK") + # Ensure singles is a GRanges object + if (!is(singles, "GRanges")) { + singles <- unlist(GRangesList(singles)) + } + # Combine removeRedundant operations removeRedundant <- function(annox) { - o <- findOverlaps(annox, drop.self = TRUE, type = "any", drop.redundant = TRUE) - annox[-unique(c( - queryHits(o)[width(annox)[queryHits(o)] <= width(annox)[subjectHits(o)]], - subjectHits(o)[width(annox)[queryHits(o)] > width(annox)[subjectHits(o)]] - ))] + if (is(annox, "GRanges")) { + o <- findOverlaps(annox, drop.self = TRUE, type = "any", drop.redundant = TRUE) + annox[-unique(c( + queryHits(o)[width(annox)[queryHits(o)] <= width(annox)[subjectHits(o)]], + subjectHits(o)[width(annox)[queryHits(o)] > width(annox)[subjectHits(o)]] + ))] + } else { + warning("Input to removeRedundant is not a GRanges object") + print(class(annox)) # Debug: Print class of annox + print(str(annox)) # Debug: Print structure of annox + return(annox) + } } isoforms <- removeRedundant(isoforms) - singles <- removeRedundant(do.call(c, singles)) + singles <- removeRedundant(singles) # Use setdiff instead of multiple findOverlaps - singles <- setdiff(singles, isoforms) + singles <- GenomicRanges::setdiff(singles, isoforms) noiso <- sort(c(isoforms, singles)) message("Truncate overlapped ranges ... ", appendLF=FALSE) -# Optimize the while loop + + # Optimize the while loop while(!isDisjoint(noiso)) { ol <- findOverlaps(noiso, drop.self=TRUE, drop.redundant=TRUE) ol_df <- as.data.frame(ol) @@ -95,23 +108,18 @@ custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) # Vectorized operations instead of lapply ol_df$new_end <- ifelse(ol_df$strand == "+", - start(noiso)[ol_df$subjectHits] - minGap, - end(noiso)[ol_df$queryHits] - ) + start(noiso)[ol_df$subjectHits] - minGap, + end(noiso)[ol_df$queryHits]) ol_df$new_start <- ifelse(ol_df$strand == "+", - start(noiso)[ol_df$queryHits], - end(noiso)[ol_df$queryHits] + minGap - ) + start(noiso)[ol_df$queryHits], + end(noiso)[ol_df$queryHits] + minGap) # Update ranges in one operation - noiso <- c( - noiso[-unique(c(ol_df$queryHits, ol_df$subjectHits))], - GRanges(seqnames(noiso)[ol_df$queryHits], - IRanges(ol_df$new_start, ol_df$new_end), - strand = ol_df$strand, - gene_id = mcols(noiso)$gene_id[ol_df$queryHits] - ) - ) + noiso <- c(noiso[-unique(c(ol_df$queryHits, ol_df$subjectHits))], + GRanges(seqnames(noiso)[ol_df$queryHits], + IRanges(ol_df$new_start, ol_df$new_end), + strand=ol_df$strand, + gene_id=mcols(noiso)$gene_id[ol_df$queryHits])) } message("OK") @@ -139,11 +147,11 @@ suppressPackageStartupMessages(library(groHMM)) suppressPackageStartupMessages(library(testthat)) suppressPackageStartupMessages(library(GenomicRanges)) suppressPackageStartupMessages(library(rtracklayer)) +# Load the GTF file +gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" +gtf <- import(gtf_url) test_that("custom_makeConsensusAnnotations maintains accuracy", { - # Load the GTF file - gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" - gtf <- import(gtf_url) # Extract transcripts from the GTF transcripts <- gtf[gtf$type == "transcript"] @@ -172,3 +180,25 @@ test_that("custom_makeConsensusAnnotations maintains accuracy", { expect_equal(sort(unique(mcols(original_result)$gene_id)), sort(unique(mcols(refactored_result)$gene_id))) }) + +test_that("custom_makeConsensusAnnotations maintains accuracy large", { + # Extract transcripts from the GTF + transcripts <- gtf[gtf$type == "transcript"] + + # Create a sample GRanges object + set.seed(42) + sample_ranges <- transcripts + print(sample_ranges) + + # Run both original and refactored functions + original_result <- groHMM::makeConsensusAnnotations(sample_ranges) + refactored_result <- custom_makeConsensusAnnotations(sample_ranges) + + # Compare results + expect_equal(length(original_result), length(refactored_result)) + expect_equal(sum(width(original_result)), sum(width(refactored_result))) + expect_equal( + sort(unique(mcols(original_result)$gene_id)), + sort(unique(mcols(refactored_result)$gene_id)) + ) +}) From 3444c5bf5d97c1e5fe82b9b1f359fb5fb4bbaa80 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 18 Oct 2024 15:50:26 -0500 Subject: [PATCH 159/255] Start over --- bin/custom_makeConsensusAnnotations | 181 ++++++++++++++-------------- 1 file changed, 93 insertions(+), 88 deletions(-) diff --git a/bin/custom_makeConsensusAnnotations b/bin/custom_makeConsensusAnnotations index a37d54a1..bd9040c4 100644 --- a/bin/custom_makeConsensusAnnotations +++ b/bin/custom_makeConsensusAnnotations @@ -26,19 +26,27 @@ #' # tx <- tx[grep("random", as.character(seqnames(tx)), invert=TRUE),] #' # ca <- makeConsensusAnnotations(tx) custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) { - # Use subset instead of indexing to avoid copying - ar <- subset(ar, elementNROWS(mcols(ar)[,"gene_id"]) == 1) - if (length(ar) < length(ar)) { - warning(length(ar) - length(ar), " ranges were dropped due to missing or multiple gene_ids") + # check missing gene_id + missing <- elementNROWS(mcols(ar)[,"gene_id"]) == 0 + if (any(missing)) { + ar <- ar[!missing,] + warning(sum(missing), " ranges do not have gene_id and they are + dropped") } - # Use tapply instead of split to avoid creating intermediate lists - ar_list <- tapply(ar, mcols(ar)$gene_id, identity, simplify = FALSE) - singles <- do.call(c, ar_list[lengths(ar_list) == 1]) - isoforms <- ar_list[lengths(ar_list) > 1] + many <- elementNROWS(mcols(ar)[, "gene_id"]) > 1 + if (any(many)) { + ar <- ar[!many, ] + warning(sum(many), " ranges have multiple gene_id and they are + dropped") + } + + ar_list <- split(ar, unlist(mcols(ar)[, "gene_id"])) + singles <- unlist(ar_list[elementNROWS(ar_list) == 1]) + isoforms <- ar_list[elementNROWS(ar_list) > 1] message("Reduce isoforms(", length(isoforms),") ... ", appendLF=FALSE) - isoforms <- mclapply(isoforms, function(x) { + isoforms <- GRangesList(mclapply(isoforms, function(x) { # For mixed strands or chrom, choose the longest if ((length(seqlevelsInUse(x)) > 1) || (length(unique(strand(x))) > 1)) { @@ -66,64 +74,65 @@ custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) mcols(result)$gene_id <- mcols(x)$gene_id[1] } return(result) - }, ...) - isoforms <- unlist(GRangesList(isoforms)) + }, ...)) + isoforms <- unlist(isoforms) message("OK") - # Ensure singles is a GRanges object - if (!is(singles, "GRanges")) { - singles <- unlist(GRangesList(singles)) - } + # Check redundancy + isoforms <- removeRedundant(isoforms) + singles <- removeRedundant(singles) - # Combine removeRedundant operations - removeRedundant <- function(annox) { - if (is(annox, "GRanges")) { - o <- findOverlaps(annox, drop.self = TRUE, type = "any", drop.redundant = TRUE) - annox[-unique(c( - queryHits(o)[width(annox)[queryHits(o)] <= width(annox)[subjectHits(o)]], - subjectHits(o)[width(annox)[queryHits(o)] > width(annox)[subjectHits(o)]] - ))] - } else { - warning("Input to removeRedundant is not a GRanges object") - print(class(annox)) # Debug: Print class of annox - print(str(annox)) # Debug: Print structure of annox - return(annox) - } + o <- findOverlaps(singles, isoforms, type = "equal") + if (length(o) != 0) { + singles <- singles[-queryHits(o), ] } - isoforms <- removeRedundant(isoforms) - singles <- removeRedundant(singles) + o <- findOverlaps(singles, isoforms, type = "within") + if (length(o) != 0) { + singles <- singles[-queryHits(o), ] + } - # Use setdiff instead of multiple findOverlaps - singles <- GenomicRanges::setdiff(singles, isoforms) + o <- findOverlaps(isoforms, singles, type = "within") + if (length(o) != 0) { + isoforms <- isoforms[-queryHits(o), ] + } - noiso <- sort(c(isoforms, singles)) + noiso <- sort(c(isoforms, singles[, "gene_id"])) message("Truncate overlapped ranges ... ", appendLF=FALSE) - - # Optimize the while loop + # with different gene_ids while(!isDisjoint(noiso)) { ol <- findOverlaps(noiso, drop.self=TRUE, drop.redundant=TRUE) - ol_df <- as.data.frame(ol) - ol_df$strand <- as.character(strand(noiso)[ol_df$queryHits]) - - # Vectorized operations instead of lapply - ol_df$new_end <- ifelse(ol_df$strand == "+", - start(noiso)[ol_df$subjectHits] - minGap, - end(noiso)[ol_df$queryHits]) - ol_df$new_start <- ifelse(ol_df$strand == "+", - start(noiso)[ol_df$queryHits], - end(noiso)[ol_df$queryHits] + minGap) - - # Update ranges in one operation - noiso <- c(noiso[-unique(c(ol_df$queryHits, ol_df$subjectHits))], - GRanges(seqnames(noiso)[ol_df$queryHits], - IRanges(ol_df$new_start, ol_df$new_end), - strand=ol_df$strand, - gene_id=mcols(noiso)$gene_id[ol_df$queryHits])) + ol_gr <- GRangesList(lapply(1:length(ol), function(x) { + sort(c( + noiso[queryHits(ol)[x]], + noiso[subjectHits(ol)[x]] + )) + })) + + # Truncate 3' end + ol_gr <- unlist(endoapply(ol_gr, function(x) { + if (as.character(strand(x[1, ])) == "+") { + end(x[1, ]) <- start(x[2, ]) - minGap + # first range's end is truncated + } else { + start(x[2, ]) <- end(x[1, ]) + minGap + # sencond range's end is truncated + } + x + })) + + # Remove any ranges with duplicated names since they already adujsted + # in the previous call + ol_gr <- ol_gr[!duplicated(names(ol_gr)), ] + + noiso <- noiso[-unique(c(queryHits(ol), subjectHits(ol))), ] + # update noiso + noiso <- c(noiso, ol_gr) } message("OK") - subset(noiso, width >= minWidth) + noiso <- noiso[width(noiso) >= minWidth, ] + return(sort(noiso)) } removeRedundant <- function(annox) { @@ -142,16 +151,17 @@ removeRedundant <- function(annox) { + ## TESTING suppressPackageStartupMessages(library(groHMM)) suppressPackageStartupMessages(library(testthat)) suppressPackageStartupMessages(library(GenomicRanges)) suppressPackageStartupMessages(library(rtracklayer)) -# Load the GTF file -gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" -gtf <- import(gtf_url) test_that("custom_makeConsensusAnnotations maintains accuracy", { + # Load the GTF file + gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" + gtf <- import(gtf_url) # Extract transcripts from the GTF transcripts <- gtf[gtf$type == "transcript"] @@ -159,46 +169,41 @@ test_that("custom_makeConsensusAnnotations maintains accuracy", { # Create a sample GRanges object set.seed(42) n <- 100 - sample_ranges <- GRanges( - seqnames = "chr7", - ranges = IRanges( - start = sort(sample(1:max(end(transcripts)), n, replace = TRUE)), - width = sample(50:500, n, replace = TRUE) - ), - strand = sample(c("+", "-"), n, replace = TRUE), - gene_id = sample(transcripts$gene_id, n, replace = TRUE) - ) + sample_ranges <- transcripts + print("Sample ranges:") print(sample_ranges) # Run both original and refactored functions original_result <- groHMM::makeConsensusAnnotations(sample_ranges) refactored_result <- custom_makeConsensusAnnotations(sample_ranges) + print("Refactored result:") + print(refactored_result) + # Compare results expect_equal(length(original_result), length(refactored_result)) expect_equal(sum(width(original_result)), sum(width(refactored_result))) - expect_equal(sort(unique(mcols(original_result)$gene_id)), - sort(unique(mcols(refactored_result)$gene_id))) -}) - -test_that("custom_makeConsensusAnnotations maintains accuracy large", { - # Extract transcripts from the GTF - transcripts <- gtf[gtf$type == "transcript"] - # Create a sample GRanges object - set.seed(42) - sample_ranges <- transcripts - print(sample_ranges) - - # Run both original and refactored functions - original_result <- groHMM::makeConsensusAnnotations(sample_ranges) - refactored_result <- custom_makeConsensusAnnotations(sample_ranges) + if (length(original_result) > 0 && length(refactored_result) > 0) { + expect_equal( + sort(unique(mcols(original_result)$gene_id)), + sort(unique(mcols(refactored_result)$gene_id)) + ) + } else { + print("Warning: One or both results are empty.") + } - # Compare results - expect_equal(length(original_result), length(refactored_result)) - expect_equal(sum(width(original_result)), sum(width(refactored_result))) - expect_equal( - sort(unique(mcols(original_result)$gene_id)), - sort(unique(mcols(refactored_result)$gene_id)) - ) + # Additional detailed comparisons + print(paste("Original result length:", length(original_result))) + print(paste("Refactored result length:", length(refactored_result))) + print(paste("Original result total width:", sum(width(original_result)))) + print(paste("Refactored result total width:", sum(width(refactored_result)))) + print(paste("Original result unique gene_ids:", length(unique(mcols(original_result)$gene_id)))) + print(paste("Refactored result unique gene_ids:", length(unique(mcols(refactored_result)$gene_id)))) + + # Compare the first few entries + print("First 5 entries of original result:") + print(head(original_result, 5)) + print("First 5 entries of refactored result:") + print(head(refactored_result, 5)) }) From 508452bf90505e68148aa6426510c07b832c7a13 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 18 Oct 2024 16:44:01 -0500 Subject: [PATCH 160/255] refactor: Split into chunks --- bin/custom_makeConsensusAnnotations | 91 +++++++++++++++++------------ 1 file changed, 53 insertions(+), 38 deletions(-) diff --git a/bin/custom_makeConsensusAnnotations b/bin/custom_makeConsensusAnnotations index bd9040c4..01f67a77 100644 --- a/bin/custom_makeConsensusAnnotations +++ b/bin/custom_makeConsensusAnnotations @@ -26,12 +26,11 @@ #' # tx <- tx[grep("random", as.character(seqnames(tx)), invert=TRUE),] #' # ca <- makeConsensusAnnotations(tx) custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) { - # check missing gene_id - missing <- elementNROWS(mcols(ar)[,"gene_id"]) == 0 - if (any(missing)) { - ar <- ar[!missing,] - warning(sum(missing), " ranges do not have gene_id and they are - dropped") + # Check and remove ranges with missing or multiple gene_ids + valid_ranges <- vapply(mcols(ar)$gene_id, function(x) length(x) == 1, logical(1)) + if (any(!valid_ranges)) { + warning(sum(!valid_ranges), " ranges have missing or multiple gene_id and they are dropped") + ar <- ar[valid_ranges] } many <- elementNROWS(mcols(ar)[, "gene_id"]) > 1 @@ -41,42 +40,58 @@ custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) dropped") } - ar_list <- split(ar, unlist(mcols(ar)[, "gene_id"])) - singles <- unlist(ar_list[elementNROWS(ar_list) == 1]) - isoforms <- ar_list[elementNROWS(ar_list) > 1] - - message("Reduce isoforms(", length(isoforms),") ... ", appendLF=FALSE) - isoforms <- GRangesList(mclapply(isoforms, function(x) { - # For mixed strands or chrom, choose the longest - if ((length(seqlevelsInUse(x)) > 1) || - (length(unique(strand(x))) > 1)) { - result <- x[which.max(width(x)), "gene_id"] - } else { - dx <- disjoin(x) - mcols(dx)$gene_id <- mcols(x)$gene_id[1] - olcnt <- countOverlaps(dx, x) - - multi <- dx[olcnt > 1] # Use the disjoint ranges - # covered more than once - if (length(multi) == 0) { # For non-overlapping isoforms, - # choose the longest + # Split into single-isoform and multi-isoform genes + gene_counts <- table(mcols(ar)$gene_id) + singles <- ar[mcols(ar)$gene_id %in% names(gene_counts[gene_counts == 1])] + multi_isoform_genes <- names(gene_counts[gene_counts > 1]) + + # Process multi-isoform genes in chunks + chunk_size <- 1000 # Adjust based on available memory + num_chunks <- ceiling(length(multi_isoform_genes) / chunk_size) + + isoforms <- GRangesList() + for (i in 1:num_chunks) { + chunk_start <- (i - 1) * chunk_size + 1 + chunk_end <- min(i * chunk_size, length(multi_isoform_genes)) + chunk_genes <- multi_isoform_genes[chunk_start:chunk_end] + + chunk_isoforms <- ar[mcols(ar)$gene_id %in% chunk_genes] + chunk_list <- split(chunk_isoforms, mcols(chunk_isoforms)$gene_id) + + message("Reduce isoforms (chunk ", i, "/", num_chunks, ") ... ", appendLF=FALSE) + chunk_result <- GRangesList(mclapply(chunk_list, function(x) { + # For mixed strands or chrom, choose the longest + if ((length(seqlevelsInUse(x)) > 1) || + (length(unique(strand(x))) > 1)) { result <- x[which.max(width(x)), "gene_id"] - } else if (length(multi) == 1) { - result <- multi } else { - reduced <- reduce(multi) - if (length(reduced) == 1) - result <- reduced - else (length(reduced) > 1) - result <- reduced[which.max(width(reduced)),] - + dx <- disjoin(x) + mcols(dx)$gene_id <- mcols(x)$gene_id[1] + olcnt <- countOverlaps(dx, x) + + multi <- dx[olcnt > 1] # Use the disjoint ranges + # covered more than once + if (length(multi) == 0) { # For non-overlapping isoforms, + # choose the longest + result <- x[which.max(width(x)), "gene_id"] + } else if (length(multi) == 1) { + result <- multi + } else { + reduced <- reduce(multi) + if (length(reduced) == 1) + result <- reduced + else (length(reduced) > 1) + result <- reduced[which.max(width(reduced)),] + + } + mcols(result)$gene_id <- mcols(x)$gene_id[1] } - mcols(result)$gene_id <- mcols(x)$gene_id[1] - } - return(result) - }, ...)) + return(result) + }, ...)) + isoforms <- c(isoforms, chunk_result) + message("OK") + } isoforms <- unlist(isoforms) - message("OK") # Check redundancy isoforms <- removeRedundant(isoforms) From b538a166542de1f733ab0601560eb49dacd8c737 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 19 Oct 2024 17:44:08 -0500 Subject: [PATCH 161/255] More tests --- bin/custom_makeConsensusAnnotations | 69 +++++++++++-- bin/parameter_tuning.R | 150 +--------------------------- 2 files changed, 60 insertions(+), 159 deletions(-) diff --git a/bin/custom_makeConsensusAnnotations b/bin/custom_makeConsensusAnnotations index 01f67a77..74c5a43e 100644 --- a/bin/custom_makeConsensusAnnotations +++ b/bin/custom_makeConsensusAnnotations @@ -33,13 +33,6 @@ custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) ar <- ar[valid_ranges] } - many <- elementNROWS(mcols(ar)[, "gene_id"]) > 1 - if (any(many)) { - ar <- ar[!many, ] - warning(sum(many), " ranges have multiple gene_id and they are - dropped") - } - # Split into single-isoform and multi-isoform genes gene_counts <- table(mcols(ar)$gene_id) singles <- ar[mcols(ar)$gene_id %in% names(gene_counts[gene_counts == 1])] @@ -173,13 +166,67 @@ suppressPackageStartupMessages(library(testthat)) suppressPackageStartupMessages(library(GenomicRanges)) suppressPackageStartupMessages(library(rtracklayer)) -test_that("custom_makeConsensusAnnotations maintains accuracy", { +# test_that("custom_makeConsensusAnnotations maintains accuracy", { +# # Load the GTF file +# gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" +# gtf <- import(gtf_url) + +# # Extract transcripts from the GTF +# transcripts <- gtf[gtf$type == "transcript"] + +# # Create a sample GRanges object +# set.seed(42) +# n <- 100 +# sample_ranges <- transcripts +# print("Sample ranges:") +# print(sample_ranges) + +# # Run both original and refactored functions +# original_result <- groHMM::makeConsensusAnnotations(sample_ranges) +# refactored_result <- custom_makeConsensusAnnotations(sample_ranges) + +# print("Refactored result:") +# print(refactored_result) + +# # Compare results +# expect_equal(length(original_result), length(refactored_result)) +# expect_equal(sum(width(original_result)), sum(width(refactored_result))) + +# if (length(original_result) > 0 && length(refactored_result) > 0) { +# expect_equal( +# sort(unique(mcols(original_result)$gene_id)), +# sort(unique(mcols(refactored_result)$gene_id)) +# ) +# } else { +# print("Warning: One or both results are empty.") +# } + +# # Additional detailed comparisons +# print(paste("Original result length:", length(original_result))) +# print(paste("Refactored result length:", length(refactored_result))) +# print(paste("Original result total width:", sum(width(original_result)))) +# print(paste("Refactored result total width:", sum(width(refactored_result)))) +# print(paste("Original result unique gene_ids:", length(unique(mcols(original_result)$gene_id)))) +# print(paste("Refactored result unique gene_ids:", length(unique(mcols(refactored_result)$gene_id)))) + +# # Compare the first few entries +# print("First 5 entries of original result:") +# print(head(original_result, 5)) +# print("First 5 entries of refactored result:") +# print(head(refactored_result, 5)) +# }) + +test_that("chm13 custom_makeConsensusAnnotations maintains accuracy", { # Load the GTF file - gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" - gtf <- import(gtf_url) + gff_url <- "./chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" + gff <- import(gff_url) + print("GFF:") + print(gff) # Extract transcripts from the GTF - transcripts <- gtf[gtf$type == "transcript"] + transcripts <- gff[gff$type == "transcript"] + print("Transcripts:") + print(transcripts) # Create a sample GRanges object set.seed(42) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index f6e750f1..b630f003 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -91,154 +91,6 @@ if (is.null(args$bam_files)) { stop("Please provide a bam file", call. = FALSE) } -#' makeConsensusAnnotations Makes a consensus annotation -#' -#' Makes a non-overlapping consensus annotation. Gene annotations are often -#' overalpping due to #' multiple isoforms for a gene. -#' In consensus annotation, isoforms are first reduced so that only -#' redundant intervals are used to represent a genomic interval for a gene, -#' i.e., a gene id. -#' Remaining unresolved annotations are further reduced by truncating 3' -#' end of annotations. -#' -#' Supports parallel processing using mclapply in the 'parallel' package. -#' To change the number of processors, use the argument 'mc.cores'. -#' -#' @param ar GRanges of annotations to be collapsed. -#' @param minGap Minimun gap between overlapped annotations after truncated. -#' Default: 1L -#' @param minWidth Minimun width of consensus annotations. Default: 1000L -#' @param ... Extra argument passed to mclapply. -#' @return Returns GRanges object of annotations. -#' @author Minho Chae -#' @examples -#' ## Not run: -#' # library(TxDb.Hsapiens.UCSC.hg19.knownGene) -#' # txdb <- TxDb.Hsapiens.UCSC.hg19.knownGene -#' # tx <- transcripts(txdb, columns=c("gene_id", "tx_id", "tx_name"), -#' filter=list(tx_chrom="chr7")) -#' # tx <- tx[grep("random", as.character(seqnames(tx)), invert=TRUE),] -#' # ca <- makeConsensusAnnotations(tx) -custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) { - # check missing gene_id - missing <- elementNROWS(mcols(ar)[,"gene_id"]) == 0 - if (any(missing)) { - ar <- ar[!missing,] - warning(sum(missing), " ranges do not have gene_id and they are - dropped") - } - - many <- elementNROWS(mcols(ar)[,"gene_id"]) > 1 - if (any(many)) { - ar <- ar[!many,] - warning(sum(many), " ranges have multiple gene_id and they are - dropped") - } - - ar_list <- split(ar, unlist(mcols(ar)[,"gene_id"])) - singles <- unlist(ar_list[elementNROWS(ar_list) == 1]) - isoforms <- ar_list[elementNROWS(ar_list) > 1] - - message("Reduce isoforms(", length(isoforms),") ... ", appendLF=FALSE) - isoforms <- GRangesList(mclapply(isoforms, function(x) { - # For mixed strands or chrom, choose the longest - if ((length(seqlevelsInUse(x)) > 1) || - (length(unique(strand(x))) > 1)) { - result <- x[which.max(width(x)), "gene_id"] - } else { - dx <- disjoin(x) - mcols(dx)$gene_id <- mcols(x)$gene_id[1] - olcnt <- countOverlaps(dx, x) - - multi <- dx[olcnt > 1] # Use the disjoint ranges - # covered more than once - if (length(multi) == 0) { # For non-overlapping isoforms, - # choose the longest - result <- x[which.max(width(x)), "gene_id"] - } else if (length(multi) == 1) { - result <- multi - } else { - reduced <- reduce(multi) - if (length(reduced) == 1) - result <- reduced - else (length(reduced) > 1) - result <- reduced[which.max(width(reduced)),] - - } - mcols(result)$gene_id <- mcols(x)$gene_id[1] - } - return(result) - }, ...)) - isoforms <- unlist(isoforms) - message("OK") - - # Check redundancy - isoforms <- removeRedundant(isoforms) - singles <- removeRedundant(singles) - - o <- findOverlaps(singles, isoforms, type="equal") - if(length(o) != 0) - singles <- singles[-queryHits(o),] - - o <- findOverlaps(singles, isoforms, type="within") - if(length(o) != 0) - singles <- singles[-queryHits(o),] - - o <- findOverlaps(isoforms, singles, type="within") - if(length(o) != 0) - isoforms <- isoforms[-queryHits(o),] - - noiso <- sort(c(isoforms, singles[,"gene_id"])) - message("Truncate overlapped ranges ... ", appendLF=FALSE) - # with different gene_ids - while(!isDisjoint(noiso)) { - ol <- findOverlaps(noiso, drop.self=TRUE, drop.redundant=TRUE) - ol_gr <- GRangesList(lapply(1:length(ol), function(x) { - sort(c(noiso[queryHits(ol)[x]], - noiso[subjectHits(ol)[x]])) - })) - - # Truncate 3' end - ol_gr <- unlist(endoapply(ol_gr, function(x) { - if (as.character(strand(x[1,])) == "+") { - end(x[1,]) <- start(x[2,]) - minGap - # first range's end is truncated - } else { - start(x[2,]) <- end(x[1,]) + minGap - # sencond range's end is truncated - } - x - })) - - # Remove any ranges with duplicated names since they already adujsted - # in the previous call - ol_gr <- ol_gr[!duplicated(names(ol_gr)),] - - noiso <- noiso[-unique(c(queryHits(ol), subjectHits(ol))),] - # update noiso - noiso <- c(noiso, ol_gr) - } - message("OK") - - noiso <- noiso[width(noiso) >= minWidth,] - return(sort(noiso)) -} - -removeRedundant <- function(annox) { - o <- findOverlaps(annox, drop.self=TRUE, type="equal", - drop.redundant=TRUE) - if(length(o) != 0) - annox <- annox[-subjectHits(o),] - - o <- findOverlaps(annox, drop.self=TRUE, type="within", - drop.redundant=TRUE) - if(length(o) != 0) - annox <- annox[-queryHits(o),] - - return(annox) -} - - # Load alignment files # TODO? CHANGE BASED ON PAIRED OR SINGLE END @@ -371,3 +223,5 @@ if (file.exists(r_log_file) == FALSE) { print(a) sink() } + + From ef677b1a1fbaab16b1f94c5d8ef4134e379ff7a2 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 19 Oct 2024 17:47:18 -0500 Subject: [PATCH 162/255] fix(grohmm): Support gxf Scrap all of the CHM13 attempts I think it's the gtf conversion stuff that's causing the memory overload. But I can get them all to load locally. So I'm going to try to use gff3 files, if they're supplied, otherwise fall back to gtf. --- ...ions => custom_makeConsensusAnnotations.R} | 14 ++ bin/parameter_tuning.R | 71 +-------- bin/transcriptcalling_grohmm.R | 6 +- modules/local/grohmm/parametertuning/main.nf | 4 +- .../local/grohmm/transcriptcalling/main.nf | 4 +- .../local/transcript_identification.nf | 4 +- workflows/nascent.nf | 4 +- .../grohmm/only_gff/main.nf.test | 57 ++++++++ .../grohmm/only_gff/main.nf.test.snap | 136 ++++++++++++++++++ 9 files changed, 226 insertions(+), 74 deletions(-) rename bin/{custom_makeConsensusAnnotations => custom_makeConsensusAnnotations.R} (96%) create mode 100644 workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test create mode 100644 workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap diff --git a/bin/custom_makeConsensusAnnotations b/bin/custom_makeConsensusAnnotations.R similarity index 96% rename from bin/custom_makeConsensusAnnotations rename to bin/custom_makeConsensusAnnotations.R index 74c5a43e..f51eda7d 100644 --- a/bin/custom_makeConsensusAnnotations +++ b/bin/custom_makeConsensusAnnotations.R @@ -165,6 +165,7 @@ suppressPackageStartupMessages(library(groHMM)) suppressPackageStartupMessages(library(testthat)) suppressPackageStartupMessages(library(GenomicRanges)) suppressPackageStartupMessages(library(rtracklayer)) +library(GenomicFeatures) # test_that("custom_makeConsensusAnnotations maintains accuracy", { # # Load the GTF file @@ -216,6 +217,17 @@ suppressPackageStartupMessages(library(rtracklayer)) # print(head(refactored_result, 5)) # }) +gff <- "./chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" +kg_db <- makeTxDbFromGFF(gff) +kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) +print("Collapse annotations in preparation for overlap") +kg_consensus <- makeConsensusAnnotations( + kg_tx, + mc.cores = 2 +) +print("Kg consensus:") +print(kg_consensus) + test_that("chm13 custom_makeConsensusAnnotations maintains accuracy", { # Load the GTF file gff_url <- "./chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" @@ -239,6 +251,8 @@ test_that("chm13 custom_makeConsensusAnnotations maintains accuracy", { original_result <- groHMM::makeConsensusAnnotations(sample_ranges) refactored_result <- custom_makeConsensusAnnotations(sample_ranges) + print("Original result:") + print(original_result) print("Refactored result:") print(refactored_result) diff --git a/bin/parameter_tuning.R b/bin/parameter_tuning.R index b630f003..de323bf5 100755 --- a/bin/parameter_tuning.R +++ b/bin/parameter_tuning.R @@ -56,11 +56,11 @@ parser$add_argument( ) parser$add_argument( "-g", - "--gtf", + "--gxf", type = "character", default = NULL, metavar = "string", - help = "GTF File to create TxDb", + help = "GFF/GTF File to create TxDb", required = TRUE ) parser$add_argument( @@ -75,7 +75,6 @@ parser$add_argument( "-m", "--memory", type = "integer", - default = 56000, metavar = "integer", help = "Amount of memory in MB" ) @@ -91,7 +90,6 @@ if (is.null(args$bam_files)) { stop("Please provide a bam file", call. = FALSE) } - # Load alignment files # TODO? CHANGE BASED ON PAIRED OR SINGLE END alignments <- c() @@ -104,65 +102,12 @@ for (bam in args$bam_files) { } print("Input transcript annotations") -# Import the GTF file using rtracklayer -gtf <- import(args$gtf) - -# Exclude any transcripts located on chromosomes labeled with "random" -gtf <- gtf[!grepl("random", seqnames(gtf)), ] - -# Extract transcript-level features -transcripts_gtf <- gtf[gtf$type == "transcript", ] -# Extract exon features -exons_gtf <- gtf[gtf$type == "exon", ] - -# Ensure that the 'transcript_id' and 'gene_id' columns are present -if (!all(c("transcript_id", "gene_id") %in% names(mcols(exons_gtf)))) { - stop("The GTF file lacks 'transcript_id' or 'gene_id' in its attributes.") -} - -# Group exons by transcript_id -exons_by_transcript <- split(exons_gtf, exons_gtf$transcript_id) - -# Diagnostic prints -print(paste("Number of transcripts:", length(exons_by_transcript))) - -# Reduce exons to create transcript ranges -transcripts_ranges <- GenomicRanges::reduce(exons_by_transcript) -transcripts_ranges <- unlist(transcripts_ranges, use.names = TRUE) - -# Diagnostic prints after reduction -print(paste("Number of transcripts_ranges after reduction:", length(transcripts_ranges))) - -# Create mapping dataframe -mapping_df <- data.frame( - transcript_id = names(transcripts_ranges), - gene_id = vapply(exons_by_transcript[names(transcripts_ranges)], function(x) unique(x$gene_id)[1], character(1)), - stringsAsFactors = FALSE -) - -# Check for length mismatch -if (nrow(mapping_df) != length(transcripts_ranges)) { - stop(paste("Length mismatch between mapping_df and transcripts_ranges:", nrow(mapping_df), length(transcripts_ranges))) -} - -# Assign metadata -mcols(transcripts_ranges)$transcript_id <- mapping_df$transcript_id -mcols(transcripts_ranges)$gene_id <- mapping_df$gene_id - -# Assign seqnames and strand from the exons -seqnames(transcripts_ranges) <- seqnames(exons_gtf[match(names(transcripts_ranges), exons_gtf$transcript_id)]) -strand(transcripts_ranges) <- strand(exons_gtf[match(names(transcripts_ranges), exons_gtf$transcript_id)]) - -# Ensure that seqlevels are set correctly -seqlevels(transcripts_ranges) <- seqlevels(gtf) - -# Remove any transcripts with NA values -transcripts_ranges <- transcripts_ranges[!is.na(start(transcripts_ranges)) & !is.na(end(transcripts_ranges))] - +kg_db <- makeTxDbFromGFF(args$gxf) +kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) print("Collapse annotations in preparation for overlap") -kg_consensus <- custom_makeConsensusAnnotations( - transcripts_ranges, - mc.cores = min(args$cores, 10) # 10 the number they had hardcoded in the grohmm package for some reason +kg_consensus <- makeConsensusAnnotations( + kg_tx, + mc.cores = args$cores ) print("Finished consensus annotations") @@ -223,5 +168,3 @@ if (file.exists(r_log_file) == FALSE) { print(a) sink() } - - diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index 883daa18..5c48c64e 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -64,11 +64,11 @@ parser$add_argument( ) parser$add_argument( "-g", - "--gtf", + "--gxf", type = "character", default = NULL, metavar = "string", - help = "GTF File to create TxDb", + help = "GFF/GTF File to create TxDb", required = TRUE ) parser$add_argument( @@ -143,7 +143,7 @@ write.table( ) print("Input transcript annotations") -kg_db <- makeTxDbFromGFF(args$gtf) +kg_db <- makeTxDbFromGFF(args$gxf) kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) # TODO I wonder if I could speed things up by filtering by chromosome at the Nextflow level # https://github.com/google/deepvariant/issues/744 diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index fef7cab3..ad5ac5c7 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -10,7 +10,7 @@ process GROHMM_PARAMETERTUNING { input: tuple val(meta), path(bams), path(bais) - path gtf + path gxf each UTS each LtProbB @@ -29,7 +29,7 @@ process GROHMM_PARAMETERTUNING { parameter_tuning.R \\ --bam_file ${bams} \\ --outprefix ${prefix} \\ - --gtf $gtf \\ + --gxf $gxf \\ --uts $UTS \\ --ltprobb $LtProbB \\ --outdir ./ \\ diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 7935daae..07cba0ca 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -10,7 +10,7 @@ process GROHMM_TRANSCRIPTCALLING { input: tuple val(meta), path(bams), path(bais), path(tuning_file) - path gtf + path gxf output: tuple val(meta), path("*.transcripts.txt"), emit: transcripts @@ -32,7 +32,7 @@ process GROHMM_TRANSCRIPTCALLING { --bam_file ${bams} \\ --tuning_file ${tuning_file} \\ --outprefix ${prefix} \\ - --gtf $gtf \\ + --gxf $gxf \\ --outdir ./ \\ --cores $task.cpus \\ --memory ${task.memory.toMega()} \\ diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification.nf index b1217a90..b2f4883d 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification.nf @@ -14,7 +14,7 @@ include { BEDTOOLS_INTERSECT } from '../../modules/nf-core/bedtools/intersect/ma workflow TRANSCRIPT_INDENTIFICATION { take: group_bam_bai - gtf + gxf fasta chrom_sizes @@ -25,7 +25,7 @@ workflow TRANSCRIPT_INDENTIFICATION { grohmm_td_plot = Channel.empty() if(!params.skip_grohmm && params.assay_type == "GROseq") { - GROHMM ( group_bam_bai, gtf ) + GROHMM ( group_bam_bai, gxf ) ch_identification_bed = ch_identification_bed.mix(GROHMM.out.bed) grohmm_td_plot = GROHMM.out.td_plot ch_versions = ch_versions.mix(GROHMM.out.versions.first()) diff --git a/workflows/nascent.nf b/workflows/nascent.nf index d4675c1d..06e7f16d 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -286,9 +286,11 @@ workflow NASCENT { ch_group_bam_bai = ch_group_bam.join(ch_group_bai, by: [0]) + ch_gxf = ch_gff ? ch_gff : PREPARE_GENOME.out.gtf + TRANSCRIPT_INDENTIFICATION ( ch_group_bam_bai, - PREPARE_GENOME.out.gtf, + ch_gxf, PREPARE_GENOME.out.fasta, PREPARE_GENOME.out.chrom_sizes, ) diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test new file mode 100644 index 00000000..4e8ab43d --- /dev/null +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test @@ -0,0 +1,57 @@ +nextflow_pipeline { + + name "GROHMM" + script "../../../../../main.nf" + tag "input" + tag "grohmm" + tag "gff" + tag "chm13" + // triggers 'bin/parameter_tuning.R', 'bin/transcriptcalling_grohmm.R' + + test("Should run groHMM with only a GFF file") { + when { + params { + outdir = "$outputDir" + skip_grohmm = false + gff = 'https://huggingface.co/datasets/edmundmiller/nascent-test-data/resolve/main/chm13v2.0_RefSeq_Liftoff_v5.1.chr21.gff3.gz' + // TODO Use CHM13 Fasta + gtf = null + bed = null + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/transcript_identification/grohmm/cd4.eval.txt"), + path("$outputDir/transcript_identification/grohmm/cd4.final.transcripts.bed"), + path("$outputDir/transcript_identification/grohmm/cd4.tdFinal.txt"), + path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.png").exists(), + path("$outputDir/transcript_identification/grohmm/cd4.transcripts.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.eval.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.final.transcripts.bed"), + path("$outputDir/transcript_identification/grohmm/jurkat.tdFinal.txt"), + path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.png").exists(), + path("$outputDir/transcript_identification/grohmm/jurkat.transcripts.txt"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap new file mode 100644 index 00000000..3df385a7 --- /dev/null +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -0,0 +1,136 @@ +{ + "output_files": { + "content": [ + 217, + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + [ + "cd4_intersect.bed:md5,51800dceda87c980e91db92b265b7ec6", + "jurkat_intersect.bed:md5,6d205f43e81053ab3a8af5096c065b66" + ], + [ + "cd4_filtered.bed:md5,3de4c6a675817a0661bb24edfd06d155", + "jurkat_filtered.bed:md5,191963fbc44ef9e5c3261a3fb96361a0" + ], + [ + "cd4_intersect.bed:md5,51800dceda87c980e91db92b265b7ec6", + "jurkat_intersect.bed:md5,6d205f43e81053ab3a8af5096c065b66" + ], + [ + "cd4_filtered.bed:md5,3de4c6a675817a0661bb24edfd06d155", + "jurkat_filtered.bed:md5,191963fbc44ef9e5c3261a3fb96361a0" + ], + "cd4.eval.txt:md5,b58c1db2cceac1fe1d89dec5838317d1", + "cd4.final.transcripts.bed:md5,a34dc280b3b023186b4935780d379338", + "cd4.tdFinal.txt:md5,8b49613bc2aa4dcbc23d852e46c41fb7", + true, + "cd4.transcripts.txt:md5,891a07c573dac76de5c466453c206c4f", + "jurkat.eval.txt:md5,1b9b3cf2f8b832ee4863168a07630db7", + "jurkat.final.transcripts.bed:md5,0d60cc43aadb918debf7cbd9113d53b4", + "jurkat.tdFinal.txt:md5,d10046e79b6c6ccff86d42b1bd59cfa4", + true, + "jurkat.transcripts.txt:md5,aae6fb7cf85d2cc91db484a9399da876", + true + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-10-19T21:30:10.156904" + }, + "software_versions": { + "content": [ + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWA_INDEX": { + "bwa": "0.7.18-r1243-dirty" + }, + "BWA_MEM": { + "bwa": "0.7.18-r1243-dirty", + "samtools": 1.2 + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GFFREAD": { + "gffread": "0.12.7" + }, + "GROHMM_PARAMETERTUNING": { + "r-base": "4.3.3", + "bioconductor-grohmm": "1.39.0" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "GUNZIP_GFF": { + "gunzip": 1.1 + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-10-19T21:30:10.110132" + } +} \ No newline at end of file From afbb7b63ced0d30f016ec9d4b134536854dadc9d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 20 Oct 2024 21:47:44 -0500 Subject: [PATCH 163/255] fix(chm13): Prevent some errors during transcriptcalling --- bin/transcriptcalling_grohmm.R | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/transcriptcalling_grohmm.R b/bin/transcriptcalling_grohmm.R index 5c48c64e..3f362275 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/transcriptcalling_grohmm.R @@ -180,7 +180,19 @@ con_expressed <- get_expressed_annotations( b_plus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "+") b_minus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "-") tx_broken <- c(b_plus, b_minus) -tx_final <- combineTranscripts(tx_broken, kg_consensus) +# Assign unique IDs if they're missing +if (is.null(mcols(tx_broken)$transcript_id) || any(is.na(mcols(tx_broken)$transcript_id))) { + mcols(tx_broken)$transcript_id <- paste0("TX", seq_along(tx_broken)) +} + +# Filter out any transcripts with NA values in start or end positions +tx_broken_filtered <- tx_broken[!is.na(start(tx_broken)) & !is.na(end(tx_broken))] + +# Ensure that kg_consensus also doesn't contain NA values +kg_consensus_filtered <- kg_consensus[!is.na(start(kg_consensus)) & !is.na(end(kg_consensus))] + +# Now call combineTranscripts with the filtered data +tx_final <- combineTranscripts(tx_broken_filtered, kg_consensus_filtered) export( tx_final, con = paste(args$outprefix, ".final.transcripts.bed", sep = "") From 5c6b24aa2ceca66df9e3218163afe902fb990c43 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 21 Oct 2024 10:17:32 -0500 Subject: [PATCH 164/255] style(grohmm): Clean up Editorconfig, styler, consistant naming --- .editorconfig | 6 +- bin/custom_makeConsensusAnnotations.R | 285 ------------------ ...eter_tuning.R => grohmm_parametertuning.R} | 4 +- ...ng_grohmm.R => grohmm_transcriptcalling.R} | 27 +- modules/local/grohmm/parametertuning/main.nf | 2 +- .../local/grohmm/transcriptcalling/main.nf | 2 +- subworkflows/local/grohmm/tests/main.nf.test | 13 +- 7 files changed, 35 insertions(+), 304 deletions(-) delete mode 100644 bin/custom_makeConsensusAnnotations.R rename bin/{parameter_tuning.R => grohmm_parametertuning.R} (96%) rename bin/{transcriptcalling_grohmm.R => grohmm_transcriptcalling.R} (88%) diff --git a/.editorconfig b/.editorconfig index 72dda289..e957201e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ trim_trailing_whitespace = true indent_size = 4 indent_style = space -[*.{md,yml,yaml,html,css,scss,js}] +[*.{md,yml,yaml,html,css,scss,js,R,Rmd}] indent_size = 2 # These files are edited and tested upstream in nf-core/modules @@ -31,3 +31,7 @@ indent_size = unset # ignore python and markdown [*.{py,md}] indent_style = unset + +# Follow tidyverse style for R +[*.{R,Rmd}] +indent_size = 2 diff --git a/bin/custom_makeConsensusAnnotations.R b/bin/custom_makeConsensusAnnotations.R deleted file mode 100644 index f51eda7d..00000000 --- a/bin/custom_makeConsensusAnnotations.R +++ /dev/null @@ -1,285 +0,0 @@ -#' custom_makeConsensusAnnotations Makes a consensus annotation #' -#' Makes a non-overlapping consensus annotation. Gene annotations are often -#' overalpping due to #' multiple isoforms for a gene. -#' In consensus annotation, isoforms are first reduced so that only -#' redundant intervals are used to represent a genomic interval for a gene, -#' i.e., a gene id. -#' Remaining unresolved annotations are further reduced by truncating 3' -#' end of annotations. -#' -#' Supports parallel processing using mclapply in the 'parallel' package. -#' To change the number of processors, use the argument 'mc.cores'. -#' -#' @param ar GRanges of annotations to be collapsed. -#' @param minGap Minimun gap between overlapped annotations after truncated. -#' Default: 1L -#' @param minWidth Minimun width of consensus annotations. Default: 1000L -#' @param ... Extra argument passed to mclapply. -#' @return Returns GRanges object of annotations. -#' @author Minho Chae -#' @examples -#' ## Not run: -#' # library(TxDb.Hsapiens.UCSC.hg19.knownGene) -#' # txdb <- TxDb.Hsapiens.UCSC.hg19.knownGene -#' # tx <- transcripts(txdb, columns=c("gene_id", "tx_id", "tx_name"), -#' filter=list(tx_chrom="chr7")) -#' # tx <- tx[grep("random", as.character(seqnames(tx)), invert=TRUE),] -#' # ca <- makeConsensusAnnotations(tx) -custom_makeConsensusAnnotations <- function(ar, minGap=1L, minWidth=1000L, ...) { - # Check and remove ranges with missing or multiple gene_ids - valid_ranges <- vapply(mcols(ar)$gene_id, function(x) length(x) == 1, logical(1)) - if (any(!valid_ranges)) { - warning(sum(!valid_ranges), " ranges have missing or multiple gene_id and they are dropped") - ar <- ar[valid_ranges] - } - - # Split into single-isoform and multi-isoform genes - gene_counts <- table(mcols(ar)$gene_id) - singles <- ar[mcols(ar)$gene_id %in% names(gene_counts[gene_counts == 1])] - multi_isoform_genes <- names(gene_counts[gene_counts > 1]) - - # Process multi-isoform genes in chunks - chunk_size <- 1000 # Adjust based on available memory - num_chunks <- ceiling(length(multi_isoform_genes) / chunk_size) - - isoforms <- GRangesList() - for (i in 1:num_chunks) { - chunk_start <- (i - 1) * chunk_size + 1 - chunk_end <- min(i * chunk_size, length(multi_isoform_genes)) - chunk_genes <- multi_isoform_genes[chunk_start:chunk_end] - - chunk_isoforms <- ar[mcols(ar)$gene_id %in% chunk_genes] - chunk_list <- split(chunk_isoforms, mcols(chunk_isoforms)$gene_id) - - message("Reduce isoforms (chunk ", i, "/", num_chunks, ") ... ", appendLF=FALSE) - chunk_result <- GRangesList(mclapply(chunk_list, function(x) { - # For mixed strands or chrom, choose the longest - if ((length(seqlevelsInUse(x)) > 1) || - (length(unique(strand(x))) > 1)) { - result <- x[which.max(width(x)), "gene_id"] - } else { - dx <- disjoin(x) - mcols(dx)$gene_id <- mcols(x)$gene_id[1] - olcnt <- countOverlaps(dx, x) - - multi <- dx[olcnt > 1] # Use the disjoint ranges - # covered more than once - if (length(multi) == 0) { # For non-overlapping isoforms, - # choose the longest - result <- x[which.max(width(x)), "gene_id"] - } else if (length(multi) == 1) { - result <- multi - } else { - reduced <- reduce(multi) - if (length(reduced) == 1) - result <- reduced - else (length(reduced) > 1) - result <- reduced[which.max(width(reduced)),] - - } - mcols(result)$gene_id <- mcols(x)$gene_id[1] - } - return(result) - }, ...)) - isoforms <- c(isoforms, chunk_result) - message("OK") - } - isoforms <- unlist(isoforms) - - # Check redundancy - isoforms <- removeRedundant(isoforms) - singles <- removeRedundant(singles) - - o <- findOverlaps(singles, isoforms, type = "equal") - if (length(o) != 0) { - singles <- singles[-queryHits(o), ] - } - - o <- findOverlaps(singles, isoforms, type = "within") - if (length(o) != 0) { - singles <- singles[-queryHits(o), ] - } - - o <- findOverlaps(isoforms, singles, type = "within") - if (length(o) != 0) { - isoforms <- isoforms[-queryHits(o), ] - } - - noiso <- sort(c(isoforms, singles[, "gene_id"])) - message("Truncate overlapped ranges ... ", appendLF=FALSE) - # with different gene_ids - while(!isDisjoint(noiso)) { - ol <- findOverlaps(noiso, drop.self=TRUE, drop.redundant=TRUE) - ol_gr <- GRangesList(lapply(1:length(ol), function(x) { - sort(c( - noiso[queryHits(ol)[x]], - noiso[subjectHits(ol)[x]] - )) - })) - - # Truncate 3' end - ol_gr <- unlist(endoapply(ol_gr, function(x) { - if (as.character(strand(x[1, ])) == "+") { - end(x[1, ]) <- start(x[2, ]) - minGap - # first range's end is truncated - } else { - start(x[2, ]) <- end(x[1, ]) + minGap - # sencond range's end is truncated - } - x - })) - - # Remove any ranges with duplicated names since they already adujsted - # in the previous call - ol_gr <- ol_gr[!duplicated(names(ol_gr)), ] - - noiso <- noiso[-unique(c(queryHits(ol), subjectHits(ol))), ] - # update noiso - noiso <- c(noiso, ol_gr) - } - message("OK") - - noiso <- noiso[width(noiso) >= minWidth, ] - return(sort(noiso)) -} - -removeRedundant <- function(annox) { - o <- findOverlaps(annox, drop.self=TRUE, type="equal", - drop.redundant=TRUE) - if(length(o) != 0) - annox <- annox[-subjectHits(o),] - - o <- findOverlaps(annox, drop.self=TRUE, type="within", - drop.redundant=TRUE) - if(length(o) != 0) - annox <- annox[-queryHits(o),] - - return(annox) -} - - - - -## TESTING -suppressPackageStartupMessages(library(groHMM)) -suppressPackageStartupMessages(library(testthat)) -suppressPackageStartupMessages(library(GenomicRanges)) -suppressPackageStartupMessages(library(rtracklayer)) -library(GenomicFeatures) - -# test_that("custom_makeConsensusAnnotations maintains accuracy", { -# # Load the GTF file -# gtf_url <- "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf" -# gtf <- import(gtf_url) - -# # Extract transcripts from the GTF -# transcripts <- gtf[gtf$type == "transcript"] - -# # Create a sample GRanges object -# set.seed(42) -# n <- 100 -# sample_ranges <- transcripts -# print("Sample ranges:") -# print(sample_ranges) - -# # Run both original and refactored functions -# original_result <- groHMM::makeConsensusAnnotations(sample_ranges) -# refactored_result <- custom_makeConsensusAnnotations(sample_ranges) - -# print("Refactored result:") -# print(refactored_result) - -# # Compare results -# expect_equal(length(original_result), length(refactored_result)) -# expect_equal(sum(width(original_result)), sum(width(refactored_result))) - -# if (length(original_result) > 0 && length(refactored_result) > 0) { -# expect_equal( -# sort(unique(mcols(original_result)$gene_id)), -# sort(unique(mcols(refactored_result)$gene_id)) -# ) -# } else { -# print("Warning: One or both results are empty.") -# } - -# # Additional detailed comparisons -# print(paste("Original result length:", length(original_result))) -# print(paste("Refactored result length:", length(refactored_result))) -# print(paste("Original result total width:", sum(width(original_result)))) -# print(paste("Refactored result total width:", sum(width(refactored_result)))) -# print(paste("Original result unique gene_ids:", length(unique(mcols(original_result)$gene_id)))) -# print(paste("Refactored result unique gene_ids:", length(unique(mcols(refactored_result)$gene_id)))) - -# # Compare the first few entries -# print("First 5 entries of original result:") -# print(head(original_result, 5)) -# print("First 5 entries of refactored result:") -# print(head(refactored_result, 5)) -# }) - -gff <- "./chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" -kg_db <- makeTxDbFromGFF(gff) -kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) -print("Collapse annotations in preparation for overlap") -kg_consensus <- makeConsensusAnnotations( - kg_tx, - mc.cores = 2 -) -print("Kg consensus:") -print(kg_consensus) - -test_that("chm13 custom_makeConsensusAnnotations maintains accuracy", { - # Load the GTF file - gff_url <- "./chm13v2.0_RefSeq_Liftoff_v5.1.gff3.gz" - gff <- import(gff_url) - - print("GFF:") - print(gff) - # Extract transcripts from the GTF - transcripts <- gff[gff$type == "transcript"] - print("Transcripts:") - print(transcripts) - - # Create a sample GRanges object - set.seed(42) - n <- 100 - sample_ranges <- transcripts - print("Sample ranges:") - print(sample_ranges) - - # Run both original and refactored functions - original_result <- groHMM::makeConsensusAnnotations(sample_ranges) - refactored_result <- custom_makeConsensusAnnotations(sample_ranges) - - print("Original result:") - print(original_result) - print("Refactored result:") - print(refactored_result) - - # Compare results - expect_equal(length(original_result), length(refactored_result)) - expect_equal(sum(width(original_result)), sum(width(refactored_result))) - - if (length(original_result) > 0 && length(refactored_result) > 0) { - expect_equal( - sort(unique(mcols(original_result)$gene_id)), - sort(unique(mcols(refactored_result)$gene_id)) - ) - } else { - print("Warning: One or both results are empty.") - } - - # Additional detailed comparisons - print(paste("Original result length:", length(original_result))) - print(paste("Refactored result length:", length(refactored_result))) - print(paste("Original result total width:", sum(width(original_result)))) - print(paste("Refactored result total width:", sum(width(refactored_result)))) - print(paste("Original result unique gene_ids:", length(unique(mcols(original_result)$gene_id)))) - print(paste("Refactored result unique gene_ids:", length(unique(mcols(refactored_result)$gene_id)))) - - # Compare the first few entries - print("First 5 entries of original result:") - print(head(original_result, 5)) - print("First 5 entries of refactored result:") - print(head(refactored_result, 5)) -}) diff --git a/bin/parameter_tuning.R b/bin/grohmm_parametertuning.R similarity index 96% rename from bin/parameter_tuning.R rename to bin/grohmm_parametertuning.R index de323bf5..482b8741 100755 --- a/bin/parameter_tuning.R +++ b/bin/grohmm_parametertuning.R @@ -119,8 +119,8 @@ tune <- data.frame( LtProbB = args$ltprobb, UTS = args$uts ) -Fp <- windowAnalysis(alignments, strand = "+", windowSize = 50) -Fm <- windowAnalysis(alignments, strand = "-", windowSize = 50) +fp <- windowAnalysis(alignments, strand = "+", windowSize = 50) +fm <- windowAnalysis(alignments, strand = "-", windowSize = 50) hmm <- detectTranscripts( Fp = Fp, Fm = Fm, diff --git a/bin/transcriptcalling_grohmm.R b/bin/grohmm_transcriptcalling.R similarity index 88% rename from bin/transcriptcalling_grohmm.R rename to bin/grohmm_transcriptcalling.R index 3f362275..cdc4ca6b 100755 --- a/bin/transcriptcalling_grohmm.R +++ b/bin/grohmm_transcriptcalling.R @@ -145,7 +145,8 @@ write.table( print("Input transcript annotations") kg_db <- makeTxDbFromGFF(args$gxf) kg_tx <- transcripts(kg_db, columns = c("gene_id", "tx_id", "tx_name")) -# TODO I wonder if I could speed things up by filtering by chromosome at the Nextflow level +# TODO I wonder if I could speed things up by filtering +# by chromosome at the Nextflow level... # https://github.com/google/deepvariant/issues/744 # filter=list(tx_chrom="chr7")) # exclude any transcripts that are located on chromosomes labeled with "random". @@ -170,8 +171,10 @@ get_expressed_annotations <- function(features, reads) { f_limit <- limitToXkb(features) count <- countOverlaps(f_limit, reads) features <- features[count != 0, ] - return(features[(quantile(width(features), .05) < width(features)) & - (width(features) < quantile(width(features), .95)), ]) + return(features[ + (quantile(width(features), .05) < width(features)) & + (width(features) < quantile(width(features), .95)), + ]) } con_expressed <- get_expressed_annotations( features = kg_consensus, @@ -181,15 +184,20 @@ b_plus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "+") b_minus <- breakTranscriptsOnGenes(tx_hmm, kg_consensus, strand = "-") tx_broken <- c(b_plus, b_minus) # Assign unique IDs if they're missing -if (is.null(mcols(tx_broken)$transcript_id) || any(is.na(mcols(tx_broken)$transcript_id))) { - mcols(tx_broken)$transcript_id <- paste0("TX", seq_along(tx_broken)) +if ( + is.null(mcols(tx_broken)$transcript_id) || + any(is.na(mcols(tx_broken)$transcript_id)) +) { + mcols(tx_broken)$transcript_id <- paste0("TX", seq_along(tx_broken)) } # Filter out any transcripts with NA values in start or end positions -tx_broken_filtered <- tx_broken[!is.na(start(tx_broken)) & !is.na(end(tx_broken))] +tx_broken_filtered <- + tx_broken[!is.na(start(tx_broken)) & !is.na(end(tx_broken))] # Ensure that kg_consensus also doesn't contain NA values -kg_consensus_filtered <- kg_consensus[!is.na(start(kg_consensus)) & !is.na(end(kg_consensus))] +kg_consensus_filtered <- + kg_consensus[!is.na(start(kg_consensus)) & !is.na(end(kg_consensus))] # Now call combineTranscripts with the filtered data tx_final <- combineTranscripts(tx_broken_filtered, kg_consensus_filtered) @@ -212,7 +220,10 @@ capture.output(td_final, file = paste0(args$outprefix, ".tdFinal.txt")) # Write the data used in the plot to a CSV file data_to_write <- data.frame(x = td_final$x, profile = td_final$profile) -write.csv(data_to_write, file = paste0(args$outprefix, ".tdFinal_mqc.csv"), row.names = FALSE) +write.csv(data_to_write, + file = paste0(args$outprefix, ".tdFinal_mqc.csv"), + row.names = FALSE +) ######################## ## CITE PACKAGES USED ## diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index ad5ac5c7..0d2a5069 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -26,7 +26,7 @@ process GROHMM_PARAMETERTUNING { def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}_${UTS}_${LtProbB}" """ - parameter_tuning.R \\ + grohmm_parametertuning.R \\ --bam_file ${bams} \\ --outprefix ${prefix} \\ --gxf $gxf \\ diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 07cba0ca..984d1800 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -28,7 +28,7 @@ process GROHMM_TRANSCRIPTCALLING { def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" """ - transcriptcalling_grohmm.R \\ + grohmm_transcriptcalling.R \\ --bam_file ${bams} \\ --tuning_file ${tuning_file} \\ --outprefix ${prefix} \\ diff --git a/subworkflows/local/grohmm/tests/main.nf.test b/subworkflows/local/grohmm/tests/main.nf.test index 29382e3f..1cbb283c 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test +++ b/subworkflows/local/grohmm/tests/main.nf.test @@ -17,15 +17,15 @@ nextflow_workflow { workflow { """ input[0] = Channel.of([ - [ id: 'Sall' ], + [ id: 'Sall' ], [ file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) ], [], - ]) + ]) input[1] = Channel.of([file( "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", checkIfExists: true - )]).first() + )]).first() """ } } @@ -41,9 +41,10 @@ nextflow_workflow { // workflow.out.td_plot, ).match() }, - { assert snapshot( - path(workflow.out.versions.get(0)).yaml) - .match("versions") + { + assert snapshot( + path(workflow.out.versions.get(0)).yaml + ).match("versions") }, ) } From 9c651138468061bc881c9bb76e8b17d9e63bd61f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 22 Oct 2024 12:15:33 -0500 Subject: [PATCH 165/255] chore: Move test data to test-datasets repo --- modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test | 2 +- modules/local/grohmm/parametertuning/tests/main.nf.test | 2 +- modules/local/grohmm/transcriptcalling/tests/main.nf.test | 4 ++-- subworkflows/local/grohmm/tests/main.nf.test | 2 +- .../transcript_indentification/grohmm/only_gff/main.nf.test | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test index 0d27d847..3b30e5ce 100644 --- a/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test +++ b/modules/local/grohmm/parametertuning/tests/chm13_gtf.nf.test @@ -19,7 +19,7 @@ nextflow_process { [], ] input[1] = file( - "https://gist.githubusercontent.com/edmundmiller/f9a31e300a90956d8aaff7ad6105e394/raw/99f6eff1ddb8ca9ac1cd766ea2fed9bb83919fb2/broke.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/broke.gtf", checkIfExists: true ) input[2] = 5 diff --git a/modules/local/grohmm/parametertuning/tests/main.nf.test b/modules/local/grohmm/parametertuning/tests/main.nf.test index eafdb9d9..09ae26fa 100644 --- a/modules/local/grohmm/parametertuning/tests/main.nf.test +++ b/modules/local/grohmm/parametertuning/tests/main.nf.test @@ -19,7 +19,7 @@ nextflow_process { [], ] input[1] = file( - "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/hg19.chr7.refGene.gtf", checkIfExists: true ) input[2] = 5 diff --git a/modules/local/grohmm/transcriptcalling/tests/main.nf.test b/modules/local/grohmm/transcriptcalling/tests/main.nf.test index 01a12c62..06e8750f 100644 --- a/modules/local/grohmm/transcriptcalling/tests/main.nf.test +++ b/modules/local/grohmm/transcriptcalling/tests/main.nf.test @@ -20,7 +20,7 @@ nextflow_process { [], ] input[1] = file( - "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/hg19.chr7.refGene.gtf", checkIfExists: true ) """ @@ -50,7 +50,7 @@ nextflow_process { file("${projectDir}/tests/config/tuningparams_small.csv", checkIfExists: true), ] input[1] = file( - "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/hg19.chr7.refGene.gtf", checkIfExists: true ) """ diff --git a/subworkflows/local/grohmm/tests/main.nf.test b/subworkflows/local/grohmm/tests/main.nf.test index 1cbb283c..39f9f380 100644 --- a/subworkflows/local/grohmm/tests/main.nf.test +++ b/subworkflows/local/grohmm/tests/main.nf.test @@ -23,7 +23,7 @@ nextflow_workflow { [], ]) input[1] = Channel.of([file( - "https://gist.github.com/edmundmiller/c142801995689ed8d15ebcf40b2fb042/raw/eca3b955312209b5845cca084bb506d5250b3d33/hg19.chr7.refGene.gtf", + "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/hg19.chr7.refGene.gtf", checkIfExists: true )]).first() """ diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test index 4e8ab43d..362f87d5 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test @@ -14,7 +14,7 @@ nextflow_pipeline { outdir = "$outputDir" skip_grohmm = false gff = 'https://huggingface.co/datasets/edmundmiller/nascent-test-data/resolve/main/chm13v2.0_RefSeq_Liftoff_v5.1.chr21.gff3.gz' - // TODO Use CHM13 Fasta + fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/chm13v2.0.chr21.fa.gz' gtf = null bed = null } From 5bdce2ee4d8c7a09bd88e82af0d70821a7f6d96e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 24 Oct 2024 20:32:55 -0500 Subject: [PATCH 166/255] fixup! style(grohmm): Clean up --- bin/grohmm_parametertuning.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/grohmm_parametertuning.R b/bin/grohmm_parametertuning.R index 482b8741..1b24f780 100755 --- a/bin/grohmm_parametertuning.R +++ b/bin/grohmm_parametertuning.R @@ -122,8 +122,8 @@ tune <- data.frame( fp <- windowAnalysis(alignments, strand = "+", windowSize = 50) fm <- windowAnalysis(alignments, strand = "-", windowSize = 50) hmm <- detectTranscripts( - Fp = Fp, - Fm = Fm, + Fp = fp, + Fm = fm, reads = alignments, LtProbB = args$ltprobb, UTS = args$uts From 2209e689c90c6ddeb6c8cab552e993a47fc98b45 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 28 Sep 2024 11:42:40 -0500 Subject: [PATCH 167/255] fix(pints): Bump up memory Looks like it's using quite a bit of memory, wondering if the lack of CPU usage is because of the memory bottleneck. Also might use a scratch directive, because it's reading 200G of data, and writing 30-40g over the course of it apparently. --- modules/nf-core/pints/caller/main.nf | 2 +- modules/nf-core/pints/caller/pints-caller.diff | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index fe423c06..8e6dea55 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -1,6 +1,6 @@ process PINTS_CALLER { tag "$meta.id" - label 'process_medium' + label 'process_high' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? diff --git a/modules/nf-core/pints/caller/pints-caller.diff b/modules/nf-core/pints/caller/pints-caller.diff index faced71c..777c0c58 100644 --- a/modules/nf-core/pints/caller/pints-caller.diff +++ b/modules/nf-core/pints/caller/pints-caller.diff @@ -1,10 +1,20 @@ Changes in module 'nf-core/pints/caller' --- modules/nf-core/pints/caller/main.nf +++ modules/nf-core/pints/caller/main.nf -@@ -9,6 +9,7 @@ +@@ -1,6 +1,6 @@ + process PINTS_CALLER { + tag "$meta.id" +- label 'process_medium' ++ label 'process_high' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? +@@ -8,7 +8,8 @@ + 'biocontainers/pypints:1.1.8--pyh7cba7a3_0' }" input: - tuple val(meta), path(bams) +- tuple val(meta), path(bams) ++ tuple val(meta), path(bams), path(bais) + val assay_type output: From 269ba9c006d00d6e66d43a237cdaafb67fd62c02 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 30 Sep 2024 07:20:45 -0500 Subject: [PATCH 168/255] refactor(pints): Scatter gather by chromosome --- modules/nf-core/pints/caller/main.nf | 7 +++++-- modules/nf-core/pints/caller/pints-caller.diff | 17 ++++++++++++++--- .../local/transcript_identification.nf | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index 8e6dea55..0b435dce 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -1,5 +1,5 @@ process PINTS_CALLER { - tag "$meta.id" + tag "$meta.id" + "${chr_name ? ' | ' + chr_name : ''}" label 'process_high' conda "${moduleDir}/environment.yml" @@ -10,6 +10,7 @@ process PINTS_CALLER { input: tuple val(meta), path(bams), path(bais) val assay_type + each chr_name // optional output: tuple val(meta), path("*_divergent_peaks.bed") , optional:true, emit: divergent_TREs @@ -23,7 +24,8 @@ process PINTS_CALLER { script: def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" + def prefix = task.ext.prefix ?: "${meta.id}" + (chr_name ? '_' + chr_name : '_all') + def chr = chr_name ? "--chromosome-start-with $chr_name" : '' // TODO handle bigwigs // def input_type = ("${input[0]}".endsWith(".bam")) ? "--bam-file $input" : // ("$input".contains(".bw")) ? "--bw-pl ${input[0]} --bw-mn ${input[1]}" : @@ -36,6 +38,7 @@ process PINTS_CALLER { --thread $task.cpus \\ --dont-check-updates \\ --exp-type $assay_type \\ + $chr \\ $args cat <<-END_VERSIONS > versions.yml diff --git a/modules/nf-core/pints/caller/pints-caller.diff b/modules/nf-core/pints/caller/pints-caller.diff index 777c0c58..27c01984 100644 --- a/modules/nf-core/pints/caller/pints-caller.diff +++ b/modules/nf-core/pints/caller/pints-caller.diff @@ -3,27 +3,38 @@ Changes in module 'nf-core/pints/caller' +++ modules/nf-core/pints/caller/main.nf @@ -1,6 +1,6 @@ process PINTS_CALLER { - tag "$meta.id" +- tag "$meta.id" - label 'process_medium' ++ tag "$meta.id" + "${chr_name ? ' | ' + chr_name : ''}" + label 'process_high' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? -@@ -8,7 +8,8 @@ +@@ -8,7 +8,9 @@ 'biocontainers/pypints:1.1.8--pyh7cba7a3_0' }" input: - tuple val(meta), path(bams) + tuple val(meta), path(bams), path(bais) + val assay_type ++ each chr_name // optional output: tuple val(meta), path("*_divergent_peaks.bed") , optional:true, emit: divergent_TREs -@@ -34,6 +35,7 @@ +@@ -23,6 +25,7 @@ + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" ++ def chr = chr_name ? "--chromosome-start-with $chr_name" : '' + // TODO handle bigwigs + // def input_type = ("${input[0]}".endsWith(".bam")) ? "--bam-file $input" : + // ("$input".contains(".bw")) ? "--bw-pl ${input[0]} --bw-mn ${input[1]}" : +@@ -34,6 +37,8 @@ --file-prefix $prefix \\ --thread $task.cpus \\ --dont-check-updates \\ + --exp-type $assay_type \\ ++ $chr \\ $args cat <<-END_VERSIONS > versions.yml diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification.nf index b2f4883d..bb1c6979 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification.nf @@ -43,13 +43,23 @@ workflow TRANSCRIPT_INDENTIFICATION { ch_versions = ch_versions.mix(HOMER_GROSEQ.out.versions.first()) } - - // TODO https://github.com/hyulab/PINTS/issues/15 - PINTS_CALLER ( group_bam_bai, params.assay_type ) + PINTS_CALLER ( + group_bam_bai, + params.assay_type, + // Scatter the chromosomes + fasta.splitFasta( record: [id: true] ).map { record -> record.id }, + ) ch_versions = ch_versions.mix(PINTS_CALLER.out.versions.first()) + + // Gather the chromosomes + // TODO Tests don't seem to hit this because there's no bidirectional_TREs + ch_bidirectional_TREs = PINTS_CALLER.out.bidirectional_TREs + .groupTuple(by: [0]) + .collect() + // HACK Not sure if this is as good as reporting all of them, but it should // reduce the overall noise. - CAT_CAT ( PINTS_CALLER.out.bidirectional_TREs ) + CAT_CAT ( ch_bidirectional_TREs ) ch_versions = ch_versions.mix(CAT_CAT.out.versions.first()) BEDTOOLS_SORT ( CAT_CAT.out.file_out, [] ) ch_versions = ch_versions.mix(BEDTOOLS_SORT.out.versions.first()) From 678ec38d752c28d4bd46c143f8719860faf53461 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 19 Oct 2024 22:20:17 -0500 Subject: [PATCH 169/255] fix: Hack out a toy example --- .../local/transcript_identification.nf | 6 ++-- .../transcript_identification/scratch.nf | 32 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 subworkflows/local/transcript_identification/scratch.nf diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification.nf index bb1c6979..db9c42f6 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification.nf @@ -53,9 +53,11 @@ workflow TRANSCRIPT_INDENTIFICATION { // Gather the chromosomes // TODO Tests don't seem to hit this because there's no bidirectional_TREs - ch_bidirectional_TREs = PINTS_CALLER.out.bidirectional_TREs + // Need to collect all of the beds for each chromosome/sample and concatenate them + // Nextflow makes this super easy + def ch_bidirectional_TREs = PINTS_CALLER.out.unidirectional_TREs .groupTuple(by: [0]) - .collect() + .map { meta, beds -> [meta, beds.flatten()] } // HACK Not sure if this is as good as reporting all of them, but it should // reduce the overall noise. diff --git a/subworkflows/local/transcript_identification/scratch.nf b/subworkflows/local/transcript_identification/scratch.nf new file mode 100644 index 00000000..7a449274 --- /dev/null +++ b/subworkflows/local/transcript_identification/scratch.nf @@ -0,0 +1,32 @@ +workflow { + def chr = Channel.from( 1..4 ) + def samples = Channel.from( "jurkat", "hepg2" ) + + RUN_FOR_EACH_CHR ( + samples, + chr + ) + + RUN_FOR_EACH_CHR.out.beds + .groupTuple(by: [0]) + .map { meta, beds -> [meta, beds.flatten()] } + .view() + +} + +process RUN_FOR_EACH_CHR { + input: + val(meta) + each chr_name // optional + + output: + tuple val(meta), path("*.bed") , optional:true, emit: beds + + script: + def prefix = "${meta}" + (chr_name ? '_' + chr_name : '_all') + """ + echo "Processing ${prefix} 1" > ${prefix}_1.bed + echo "Processing ${prefix} 2" > ${prefix}_2.bed + echo "Processing ${prefix} 3" > ${prefix}_3.bed + """ +} From 6cf0afa5f0b0c1c0f1b7df87e0bb337b1f4fc170 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 19 Oct 2024 22:46:20 -0500 Subject: [PATCH 170/255] fix: Get bed2saf working --- .../local/transcript_identification.nf | 6 +- workflows/tests/aligner/bwa.nf.test.snap | 32 +++++++--- workflows/tests/aligner/bwamem2.nf.test.snap | 32 +++++++--- workflows/tests/aligner/dragmap.nf.test.snap | 38 ++++++++---- workflows/tests/aligner/hisat2.nf.test.snap | 27 +++++--- workflows/tests/aligner/star.nf.test.snap | 58 ++++++++++++----- workflows/tests/inputs/gff/main.nf.test.snap | 32 +++++++--- .../inputs/gzipped_gff/main.nf.test.snap | 32 +++++++--- .../tests/inputs/only_gff/main.nf.test.snap | 32 +++++++--- .../grohmm/only_gff/main.nf.test.snap | 62 +++++++++++-------- .../grohmm/tuning/main.nf.test.snap | 55 +++++++++------- 11 files changed, 267 insertions(+), 139 deletions(-) diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification.nf index db9c42f6..8eb60b76 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification.nf @@ -71,19 +71,21 @@ workflow TRANSCRIPT_INDENTIFICATION { if(params.filter_bed) { ch_filter_bed = Channel.from(params.filter_bed) - BEDTOOLS_INTERSECT_FILTER ( ch_identification_bed.combine(ch_filter_bed), chrom_sizes.map { [ [:], it ] } ) + BEDTOOLS_INTERSECT_FILTER ( ch_identification_bed.combine(ch_filter_bed.first()), chrom_sizes.map { [ [:], it ] } ) ch_identification_bed = BEDTOOLS_INTERSECT_FILTER.out.intersect ch_versions = ch_versions.mix(BEDTOOLS_INTERSECT_FILTER.out.versions.first()) } if(params.intersect_bed) { ch_intersect_bed = Channel.from(params.intersect_bed) - BEDTOOLS_INTERSECT ( ch_identification_bed.combine(ch_intersect_bed), chrom_sizes.map { [ [:], it ] } ) + BEDTOOLS_INTERSECT ( ch_identification_bed.combine(ch_intersect_bed.first()), chrom_sizes.map { [ [:], it ] } ) ch_identification_bed = BEDTOOLS_INTERSECT.out.intersect ch_versions = ch_versions.mix(BEDTOOLS_INTERSECT.out.versions.first()) } ch_identification_bed // Drop any empty bed files + // Prevents throwing an error in featurecounts + // FIXME This drops one of the samples in the test data, jurkat .filter { meta, bed -> bed.size() > 0 } .set { ch_identification_bed_clean } diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index c6fadfb0..54a94c94 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 134, + 147, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -137,20 +137,20 @@ "cd4.bed:md5,ab94918610a560772fdbec591200295f", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,c45718bf5c21eb28b810d4800296728b", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,22a41b0aef6da7f4fa0f0644cc60ef32", - "jurkat_filtered.bed:md5,a491231815327b0d0fab1885b8a8662e" + "cd4_filtered.bed:md5,9d602f0b63502f05fce25d27a8cb179b", + "jurkat_filtered.bed:md5,7c59749ca5b3eb090415420830f8d394" ], true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-08-11T14:09:09.905409258" + "timestamp": "2024-11-07T14:27:43.485041" }, "Should work with gzipped references": { "content": [ @@ -182,6 +182,12 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, "BWA_INDEX": { "bwa": "0.7.18-r1243-dirty" }, @@ -189,6 +195,9 @@ "bwa": "0.7.18-r1243-dirty", "samtools": 1.2 }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -212,8 +221,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -233,6 +242,9 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } @@ -240,9 +252,9 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T12:57:24.191417844" + "timestamp": "2024-11-07T14:27:42.702359" }, "Should work with BWA Index": { "content": [ diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index e297f404..55ef6964 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 77, + 90, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -80,20 +80,20 @@ "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", - "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-08-11T12:45:38.504730102" + "timestamp": "2024-11-07T14:30:34.98243" }, "software_versions": { "content": [ @@ -115,6 +115,12 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, "BWAMEM2_INDEX": { "bwamem2": "2.2.1" }, @@ -122,6 +128,9 @@ "bwamem2": "2.2.1", "samtools": "1.19.2" }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -145,8 +154,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -181,6 +190,9 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } @@ -188,8 +200,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:03:04.896300418" + "timestamp": "2024-11-07T14:30:34.70143" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index ec9a163b..6284268a 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 77, + 90, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -80,20 +80,20 @@ "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", "jurkat.bed:md5,31454804c53975171a763d3049406598", [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,063a59e4a2612e8eedaa443d02f6d271", - "jurkat_filtered.bed:md5,6625c2c4f2bbbf9ff2c93e587990b906" + "cd4_filtered.bed:md5,8624dd128e0a4b1d73296ceacc553beb", + "jurkat_filtered.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c" ], true ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.0" }, - "timestamp": "2024-08-11T20:13:30.191639621" + "timestamp": "2024-11-07T20:41:37.262053277" }, "software_versions": { "content": [ @@ -115,6 +115,15 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -146,8 +155,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -182,15 +191,18 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } } ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:24:45.988211144" + "timestamp": "2024-11-07T20:41:36.959938207" } -} \ No newline at end of file +} diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 7fccf211..b119fea8 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 77, + 87, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -89,16 +89,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,d2d0eea74b786692bea5a6a23046ad4a", - "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495" + "cd4_filtered.bed:md5,1db971f660d9a171e4c5048359e6fb50", + "jurkat_filtered.bed:md5,bd6458d033db136523d32ffba259f564" ], true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-13T08:37:05.644780156" + "timestamp": "2024-11-07T14:32:12.531811" }, "software_versions": { "content": [ @@ -120,6 +120,15 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -147,8 +156,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -193,8 +202,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:31:57.505925737" + "timestamp": "2024-11-07T14:32:12.49014" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 319e65e2..0f061067 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -1,17 +1,17 @@ { "Should run with gzipped gtf": { "content": [ - 83 + 96 ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-08-10T23:12:22.87545483" + "timestamp": "2024-11-07T14:37:11.823695" }, "output_files": { "content": [ - 82, + 95, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -90,20 +90,20 @@ "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,ae17ebd0485c6fc2648dcdb31eeb59b2", - "jurkat_filtered.bed:md5,f671cf2998b8d2422554c8cee21ee91f" + "cd4_filtered.bed:md5,148cc780cdf3733edee188ab141e183c", + "jurkat_filtered.bed:md5,95a5279ec2387dfa0b4c2e7820083527" ], true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-08-11T13:24:35.500633327" + "timestamp": "2024-11-07T14:34:49.87981" }, "software_versions": { "content": [ @@ -125,6 +125,15 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -148,8 +157,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -169,6 +178,9 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } @@ -176,9 +188,9 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:36:46.329601446" + "timestamp": "2024-11-07T14:34:49.029692" }, "gzip_software_versions": { "content": [ @@ -200,6 +212,15 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -226,8 +247,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -247,6 +268,9 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } @@ -254,8 +278,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:42:56.284149051" + "timestamp": "2024-11-07T14:37:11.702677" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 881a1903..90c40798 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 77, + 90, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -80,20 +80,20 @@ "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", - "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-08-29T22:00:31.371208715" + "timestamp": "2024-11-07T14:38:39.447299" }, "software_versions": { "content": [ @@ -115,6 +115,12 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, "BWA_INDEX": { "bwa": "0.7.18-r1243-dirty" }, @@ -122,6 +128,9 @@ "bwa": "0.7.18-r1243-dirty", "samtools": 1.2 }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -145,8 +154,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -166,6 +175,9 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } @@ -173,8 +185,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:46:36.600907422" + "timestamp": "2024-11-07T14:38:39.158827" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index a5f01885..f10d503c 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 77, + 90, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -80,20 +80,20 @@ "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", - "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-08-29T22:05:38.178813579" + "timestamp": "2024-11-07T14:40:08.263278" }, "software_versions": { "content": [ @@ -115,6 +115,12 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, "BWA_INDEX": { "bwa": "0.7.18-r1243-dirty" }, @@ -122,6 +128,9 @@ "bwa": "0.7.18-r1243-dirty", "samtools": 1.2 }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -145,8 +154,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -166,6 +175,9 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } @@ -173,8 +185,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:50:42.207513749" + "timestamp": "2024-11-07T14:40:08.00609" } } \ No newline at end of file diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 15ffad79..2975d054 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 78, + 91, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -80,20 +80,20 @@ "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", - "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-08-30T19:42:31.394291729" + "timestamp": "2024-11-07T14:41:32.789831" }, "software_versions": { "content": [ @@ -115,6 +115,12 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, "BWA_INDEX": { "bwa": "0.7.18-r1243-dirty" }, @@ -122,6 +128,9 @@ "bwa": "0.7.18-r1243-dirty", "samtools": 1.2 }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -148,8 +157,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -169,6 +178,9 @@ "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, + "SUBREAD_FEATURECOUNTS_PREDICTED": { + "subread": "2.0.1" + }, "Workflow": { "nf-core/nascent": "v2.3.0dev" } @@ -176,8 +188,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T13:54:12.649672582" + "timestamp": "2024-11-07T14:41:32.519314" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index 3df385a7..b993c9f8 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -1,42 +1,42 @@ { "output_files": { "content": [ - 217, - "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + 110, + "cd4.bed:md5,202652821e59d0357c699b217d02f755", + "jurkat.bed:md5,7c37a46578dac48f8bf15155cd78b214", [ - "cd4_intersect.bed:md5,51800dceda87c980e91db92b265b7ec6", - "jurkat_intersect.bed:md5,6d205f43e81053ab3a8af5096c065b66" + "cd4_intersect.bed:md5,af5866394906d9262d99ff691f0a63db", + "jurkat_intersect.bed:md5,c4ee0f73a5d2f4f210cad1090237fb8b" ], [ - "cd4_filtered.bed:md5,3de4c6a675817a0661bb24edfd06d155", - "jurkat_filtered.bed:md5,191963fbc44ef9e5c3261a3fb96361a0" + "cd4_filtered.bed:md5,e87e37f217df119d7b782150db375494", + "jurkat_filtered.bed:md5,e31353bc7016b44a2ad8a93dc26501e1" ], [ - "cd4_intersect.bed:md5,51800dceda87c980e91db92b265b7ec6", - "jurkat_intersect.bed:md5,6d205f43e81053ab3a8af5096c065b66" + "cd4_intersect.bed:md5,af5866394906d9262d99ff691f0a63db", + "jurkat_intersect.bed:md5,c4ee0f73a5d2f4f210cad1090237fb8b" ], [ - "cd4_filtered.bed:md5,3de4c6a675817a0661bb24edfd06d155", - "jurkat_filtered.bed:md5,191963fbc44ef9e5c3261a3fb96361a0" + "cd4_filtered.bed:md5,e87e37f217df119d7b782150db375494", + "jurkat_filtered.bed:md5,e31353bc7016b44a2ad8a93dc26501e1" ], - "cd4.eval.txt:md5,b58c1db2cceac1fe1d89dec5838317d1", - "cd4.final.transcripts.bed:md5,a34dc280b3b023186b4935780d379338", - "cd4.tdFinal.txt:md5,8b49613bc2aa4dcbc23d852e46c41fb7", + "cd4.eval.txt:md5,de1f790f721a67dfd1e1bf1592a7971a", + "cd4.final.transcripts.bed:md5,3707df9ae8e7a95b6b5bfc336cfb1c8a", + "cd4.tdFinal.txt:md5,f8db76ddb3212459405e0d780c1dc807", true, - "cd4.transcripts.txt:md5,891a07c573dac76de5c466453c206c4f", - "jurkat.eval.txt:md5,1b9b3cf2f8b832ee4863168a07630db7", - "jurkat.final.transcripts.bed:md5,0d60cc43aadb918debf7cbd9113d53b4", - "jurkat.tdFinal.txt:md5,d10046e79b6c6ccff86d42b1bd59cfa4", + "cd4.transcripts.txt:md5,48d15103e5f67abc30b4da71a595243b", + "jurkat.eval.txt:md5,f8f6402c871cd55d6cfb9c2be04627b6", + "jurkat.final.transcripts.bed:md5,cd3ce78611dcad5a1893a6da3d70a39f", + "jurkat.tdFinal.txt:md5,4bb6a220a6ba29941d4ab28696816afd", true, - "jurkat.transcripts.txt:md5,aae6fb7cf85d2cc91db484a9399da876", + "jurkat.transcripts.txt:md5,901825bc4b6b93e718f7082fb4c2c579", true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-10-19T21:30:10.156904" + "timestamp": "2024-11-07T14:48:21.416161" }, "software_versions": { "content": [ @@ -58,6 +58,12 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, "BWA_INDEX": { "bwa": "0.7.18-r1243-dirty" }, @@ -65,6 +71,9 @@ "bwa": "0.7.18-r1243-dirty", "samtools": 1.2 }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -90,6 +99,9 @@ "GTF2BED": { "perl": "5.26.2" }, + "GUNZIP_FASTA": { + "gunzip": 1.1 + }, "GUNZIP_GFF": { "gunzip": 1.1 }, @@ -98,8 +110,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -129,8 +141,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-10-19T21:30:10.110132" + "timestamp": "2024-11-07T14:48:21.394461" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 5796458e..0ad30c73 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -1,42 +1,42 @@ { "output_files": { "content": [ - 215, + 110, "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", [ - "cd4_intersect.bed:md5,08e9166b4515fa76c7f624a5377d630f", - "jurkat_intersect.bed:md5,3f625c7e363f49f75bcac2d9316af2e0" + "cd4_intersect.bed:md5,ca03c888e605b1de100c3af9f975051e", + "jurkat_intersect.bed:md5,c30da7861bb57a96e051bf70ee882887" ], [ - "cd4_filtered.bed:md5,bafed399a3f4d5d8363f40616bca4824", - "jurkat_filtered.bed:md5,ee570f28e2f347b66f085357e8ddba57" + "cd4_filtered.bed:md5,2e235f9fe4e337a4e3f14c459ecd7988", + "jurkat_filtered.bed:md5,75086096f2ee6dab198228a0d2af1fad" ], [ - "cd4_intersect.bed:md5,08e9166b4515fa76c7f624a5377d630f", - "jurkat_intersect.bed:md5,3f625c7e363f49f75bcac2d9316af2e0" + "cd4_intersect.bed:md5,ca03c888e605b1de100c3af9f975051e", + "jurkat_intersect.bed:md5,c30da7861bb57a96e051bf70ee882887" ], [ - "cd4_filtered.bed:md5,bafed399a3f4d5d8363f40616bca4824", - "jurkat_filtered.bed:md5,ee570f28e2f347b66f085357e8ddba57" + "cd4_filtered.bed:md5,2e235f9fe4e337a4e3f14c459ecd7988", + "jurkat_filtered.bed:md5,75086096f2ee6dab198228a0d2af1fad" ], - "cd4.eval.txt:md5,7f49f3b1211f9a2086a3df3b5932b14e", - "cd4.final.transcripts.bed:md5,51089857e6c7c0fa2259c9615e201564", - "cd4.tdFinal.txt:md5,4a40e320646af024b151d199fd442380", + "cd4.eval.txt:md5,6f688621a2acb60f2e48163f132d390c", + "cd4.final.transcripts.bed:md5,5eb7209e5bb45744ae03f89010a162aa", + "cd4.tdFinal.txt:md5,83f65b2db4f2f584992a1d036fd8859d", true, - "cd4.transcripts.txt:md5,256b4b93c61506c8470d6c20e7043a85", - "jurkat.eval.txt:md5,7168cf089146b0752d6eb87836e91e34", - "jurkat.final.transcripts.bed:md5,2d560a6af857d69042e1fba09d8533d1", - "jurkat.tdFinal.txt:md5,f65dcec240c6c55f0fb077ed21f17285", + "cd4.transcripts.txt:md5,4b339fcbf7ca955c12ca1198b2c0db36", + "jurkat.eval.txt:md5,dac8d86b680c5a9d59558b62a3fc896b", + "jurkat.final.transcripts.bed:md5,d7149560c228316a2de2af10b48361ec", + "jurkat.tdFinal.txt:md5,e21a5b8112deb8b747a17630f21eb723", true, - "jurkat.transcripts.txt:md5,a601a4312e953e1adc05e18b7488c3b0", + "jurkat.transcripts.txt:md5,ad6c62cf26bcb7f56d073d5404bc8674", true ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-10-09T17:31:48.135947809" + "timestamp": "2024-11-07T14:54:30.70811" }, "software_versions": { "content": [ @@ -58,6 +58,12 @@ "BEDTOOLS_INTERSECT_FILTER": { "bedtools": "2.31.1" }, + "BEDTOOLS_MERGE": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_SORT": { + "bedtools": "2.31.1" + }, "BWA_INDEX": { "bwa": "0.7.18-r1243-dirty" }, @@ -65,6 +71,9 @@ "bwa": "0.7.18-r1243-dirty", "samtools": 1.2 }, + "CAT_CAT": { + "pigz": "2.3.4" + }, "CUSTOM_GETCHROMSIZES": { "getchromsizes": 1.2 }, @@ -92,8 +101,8 @@ "samtools": 1.11 }, "PINTS_CALLER": { - "python": "3.10.6", - "pints": "1.1.8" + "python": "3.12.6", + "pints": "1.1.13" }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -123,8 +132,8 @@ ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nextflow": "24.10.0" }, - "timestamp": "2024-10-09T17:31:48.111668358" + "timestamp": "2024-11-07T14:54:30.687342" } } \ No newline at end of file From 6e756ea3f0c9c61d71597e4edbae3da6f2ee7204 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 20 Oct 2024 14:21:35 -0500 Subject: [PATCH 171/255] style: Move transcript_identification into it's own dir --- .../main.nf} | 16 +++++----- .../transcript_identification/scratch.nf | 32 ------------------- workflows/nascent.nf | 2 +- 3 files changed, 9 insertions(+), 41 deletions(-) rename subworkflows/local/{transcript_identification.nf => transcript_identification/main.nf} (86%) delete mode 100644 subworkflows/local/transcript_identification/scratch.nf diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification/main.nf similarity index 86% rename from subworkflows/local/transcript_identification.nf rename to subworkflows/local/transcript_identification/main.nf index 8eb60b76..d75c27a3 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -2,14 +2,14 @@ * Calls Transcripts and Transcript Start Sites and various cleaning steps */ -include { GROHMM } from './grohmm/main' -include { HOMER_GROSEQ } from '../nf-core/homer/groseq/main' -include { PINTS_CALLER } from '../../modules/nf-core/pints/caller/main' -include { CAT_CAT } from '../../modules/nf-core/cat/cat/main' -include { BEDTOOLS_MERGE } from '../../modules/nf-core/bedtools/merge/main' -include { BEDTOOLS_SORT } from '../../modules/nf-core/bedtools/sort/main' -include { BEDTOOLS_INTERSECT as BEDTOOLS_INTERSECT_FILTER } from '../../modules/nf-core/bedtools/intersect/main' -include { BEDTOOLS_INTERSECT } from '../../modules/nf-core/bedtools/intersect/main' +include { GROHMM } from '../grohmm' +include { HOMER_GROSEQ } from '../../nf-core/homer/groseq/main' +include { PINTS_CALLER } from '../../../modules/nf-core/pints/caller/main' +include { CAT_CAT } from '../../../modules/nf-core/cat/cat/main' +include { BEDTOOLS_MERGE } from '../../../modules/nf-core/bedtools/merge/main' +include { BEDTOOLS_SORT } from '../../../modules/nf-core/bedtools/sort/main' +include { BEDTOOLS_INTERSECT as BEDTOOLS_INTERSECT_FILTER } from '../../../modules/nf-core/bedtools/intersect/main' +include { BEDTOOLS_INTERSECT } from '../../../modules/nf-core/bedtools/intersect/main' workflow TRANSCRIPT_INDENTIFICATION { take: diff --git a/subworkflows/local/transcript_identification/scratch.nf b/subworkflows/local/transcript_identification/scratch.nf deleted file mode 100644 index 7a449274..00000000 --- a/subworkflows/local/transcript_identification/scratch.nf +++ /dev/null @@ -1,32 +0,0 @@ -workflow { - def chr = Channel.from( 1..4 ) - def samples = Channel.from( "jurkat", "hepg2" ) - - RUN_FOR_EACH_CHR ( - samples, - chr - ) - - RUN_FOR_EACH_CHR.out.beds - .groupTuple(by: [0]) - .map { meta, beds -> [meta, beds.flatten()] } - .view() - -} - -process RUN_FOR_EACH_CHR { - input: - val(meta) - each chr_name // optional - - output: - tuple val(meta), path("*.bed") , optional:true, emit: beds - - script: - def prefix = "${meta}" + (chr_name ? '_' + chr_name : '_all') - """ - echo "Processing ${prefix} 1" > ${prefix}_1.bed - echo "Processing ${prefix} 2" > ${prefix}_2.bed - echo "Processing ${prefix} 3" > ${prefix}_3.bed - """ -} diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 06e7f16d..e9543c97 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -11,7 +11,7 @@ include { ALIGN_BWAMEM2 } from '../subworkflows/local/align_bwamem2/main' include { ALIGN_DRAGMAP } from '../subworkflows/local/align_dragmap/main' include { QUALITY_CONTROL } from '../subworkflows/local/quality_control.nf' include { COVERAGE_GRAPHS } from '../subworkflows/local/coverage_graphs.nf' -include { TRANSCRIPT_INDENTIFICATION } from '../subworkflows/local/transcript_identification.nf' +include { TRANSCRIPT_INDENTIFICATION } from '../subworkflows/local/transcript_identification' include { FASTP } from '../modules/nf-core/fastp/main' include { From 663cbd8a7c7a49d5a2d56c6e2d5d28812f8a8f2f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 20 Oct 2024 21:21:10 -0500 Subject: [PATCH 172/255] test: Update copro UMI settings --- conf/test_copro.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/test_copro.config b/conf/test_copro.config index c5244d0b..27d33607 100644 --- a/conf/test_copro.config +++ b/conf/test_copro.config @@ -41,4 +41,7 @@ process { "-l 18" ].join(' ').trim() } + withName: 'NFCORE_NASCENT:NASCENT:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:UMITOOLS_DEDUP' { + ext.args = "--unpaired-reads=discard --umi-separator=: --paired" + } } From 3dc061b086d40fe7f762f159f40ce243671d9f73 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 20 Oct 2024 22:24:40 -0500 Subject: [PATCH 173/255] fix(pints): Avoid running on chrY It doesn't usually have much signal and PINTS throws a: AssertionError: You must specify at least one other bedfile! --- modules/nf-core/pints/caller/main.nf | 1 + .../local/transcript_identification/main.nf | 54 +++++++++---------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index 0b435dce..c6575861 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -1,6 +1,7 @@ process PINTS_CALLER { tag "$meta.id" + "${chr_name ? ' | ' + chr_name : ''}" label 'process_high' + label 'error_ignore' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index d75c27a3..37eda621 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -2,14 +2,14 @@ * Calls Transcripts and Transcript Start Sites and various cleaning steps */ -include { GROHMM } from '../grohmm' -include { HOMER_GROSEQ } from '../../nf-core/homer/groseq/main' -include { PINTS_CALLER } from '../../../modules/nf-core/pints/caller/main' -include { CAT_CAT } from '../../../modules/nf-core/cat/cat/main' -include { BEDTOOLS_MERGE } from '../../../modules/nf-core/bedtools/merge/main' -include { BEDTOOLS_SORT } from '../../../modules/nf-core/bedtools/sort/main' +include { GROHMM } from '../grohmm' +include { HOMER_GROSEQ } from '../../nf-core/homer/groseq/main' +include { PINTS_CALLER } from '../../../modules/nf-core/pints/caller/main' +include { CAT_CAT } from '../../../modules/nf-core/cat/cat/main' +include { BEDTOOLS_MERGE } from '../../../modules/nf-core/bedtools/merge/main' +include { BEDTOOLS_SORT } from '../../../modules/nf-core/bedtools/sort/main' include { BEDTOOLS_INTERSECT as BEDTOOLS_INTERSECT_FILTER } from '../../../modules/nf-core/bedtools/intersect/main' -include { BEDTOOLS_INTERSECT } from '../../../modules/nf-core/bedtools/intersect/main' +include { BEDTOOLS_INTERSECT } from '../../../modules/nf-core/bedtools/intersect/main' workflow TRANSCRIPT_INDENTIFICATION { take: @@ -24,8 +24,8 @@ workflow TRANSCRIPT_INDENTIFICATION { ch_identification_bed = Channel.empty() grohmm_td_plot = Channel.empty() - if(!params.skip_grohmm && params.assay_type == "GROseq") { - GROHMM ( group_bam_bai, gxf ) + if (!params.skip_grohmm && params.assay_type == "GROseq") { + GROHMM(group_bam_bai, gxf) ch_identification_bed = ch_identification_bed.mix(GROHMM.out.bed) grohmm_td_plot = GROHMM.out.td_plot ch_versions = ch_versions.mix(GROHMM.out.versions.first()) @@ -34,20 +34,25 @@ workflow TRANSCRIPT_INDENTIFICATION { homer_peaks = Channel.empty() homer_tagdir = Channel.empty() - if(params.assay_type == "GROseq") { + if (params.assay_type == "GROseq") { group_bam = group_bam_bai.map { meta, bam, bai -> [meta, bam] } - HOMER_GROSEQ ( group_bam, fasta ) + HOMER_GROSEQ(group_bam, fasta) ch_identification_bed = ch_identification_bed.mix(HOMER_GROSEQ.out.bed) homer_peaks = HOMER_GROSEQ.out.peaks homer_tagdir = HOMER_GROSEQ.out.tagdir ch_versions = ch_versions.mix(HOMER_GROSEQ.out.versions.first()) } - PINTS_CALLER ( + // Scatter the chromosomes + ch_chr = fasta + .splitFasta(record: [id: true]) + .map { record -> record.id } + .filter { it != "chrY" } // Remove chrY as it doesn't have much signal + + PINTS_CALLER( group_bam_bai, params.assay_type, - // Scatter the chromosomes - fasta.splitFasta( record: [id: true] ).map { record -> record.id }, + ch_chr, ) ch_versions = ch_versions.mix(PINTS_CALLER.out.versions.first()) @@ -61,31 +66,28 @@ workflow TRANSCRIPT_INDENTIFICATION { // HACK Not sure if this is as good as reporting all of them, but it should // reduce the overall noise. - CAT_CAT ( ch_bidirectional_TREs ) + CAT_CAT(ch_bidirectional_TREs) ch_versions = ch_versions.mix(CAT_CAT.out.versions.first()) - BEDTOOLS_SORT ( CAT_CAT.out.file_out, [] ) + BEDTOOLS_SORT(CAT_CAT.out.file_out, []) ch_versions = ch_versions.mix(BEDTOOLS_SORT.out.versions.first()) - BEDTOOLS_MERGE ( BEDTOOLS_SORT.out.sorted ) + BEDTOOLS_MERGE(BEDTOOLS_SORT.out.sorted) ch_identification_bed = ch_identification_bed.mix(BEDTOOLS_MERGE.out.bed) ch_versions = ch_versions.mix(BEDTOOLS_MERGE.out.versions.first()) - if(params.filter_bed) { + if (params.filter_bed) { ch_filter_bed = Channel.from(params.filter_bed) - BEDTOOLS_INTERSECT_FILTER ( ch_identification_bed.combine(ch_filter_bed.first()), chrom_sizes.map { [ [:], it ] } ) + BEDTOOLS_INTERSECT_FILTER(ch_identification_bed.combine(ch_filter_bed.first()), chrom_sizes.map { [[:], it] }) ch_identification_bed = BEDTOOLS_INTERSECT_FILTER.out.intersect ch_versions = ch_versions.mix(BEDTOOLS_INTERSECT_FILTER.out.versions.first()) } - if(params.intersect_bed) { + if (params.intersect_bed) { ch_intersect_bed = Channel.from(params.intersect_bed) - BEDTOOLS_INTERSECT ( ch_identification_bed.combine(ch_intersect_bed.first()), chrom_sizes.map { [ [:], it ] } ) + BEDTOOLS_INTERSECT(ch_identification_bed.combine(ch_intersect_bed.first()), chrom_sizes.map { [[:], it] }) ch_identification_bed = BEDTOOLS_INTERSECT.out.intersect ch_versions = ch_versions.mix(BEDTOOLS_INTERSECT.out.versions.first()) } ch_identification_bed - // Drop any empty bed files - // Prevents throwing an error in featurecounts - // FIXME This drops one of the samples in the test data, jurkat .filter { meta, bed -> bed.size() > 0 } .set { ch_identification_bed_clean } @@ -93,8 +95,6 @@ workflow TRANSCRIPT_INDENTIFICATION { grohmm_td_plot homer_peaks homer_tagdir - transcript_beds = ch_identification_bed_clean - - versions = ch_versions + versions = ch_versions } From 5bc32ec6f15eccede79cc9cac2b0be4ffa50156c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 21 Oct 2024 07:29:03 -0500 Subject: [PATCH 174/255] chore: nf-core modules update pints/caller --- modules.json | 2 +- modules/nf-core/pints/caller/environment.yml | 11 +- modules/nf-core/pints/caller/main.nf | 10 +- modules/nf-core/pints/caller/meta.yml | 96 +++++++++++------ .../nf-core/pints/caller/tests/main.nf.test | 101 ++++++++++++++++++ .../pints/caller/tests/main.nf.test.snap | 89 +++++++++++++++ .../pints/caller/tests/nextflow.config | 5 + 7 files changed, 271 insertions(+), 43 deletions(-) create mode 100644 modules/nf-core/pints/caller/tests/main.nf.test create mode 100644 modules/nf-core/pints/caller/tests/main.nf.test.snap create mode 100644 modules/nf-core/pints/caller/tests/nextflow.config diff --git a/modules.json b/modules.json index c7f5f80b..35f0ff77 100644 --- a/modules.json +++ b/modules.json @@ -150,7 +150,7 @@ }, "pints/caller": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "ac55541b663c35e9ff50f79d32049ce7492a6ea5", "installed_by": ["modules"], "patch": "modules/nf-core/pints/caller/pints-caller.diff" }, diff --git a/modules/nf-core/pints/caller/environment.yml b/modules/nf-core/pints/caller/environment.yml index 71a5c981..1c29653c 100644 --- a/modules/nf-core/pints/caller/environment.yml +++ b/modules/nf-core/pints/caller/environment.yml @@ -1,7 +1,12 @@ -name: pints_caller channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::pypints=1.1.8 + - pybedtools + - bedtools + - htslib + - pip + - pip: # FIXME https://github.com/nf-core/modules/issues/5814 + # NOTE PINTS isn't adding conda builds and is a few versions behind. + # renovate: datasource=pypi depName=pypints + - pypints==1.1.13 diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index c6575861..dd7ab8c7 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -1,12 +1,12 @@ process PINTS_CALLER { tag "$meta.id" + "${chr_name ? ' | ' + chr_name : ''}" - label 'process_high' - label 'error_ignore' + label 'process_medium' conda "${moduleDir}/environment.yml" + // NOTE Stopped publishing at 1.1.9 https://quay.io/repository/biocontainers/pypints?tab=tags container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/pypints:1.1.8--pyh7cba7a3_0' : - 'biocontainers/pypints:1.1.8--pyh7cba7a3_0' }" + 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/f1/f1a9e30012e1b41baf9acd1ff94e01161138d8aa17f4e97aa32f2dc4effafcd1/data' : + 'community.wave.seqera.io/library/pybedtools_bedtools_htslib_pip_pypints:39699b96998ec5f6' }" input: tuple val(meta), path(bams), path(bais) @@ -26,11 +26,11 @@ process PINTS_CALLER { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" + (chr_name ? '_' + chr_name : '_all') - def chr = chr_name ? "--chromosome-start-with $chr_name" : '' // TODO handle bigwigs // def input_type = ("${input[0]}".endsWith(".bam")) ? "--bam-file $input" : // ("$input".contains(".bw")) ? "--bw-pl ${input[0]} --bw-mn ${input[1]}" : // error "Please use bam or BigWig files" + def chr = chr_name ? "--chromosome-start-with $chr_name" : '' """ pints_caller \\ --bam-file $bams \\ diff --git a/modules/nf-core/pints/caller/meta.yml b/modules/nf-core/pints/caller/meta.yml index 020609f1..851ead84 100644 --- a/modules/nf-core/pints/caller/meta.yml +++ b/modules/nf-core/pints/caller/meta.yml @@ -19,46 +19,74 @@ tools: documentation: "https://github.com/hyulab/PINTS/blob/main/README.md" tool_dev_url: "https://github.com/hyulab/PINTS" doi: "10.1038/s41587-022-01211-7" - licence: "['GPL']" + licence: ["GPL v3"] + identifier: biotools:pyPINTS input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - bams: - type: file - description: BAM/ file - pattern: "*.{bam}" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bams: + type: file + description: One or more BAM files + pattern: "*.{bam}" + - bais: + type: file + description: Corresponding BAM file indexes + pattern: "*.bam.bai" + - - assay_type: + type: string + description: Assay type output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - versions: - type: file - description: File containing software versions - pattern: "versions.yml" - divergent_TREs: - type: file - description: Divergent TREs - pattern: "*_divergent_peaks.bed" - optional: true + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*_divergent_peaks.bed": + type: file + description: Divergent TREs + pattern: "*_divergent_peaks.bed" + optional: true - bidirectional_TREs: - type: file - description: Divergent TREs and convergent TREs - pattern: "*_bidirectional_peaks.bed" - optional: true + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*_bidirectional_peaks.bed": + type: file + description: Divergent TREs and convergent TREs + pattern: "*_bidirectional_peaks.bed" + optional: true - unidirectional_TREs: - type: file - description: Unidirectional TREs, maybe lncRNAs transcribed from enhancers (e-lncRNAs) - pattern: "*_unidirectional_peaks.bed" - optional: true + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*_unidirectional_peaks.bed": + type: file + description: Unidirectional TREs, maybe lncRNAs transcribed from enhancers (e-lncRNAs) + pattern: "*_unidirectional_peaks.bed" + optional: true - peakcalling_log: - type: file - description: Peakcalling log for debugging purposes - pattern: "peakcalling_*.log" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - peakcalling_*.log: + type: file + description: Peakcalling log for debugging purposes + pattern: "peakcalling_*.log" + - versions: + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@edmundmiller" maintainers: diff --git a/modules/nf-core/pints/caller/tests/main.nf.test b/modules/nf-core/pints/caller/tests/main.nf.test new file mode 100644 index 00000000..e0e2f8ea --- /dev/null +++ b/modules/nf-core/pints/caller/tests/main.nf.test @@ -0,0 +1,101 @@ +nextflow_process { + + name "Test Process PINTS_CALLER" + script "../main.nf" + process "PINTS_CALLER" + config "./nextflow.config" + + tag "modules" + tag "modules_nfcore" + tag "pints" + tag "pints/caller" + + test("groHMM data - [bam, bam], fasta") { + + when { + process { + """ + input[0] = [ + [ id:'test' ], + [ + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S40mR1.bam", checkIfExists: true) + ], + [], + ] + input[1] = "GROseq" + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + process.out.divergent_TREs, + process.out.bidirectional_TREs, + file(process.out.unidirectional_TREs.get(0).get(1).get(0)).name, + path(process.out.versions.get(0)).yaml, + ).match("bams") + }, + ) + } + + } + + test("groHMM data - [bam], fasta") { + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + file("https://raw.githubusercontent.com/Kraus-Lab/groHMM/master/inst/extdata/S0mR1.bam", checkIfExists: true), + [], + ] + input[1] = "GROseq" + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + process.out.divergent_TREs, + process.out.bidirectional_TREs, + file(process.out.unidirectional_TREs[0][1]).name, + path(process.out.versions.get(0)).yaml, + ).match("single_bam") + }, + { assert snapshot(path(process.out.versions.get(0)).yaml).match("versions") }, + ) + } + } + + test("Fails if no signal is found") { + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true) + [], + ] + input[1] = "GROseq" + """ + } + } + + then { + assertAll( + { assert process.failed }, + { assert process.exitStatus == 1 }, + ) + } + } + + // TODO Test single bigwig input + // TODO Test multiple bigwig input +} diff --git a/modules/nf-core/pints/caller/tests/main.nf.test.snap b/modules/nf-core/pints/caller/tests/main.nf.test.snap new file mode 100644 index 00000000..d6d2a14b --- /dev/null +++ b/modules/nf-core/pints/caller/tests/main.nf.test.snap @@ -0,0 +1,89 @@ +{ + "versions": { + "content": [ + { + "PINTS_CALLER": { + "python": "3.12.6", + "pints": "1.1.13" + } + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-29T22:22:29.559913" + }, + "bams": { + "content": [ + [ + [ + { + "id": "test" + }, + [ + "test_1_divergent_peaks.bed:md5,d87cbbfa748e0a0ee01e26acb2922806", + "test_2_divergent_peaks.bed:md5,a34c06a2fa7bd9490ef6a34b104651ce" + ] + ] + ], + [ + [ + { + "id": "test" + }, + [ + "test_1_bidirectional_peaks.bed:md5,1c32c50def298e258b4ecd44f334cb9d", + "test_2_bidirectional_peaks.bed:md5,18a1eac15b6ded3717523622948e9251" + ] + ] + ], + "test_1_unidirectional_peaks.bed", + { + "PINTS_CALLER": { + "python": "3.12.6", + "pints": "1.1.13" + } + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-29T22:19:23.738834" + }, + "single_bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test_1_divergent_peaks.bed:md5,3aa8ae581240d4d26f63ea6f3ed1f233" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test_1_bidirectional_peaks.bed:md5,3c6ef0324e75082a6b172cb60549d2ad" + ] + ], + "test_1_unidirectional_peaks.bed", + { + "PINTS_CALLER": { + "python": "3.12.6", + "pints": "1.1.13" + } + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-29T22:22:29.544608" + } +} \ No newline at end of file diff --git a/modules/nf-core/pints/caller/tests/nextflow.config b/modules/nf-core/pints/caller/tests/nextflow.config new file mode 100644 index 00000000..61252fb5 --- /dev/null +++ b/modules/nf-core/pints/caller/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: 'PINTS_CALLER' { + ext.args = "--disable-small" + } +} From 204a60878f79ec470321648cafb9ab2529fb58bc Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 22 Oct 2024 09:09:31 -0500 Subject: [PATCH 175/255] fix: PINTS needs more resources --- modules/nf-core/pints/caller/main.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index dd7ab8c7..e754f993 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -1,6 +1,6 @@ process PINTS_CALLER { tag "$meta.id" + "${chr_name ? ' | ' + chr_name : ''}" - label 'process_medium' + label 'process_high' conda "${moduleDir}/environment.yml" // NOTE Stopped publishing at 1.1.9 https://quay.io/repository/biocontainers/pypints?tab=tags From f68eb7693b853fb97597f8465c50fb59e6701c0d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 22 Oct 2024 21:32:54 -0500 Subject: [PATCH 176/255] fix(chm13): Skip _random fasta entries --- subworkflows/local/transcript_identification/main.nf | 1 + 1 file changed, 1 insertion(+) diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 37eda621..96473723 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -48,6 +48,7 @@ workflow TRANSCRIPT_INDENTIFICATION { .splitFasta(record: [id: true]) .map { record -> record.id } .filter { it != "chrY" } // Remove chrY as it doesn't have much signal + .filter { it != "_random" } // FIXME If there's no signal the PINTS throws an error PINTS_CALLER( group_bam_bai, From d74b4e869f6d9e5024b286c994b577b629588fa4 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 24 Oct 2024 18:43:50 -0500 Subject: [PATCH 177/255] fix(pints): Use contains to filter out --- subworkflows/local/transcript_identification/main.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 96473723..e7905260 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -48,7 +48,7 @@ workflow TRANSCRIPT_INDENTIFICATION { .splitFasta(record: [id: true]) .map { record -> record.id } .filter { it != "chrY" } // Remove chrY as it doesn't have much signal - .filter { it != "_random" } // FIXME If there's no signal the PINTS throws an error + .filter { !it.contains("_random") } // Filter out random chromosomes that may cause PINTS errors PINTS_CALLER( group_bam_bai, From 29b003f28aef3a06f3d68dcd6ca4fdb6231421d1 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 24 Oct 2024 18:46:36 -0500 Subject: [PATCH 178/255] chore: Make notes of things to test --- subworkflows/local/transcript_identification/tests/main.nf.test | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 subworkflows/local/transcript_identification/tests/main.nf.test diff --git a/subworkflows/local/transcript_identification/tests/main.nf.test b/subworkflows/local/transcript_identification/tests/main.nf.test new file mode 100644 index 00000000..dcb5dc56 --- /dev/null +++ b/subworkflows/local/transcript_identification/tests/main.nf.test @@ -0,0 +1,2 @@ +// TODO Test ChrY filtering +// TODO Test _random filtering From 708b73f99e24b09d96d3ddc471cdd1313af0a8bd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 28 Oct 2024 10:13:25 +0100 Subject: [PATCH 179/255] fix: Add chrUn to skip --- subworkflows/local/transcript_identification/main.nf | 1 + 1 file changed, 1 insertion(+) diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index e7905260..68140c0d 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -49,6 +49,7 @@ workflow TRANSCRIPT_INDENTIFICATION { .map { record -> record.id } .filter { it != "chrY" } // Remove chrY as it doesn't have much signal .filter { !it.contains("_random") } // Filter out random chromosomes that may cause PINTS errors + .filter { !it.contains("chrUn_") } PINTS_CALLER( group_bam_bai, From 060aa75e8651dc50d20119f6cdb1513478667f62 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 30 Oct 2024 11:47:09 +0100 Subject: [PATCH 180/255] fix: Remove EBV --- subworkflows/local/transcript_identification/main.nf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 68140c0d..ecb4db88 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -48,8 +48,10 @@ workflow TRANSCRIPT_INDENTIFICATION { .splitFasta(record: [id: true]) .map { record -> record.id } .filter { it != "chrY" } // Remove chrY as it doesn't have much signal - .filter { !it.contains("_random") } // Filter out random chromosomes that may cause PINTS errors + // Filter out random chromosomes that may cause PINTS errors + .filter { !it.contains("_random") } .filter { !it.contains("chrUn_") } + .filter { !it.contains("chrEBV") } PINTS_CALLER( group_bam_bai, From 0d654bf71f7498880739c00fbcf41a6846e2d88d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 31 Oct 2024 12:39:34 +0100 Subject: [PATCH 181/255] fix: Skip chrM --- subworkflows/local/transcript_identification/main.nf | 1 + 1 file changed, 1 insertion(+) diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index ecb4db88..7f04a471 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -52,6 +52,7 @@ workflow TRANSCRIPT_INDENTIFICATION { .filter { !it.contains("_random") } .filter { !it.contains("chrUn_") } .filter { !it.contains("chrEBV") } + .filter { !it.contains("chrM") } PINTS_CALLER( group_bam_bai, From a3dc20fe3000f073046c94bdfe3a9c285010ee6f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 7 Nov 2024 11:27:38 -0600 Subject: [PATCH 182/255] docs: Add PINTS docs --- docs/usage.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/usage.md b/docs/usage.md index f1a5b4b9..d6725ee0 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -77,6 +77,14 @@ The current options for transcript identification include [GroHMM](https://bioco The default transcript identification option is PINTS, and HOMER if the transcript `assay_type` is `GROseq` but this may change in future releases. +### PINTS + +PINTS handles the majority of the transcript identification, since it covers all of the supported assays. + +PINTS can use a lot of memory while running, so [a scatter-gather pattern was implemented](github). + +It splits the identification up by the Chromosomes available in the provided FASTA file. Some of the Chromosomes are skipped because PINTS throws an error when it doesn't find any regions. If this causes an issue with your analysis please open an issue. + ### GroHMM groHMM is split into two steps: parameter tuning and transcript identification. From bef9eef1bdcb00a3671894dbedc4aee26a50a442 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 7 Nov 2024 13:23:32 -0600 Subject: [PATCH 183/255] refactor: Clean up the filters to run once --- subworkflows/local/transcript_identification/main.nf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 7f04a471..6cfff354 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -44,15 +44,11 @@ workflow TRANSCRIPT_INDENTIFICATION { } // Scatter the chromosomes + skip_chr = ["chrY", "_random", "chrUn_", "chrEBV", "chrM"] ch_chr = fasta .splitFasta(record: [id: true]) .map { record -> record.id } - .filter { it != "chrY" } // Remove chrY as it doesn't have much signal - // Filter out random chromosomes that may cause PINTS errors - .filter { !it.contains("_random") } - .filter { !it.contains("chrUn_") } - .filter { !it.contains("chrEBV") } - .filter { !it.contains("chrM") } + .filter { !(it in skip_chr) } PINTS_CALLER( group_bam_bai, From f075a6caef79b3231488ae985df615fec35e0da1 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 7 Nov 2024 13:58:49 -0600 Subject: [PATCH 184/255] refactor(PINTS): Use combine instead of each --- modules/nf-core/pints/caller/main.nf | 3 +- .../nf-core/pints/caller/pints-caller.diff | 37 ++++++++++++------- .../local/transcript_identification/main.nf | 6 +-- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index e754f993..27cf5c57 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -9,9 +9,8 @@ process PINTS_CALLER { 'community.wave.seqera.io/library/pybedtools_bedtools_htslib_pip_pypints:39699b96998ec5f6' }" input: - tuple val(meta), path(bams), path(bais) + tuple val(meta), path(bams), path(bais), val(chr_name) val assay_type - each chr_name // optional output: tuple val(meta), path("*_divergent_peaks.bed") , optional:true, emit: divergent_TREs diff --git a/modules/nf-core/pints/caller/pints-caller.diff b/modules/nf-core/pints/caller/pints-caller.diff index 27c01984..ca6fcfd0 100644 --- a/modules/nf-core/pints/caller/pints-caller.diff +++ b/modules/nf-core/pints/caller/pints-caller.diff @@ -1,4 +1,7 @@ Changes in module 'nf-core/pints/caller' +'modules/nf-core/pints/caller/environment.yml' is unchanged +'modules/nf-core/pints/caller/meta.yml' is unchanged +Changes in 'pints/caller/main.nf': --- modules/nf-core/pints/caller/main.nf +++ modules/nf-core/pints/caller/main.nf @@ -1,6 +1,6 @@ @@ -9,34 +12,40 @@ Changes in module 'nf-core/pints/caller' + label 'process_high' conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? -@@ -8,7 +8,9 @@ - 'biocontainers/pypints:1.1.8--pyh7cba7a3_0' }" + // NOTE Stopped publishing at 1.1.9 https://quay.io/repository/biocontainers/pypints?tab=tags +@@ -9,7 +9,7 @@ + 'community.wave.seqera.io/library/pybedtools_bedtools_htslib_pip_pypints:39699b96998ec5f6' }" input: -- tuple val(meta), path(bams) -+ tuple val(meta), path(bams), path(bais) -+ val assay_type -+ each chr_name // optional +- tuple val(meta), path(bams), path(bais) ++ tuple val(meta), path(bams), path(bais), val(chr_name) + val assay_type output: - tuple val(meta), path("*_divergent_peaks.bed") , optional:true, emit: divergent_TREs -@@ -23,6 +25,7 @@ +@@ -24,11 +24,12 @@ + script: def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" -+ def chr = chr_name ? "--chromosome-start-with $chr_name" : '' +- def prefix = task.ext.prefix ?: "${meta.id}" ++ def prefix = task.ext.prefix ?: "${meta.id}" + (chr_name ? '_' + chr_name : '_all') // TODO handle bigwigs // def input_type = ("${input[0]}".endsWith(".bam")) ? "--bam-file $input" : // ("$input".contains(".bw")) ? "--bw-pl ${input[0]} --bw-mn ${input[1]}" : -@@ -34,6 +37,8 @@ - --file-prefix $prefix \\ + // error "Please use bam or BigWig files" ++ def chr = chr_name ? "--chromosome-start-with $chr_name" : '' + """ + pints_caller \\ + --bam-file $bams \\ +@@ -37,6 +38,7 @@ --thread $task.cpus \\ --dont-check-updates \\ -+ --exp-type $assay_type \\ + --exp-type $assay_type \\ + $chr \\ $args cat <<-END_VERSIONS > versions.yml +'modules/nf-core/pints/caller/tests/main.nf.test.snap' is unchanged +'modules/nf-core/pints/caller/tests/nextflow.config' is unchanged +'modules/nf-core/pints/caller/tests/main.nf.test' is unchanged ************************************************************ diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 6cfff354..d7fb9f38 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -44,6 +44,7 @@ workflow TRANSCRIPT_INDENTIFICATION { } // Scatter the chromosomes + // TODO Might turn this into a param skip_chr = ["chrY", "_random", "chrUn_", "chrEBV", "chrM"] ch_chr = fasta .splitFasta(record: [id: true]) @@ -51,9 +52,8 @@ workflow TRANSCRIPT_INDENTIFICATION { .filter { !(it in skip_chr) } PINTS_CALLER( - group_bam_bai, - params.assay_type, - ch_chr, + group_bam_bai.combine(ch_chr), + params.assay_type ) ch_versions = ch_versions.mix(PINTS_CALLER.out.versions.first()) From fe259ca466badd1fa0777517acfe68f3b5dc8d3e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 7 Nov 2024 13:59:57 -0600 Subject: [PATCH 185/255] chore: Specify arity for bams in PINTS The rest are optional --- modules/nf-core/pints/caller/main.nf | 2 +- modules/nf-core/pints/caller/pints-caller.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index 27cf5c57..e4ad10b7 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -9,7 +9,7 @@ process PINTS_CALLER { 'community.wave.seqera.io/library/pybedtools_bedtools_htslib_pip_pypints:39699b96998ec5f6' }" input: - tuple val(meta), path(bams), path(bais), val(chr_name) + tuple val(meta), path(bams, arity: '1..*'), path(bais), val(chr_name) val assay_type output: diff --git a/modules/nf-core/pints/caller/pints-caller.diff b/modules/nf-core/pints/caller/pints-caller.diff index ca6fcfd0..593458a6 100644 --- a/modules/nf-core/pints/caller/pints-caller.diff +++ b/modules/nf-core/pints/caller/pints-caller.diff @@ -18,7 +18,7 @@ Changes in 'pints/caller/main.nf': input: - tuple val(meta), path(bams), path(bais) -+ tuple val(meta), path(bams), path(bais), val(chr_name) ++ tuple val(meta), path(bams, arity: '1..*'), path(bais), val(chr_name) val assay_type output: From 8c5c2f8de8b8ff8ac6735b6db9f34d47240942d4 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 7 Nov 2024 14:08:18 -0600 Subject: [PATCH 186/255] chore: Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90ba7f78..b2c4bd5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#142](https://github.com/nf-core/nascent/pull/142) - Updated CHM13 references - [#171](https://github.com/nf-core/nascent/pull/171) - Use assertAll in tests - [#165](https://github.com/nf-core/nascent/pull/165) - groHMM overhaul. Removed R mclapply calls and replaced with Nextflow scatter gather for parameter tuning. This creates a job for each parameter set. +- [#174](https://github.com/nf-core/nascent/pull/174) - PINTS Scatter gather pattern by chromosome ### Fixed From dac911103e259ba9553eab71a6a321b6cb3ea56d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 8 Nov 2024 16:13:11 -0600 Subject: [PATCH 187/255] test: flatten => toSortedList to make the order of beds consistant for snapshots --- subworkflows/local/transcript_identification/main.nf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index d7fb9f38..e363ba0d 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -61,9 +61,10 @@ workflow TRANSCRIPT_INDENTIFICATION { // TODO Tests don't seem to hit this because there's no bidirectional_TREs // Need to collect all of the beds for each chromosome/sample and concatenate them // Nextflow makes this super easy - def ch_bidirectional_TREs = PINTS_CALLER.out.unidirectional_TREs - .groupTuple(by: [0]) - .map { meta, beds -> [meta, beds.flatten()] } + def ch_bidirectional_TREs = + PINTS_CALLER.out.unidirectional_TREs.groupTuple(by: [0]).map { meta, beds -> + [meta, beds.toSortedList()] + } // HACK Not sure if this is as good as reporting all of them, but it should // reduce the overall noise. From 136a9ca2390121639e823e39e508afe9b6970d77 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 8 Nov 2024 17:15:48 -0600 Subject: [PATCH 188/255] fix(pints): Refactor to merge groups based on issue Started out just trying to make the tests deterministic. Re-read the issue and realized this is how they should be merged. --- modules.json | 5 + modules/nf-core/pints/caller/main.nf | 10 +- .../nf-core/pints/caller/pints-caller.diff | 21 +- .../nf-core/samtools/merge/environment.yml | 8 + modules/nf-core/samtools/merge/main.nf | 61 +++++ modules/nf-core/samtools/merge/meta.yml | 104 ++++++++ .../nf-core/samtools/merge/tests/index.config | 3 + .../nf-core/samtools/merge/tests/main.nf.test | 137 +++++++++++ .../samtools/merge/tests/main.nf.test.snap | 228 ++++++++++++++++++ modules/nf-core/samtools/merge/tests/tags.yml | 2 + .../local/transcript_identification/main.nf | 23 +- workflows/tests/aligner/bowtie2.nf.test.snap | 17 +- workflows/tests/aligner/bwa.nf.test.snap | 25 +- workflows/tests/aligner/bwamem2.nf.test.snap | 15 +- workflows/tests/aligner/dragmap.nf.test.snap | 15 +- workflows/tests/aligner/hisat2.nf.test.snap | 15 +- workflows/tests/aligner/star.nf.test.snap | 28 ++- workflows/tests/inputs/gff/main.nf.test.snap | 15 +- .../inputs/gzipped_gff/main.nf.test.snap | 15 +- .../tests/inputs/only_gff/main.nf.test.snap | 15 +- .../grohmm/only_gff/main.nf.test.snap | 13 +- .../grohmm/tuning/main.nf.test.snap | 13 +- 22 files changed, 699 insertions(+), 89 deletions(-) create mode 100644 modules/nf-core/samtools/merge/environment.yml create mode 100644 modules/nf-core/samtools/merge/main.nf create mode 100644 modules/nf-core/samtools/merge/meta.yml create mode 100644 modules/nf-core/samtools/merge/tests/index.config create mode 100644 modules/nf-core/samtools/merge/tests/main.nf.test create mode 100644 modules/nf-core/samtools/merge/tests/main.nf.test.snap create mode 100644 modules/nf-core/samtools/merge/tests/tags.yml diff --git a/modules.json b/modules.json index 35f0ff77..9c78217d 100644 --- a/modules.json +++ b/modules.json @@ -219,6 +219,11 @@ "git_sha": "46eca555142d6e597729fcb682adcc791796f514", "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools"] }, + "samtools/merge": { + "branch": "master", + "git_sha": "b13f07be4c508d6ff6312d354d09f2493243e208", + "installed_by": ["modules"] + }, "samtools/sort": { "branch": "master", "git_sha": "46eca555142d6e597729fcb682adcc791796f514", diff --git a/modules/nf-core/pints/caller/main.nf b/modules/nf-core/pints/caller/main.nf index e4ad10b7..3862b06e 100644 --- a/modules/nf-core/pints/caller/main.nf +++ b/modules/nf-core/pints/caller/main.nf @@ -9,13 +9,13 @@ process PINTS_CALLER { 'community.wave.seqera.io/library/pybedtools_bedtools_htslib_pip_pypints:39699b96998ec5f6' }" input: - tuple val(meta), path(bams, arity: '1..*'), path(bais), val(chr_name) + tuple val(meta), path(bam, arity: '1'), val(chr_name) val assay_type output: - tuple val(meta), path("*_divergent_peaks.bed") , optional:true, emit: divergent_TREs - tuple val(meta), path("*_bidirectional_peaks.bed") , optional:true, emit: bidirectional_TREs - tuple val(meta), path("*_unidirectional_peaks.bed"), optional:true, emit: unidirectional_TREs + tuple val(meta), path("*_1_divergent_peaks.bed") , optional:true, emit: divergent_TREs + tuple val(meta), path("*_1_bidirectional_peaks.bed") , optional:true, emit: bidirectional_TREs + tuple val(meta), path("*_1_unidirectional_peaks.bed"), optional:true, emit: unidirectional_TREs tuple val(meta), path("peakcalling_*.log") , emit: peakcalling_log path "versions.yml" , emit: versions @@ -32,7 +32,7 @@ process PINTS_CALLER { def chr = chr_name ? "--chromosome-start-with $chr_name" : '' """ pints_caller \\ - --bam-file $bams \\ + --bam-file $bam \\ --save-to . \\ --file-prefix $prefix \\ --thread $task.cpus \\ diff --git a/modules/nf-core/pints/caller/pints-caller.diff b/modules/nf-core/pints/caller/pints-caller.diff index 593458a6..021ca528 100644 --- a/modules/nf-core/pints/caller/pints-caller.diff +++ b/modules/nf-core/pints/caller/pints-caller.diff @@ -13,16 +13,25 @@ Changes in 'pints/caller/main.nf': conda "${moduleDir}/environment.yml" // NOTE Stopped publishing at 1.1.9 https://quay.io/repository/biocontainers/pypints?tab=tags -@@ -9,7 +9,7 @@ +@@ -9,13 +9,13 @@ 'community.wave.seqera.io/library/pybedtools_bedtools_htslib_pip_pypints:39699b96998ec5f6' }" input: - tuple val(meta), path(bams), path(bais) -+ tuple val(meta), path(bams, arity: '1..*'), path(bais), val(chr_name) ++ tuple val(meta), path(bam, arity: '1'), val(chr_name) val assay_type output: -@@ -24,11 +24,12 @@ +- tuple val(meta), path("*_divergent_peaks.bed") , optional:true, emit: divergent_TREs +- tuple val(meta), path("*_bidirectional_peaks.bed") , optional:true, emit: bidirectional_TREs +- tuple val(meta), path("*_unidirectional_peaks.bed"), optional:true, emit: unidirectional_TREs ++ tuple val(meta), path("*_1_divergent_peaks.bed") , optional:true, emit: divergent_TREs ++ tuple val(meta), path("*_1_bidirectional_peaks.bed") , optional:true, emit: bidirectional_TREs ++ tuple val(meta), path("*_1_unidirectional_peaks.bed"), optional:true, emit: unidirectional_TREs + tuple val(meta), path("peakcalling_*.log") , emit: peakcalling_log + path "versions.yml" , emit: versions + +@@ -24,19 +24,21 @@ script: def args = task.ext.args ?: '' @@ -35,8 +44,10 @@ Changes in 'pints/caller/main.nf': + def chr = chr_name ? "--chromosome-start-with $chr_name" : '' """ pints_caller \\ - --bam-file $bams \\ -@@ -37,6 +38,7 @@ +- --bam-file $bams \\ ++ --bam-file $bam \\ + --save-to . \\ + --file-prefix $prefix \\ --thread $task.cpus \\ --dont-check-updates \\ --exp-type $assay_type \\ diff --git a/modules/nf-core/samtools/merge/environment.yml b/modules/nf-core/samtools/merge/environment.yml new file mode 100644 index 00000000..62054fc9 --- /dev/null +++ b/modules/nf-core/samtools/merge/environment.yml @@ -0,0 +1,8 @@ +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json +channels: + - conda-forge + - bioconda +dependencies: + - bioconda::htslib=1.21 + - bioconda::samtools=1.21 diff --git a/modules/nf-core/samtools/merge/main.nf b/modules/nf-core/samtools/merge/main.nf new file mode 100644 index 00000000..34da4c7c --- /dev/null +++ b/modules/nf-core/samtools/merge/main.nf @@ -0,0 +1,61 @@ +process SAMTOOLS_MERGE { + tag "$meta.id" + label 'process_low' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/samtools:1.21--h50ea8bc_0' : + 'biocontainers/samtools:1.21--h50ea8bc_0' }" + + input: + tuple val(meta), path(input_files, stageAs: "?/*") + tuple val(meta2), path(fasta) + tuple val(meta3), path(fai) + + output: + tuple val(meta), path("${prefix}.bam") , optional:true, emit: bam + tuple val(meta), path("${prefix}.cram"), optional:true, emit: cram + tuple val(meta), path("*.csi") , optional:true, emit: csi + tuple val(meta), path("*.crai") , optional:true, emit: crai + path "versions.yml" , emit: versions + + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + prefix = task.ext.prefix ?: "${meta.id}" + def file_type = input_files instanceof List ? input_files[0].getExtension() : input_files.getExtension() + def reference = fasta ? "--reference ${fasta}" : "" + """ + samtools \\ + merge \\ + --threads ${task.cpus-1} \\ + $args \\ + ${reference} \\ + ${prefix}.${file_type} \\ + $input_files + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + END_VERSIONS + """ + + stub: + def args = task.ext.args ?: '' + prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}" + def file_type = input_files instanceof List ? input_files[0].getExtension() : input_files.getExtension() + def index_type = file_type == "bam" ? "csi" : "crai" + def index = args.contains("--write-index") ? "touch ${prefix}.${index_type}" : "" + """ + touch ${prefix}.${file_type} + ${index} + + 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/merge/meta.yml b/modules/nf-core/samtools/merge/meta.yml new file mode 100644 index 00000000..235aa219 --- /dev/null +++ b/modules/nf-core/samtools/merge/meta.yml @@ -0,0 +1,104 @@ +name: samtools_merge +description: Merge BAM or CRAM file +keywords: + - merge + - bam + - sam + - cram +tools: + - samtools: + description: | + SAMtools is a set of utilities for interacting with and post-processing + short DNA sequence read alignments in the SAM, BAM and CRAM formats, written by Heng Li. + These files are generated as output by short read aligners like BWA. + homepage: http://www.htslib.org/ + documentation: http://www.htslib.org/doc/samtools.html + doi: 10.1093/bioinformatics/btp352 + licence: ["MIT"] + identifier: biotools:samtools +input: + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - input_files: + type: file + description: BAM/CRAM file + pattern: "*.{bam,cram,sam}" + - - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - fasta: + type: file + description: Reference file the CRAM was created with (optional) + pattern: "*.{fasta,fa}" + - - meta3: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - fai: + type: file + description: Index of the reference file the CRAM was created with (optional) + pattern: "*.fai" +output: + - bam: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - ${prefix}.bam: + type: file + description: BAM file + pattern: "*.{bam}" + - cram: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - ${prefix}.cram: + type: file + description: CRAM file + pattern: "*.{cram}" + - csi: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.csi": + type: file + description: BAM index file (optional) + pattern: "*.csi" + - crai: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.crai": + type: file + description: CRAM index file (optional) + pattern: "*.crai" + - versions: + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" + - "@yuukiiwa " + - "@maxulysse" + - "@FriederikeHanssen" + - "@ramprasadn" +maintainers: + - "@drpatelh" + - "@yuukiiwa " + - "@maxulysse" + - "@FriederikeHanssen" + - "@ramprasadn" diff --git a/modules/nf-core/samtools/merge/tests/index.config b/modules/nf-core/samtools/merge/tests/index.config new file mode 100644 index 00000000..8c5668cf --- /dev/null +++ b/modules/nf-core/samtools/merge/tests/index.config @@ -0,0 +1,3 @@ +process { + ext.args = "--write-index" +} \ No newline at end of file diff --git a/modules/nf-core/samtools/merge/tests/main.nf.test b/modules/nf-core/samtools/merge/tests/main.nf.test new file mode 100644 index 00000000..40b36e82 --- /dev/null +++ b/modules/nf-core/samtools/merge/tests/main.nf.test @@ -0,0 +1,137 @@ +nextflow_process { + + name "Test Process SAMTOOLS_MERGE" + script "../main.nf" + process "SAMTOOLS_MERGE" + + tag "modules" + tag "modules_nfcore" + tag "samtools" + tag "samtools/merge" + + test("bams") { + + config "./index.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.methylated.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.single_end.sorted.bam', checkIfExists: true) ] + ]) + input[1] = [[],[]] + input[2] = [[],[]] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.bam[0][1]).name).match("bams_bam") }, + { assert snapshot(process.out.cram).match("bams_cram") }, + { assert snapshot(file(process.out.csi[0][1]).name).match("bams_csi") }, + { assert snapshot(process.out.crai).match("bams_crai") }, + { assert snapshot(process.out.versions).match("bams_versions") } + ) + } + } + + test("crams") { + + config "./index.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.recalibrated.sorted.cram', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test2.paired_end.recalibrated.sorted.cram', checkIfExists: true) ] + ]) + input[1] = Channel.of([ + [ id:'genome' ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) + ]) + input[2] = Channel.of([ + [ id:'genome' ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta.fai', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.cram[0][1]).name).match("crams_cram") }, + { assert snapshot(process.out.bam).match("crams_bam") }, + { assert snapshot(file(process.out.crai[0][1]).name).match("crams_crai") }, + { assert snapshot(process.out.csi).match("crams_csi") }, + { assert snapshot(process.out.versions).match("crams_versions") } + ) + } + } + + test("bam") { + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.methylated.sorted.bam', checkIfExists: true) ] + ]) + input[1] = [[],[]] + input[2] = [[],[]] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.bam[0][1]).name).match("bam_bam") }, + { assert snapshot(process.out.cram).match("bam_cram") }, + { assert snapshot(process.out.crai).match("bam_crai") }, + { assert snapshot(process.out.csi).match("bam_csi") }, + { assert snapshot(process.out.versions).match("bam_versions") } + ) + } + } + + test("bams_stub") { + + config "./index.config" + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.methylated.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.single_end.sorted.bam', checkIfExists: true) ] + ]) + input[1] = [[],[]] + input[2] = [[],[]] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.bam[0][1]).name).match("bams_stub_bam") }, + { assert snapshot(process.out.cram).match("bams_stub_cram") }, + { assert snapshot(file(process.out.csi[0][1]).name).match("bams_stub_csi") }, + { assert snapshot(process.out.crai).match("bams_stub_crai") }, + { assert snapshot(process.out.versions).match("bams_stub_versions") } + ) + } + } +} diff --git a/modules/nf-core/samtools/merge/tests/main.nf.test.snap b/modules/nf-core/samtools/merge/tests/main.nf.test.snap new file mode 100644 index 00000000..0a41e01a --- /dev/null +++ b/modules/nf-core/samtools/merge/tests/main.nf.test.snap @@ -0,0 +1,228 @@ +{ + "crams_cram": { + "content": [ + "test.cram" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:00.647389" + }, + "bams_stub_cram": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:19.937013" + }, + "bams_crai": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:49:24.928616" + }, + "bams_bam": { + "content": [ + "test.bam" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:49:24.923289" + }, + "bams_cram": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:49:24.925716" + }, + "crams_csi": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:00.655959" + }, + "bam_bam": { + "content": [ + "test.bam" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:10.319539" + }, + "bam_versions": { + "content": [ + [ + "versions.yml:md5,d51d18a97513e370e43f0c891c51dfc4" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-16T09:16:30.476887194" + }, + "bams_csi": { + "content": [ + "test.bam.csi" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:49:24.92719" + }, + "bams_stub_csi": { + "content": [ + "test.csi" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:19.940498" + }, + "bam_crai": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:10.328852" + }, + "bams_stub_versions": { + "content": [ + [ + "versions.yml:md5,d51d18a97513e370e43f0c891c51dfc4" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-16T09:16:52.203823961" + }, + "bam_cram": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:10.324219" + }, + "bams_stub_bam": { + "content": [ + "test.bam" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:19.933153" + }, + "bams_versions": { + "content": [ + [ + "versions.yml:md5,d51d18a97513e370e43f0c891c51dfc4" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-16T08:29:57.524363148" + }, + "crams_bam": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:00.650652" + }, + "crams_versions": { + "content": [ + [ + "versions.yml:md5,d51d18a97513e370e43f0c891c51dfc4" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-16T09:16:06.977096207" + }, + "bam_csi": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:10.33292" + }, + "crams_crai": { + "content": [ + "test.cram.crai" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:00.653512" + }, + "bams_stub_crai": { + "content": [ + [ + + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.04.3" + }, + "timestamp": "2024-02-12T18:50:19.943839" + } +} \ No newline at end of file diff --git a/modules/nf-core/samtools/merge/tests/tags.yml b/modules/nf-core/samtools/merge/tests/tags.yml new file mode 100644 index 00000000..b869abcb --- /dev/null +++ b/modules/nf-core/samtools/merge/tests/tags.yml @@ -0,0 +1,2 @@ +samtools/merge: + - "modules/nf-core/samtools/merge/**" diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index e363ba0d..72dce79b 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -5,6 +5,7 @@ include { GROHMM } from '../grohmm' include { HOMER_GROSEQ } from '../../nf-core/homer/groseq/main' include { PINTS_CALLER } from '../../../modules/nf-core/pints/caller/main' +include { SAMTOOLS_MERGE } from '../../../modules/nf-core/samtools/merge/main' include { CAT_CAT } from '../../../modules/nf-core/cat/cat/main' include { BEDTOOLS_MERGE } from '../../../modules/nf-core/bedtools/merge/main' include { BEDTOOLS_SORT } from '../../../modules/nf-core/bedtools/sort/main' @@ -51,8 +52,23 @@ workflow TRANSCRIPT_INDENTIFICATION { .map { record -> record.id } .filter { !(it in skip_chr) } + // NOTE https://github.com/hyulab/PINTS/issues/15 + // We want to run PINTS once per biological/technical sample. + // Let Nextflow handle the parallelization Per the docs + // Per the docs: + // {SID} will be replaced with the number of samples that peaks are called from, + // if you only provide PINTS with one sample, then {SID} will be replaced with 1, + // if you try to use PINTS with three replicates (--bam-file A.bam B.bam C.bam), + // then {SID} for peaks identified from A.bam will be replaced with 1. + SAMTOOLS_MERGE( + group_bam_bai.map { meta, bams, _bais -> [meta, bams] }, + [[], []], + [[], []] + ) + ch_versions = ch_versions.mix(SAMTOOLS_MERGE.out.versions.first()) + PINTS_CALLER( - group_bam_bai.combine(ch_chr), + SAMTOOLS_MERGE.out.bam.combine(ch_chr), params.assay_type ) ch_versions = ch_versions.mix(PINTS_CALLER.out.versions.first()) @@ -61,9 +77,8 @@ workflow TRANSCRIPT_INDENTIFICATION { // TODO Tests don't seem to hit this because there's no bidirectional_TREs // Need to collect all of the beds for each chromosome/sample and concatenate them // Nextflow makes this super easy - def ch_bidirectional_TREs = - PINTS_CALLER.out.unidirectional_TREs.groupTuple(by: [0]).map { meta, beds -> - [meta, beds.toSortedList()] + def ch_bidirectional_TREs = PINTS_CALLER.out.unidirectional_TREs.groupTuple(by: [0]).map { meta, beds -> + [meta, beds.flatten()] } // HACK Not sure if this is as good as reporting all of them, but it should diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 9903fbc7..ef0f16d1 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 75, + 77, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -95,10 +95,10 @@ true ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.0" }, - "timestamp": "2024-08-11T20:03:14.305867126" + "timestamp": "2024-11-08T19:57:28.384783" }, "software_versions": { "content": [ @@ -174,6 +174,9 @@ "SAMTOOLS_INDEX": { "samtools": 1.2 }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SAMTOOLS_SORT": { "samtools": 1.2 }, @@ -189,9 +192,9 @@ } ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.0" }, - "timestamp": "2024-09-12T12:45:59.17180037" + "timestamp": "2024-11-08T19:57:28.2719" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 54a94c94..ab4147cd 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 147, + 149, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -141,26 +141,26 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,9d602f0b63502f05fce25d27a8cb179b", - "jurkat_filtered.bed:md5,7c59749ca5b3eb090415420830f8d394" + "cd4_filtered.bed:md5,9765d778862a20feefb94d407773bef3", + "jurkat_filtered.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8" ], true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:27:43.485041" + "timestamp": "2024-11-08T19:59:26.10702" }, "Should work with gzipped references": { "content": [ - 53 + 55 ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.0" }, - "timestamp": "2024-08-03T07:39:38.160960801" + "timestamp": "2024-11-08T20:00:53.869213" }, "software_versions": { "content": [ @@ -239,6 +239,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -251,10 +254,10 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:27:42.702359" + "timestamp": "2024-11-08T19:59:25.439456" }, "Should work with BWA Index": { "content": [ diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 55ef6964..64f4ce2f 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 90, + 92, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -84,16 +84,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:30:34.98243" + "timestamp": "2024-11-08T20:02:08.759585" }, "software_versions": { "content": [ @@ -181,6 +181,9 @@ "SAMTOOLS_INDEX": { "samtools": 1.2 }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SAMTOOLS_SORT": { "samtools": 1.2 }, @@ -199,9 +202,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:30:34.70143" + "timestamp": "2024-11-08T20:02:08.491193" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index 6284268a..4bf98dc9 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 90, + 92, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -84,16 +84,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,8624dd128e0a4b1d73296ceacc553beb", + "cd4_filtered.bed:md5,c9f505b59820e0e5f3589de3e2300a83", "jurkat_filtered.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c" ], true ], "meta": { - "nf-test": "0.9.2", + "nf-test": "0.9.0", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T20:41:37.262053277" + "timestamp": "2024-11-09T01:33:02.135866793" }, "software_versions": { "content": [ @@ -182,6 +182,9 @@ "SAMTOOLS_INDEX": { "samtools": 1.2 }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SAMTOOLS_SORT": { "samtools": 1.2 }, @@ -200,9 +203,9 @@ } ], "meta": { - "nf-test": "0.9.2", + "nf-test": "0.9.0", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T20:41:36.959938207" + "timestamp": "2024-11-09T01:33:02.04958832" } } diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index b119fea8..1dd4bdd4 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 87, + 89, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -89,16 +89,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,1db971f660d9a171e4c5048359e6fb50", + "cd4_filtered.bed:md5,057f04ad44d3c2bf223be225b390fe0e", "jurkat_filtered.bed:md5,bd6458d033db136523d32ffba259f564" ], true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:32:12.531811" + "timestamp": "2024-11-08T20:03:21.644125" }, "software_versions": { "content": [ @@ -183,6 +183,9 @@ "SAMTOOLS_INDEX": { "samtools": 1.2 }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SAMTOOLS_SORT": { "samtools": 1.2 }, @@ -201,9 +204,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:32:12.49014" + "timestamp": "2024-11-08T20:03:21.599808" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 0f061067..21f9e229 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -1,17 +1,17 @@ { "Should run with gzipped gtf": { "content": [ - 96 + 98 ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:37:11.823695" + "timestamp": "2024-11-08T20:07:47.754134" }, "output_files": { "content": [ - 95, + 97, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -94,16 +94,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,148cc780cdf3733edee188ab141e183c", + "cd4_filtered.bed:md5,57cde1c26fabdc9c416326ba825b3f15", "jurkat_filtered.bed:md5,95a5279ec2387dfa0b4c2e7820083527" ], true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:34:49.87981" + "timestamp": "2024-11-08T20:05:33.881075" }, "software_versions": { "content": [ @@ -175,6 +175,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -187,10 +190,10 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:34:49.029692" + "timestamp": "2024-11-08T20:05:33.084407" }, "gzip_software_versions": { "content": [ @@ -265,6 +268,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -277,9 +283,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:37:11.702677" + "timestamp": "2024-11-08T20:07:47.638876" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 90c40798..73f9cc01 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 90, + 92, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -84,16 +84,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:38:39.447299" + "timestamp": "2024-11-08T20:09:08.76233" }, "software_versions": { "content": [ @@ -172,6 +172,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -184,9 +187,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:38:39.158827" + "timestamp": "2024-11-08T20:09:08.515208" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index f10d503c..4cc34186 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 90, + 92, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -84,16 +84,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:40:08.263278" + "timestamp": "2024-11-08T20:10:29.792013" }, "software_versions": { "content": [ @@ -172,6 +172,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -184,9 +187,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:40:08.00609" + "timestamp": "2024-11-08T20:10:29.552992" } } \ No newline at end of file diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 2975d054..289ae258 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 91, + 93, [ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", @@ -84,16 +84,16 @@ "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ], [ - "cd4_filtered.bed:md5,686cb2e55d18a584632711be1874a9f8", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" ], true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:41:32.789831" + "timestamp": "2024-11-08T20:11:49.680256" }, "software_versions": { "content": [ @@ -175,6 +175,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -187,9 +190,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:41:32.519314" + "timestamp": "2024-11-08T20:11:49.433129" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index b993c9f8..a05cb686 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 110, + 112, "cd4.bed:md5,202652821e59d0357c699b217d02f755", "jurkat.bed:md5,7c37a46578dac48f8bf15155cd78b214", [ @@ -33,10 +33,10 @@ true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:48:21.416161" + "timestamp": "2024-11-08T20:17:44.462822" }, "software_versions": { "content": [ @@ -128,6 +128,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -140,9 +143,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:48:21.394461" + "timestamp": "2024-11-08T20:17:44.444383" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 0ad30c73..e1a6865f 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -1,7 +1,7 @@ { "output_files": { "content": [ - 110, + 112, "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", [ @@ -33,10 +33,10 @@ true ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:54:30.70811" + "timestamp": "2024-11-08T20:23:19.772674" }, "software_versions": { "content": [ @@ -119,6 +119,9 @@ "RSEQC_READDUPLICATION": { "rseqc": "5.0.2" }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" }, @@ -131,9 +134,9 @@ } ], "meta": { - "nf-test": "0.9.0", + "nf-test": "0.9.2", "nextflow": "24.10.0" }, - "timestamp": "2024-11-07T14:54:30.687342" + "timestamp": "2024-11-08T20:23:19.755524" } } \ No newline at end of file From 55861cd6173c9a0e7da0fa28cdb4e7feae7c70f1 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 9 Nov 2024 11:15:21 -0600 Subject: [PATCH 189/255] style: Updates from code-review Co-authored-by: jfy133 --- docs/usage.md | 4 ++-- subworkflows/local/transcript_identification/main.nf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/usage.md b/docs/usage.md index d6725ee0..72d0c0dd 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -81,9 +81,9 @@ The default transcript identification option is PINTS, and HOMER if the transcri PINTS handles the majority of the transcript identification, since it covers all of the supported assays. -PINTS can use a lot of memory while running, so [a scatter-gather pattern was implemented](github). +PINTS can use a lot of memory while running, so [a scatter-gather pattern was implemented](https://github.com/nf-core/nascent/blob/136a9ca2390121639e823e39e508afe9b6970d77/subworkflows/local/transcript_identification/main.nf#L47-L74). -It splits the identification up by the Chromosomes available in the provided FASTA file. Some of the Chromosomes are skipped because PINTS throws an error when it doesn't find any regions. If this causes an issue with your analysis please open an issue. +It splits the identification up by the chromosomes available in the provided FASTA file. Some of the chromosomes are skipped because PINTS throws an error when it doesn't find any regions. If this causes an issue with your analysis please open an issue. ### GroHMM diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 72dce79b..406ad5b1 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -77,13 +77,13 @@ workflow TRANSCRIPT_INDENTIFICATION { // TODO Tests don't seem to hit this because there's no bidirectional_TREs // Need to collect all of the beds for each chromosome/sample and concatenate them // Nextflow makes this super easy - def ch_bidirectional_TREs = PINTS_CALLER.out.unidirectional_TREs.groupTuple(by: [0]).map { meta, beds -> + def ch_bidirectional_tres = PINTS_CALLER.out.unidirectional_TREs.groupTuple(by: [0]).map { meta, beds -> [meta, beds.flatten()] } // HACK Not sure if this is as good as reporting all of them, but it should // reduce the overall noise. - CAT_CAT(ch_bidirectional_TREs) + CAT_CAT(ch_bidirectional_tres) ch_versions = ch_versions.mix(CAT_CAT.out.versions.first()) BEDTOOLS_SORT(CAT_CAT.out.file_out, []) ch_versions = ch_versions.mix(BEDTOOLS_SORT.out.versions.first()) From 9c0487ab23cecec85496122316a7e365ba063c4d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 14 Nov 2024 16:42:01 -0600 Subject: [PATCH 190/255] feat(homer): Add uniqmap generation --- modules/nf-core/homer/createuniqmap/main.nf | 44 ++++++++++++++++ .../nf-core/homer/getmappableregions/main.nf | 50 +++++++++++++++++++ subworkflows/nf-core/homer/groseq/main.nf | 17 +++++++ 3 files changed, 111 insertions(+) create mode 100644 modules/nf-core/homer/createuniqmap/main.nf create mode 100644 modules/nf-core/homer/getmappableregions/main.nf diff --git a/modules/nf-core/homer/createuniqmap/main.nf b/modules/nf-core/homer/createuniqmap/main.nf new file mode 100644 index 00000000..ae22febb --- /dev/null +++ b/modules/nf-core/homer/createuniqmap/main.nf @@ -0,0 +1,44 @@ +process HOMER_CREATEUNIQMAP { + tag "$meta.id" + label 'process_medium' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : + 'biocontainers/homer:4.11--pl526hc9558a2_3' }" + + input: + tuple val(meta), path(mappable_regions) + + output: + tuple val(meta), path("uniqmap/"), emit: uniqmap_dir + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' + """ + mkdir -p uniqmap + homerTools special uniqmap uniqmap/ $mappable_regions + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: $VERSION + END_VERSIONS + """ + + stub: + def VERSION = '4.11' + """ + mkdir -p uniqmap + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: $VERSION + END_VERSIONS + """ +} diff --git a/modules/nf-core/homer/getmappableregions/main.nf b/modules/nf-core/homer/getmappableregions/main.nf new file mode 100644 index 00000000..596a7264 --- /dev/null +++ b/modules/nf-core/homer/getmappableregions/main.nf @@ -0,0 +1,50 @@ +process HOMER_GETMAPPABLEREGIONS { + tag "$meta.id" + label 'process_high_memory' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : + 'biocontainers/homer:4.11--pl526hc9558a2_3' }" + + input: + tuple val(meta), path(fasta_files) + val(read_length) + val(parallel_sequences) + + output: + tuple val(meta), path("*.txt"), emit: txt + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' + """ + getMappableRegions \\ + $parallel_sequences \\ + $read_length \\ + $fasta_files \\ + > ${prefix}.${read_length}nt.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: $VERSION + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' + """ + touch ${prefix}.${read_length}nt.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: $VERSION + END_VERSIONS + """ +} diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index ad6f0bf1..332a94da 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -2,6 +2,9 @@ * Identify transcripts with homer */ +include { HOMER_GETMAPPABLEREGIONS } from '../../../../modules/nf-core/homer/getmappableregions/main' +include { HOMER_CREATEUNIQMAP } from '../../../../modules/nf-core/homer/createuniqmap/main' + include { HOMER_MAKETAGDIRECTORY } from '../../../../modules/nf-core/homer/maketagdirectory/main' include { HOMER_MAKEUCSCFILE } from '../../../../modules/nf-core/homer/makeucscfile/main' include { HOMER_FINDPEAKS } from '../../../../modules/nf-core/homer/findpeaks/main' @@ -16,6 +19,20 @@ workflow HOMER_GROSEQ { ch_versions = Channel.empty() + // Generate mappable regions + HOMER_GETMAPPABLEREGIONS ( + fasta, + params.read_length, + params.parallel_sequences, + ) + ch_versions = ch_versions.mix(HOMER_GETMAPPABLEREGIONS.out.versions) + + // Create uniqmap directory + HOMER_CREATEUNIQMAP ( + HOMER_GETMAPPABLEREGIONS.out.txt + ) + ch_versions = ch_versions.mix(HOMER_CREATEUNIQMAP.out.versions) + /* * Create a Tag Directory From The GRO-Seq experiment */ From 22463a31d0b2ba5a02f3bbf628ee1ddfa1eef2aa Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 14 Nov 2024 19:03:43 -0600 Subject: [PATCH 191/255] fix(homer): Split fasta --- .../nf-core/homer/getmappableregions/main.nf | 6 +-- subworkflows/nf-core/homer/groseq/main.nf | 44 ++++++++++--------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/modules/nf-core/homer/getmappableregions/main.nf b/modules/nf-core/homer/getmappableregions/main.nf index 596a7264..6e18ee9b 100644 --- a/modules/nf-core/homer/getmappableregions/main.nf +++ b/modules/nf-core/homer/getmappableregions/main.nf @@ -1,5 +1,5 @@ process HOMER_GETMAPPABLEREGIONS { - tag "$meta.id" + tag "$fasta_files[0].baseName" label 'process_high_memory' conda "${moduleDir}/environment.yml" @@ -8,7 +8,7 @@ process HOMER_GETMAPPABLEREGIONS { 'biocontainers/homer:4.11--pl526hc9558a2_3' }" input: - tuple val(meta), path(fasta_files) + path(fasta_files, arity: '1..*') val(read_length) val(parallel_sequences) @@ -21,7 +21,7 @@ process HOMER_GETMAPPABLEREGIONS { script: def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" + def prefix = task.ext.prefix ?: "${fasta_files[0].baseName}" def VERSION = '4.11' """ getMappableRegions \\ diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index 332a94da..78baa116 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -3,12 +3,12 @@ */ include { HOMER_GETMAPPABLEREGIONS } from '../../../../modules/nf-core/homer/getmappableregions/main' -include { HOMER_CREATEUNIQMAP } from '../../../../modules/nf-core/homer/createuniqmap/main' +include { HOMER_CREATEUNIQMAP } from '../../../../modules/nf-core/homer/createuniqmap/main' -include { HOMER_MAKETAGDIRECTORY } from '../../../../modules/nf-core/homer/maketagdirectory/main' -include { HOMER_MAKEUCSCFILE } from '../../../../modules/nf-core/homer/makeucscfile/main' -include { HOMER_FINDPEAKS } from '../../../../modules/nf-core/homer/findpeaks/main' -include { HOMER_POS2BED } from '../../../../modules/nf-core/homer/pos2bed/main' +include { HOMER_MAKETAGDIRECTORY } from '../../../../modules/nf-core/homer/maketagdirectory/main' +include { HOMER_MAKEUCSCFILE } from '../../../../modules/nf-core/homer/makeucscfile/main' +include { HOMER_FINDPEAKS } from '../../../../modules/nf-core/homer/findpeaks/main' +include { HOMER_POS2BED } from '../../../../modules/nf-core/homer/pos2bed/main' workflow HOMER_GROSEQ { take: @@ -19,16 +19,21 @@ workflow HOMER_GROSEQ { ch_versions = Channel.empty() + // Split FASTA by chromosome + split_fastas = fasta + .splitFasta(by: 1, file: true) + .toSortedList() + // Generate mappable regions - HOMER_GETMAPPABLEREGIONS ( - fasta, - params.read_length, - params.parallel_sequences, + HOMER_GETMAPPABLEREGIONS( + split_fastas, + 1000000000, + 50 ) ch_versions = ch_versions.mix(HOMER_GETMAPPABLEREGIONS.out.versions) // Create uniqmap directory - HOMER_CREATEUNIQMAP ( + HOMER_CREATEUNIQMAP( HOMER_GETMAPPABLEREGIONS.out.txt ) ch_versions = ch_versions.mix(HOMER_CREATEUNIQMAP.out.versions) @@ -36,32 +41,31 @@ workflow HOMER_GROSEQ { /* * Create a Tag Directory From The GRO-Seq experiment */ - HOMER_MAKETAGDIRECTORY ( bam, fasta ) + HOMER_MAKETAGDIRECTORY(bam, fasta) ch_versions = ch_versions.mix(HOMER_MAKETAGDIRECTORY.out.versions.first()) /* * Creating UCSC Visualization Files */ - HOMER_MAKEUCSCFILE ( HOMER_MAKETAGDIRECTORY.out.tagdir ) + HOMER_MAKEUCSCFILE(HOMER_MAKETAGDIRECTORY.out.tagdir) ch_versions = ch_versions.mix(HOMER_MAKEUCSCFILE.out.versions.first()) /* * Find transcripts directly from GRO-Seq */ - HOMER_FINDPEAKS ( HOMER_MAKETAGDIRECTORY.out.tagdir ) + HOMER_FINDPEAKS(HOMER_MAKETAGDIRECTORY.out.tagdir) ch_versions = ch_versions.mix(HOMER_FINDPEAKS.out.versions.first()) /* * Convert peak file to bed file */ - HOMER_POS2BED ( HOMER_FINDPEAKS.out.txt ) + HOMER_POS2BED(HOMER_FINDPEAKS.out.txt) ch_versions = ch_versions.mix(HOMER_POS2BED.out.versions.first()) emit: - tagdir = HOMER_MAKETAGDIRECTORY.out.tagdir // channel: [ val(meta), [ tagdir ] ] - bed_graph = HOMER_MAKEUCSCFILE.out.bedGraph // channel: [ val(meta), [ tag_dir/*ucsc.bedGraph.gz ] ] - peaks = HOMER_FINDPEAKS.out.txt // channel: [ val(meta), [ *peaks.txt ] ] - bed = HOMER_POS2BED.out.bed // channel: [ val(meta), [ *peaks.txt ] ] - - versions = ch_versions // channel: [ versions.yml ] + tagdir = HOMER_MAKETAGDIRECTORY.out.tagdir // channel: [ val(meta), [ tagdir ] ] + bed_graph = HOMER_MAKEUCSCFILE.out.bedGraph // channel: [ val(meta), [ tag_dir/*ucsc.bedGraph.gz ] ] + peaks = HOMER_FINDPEAKS.out.txt // channel: [ val(meta), [ *peaks.txt ] ] + bed = HOMER_POS2BED.out.bed // channel: [ val(meta), [ *peaks.txt ] ] + versions = ch_versions // channel: [ versions.yml ] } From 1b006b37af58aaae6e5ba30c1889af3571e71a05 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 14 Nov 2024 19:43:11 -0600 Subject: [PATCH 192/255] fix(homer): Flip the read_length and parallel_sequences --- modules/nf-core/homer/getmappableregions/main.nf | 6 +++--- subworkflows/nf-core/homer/groseq/main.nf | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/nf-core/homer/getmappableregions/main.nf b/modules/nf-core/homer/getmappableregions/main.nf index 6e18ee9b..e55e0deb 100644 --- a/modules/nf-core/homer/getmappableregions/main.nf +++ b/modules/nf-core/homer/getmappableregions/main.nf @@ -1,16 +1,16 @@ process HOMER_GETMAPPABLEREGIONS { - tag "$fasta_files[0].baseName" + tag "${fasta_files[0].baseName}" label 'process_high_memory' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : - 'biocontainers/homer:4.11--pl526hc9558a2_3' }" + 'community.wave.seqera.io/library/homer:4.11--e7dc4a041f589d54' }" input: path(fasta_files, arity: '1..*') - val(read_length) val(parallel_sequences) + val(read_length) output: tuple val(meta), path("*.txt"), emit: txt diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index 78baa116..b8bf3508 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -27,7 +27,9 @@ workflow HOMER_GROSEQ { // Generate mappable regions HOMER_GETMAPPABLEREGIONS( split_fastas, - 1000000000, + // 10000, + // 1000000000, + 1000000, 50 ) ch_versions = ch_versions.mix(HOMER_GETMAPPABLEREGIONS.out.versions) From e5d9d9f9f6929341d5d16442c5379061b53a9d41 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 14 Nov 2024 19:49:01 -0600 Subject: [PATCH 193/255] fix(homer): Setup for a full run --- modules/nf-core/homer/createuniqmap/main.nf | 5 +++-- modules/nf-core/homer/findpeaks/main.nf | 4 +++- modules/nf-core/homer/getmappableregions/main.nf | 3 ++- subworkflows/nf-core/homer/groseq/main.nf | 6 +++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/nf-core/homer/createuniqmap/main.nf b/modules/nf-core/homer/createuniqmap/main.nf index ae22febb..0b944d3a 100644 --- a/modules/nf-core/homer/createuniqmap/main.nf +++ b/modules/nf-core/homer/createuniqmap/main.nf @@ -1,6 +1,7 @@ process HOMER_CREATEUNIQMAP { tag "$meta.id" label 'process_medium' + label 'process_long' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? @@ -8,10 +9,10 @@ process HOMER_CREATEUNIQMAP { 'biocontainers/homer:4.11--pl526hc9558a2_3' }" input: - tuple val(meta), path(mappable_regions) + path(mappable_regions) output: - tuple val(meta), path("uniqmap/"), emit: uniqmap_dir + path("uniqmap/"), emit: uniqmap_dir path "versions.yml" , emit: versions when: diff --git a/modules/nf-core/homer/findpeaks/main.nf b/modules/nf-core/homer/findpeaks/main.nf index f18e80d0..71e26679 100644 --- a/modules/nf-core/homer/findpeaks/main.nf +++ b/modules/nf-core/homer/findpeaks/main.nf @@ -10,6 +10,7 @@ process HOMER_FINDPEAKS { input: tuple val(meta), path(tagDir) + path uniqmap output: tuple val(meta), path("*.peaks.txt"), emit: txt @@ -27,7 +28,8 @@ process HOMER_FINDPEAKS { findPeaks \\ $tagDir \\ $args \\ - -o ${prefix}.peaks.txt + -o ${prefix}.peaks.txt \\ + -uniqmap $uniqmap cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/homer/getmappableregions/main.nf b/modules/nf-core/homer/getmappableregions/main.nf index e55e0deb..507f4ac5 100644 --- a/modules/nf-core/homer/getmappableregions/main.nf +++ b/modules/nf-core/homer/getmappableregions/main.nf @@ -1,6 +1,7 @@ process HOMER_GETMAPPABLEREGIONS { tag "${fasta_files[0].baseName}" label 'process_high_memory' + label 'process_long' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? @@ -13,7 +14,7 @@ process HOMER_GETMAPPABLEREGIONS { val(read_length) output: - tuple val(meta), path("*.txt"), emit: txt + path("*.txt"), emit: txt path "versions.yml" , emit: versions when: diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index b8bf3508..964122c0 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -28,8 +28,8 @@ workflow HOMER_GROSEQ { HOMER_GETMAPPABLEREGIONS( split_fastas, // 10000, - // 1000000000, - 1000000, + 1000000000, + // 1000000, 50 ) ch_versions = ch_versions.mix(HOMER_GETMAPPABLEREGIONS.out.versions) @@ -55,7 +55,7 @@ workflow HOMER_GROSEQ { /* * Find transcripts directly from GRO-Seq */ - HOMER_FINDPEAKS(HOMER_MAKETAGDIRECTORY.out.tagdir) + HOMER_FINDPEAKS(HOMER_MAKETAGDIRECTORY.out.tagdir, HOMER_CREATEUNIQMAP.out.uniqmap_dir) ch_versions = ch_versions.mix(HOMER_FINDPEAKS.out.versions.first()) /* From cb95feb1225c82e80673781cf1413820962273ea Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 14 Nov 2024 20:03:41 -0600 Subject: [PATCH 194/255] feat(homer): Add a hacky uniqmap download --- conf/igenomes.config | 2 + main.nf | 1 + .../homer/createuniqmap/main.nf | 0 .../homer/getmappableregions/main.nf | 0 modules/nf-core/unzip/environment.yml | 5 ++ modules/nf-core/unzip/main.nf | 49 ++++++++++++ modules/nf-core/unzip/meta.yml | 46 +++++++++++ modules/nf-core/unzip/tests/main.nf.test | 54 +++++++++++++ modules/nf-core/unzip/tests/main.nf.test.snap | 76 +++++++++++++++++++ modules/nf-core/unzip/tests/tags.yml | 2 + subworkflows/nf-core/homer/groseq/main.nf | 49 +++++++----- workflows/nascent.nf | 1 + 12 files changed, 264 insertions(+), 21 deletions(-) rename modules/{nf-core => local}/homer/createuniqmap/main.nf (100%) rename modules/{nf-core => local}/homer/getmappableregions/main.nf (100%) create mode 100644 modules/nf-core/unzip/environment.yml create mode 100644 modules/nf-core/unzip/main.nf create mode 100644 modules/nf-core/unzip/meta.yml create mode 100644 modules/nf-core/unzip/tests/main.nf.test create mode 100644 modules/nf-core/unzip/tests/main.nf.test.snap create mode 100644 modules/nf-core/unzip/tests/tags.yml diff --git a/conf/igenomes.config b/conf/igenomes.config index 4daa9d47..1d77481d 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -288,6 +288,7 @@ params { mito_name = "chrM" macs_gsize = "2.7e9" blacklist = "${projectDir}/assets/blacklists/hg38-blacklist.bed" + uniqmap = "http://homer.ucsd.edu/homer/data/uniqmap/uniqmap.hg38.50nt.zip" } 'hg19' { fasta = "${params.igenomes_base}/Homo_sapiens/UCSC/hg19/Sequence/WholeGenomeFasta/genome.fa" @@ -302,6 +303,7 @@ params { mito_name = "chrM" macs_gsize = "2.7e9" blacklist = "${projectDir}/assets/blacklists/hg19-blacklist.bed" + uniqmap = "http://homer.ucsd.edu/homer/data/uniqmap/uniqmap.hg19.50nt.zip" } 'mm10' { fasta = "${params.igenomes_base}/Mus_musculus/UCSC/mm10/Sequence/WholeGenomeFasta/genome.fa" diff --git a/main.nf b/main.nf index a7c8547b..4e0cbc32 100644 --- a/main.nf +++ b/main.nf @@ -36,6 +36,7 @@ params.dragmap = getGenomeAttribute('dragmap') params.bowtie2_index = getGenomeAttribute('bowtie2') params.hisat2_index = getGenomeAttribute('hisat2') params.star_index = null +params.homer_uniqmap = getGenomeAttribute('uniqmap') /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/modules/nf-core/homer/createuniqmap/main.nf b/modules/local/homer/createuniqmap/main.nf similarity index 100% rename from modules/nf-core/homer/createuniqmap/main.nf rename to modules/local/homer/createuniqmap/main.nf diff --git a/modules/nf-core/homer/getmappableregions/main.nf b/modules/local/homer/getmappableregions/main.nf similarity index 100% rename from modules/nf-core/homer/getmappableregions/main.nf rename to modules/local/homer/getmappableregions/main.nf diff --git a/modules/nf-core/unzip/environment.yml b/modules/nf-core/unzip/environment.yml new file mode 100644 index 00000000..e93c649f --- /dev/null +++ b/modules/nf-core/unzip/environment.yml @@ -0,0 +1,5 @@ +channels: + - conda-forge + - bioconda +dependencies: + - conda-forge::p7zip=16.02 diff --git a/modules/nf-core/unzip/main.nf b/modules/nf-core/unzip/main.nf new file mode 100644 index 00000000..a0c02109 --- /dev/null +++ b/modules/nf-core/unzip/main.nf @@ -0,0 +1,49 @@ +process UNZIP { + tag "$archive" + label 'process_single' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/p7zip:16.02' : + 'biocontainers/p7zip:16.02' }" + + input: + tuple val(meta), path(archive) + + output: + tuple val(meta), path("${prefix}/"), emit: unzipped_archive + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + if ( archive instanceof List && archive.name.size > 1 ) { error "[UNZIP] error: 7za only accepts a single archive as input. Please check module input." } + prefix = task.ext.prefix ?: ( meta.id ? "${meta.id}" : archive.baseName) + """ + 7za \\ + x \\ + -o"${prefix}"/ \\ + $args \\ + $archive + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + 7za: \$(echo \$(7za --help) | sed 's/.*p7zip Version //; s/(.*//') + END_VERSIONS + """ + + stub: + def args = task.ext.args ?: '' + if ( archive instanceof List && archive.name.size > 1 ) { error "[UNZIP] error: 7za only accepts a single archive as input. Please check module input." } + prefix = task.ext.prefix ?: ( meta.id ? "${meta.id}" : archive.baseName) + """ + mkdir "${prefix}" + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + 7za: \$(echo \$(7za --help) | sed 's/.*p7zip Version //; s/(.*//') + END_VERSIONS + """ +} diff --git a/modules/nf-core/unzip/meta.yml b/modules/nf-core/unzip/meta.yml new file mode 100644 index 00000000..426fccb7 --- /dev/null +++ b/modules/nf-core/unzip/meta.yml @@ -0,0 +1,46 @@ +name: unzip +description: Unzip ZIP archive files +keywords: + - unzip + - decompression + - zip + - archiving +tools: + - unzip: + description: p7zip is a quick port of 7z.exe and 7za.exe (command line version + of 7zip, see www.7-zip.org) for Unix. + homepage: https://sourceforge.net/projects/p7zip/ + documentation: https://sourceforge.net/projects/p7zip/ + tool_dev_url: https://sourceforge.net/projects/p7zip" + licence: ["LGPL-2.1-or-later"] + identifier: "" +input: + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - archive: + type: file + description: ZIP file + pattern: "*.zip" +output: + - unzipped_archive: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - ${prefix}/: + type: directory + description: Directory contents of the unzipped archive + pattern: "${archive.baseName}/" + - versions: + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@jfy133" +maintainers: + - "@jfy133" diff --git a/modules/nf-core/unzip/tests/main.nf.test b/modules/nf-core/unzip/tests/main.nf.test new file mode 100644 index 00000000..238b68d8 --- /dev/null +++ b/modules/nf-core/unzip/tests/main.nf.test @@ -0,0 +1,54 @@ +nextflow_process { + + name "Test Process UNZIP" + script "../main.nf" + process "UNZIP" + + tag "modules" + tag "modules_nfcore" + tag "unzip" + + test("generic [tar] [tar_gz]") { + + when { + process { + """ + input[0] = [ + [ id: 'hello' ], + file(params.modules_testdata_base_path + 'generic/tar/hello.tar.gz', checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("generic [tar] [tar_gz] stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ + [ id: 'hello' ], + file(params.modules_testdata_base_path + 'generic/tar/hello.tar.gz', checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } +} diff --git a/modules/nf-core/unzip/tests/main.nf.test.snap b/modules/nf-core/unzip/tests/main.nf.test.snap new file mode 100644 index 00000000..cdd2ab16 --- /dev/null +++ b/modules/nf-core/unzip/tests/main.nf.test.snap @@ -0,0 +1,76 @@ +{ + "generic [tar] [tar_gz] stub": { + "content": [ + { + "0": [ + [ + { + "id": "hello" + }, + [ + + ] + ] + ], + "1": [ + "versions.yml:md5,52c55ce814e8bc9edc5a6c625ed794b8" + ], + "unzipped_archive": [ + [ + { + "id": "hello" + }, + [ + + ] + ] + ], + "versions": [ + "versions.yml:md5,52c55ce814e8bc9edc5a6c625ed794b8" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-30T19:16:37.11550986" + }, + "generic [tar] [tar_gz]": { + "content": [ + { + "0": [ + [ + { + "id": "hello" + }, + [ + "hello.tar:md5,80c66db79a773bc87b3346035ff9593e" + ] + ] + ], + "1": [ + "versions.yml:md5,52c55ce814e8bc9edc5a6c625ed794b8" + ], + "unzipped_archive": [ + [ + { + "id": "hello" + }, + [ + "hello.tar:md5,80c66db79a773bc87b3346035ff9593e" + ] + ] + ], + "versions": [ + "versions.yml:md5,52c55ce814e8bc9edc5a6c625ed794b8" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-30T19:16:25.120242571" + } +} \ No newline at end of file diff --git a/modules/nf-core/unzip/tests/tags.yml b/modules/nf-core/unzip/tests/tags.yml new file mode 100644 index 00000000..7f5647e1 --- /dev/null +++ b/modules/nf-core/unzip/tests/tags.yml @@ -0,0 +1,2 @@ +unzip: + - "modules/nf-core/unzip/**" diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index 964122c0..4df5b089 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -2,8 +2,9 @@ * Identify transcripts with homer */ -include { HOMER_GETMAPPABLEREGIONS } from '../../../../modules/nf-core/homer/getmappableregions/main' -include { HOMER_CREATEUNIQMAP } from '../../../../modules/nf-core/homer/createuniqmap/main' +include { HOMER_GETMAPPABLEREGIONS } from '../../../../modules/local/homer/getmappableregions/main' +include { HOMER_CREATEUNIQMAP } from '../../../../modules/local/homer/createuniqmap/main' +include { UNZIP } from '../../../../modules/nf-core/unzip/main' include { HOMER_MAKETAGDIRECTORY } from '../../../../modules/nf-core/homer/maketagdirectory/main' include { HOMER_MAKEUCSCFILE } from '../../../../modules/nf-core/homer/makeucscfile/main' @@ -19,26 +20,32 @@ workflow HOMER_GROSEQ { ch_versions = Channel.empty() - // Split FASTA by chromosome - split_fastas = fasta - .splitFasta(by: 1, file: true) - .toSortedList() + ch_uniqmap = Channel.empty() + if (!params.homer_uniqmap) { + // Split FASTA by chromosome + split_fastas = fasta + .splitFasta(by: 1, file: true) + .toSortedList() - // Generate mappable regions - HOMER_GETMAPPABLEREGIONS( - split_fastas, - // 10000, - 1000000000, - // 1000000, - 50 - ) - ch_versions = ch_versions.mix(HOMER_GETMAPPABLEREGIONS.out.versions) + // Generate mappable regions + HOMER_GETMAPPABLEREGIONS( + split_fastas, + 1000000000, + 50 + ) + ch_versions = ch_versions.mix(HOMER_GETMAPPABLEREGIONS.out.versions) - // Create uniqmap directory - HOMER_CREATEUNIQMAP( - HOMER_GETMAPPABLEREGIONS.out.txt - ) - ch_versions = ch_versions.mix(HOMER_CREATEUNIQMAP.out.versions) + // Create uniqmap directory + HOMER_CREATEUNIQMAP( + HOMER_GETMAPPABLEREGIONS.out.txt + ) + ch_versions = ch_versions.mix(HOMER_CREATEUNIQMAP.out.versions) + + ch_uniqmap = HOMER_CREATEUNIQMAP.out.uniqmap_dir + } + else { + ch_uniqmap = UNZIP([[:], params.homer_uniqmap]).map { it[1] } + } /* * Create a Tag Directory From The GRO-Seq experiment @@ -55,7 +62,7 @@ workflow HOMER_GROSEQ { /* * Find transcripts directly from GRO-Seq */ - HOMER_FINDPEAKS(HOMER_MAKETAGDIRECTORY.out.tagdir, HOMER_CREATEUNIQMAP.out.uniqmap_dir) + HOMER_FINDPEAKS(HOMER_MAKETAGDIRECTORY.out.tagdir, ch_uniqmap) ch_versions = ch_versions.mix(HOMER_FINDPEAKS.out.versions.first()) /* diff --git a/workflows/nascent.nf b/workflows/nascent.nf index e9543c97..0eb1b33e 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -60,6 +60,7 @@ workflow NASCENT { ch_hisat2_index ch_star_index + main: ch_versions = Channel.empty() From 58a8977ac047227d66b64b60b82af4e4a0b702e5 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 16 Nov 2024 15:12:56 -0600 Subject: [PATCH 195/255] refactor: Move uniqmap generation to references https://github.com/nf-core/references/issues/3 --- main.nf | 1 + modules/local/homer/createuniqmap/main.nf | 45 ---------------- .../local/homer/getmappableregions/main.nf | 51 ------------------- modules/nf-core/homer/findpeaks/main.nf | 3 +- nextflow_schema.json | 6 +++ .../local/transcript_identification/main.nf | 3 +- subworkflows/nf-core/homer/groseq/main.nf | 45 +++++----------- workflows/nascent.nf | 2 + 8 files changed, 27 insertions(+), 129 deletions(-) delete mode 100644 modules/local/homer/createuniqmap/main.nf delete mode 100644 modules/local/homer/getmappableregions/main.nf diff --git a/main.nf b/main.nf index 4e0cbc32..e698542d 100644 --- a/main.nf +++ b/main.nf @@ -69,6 +69,7 @@ workflow NFCORE_NASCENT { params.bowtie2_index, params.hisat2_index, params.star_index, + params.homer_uniqmap ) emit: multiqc_report = NASCENT.out.multiqc_report // channel: /path/to/multiqc_report.html diff --git a/modules/local/homer/createuniqmap/main.nf b/modules/local/homer/createuniqmap/main.nf deleted file mode 100644 index 0b944d3a..00000000 --- a/modules/local/homer/createuniqmap/main.nf +++ /dev/null @@ -1,45 +0,0 @@ -process HOMER_CREATEUNIQMAP { - tag "$meta.id" - label 'process_medium' - label 'process_long' - - conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : - 'biocontainers/homer:4.11--pl526hc9558a2_3' }" - - input: - path(mappable_regions) - - output: - path("uniqmap/"), emit: uniqmap_dir - path "versions.yml" , emit: versions - - when: - task.ext.when == null || task.ext.when - - script: - def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '4.11' - """ - mkdir -p uniqmap - homerTools special uniqmap uniqmap/ $mappable_regions - - cat <<-END_VERSIONS > versions.yml - "${task.process}": - homer: $VERSION - END_VERSIONS - """ - - stub: - def VERSION = '4.11' - """ - mkdir -p uniqmap - - cat <<-END_VERSIONS > versions.yml - "${task.process}": - homer: $VERSION - END_VERSIONS - """ -} diff --git a/modules/local/homer/getmappableregions/main.nf b/modules/local/homer/getmappableregions/main.nf deleted file mode 100644 index 507f4ac5..00000000 --- a/modules/local/homer/getmappableregions/main.nf +++ /dev/null @@ -1,51 +0,0 @@ -process HOMER_GETMAPPABLEREGIONS { - tag "${fasta_files[0].baseName}" - label 'process_high_memory' - label 'process_long' - - conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : - 'community.wave.seqera.io/library/homer:4.11--e7dc4a041f589d54' }" - - input: - path(fasta_files, arity: '1..*') - val(parallel_sequences) - val(read_length) - - output: - path("*.txt"), emit: txt - path "versions.yml" , emit: versions - - when: - task.ext.when == null || task.ext.when - - script: - def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${fasta_files[0].baseName}" - def VERSION = '4.11' - """ - getMappableRegions \\ - $parallel_sequences \\ - $read_length \\ - $fasta_files \\ - > ${prefix}.${read_length}nt.txt - - cat <<-END_VERSIONS > versions.yml - "${task.process}": - homer: $VERSION - END_VERSIONS - """ - - stub: - def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '4.11' - """ - touch ${prefix}.${read_length}nt.txt - - cat <<-END_VERSIONS > versions.yml - "${task.process}": - homer: $VERSION - END_VERSIONS - """ -} diff --git a/modules/nf-core/homer/findpeaks/main.nf b/modules/nf-core/homer/findpeaks/main.nf index 71e26679..bce67462 100644 --- a/modules/nf-core/homer/findpeaks/main.nf +++ b/modules/nf-core/homer/findpeaks/main.nf @@ -23,13 +23,14 @@ process HOMER_FINDPEAKS { def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + def uniqmap_flag = uniqmap ? "-uniqmap $uniqmap" : "" """ findPeaks \\ $tagDir \\ $args \\ -o ${prefix}.peaks.txt \\ - -uniqmap $uniqmap + $uniqmap_flag cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/nextflow_schema.json b/nextflow_schema.json index 60465a52..ba327409 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -254,6 +254,12 @@ "fa_icon": "fas fa-copy", "help_text": "> **NB** If none provided, index will be generated automatically from the FASTA reference." }, + "homer_uniqmap": { + "type": "string", + "description": "Path to HOMER uniqmap file or URL to download.", + "fa_icon": "fas fa-file-archive", + "help_text": "> **NB** If none provided, will be downloaded automatically from the HOMER website. See nf-core/references for generation" + }, "save_reference": { "type": "boolean", "description": "If generated by the pipeline save the BWA index in the results directory.", diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 406ad5b1..b53f1162 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -18,6 +18,7 @@ workflow TRANSCRIPT_INDENTIFICATION { gxf fasta chrom_sizes + uniqmap main: @@ -37,7 +38,7 @@ workflow TRANSCRIPT_INDENTIFICATION { homer_tagdir = Channel.empty() if (params.assay_type == "GROseq") { group_bam = group_bam_bai.map { meta, bam, bai -> [meta, bam] } - HOMER_GROSEQ(group_bam, fasta) + HOMER_GROSEQ(group_bam, fasta, uniqmap) ch_identification_bed = ch_identification_bed.mix(HOMER_GROSEQ.out.bed) homer_peaks = HOMER_GROSEQ.out.peaks homer_tagdir = HOMER_GROSEQ.out.tagdir diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index 4df5b089..09f41bde 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -2,49 +2,32 @@ * Identify transcripts with homer */ -include { HOMER_GETMAPPABLEREGIONS } from '../../../../modules/local/homer/getmappableregions/main' -include { HOMER_CREATEUNIQMAP } from '../../../../modules/local/homer/createuniqmap/main' -include { UNZIP } from '../../../../modules/nf-core/unzip/main' +include { UNZIP } from '../../../../modules/nf-core/unzip/main' -include { HOMER_MAKETAGDIRECTORY } from '../../../../modules/nf-core/homer/maketagdirectory/main' -include { HOMER_MAKEUCSCFILE } from '../../../../modules/nf-core/homer/makeucscfile/main' -include { HOMER_FINDPEAKS } from '../../../../modules/nf-core/homer/findpeaks/main' -include { HOMER_POS2BED } from '../../../../modules/nf-core/homer/pos2bed/main' +include { HOMER_MAKETAGDIRECTORY } from '../../../../modules/nf-core/homer/maketagdirectory/main' +include { HOMER_MAKEUCSCFILE } from '../../../../modules/nf-core/homer/makeucscfile/main' +include { HOMER_FINDPEAKS } from '../../../../modules/nf-core/homer/findpeaks/main' +include { HOMER_POS2BED } from '../../../../modules/nf-core/homer/pos2bed/main' workflow HOMER_GROSEQ { take: - bam // channel: [ val(meta), [ reads ] ] - fasta // file: /path/to/bwa/index/ + bam // channel: [ val(meta), [ reads ] ] + fasta // file: /path/to/bwa/index/ + uniqmap main: ch_versions = Channel.empty() ch_uniqmap = Channel.empty() - if (!params.homer_uniqmap) { - // Split FASTA by chromosome - split_fastas = fasta - .splitFasta(by: 1, file: true) - .toSortedList() - - // Generate mappable regions - HOMER_GETMAPPABLEREGIONS( - split_fastas, - 1000000000, - 50 - ) - ch_versions = ch_versions.mix(HOMER_GETMAPPABLEREGIONS.out.versions) - - // Create uniqmap directory - HOMER_CREATEUNIQMAP( - HOMER_GETMAPPABLEREGIONS.out.txt - ) - ch_versions = ch_versions.mix(HOMER_CREATEUNIQMAP.out.versions) - - ch_uniqmap = HOMER_CREATEUNIQMAP.out.uniqmap_dir + if (!uniqmap) { + ch_uniqmap = [] + } + else if (uniqmap.endsWith('.zip')) { + ch_uniqmap = UNZIP([[:], uniqmap]).unzipped_archive.map { it[1] } } else { - ch_uniqmap = UNZIP([[:], params.homer_uniqmap]).map { it[1] } + ch_uniqmap = uniqmap } /* diff --git a/workflows/nascent.nf b/workflows/nascent.nf index 0eb1b33e..af9b1996 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -59,6 +59,7 @@ workflow NASCENT { ch_bowtie2_index ch_hisat2_index ch_star_index + ch_uniqmap main: @@ -294,6 +295,7 @@ workflow NASCENT { ch_gxf, PREPARE_GENOME.out.fasta, PREPARE_GENOME.out.chrom_sizes, + ch_uniqmap ) ch_grohmm_multiqc = TRANSCRIPT_INDENTIFICATION.out.grohmm_td_plot.collect() ch_homer_multiqc = TRANSCRIPT_INDENTIFICATION.out.homer_peaks From 1231e940073309af110df42292e70b1f2634a7da Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 11:45:09 -0600 Subject: [PATCH 196/255] chore: nf-core modules patch homer/findpeaks --- modules.json | 8 ++++- .../homer/findpeaks/homer-findpeaks.diff | 36 +++++++++++++++++++ modules/nf-core/homer/findpeaks/main.nf | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 modules/nf-core/homer/findpeaks/homer-findpeaks.diff diff --git a/modules.json b/modules.json index 9c78217d..839f2748 100644 --- a/modules.json +++ b/modules.json @@ -126,7 +126,8 @@ "homer/findpeaks": { "branch": "master", "git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08", - "installed_by": ["homer/groseq"] + "installed_by": ["homer/groseq"], + "patch": "modules/nf-core/homer/findpeaks/homer-findpeaks.diff" }, "homer/maketagdirectory": { "branch": "master", @@ -258,6 +259,11 @@ "branch": "master", "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", "installed_by": ["modules"] + }, + "unzip": { + "branch": "master", + "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", + "installed_by": ["homer/groseq"] } } }, diff --git a/modules/nf-core/homer/findpeaks/homer-findpeaks.diff b/modules/nf-core/homer/findpeaks/homer-findpeaks.diff new file mode 100644 index 00000000..88ee1838 --- /dev/null +++ b/modules/nf-core/homer/findpeaks/homer-findpeaks.diff @@ -0,0 +1,36 @@ +Changes in module 'nf-core/homer/findpeaks' +'modules/nf-core/homer/findpeaks/environment.yml' is unchanged +'modules/nf-core/homer/findpeaks/meta.yml' is unchanged +Changes in 'homer/findpeaks/main.nf': +--- modules/nf-core/homer/findpeaks/main.nf ++++ modules/nf-core/homer/findpeaks/main.nf +@@ -10,6 +10,7 @@ + + input: + tuple val(meta), path(tagDir) ++ path uniqmap // optional + + output: + tuple val(meta), path("*.peaks.txt"), emit: txt +@@ -22,12 +23,14 @@ + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. ++ def uniqmap_flag = uniqmap ? "-uniqmap $uniqmap" : "" + """ + + findPeaks \\ + $tagDir \\ + $args \\ +- -o ${prefix}.peaks.txt ++ -o ${prefix}.peaks.txt \\ ++ $uniqmap_flag + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + +'modules/nf-core/homer/findpeaks/tests/main.nf.test.snap' is unchanged +'modules/nf-core/homer/findpeaks/tests/tags.yml' is unchanged +'modules/nf-core/homer/findpeaks/tests/nextflow.config' is unchanged +'modules/nf-core/homer/findpeaks/tests/main.nf.test' is unchanged +************************************************************ diff --git a/modules/nf-core/homer/findpeaks/main.nf b/modules/nf-core/homer/findpeaks/main.nf index bce67462..63891500 100644 --- a/modules/nf-core/homer/findpeaks/main.nf +++ b/modules/nf-core/homer/findpeaks/main.nf @@ -10,7 +10,7 @@ process HOMER_FINDPEAKS { input: tuple val(meta), path(tagDir) - path uniqmap + path uniqmap // optional output: tuple val(meta), path("*.peaks.txt"), emit: txt From a07d0ff40ce48576e2e50055c93208388768838b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 11:56:52 -0600 Subject: [PATCH 197/255] fix(homer): Set uniqmap to off by default --- main.nf | 2 +- nextflow.config | 1 + nextflow_schema.json | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/main.nf b/main.nf index e698542d..38579d01 100644 --- a/main.nf +++ b/main.nf @@ -69,7 +69,7 @@ workflow NFCORE_NASCENT { params.bowtie2_index, params.hisat2_index, params.star_index, - params.homer_uniqmap + params.use_homer_uniqmap ? params.homer_uniqmap : [] ) emit: multiqc_report = NASCENT.out.multiqc_report // channel: /path/to/multiqc_report.html diff --git a/nextflow.config b/nextflow.config index 36c88a4a..b9160d7b 100644 --- a/nextflow.config +++ b/nextflow.config @@ -24,6 +24,7 @@ params { // Transcript identification method assay_type = null + use_homer_uniqmap = false skip_grohmm = false grohmm_min_uts = 5 grohmm_max_uts = 45 diff --git a/nextflow_schema.json b/nextflow_schema.json index ba327409..0e82de2b 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -117,6 +117,14 @@ "R2_3" ] }, + + "use_homer_uniqmap": { + "type": "boolean", + "description": "Use HOMER uniqmap for transcript identification.", + "fa_icon": "fas fa-dna", + "help_text": "Enable this to use HOMER's uniqmap functionality for more accurate transcript identification in repetitive regions.", + "default": false + }, "skip_grohmm": { "type": "boolean", "description": "Skip groHMM all together", From e15e004412f048a58251ce045bb90a4b1b092b65 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 12:10:51 -0600 Subject: [PATCH 198/255] chore(homer): Add other supported uniq-maps --- conf/igenomes.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/igenomes.config b/conf/igenomes.config index 1d77481d..37ea2a1f 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -317,6 +317,7 @@ params { mito_name = "chrM" macs_gsize = "1.87e9" blacklist = "${projectDir}/assets/blacklists/mm10-blacklist.bed" + uniqmap = "http://homer.ucsd.edu/homer/data/uniqmap/uniqmap.mm10.50nt.zip" } 'bosTau8' { fasta = "${params.igenomes_base}/Bos_taurus/UCSC/bosTau8/Sequence/WholeGenomeFasta/genome.fa" @@ -372,6 +373,7 @@ params { bed12 = "${params.igenomes_base}/Drosophila_melanogaster/UCSC/dm6/Annotation/Genes/genes.bed" mito_name = "chrM" macs_gsize = "1.2e8" + uniqmap = "http://homer.ucsd.edu/homer/data/uniqmap/uniqmap.dm6.50nt.zip" } 'equCab2' { fasta = "${params.igenomes_base}/Equus_caballus/UCSC/equCab2/Sequence/WholeGenomeFasta/genome.fa" From 5f46a476ad9dd800fd96355ec5aae831b560729c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 12:21:06 -0600 Subject: [PATCH 199/255] docs(HOMER): Update HOMER documentation and turn off download by default --- docs/usage.md | 47 ++++++++++++++++++++++++++++++++++++++++++++ nextflow_schema.json | 34 +++++++++++++++++++++++++------- 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/docs/usage.md b/docs/usage.md index 72d0c0dd..bb17c656 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -118,6 +118,53 @@ For example if you have indentified that the best parameters for your data are 1 } ``` +### Homer + +HOMER is used for transcript identification when the `assay_type` is set to `GROseq`. HOMER's GRO-seq analysis capabilities include: + +- De novo transcript identification from GRO-seq data +- Support for analyzing nascent RNA production +- Detection of various RNA species including: + - Protein coding transcripts + - Promoter anti-sense transcripts + - Enhancer templated transcripts (eRNAs) + - Long and short non-coding RNAs + - miRNA transcripts + - Pol III and Pol I transcripts + +HOMER uses uniquely mappable regions to improve transcript detection in repetitive regions. The pipeline can automatically download the appropriate uniqmap files for supported genomes: + +- Human: hg19, hg38 +- Mouse: mm10 +- Fly: dm6 + +**This setting is off by default** + +To find the full list of uniqmaps supplied by the author check http://homer.ucsd.edu/homer/data/uniqmap/. + +The transcript detection algorithm: + +1. Tracks along each strand looking for continuous GRO-seq signal +2. Starts transcripts when encountering high read density +3. Stops transcripts when signal decreases significantly +4. Creates new transcripts when signal increases sustainably +5. Filters out artifactual spikes that don't extend over distance + +Key parameters that can be tuned: + +- tssFold: Fold change required at transcript start (default: 4) +- bodyFold: Fold change required in transcript body (default: 3) +- minBodySize: Minimum transcript body size (default: 600bp) +- maxBodySize: Maximum transcript body size (default: 10000bp) + +```nextflow +withName: HOMER_FINDPEAKS { + ext.args = "-style groseq -tssFold 4 -bodyFold 3" +} +``` + +For more info check the [Homer GRO-seq Tutorial](http://homer.ucsd.edu/homer/ngs/groseq/groseq.html). + ## Running the pipeline The typical command for running the pipeline is as follows: diff --git a/nextflow_schema.json b/nextflow_schema.json index 0e82de2b..21753aad 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -10,7 +10,10 @@ "type": "object", "fa_icon": "fas fa-terminal", "description": "Define where the pipeline should find input data and save output data.", - "required": ["input", "outdir"], + "required": [ + "input", + "outdir" + ], "properties": { "input": { "type": "string", @@ -53,7 +56,14 @@ "type": "string", "default": "bwa", "fa_icon": "fas fa-puzzle-piece", - "enum": ["bwa", "bwamem2", "dragmap", "bowtie2", "hisat2", "star"], + "enum": [ + "bwa", + "bwamem2", + "dragmap", + "bowtie2", + "hisat2", + "star" + ], "description": "Specify aligner to be used to map reads to reference genome." }, "skip_alignment": { @@ -117,13 +127,13 @@ "R2_3" ] }, - "use_homer_uniqmap": { "type": "boolean", "description": "Use HOMER uniqmap for transcript identification.", "fa_icon": "fas fa-dna", "help_text": "Enable this to use HOMER's uniqmap functionality for more accurate transcript identification in repetitive regions.", - "default": false + "default": false, + "hidden": true }, "skip_grohmm": { "type": "boolean", @@ -172,7 +182,9 @@ "help_text": "Histone Modifications(H3K4me1 and H3K27ac), or known TREs from the PINTS element matrix are examples" } }, - "required": ["assay_type"], + "required": [ + "assay_type" + ], "fa_icon": "fas fa-microscope" }, "reference_genome_options": { @@ -266,7 +278,8 @@ "type": "string", "description": "Path to HOMER uniqmap file or URL to download.", "fa_icon": "fas fa-file-archive", - "help_text": "> **NB** If none provided, will be downloaded automatically from the HOMER website. See nf-core/references for generation" + "help_text": "> **NB** If none provided, will be downloaded automatically from the HOMER website. See nf-core/references for generation", + "hidden": true }, "save_reference": { "type": "boolean", @@ -365,7 +378,14 @@ "description": "Method used to save pipeline results to output directory.", "help_text": "The Nextflow `publishDir` option specifies which intermediate files should be saved to the output directory. This option tells the pipeline what method should be used to move these files. See [Nextflow docs](https://www.nextflow.io/docs/latest/process.html#publishdir) for details.", "fa_icon": "fas fa-copy", - "enum": ["symlink", "rellink", "link", "copy", "copyNoFollow", "move"], + "enum": [ + "symlink", + "rellink", + "link", + "copy", + "copyNoFollow", + "move" + ], "hidden": true }, "email_on_fail": { From b991a8399a335b9c647d0b655c2c4d50a274754d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 20:41:58 -0600 Subject: [PATCH 200/255] docs: Add mention of Functional-Genomics-Lab/homer-uniqmap-nf --- docs/usage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usage.md b/docs/usage.md index bb17c656..5713c091 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -140,7 +140,7 @@ HOMER uses uniquely mappable regions to improve transcript detection in repetiti **This setting is off by default** -To find the full list of uniqmaps supplied by the author check http://homer.ucsd.edu/homer/data/uniqmap/. +To find the full list of uniqmaps supplied by the author check http://homer.ucsd.edu/homer/data/uniqmap/. To build a uniqmap for a genome that isn't supported, check out [homer-uniqmap-nf](https://github.com/Functional-Genomics-Lab/homer-uniqmap-nf). The transcript detection algorithm: From 38b36b37a9f610d6ebd2f442a1f5b8f6ae6139fa Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 20:45:58 -0600 Subject: [PATCH 201/255] style: Run prettier --- nextflow_schema.json | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/nextflow_schema.json b/nextflow_schema.json index 21753aad..4e7d64d9 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -10,10 +10,7 @@ "type": "object", "fa_icon": "fas fa-terminal", "description": "Define where the pipeline should find input data and save output data.", - "required": [ - "input", - "outdir" - ], + "required": ["input", "outdir"], "properties": { "input": { "type": "string", @@ -56,14 +53,7 @@ "type": "string", "default": "bwa", "fa_icon": "fas fa-puzzle-piece", - "enum": [ - "bwa", - "bwamem2", - "dragmap", - "bowtie2", - "hisat2", - "star" - ], + "enum": ["bwa", "bwamem2", "dragmap", "bowtie2", "hisat2", "star"], "description": "Specify aligner to be used to map reads to reference genome." }, "skip_alignment": { @@ -182,9 +172,7 @@ "help_text": "Histone Modifications(H3K4me1 and H3K27ac), or known TREs from the PINTS element matrix are examples" } }, - "required": [ - "assay_type" - ], + "required": ["assay_type"], "fa_icon": "fas fa-microscope" }, "reference_genome_options": { @@ -378,14 +366,7 @@ "description": "Method used to save pipeline results to output directory.", "help_text": "The Nextflow `publishDir` option specifies which intermediate files should be saved to the output directory. This option tells the pipeline what method should be used to move these files. See [Nextflow docs](https://www.nextflow.io/docs/latest/process.html#publishdir) for details.", "fa_icon": "fas fa-copy", - "enum": [ - "symlink", - "rellink", - "link", - "copy", - "copyNoFollow", - "move" - ], + "enum": ["symlink", "rellink", "link", "copy", "copyNoFollow", "move"], "hidden": true }, "email_on_fail": { From 9f5a2cc1e99a8d9131064c4bbf71e028bcc4e5e5 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 20:46:52 -0600 Subject: [PATCH 202/255] chore: Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2c4bd5f..9b63b023 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#140](https://github.com/nf-core/nascent/pull/140) - Add HISAT2 aligner - [#142](https://github.com/nf-core/nascent/pull/142) - Add STAR aligner - [#149](https://github.com/nf-core/nascent/pull/149) - Add Software citations to MultiQC +- [#175](https://github.com/nf-core/nascent/pull/175) - Add HOMER uniqmap support ### Fixed From 739109a69ab92eee0e361321f3f61dee144d326a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 21 Nov 2024 20:47:20 -0600 Subject: [PATCH 203/255] chore: Remove second Fixed --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b63b023..35b04775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - [#171](https://github.com/nf-core/nascent/pull/171) - Clean up MultiQC report +- [#170](https://github.com/nf-core/nascent/pull/170) - Remove "Access to undefined parameter forwardStranded" warnings ### Changed @@ -26,10 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#165](https://github.com/nf-core/nascent/pull/165) - groHMM overhaul. Removed R mclapply calls and replaced with Nextflow scatter gather for parameter tuning. This creates a job for each parameter set. - [#174](https://github.com/nf-core/nascent/pull/174) - PINTS Scatter gather pattern by chromosome -### Fixed - -- [#170](https://github.com/nf-core/nascent/pull/170) - Remove "Access to undefined parameter forwardStranded" warnings - ### Removed - [[#165](https://github.com/nf-core/nascent/pull/165)] - Removed support for groHMM tuning files. From 1af617e3fa0ea9c39287a63408ccf2359de8dcdb Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 22 Nov 2024 22:17:51 -0600 Subject: [PATCH 204/255] fix: Update prefix if using uniqmap --- modules/nf-core/homer/findpeaks/main.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nf-core/homer/findpeaks/main.nf b/modules/nf-core/homer/findpeaks/main.nf index 63891500..aa655699 100644 --- a/modules/nf-core/homer/findpeaks/main.nf +++ b/modules/nf-core/homer/findpeaks/main.nf @@ -21,7 +21,7 @@ process HOMER_FINDPEAKS { script: def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" + def prefix = task.ext.prefix ?: uniqmap ? "${meta.id}-${uniqmap.baseName}" : "${meta.id}" def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. def uniqmap_flag = uniqmap ? "-uniqmap $uniqmap" : "" """ From 21376f385f5bf9b026a6e7c9fc28e82a375f60b0 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 25 Nov 2024 19:53:25 -0600 Subject: [PATCH 205/255] chore: Bump homer/groseq => homer_groseq --- modules.json | 23 ++- .../nf-core/homer/findpeaks/environment.yml | 10 +- .../homer/findpeaks/homer-findpeaks.diff | 36 ----- modules/nf-core/homer/findpeaks/main.nf | 32 ++-- modules/nf-core/homer/findpeaks/meta.yml | 50 ++++--- .../homer/findpeaks/tests/main.nf.test | 9 +- .../homer/findpeaks/tests/main.nf.test.snap | 6 +- .../homer/maketagdirectory/environment.yml | 13 +- .../nf-core/homer/maketagdirectory/main.nf | 47 ++++-- .../nf-core/homer/maketagdirectory/meta.yml | 66 +++++---- .../maketagdirectory/tests/main.nf.test.snap | 54 +++---- .../homer/makeucscfile/environment.yml | 10 +- modules/nf-core/homer/makeucscfile/main.nf | 35 +++-- modules/nf-core/homer/makeucscfile/meta.yml | 43 +++--- .../homer/makeucscfile/tests/main.nf.test | 73 +++++++++ .../makeucscfile/tests/main.nf.test.snap | 64 ++++++++ .../homer/makeucscfile/tests/nextflow.config | 5 + modules/nf-core/homer/pos2bed/environment.yml | 8 +- modules/nf-core/homer/pos2bed/main.nf | 33 +++-- modules/nf-core/homer/pos2bed/meta.yml | 42 +++--- .../nf-core/homer/pos2bed/tests/main.nf.test | 3 +- .../homer/pos2bed/tests/main.nf.test.snap | 6 +- .../local/transcript_identification/main.nf | 2 +- .../{homer/groseq => homer_groseq}/main.nf | 20 +-- .../{homer/groseq => homer_groseq}/meta.yml | 19 +-- .../nf-core/homer_groseq/tests/bed.config | 5 + .../nf-core/homer_groseq/tests/main.nf.test | 139 +++++++++++++++++ .../homer_groseq/tests/main.nf.test.snap | 140 ++++++++++++++++++ workflows/tests/aligner/bowtie2.nf.test.snap | 6 +- workflows/tests/aligner/bwa.nf.test.snap | 16 +- workflows/tests/aligner/bwamem2.nf.test.snap | 6 +- workflows/tests/aligner/dragmap.nf.test.snap | 2 +- workflows/tests/aligner/hisat2.nf.test.snap | 6 +- workflows/tests/aligner/star.nf.test.snap | 16 +- workflows/tests/inputs/gff/main.nf.test.snap | 6 +- .../inputs/gzipped_gff/main.nf.test.snap | 6 +- .../tests/inputs/only_gff/main.nf.test.snap | 6 +- .../grohmm/only_gff/main.nf.test.snap | 6 +- .../grohmm/tuning/main.nf.test.snap | 6 +- 39 files changed, 775 insertions(+), 300 deletions(-) delete mode 100644 modules/nf-core/homer/findpeaks/homer-findpeaks.diff create mode 100644 modules/nf-core/homer/makeucscfile/tests/main.nf.test create mode 100644 modules/nf-core/homer/makeucscfile/tests/main.nf.test.snap create mode 100644 modules/nf-core/homer/makeucscfile/tests/nextflow.config rename subworkflows/nf-core/{homer/groseq => homer_groseq}/main.nf (70%) rename subworkflows/nf-core/{homer/groseq => homer_groseq}/meta.yml (69%) create mode 100644 subworkflows/nf-core/homer_groseq/tests/bed.config create mode 100644 subworkflows/nf-core/homer_groseq/tests/main.nf.test create mode 100644 subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap diff --git a/modules.json b/modules.json index 839f2748..fe81c8d6 100644 --- a/modules.json +++ b/modules.json @@ -125,24 +125,23 @@ }, "homer/findpeaks": { "branch": "master", - "git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08", - "installed_by": ["homer/groseq"], - "patch": "modules/nf-core/homer/findpeaks/homer-findpeaks.diff" + "git_sha": "b108745a1d59778e21577c217a963e17b8ba9bc2", + "installed_by": ["homer_groseq"] }, "homer/maketagdirectory": { "branch": "master", - "git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08", - "installed_by": ["homer/groseq"] + "git_sha": "b108745a1d59778e21577c217a963e17b8ba9bc2", + "installed_by": ["homer_groseq"] }, "homer/makeucscfile": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", - "installed_by": ["homer/groseq"] + "git_sha": "b108745a1d59778e21577c217a963e17b8ba9bc2", + "installed_by": ["homer_groseq"] }, "homer/pos2bed": { "branch": "master", - "git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08", - "installed_by": ["homer/groseq"] + "git_sha": "b108745a1d59778e21577c217a963e17b8ba9bc2", + "installed_by": ["homer_groseq"] }, "multiqc": { "branch": "master", @@ -263,7 +262,7 @@ "unzip": { "branch": "master", "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", - "installed_by": ["homer/groseq"] + "installed_by": ["homer_groseq"] } } }, @@ -314,9 +313,9 @@ "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", "installed_by": ["subworkflows"] }, - "homer/groseq": { + "homer_groseq": { "branch": "master", - "git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83", + "git_sha": "b108745a1d59778e21577c217a963e17b8ba9bc2", "installed_by": ["subworkflows"] }, "utils_nextflow_pipeline": { diff --git a/modules/nf-core/homer/findpeaks/environment.yml b/modules/nf-core/homer/findpeaks/environment.yml index a5766cfb..05b3acf2 100644 --- a/modules/nf-core/homer/findpeaks/environment.yml +++ b/modules/nf-core/homer/findpeaks/environment.yml @@ -1,7 +1,11 @@ -name: homer_findpeaks channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::homer=4.11=pl526hc9558a2_3 + - bioconda::bioconductor-deseq2=1.42.0 + - bioconda::bioconductor-edger=4.0.16 + # renovate: datasource=conda depName=bioconda/homer + - bioconda::homer=4.11 + - bioconda::samtools=1.21 + - conda-forge::r-essentials=4.3 + - conda-forge::wget=1.21.4 diff --git a/modules/nf-core/homer/findpeaks/homer-findpeaks.diff b/modules/nf-core/homer/findpeaks/homer-findpeaks.diff deleted file mode 100644 index 88ee1838..00000000 --- a/modules/nf-core/homer/findpeaks/homer-findpeaks.diff +++ /dev/null @@ -1,36 +0,0 @@ -Changes in module 'nf-core/homer/findpeaks' -'modules/nf-core/homer/findpeaks/environment.yml' is unchanged -'modules/nf-core/homer/findpeaks/meta.yml' is unchanged -Changes in 'homer/findpeaks/main.nf': ---- modules/nf-core/homer/findpeaks/main.nf -+++ modules/nf-core/homer/findpeaks/main.nf -@@ -10,6 +10,7 @@ - - input: - tuple val(meta), path(tagDir) -+ path uniqmap // optional - - output: - tuple val(meta), path("*.peaks.txt"), emit: txt -@@ -22,12 +23,14 @@ - def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. -+ def uniqmap_flag = uniqmap ? "-uniqmap $uniqmap" : "" - """ - - findPeaks \\ - $tagDir \\ - $args \\ -- -o ${prefix}.peaks.txt -+ -o ${prefix}.peaks.txt \\ -+ $uniqmap_flag - - cat <<-END_VERSIONS > versions.yml - "${task.process}": - -'modules/nf-core/homer/findpeaks/tests/main.nf.test.snap' is unchanged -'modules/nf-core/homer/findpeaks/tests/tags.yml' is unchanged -'modules/nf-core/homer/findpeaks/tests/nextflow.config' is unchanged -'modules/nf-core/homer/findpeaks/tests/main.nf.test' is unchanged -************************************************************ diff --git a/modules/nf-core/homer/findpeaks/main.nf b/modules/nf-core/homer/findpeaks/main.nf index aa655699..f9a5c78b 100644 --- a/modules/nf-core/homer/findpeaks/main.nf +++ b/modules/nf-core/homer/findpeaks/main.nf @@ -1,20 +1,18 @@ process HOMER_FINDPEAKS { - tag "$meta.id" + tag "${meta.id}" label 'process_medium' - - // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions. conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : - 'biocontainers/homer:4.11--pl526hc9558a2_3' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/0f/0fe4a3875b78dce3c66b43fb96489769cc32e55e329e2525d2af09096af2252a/data' + : 'community.wave.seqera.io/library/bioconductor-deseq2_bioconductor-edger_homer_samtools_pruned:a8f4c58755bb281b'}" input: tuple val(meta), path(tagDir) - path uniqmap // optional + path uniqmap output: tuple val(meta), path("*.peaks.txt"), emit: txt - path "versions.yml" , emit: versions + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when @@ -22,32 +20,34 @@ process HOMER_FINDPEAKS { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: uniqmap ? "${meta.id}-${uniqmap.baseName}" : "${meta.id}" - def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. - def uniqmap_flag = uniqmap ? "-uniqmap $uniqmap" : "" + def uniqmap_flag = uniqmap ? "-uniqmap ${uniqmap}" : "" + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. """ findPeaks \\ - $tagDir \\ - $args \\ + ${tagDir} \\ + ${args} \\ -o ${prefix}.peaks.txt \\ - $uniqmap_flag + ${uniqmap_flag} cat <<-END_VERSIONS > versions.yml "${task.process}": - homer: $VERSION + homer: ${VERSION} END_VERSIONS """ stub: def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. """ touch ${prefix}.peaks.txt cat <<-END_VERSIONS > versions.yml "${task.process}": - homer: $VERSION + homer: ${VERSION} END_VERSIONS """ } diff --git a/modules/nf-core/homer/findpeaks/meta.yml b/modules/nf-core/homer/findpeaks/meta.yml index 286032c3..3b149dd9 100644 --- a/modules/nf-core/homer/findpeaks/meta.yml +++ b/modules/nf-core/homer/findpeaks/meta.yml @@ -13,30 +13,38 @@ tools: tool_dev_url: "http://homer.ucsd.edu/homer/ngs/peaks.html" doi: 10.1016/j.molcel.2010.05.004. licence: ["GPL-3.0-or-later"] + identifier: biotools:homer input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - tagDir: - type: directory - description: "The 'Tag Directory'" - pattern: "tagDir" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - tagDir: + type: directory + description: "The 'Tag Directory'" + pattern: "tagDir" + - - uniqmap: + type: directory + description: "(directory of binary files specifying uniquely mappable locations) + Download from http://biowhat.ucsd.edu/homer/groseq/" + pattern: "uniqmap/" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - peaks: - type: file - description: The found peaks - pattern: "*.peaks.txt" + - txt: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.peaks.txt": + type: file + description: "Peaks in txt file" + pattern: "*.peaks.txt" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@edmundmiller" maintainers: diff --git a/modules/nf-core/homer/findpeaks/tests/main.nf.test b/modules/nf-core/homer/findpeaks/tests/main.nf.test index 4f7e100f..a2263990 100644 --- a/modules/nf-core/homer/findpeaks/tests/main.nf.test +++ b/modules/nf-core/homer/findpeaks/tests/main.nf.test @@ -27,7 +27,6 @@ nextflow_process { """ } } - } test("sarscov2 - tagdir") { @@ -36,6 +35,7 @@ nextflow_process { process { """ input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + input[1] = [] """ } } @@ -57,6 +57,7 @@ nextflow_process { process { """ input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + input[1] = [] """ } } @@ -67,7 +68,7 @@ nextflow_process { { assert snapshot(process.out).match("stub") } ) } - } - -} + // TODO Test uniqmap. Might need to make a small uniqmap but that could take a day or two. + // See https://github.com/Functional-Genomics-Lab/homer-uniqmap-nf if you're feeling adventurous! +} \ No newline at end of file diff --git a/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap b/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap index 05b9c786..e2a44d5b 100644 --- a/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap +++ b/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap @@ -27,10 +27,10 @@ } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.03.0" + "nf-test": "0.9.2", + "nextflow": "24.10.1" }, - "timestamp": "2024-05-17T13:57:52.208349083" + "timestamp": "2024-11-23T14:32:17.860543" }, "tagdir": { "content": [ diff --git a/modules/nf-core/homer/maketagdirectory/environment.yml b/modules/nf-core/homer/maketagdirectory/environment.yml index c3ad2cc9..05b3acf2 100644 --- a/modules/nf-core/homer/maketagdirectory/environment.yml +++ b/modules/nf-core/homer/maketagdirectory/environment.yml @@ -1,12 +1,11 @@ -name: homer_maketagdirectory channels: - conda-forge - bioconda - - defaults dependencies: + - bioconda::bioconductor-deseq2=1.42.0 + - bioconda::bioconductor-edger=4.0.16 + # renovate: datasource=conda depName=bioconda/homer - bioconda::homer=4.11 - - bioconda::samtools=1.11 - - conda-forge::r-base=4.0.2 - - bioconda::bioconductor-deseq2=1.30.0 - - bioconda::bioconductor-edger=3.32.0 - - conda-forge::perl=5.26.2 + - bioconda::samtools=1.21 + - conda-forge::r-essentials=4.3 + - conda-forge::wget=1.21.4 diff --git a/modules/nf-core/homer/maketagdirectory/main.nf b/modules/nf-core/homer/maketagdirectory/main.nf index e70b31b3..8d662a68 100644 --- a/modules/nf-core/homer/maketagdirectory/main.nf +++ b/modules/nf-core/homer/maketagdirectory/main.nf @@ -1,22 +1,19 @@ - process HOMER_MAKETAGDIRECTORY { - tag "$meta.id" + tag "${meta.id}" label 'process_medium' - - // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions. conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-29293b111ffe5b4c1d1e14c711264aaed6b97b4a:594338b771cacf1623bd27772b5e12825f8835f2-0' : - 'biocontainers/mulled-v2-29293b111ffe5b4c1d1e14c711264aaed6b97b4a:594338b771cacf1623bd27772b5e12825f8835f2-0' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/0f/0fe4a3875b78dce3c66b43fb96489769cc32e55e329e2525d2af09096af2252a/data' + : 'community.wave.seqera.io/library/bioconductor-deseq2_bioconductor-edger_homer_samtools_pruned:a8f4c58755bb281b'}" input: tuple val(meta), path(bam) path fasta output: - tuple val(meta), path("*_tagdir") , emit: tagdir + tuple val(meta), path("*_tagdir"), emit: tagdir tuple val(meta), path("*_tagdir/tagInfo.txt"), emit: taginfo - path "versions.yml" , emit: versions + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when @@ -24,17 +21,39 @@ process HOMER_MAKETAGDIRECTORY { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. """ makeTagDirectory \\ ${prefix}_tagdir \\ - -genome $fasta \\ - $args \\ - $bam + -genome ${fasta} \\ + ${args} \\ + ${bam} + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: ${VERSION} + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + + """ + mkdir ${prefix}_tagdir/ + + touch ${prefix}_tagdir/${fasta.baseName}.1.tags.tsv + touch ${prefix}_tagdir/tagAutocorrelation.txt + touch ${prefix}_tagdir/tagCountDistribution.txt + touch ${prefix}_tagdir/tagInfo.txt + touch ${prefix}_tagdir/tagLengthDistribution.txt cat <<-END_VERSIONS > versions.yml "${task.process}": - homer: $VERSION + homer: ${VERSION} samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') END_VERSIONS """ diff --git a/modules/nf-core/homer/maketagdirectory/meta.yml b/modules/nf-core/homer/maketagdirectory/meta.yml index 8b240411..1e3b9c45 100644 --- a/modules/nf-core/homer/maketagdirectory/meta.yml +++ b/modules/nf-core/homer/maketagdirectory/meta.yml @@ -12,6 +12,7 @@ tools: documentation: http://homer.ucsd.edu/homer/ doi: 10.1016/j.molcel.2010.05.004. licence: ["GPL-3.0-or-later"] + identifier: biotools:homer - samtools: description: | SAMtools is a set of utilities for interacting with and post-processing @@ -21,6 +22,7 @@ tools: documentation: http://www.htslib.org/doc/samtools.html doi: 10.1093/bioinformatics/btp352 licence: ["MIT"] + identifier: biotools:homer - DESeq2: description: | Differential gene expression analysis based on the negative binomial distribution @@ -29,6 +31,7 @@ tools: tool_dev_url: "https://github.com/mikelove/DESeq2" doi: 10.18129/B9.bioc.DESeq2 licence: ["LGPL-3.0-or-later"] + identifier: biotools:homer - edgeR: description: | Empirical Analysis of Digital Gene Expression Data in R @@ -37,38 +40,47 @@ tools: tool_dev_url: "https://git.bioconductor.org/packages/edgeR" doi: 10.18129/B9.bioc.edgeR licence: ["GPL >=2"] + identifier: biotools:homer input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - bam: - type: file - description: BAM/BED/SAM file - pattern: "*.{bam,bed,sam}" - - fasta: - type: file - description: Fasta file of reference genome - pattern: "*.fasta" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: BAM/BED/SAM file + pattern: "*.{bam,bed,sam}" + - - fasta: + type: file + description: Fasta file of reference genome + pattern: "*.fasta" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - tagdir: - type: directory - description: The "Tag Directory" - pattern: "*_tagdir" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*_tagdir": + type: directory + description: The "Tag Directory" + pattern: "*_tagdir" - taginfo: - type: directory - description: The tagInfo.txt included to ensure there's proper output - pattern: "*_tagdir/tagInfo.txt" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*_tagdir/tagInfo.txt": + type: directory + description: The tagInfo.txt included to ensure there's proper output + pattern: "*_tagdir/tagInfo.txt" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@edmundmiller" maintainers: diff --git a/modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap b/modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap index 72349e22..7b5d34b2 100644 --- a/modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap +++ b/modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap @@ -25,7 +25,7 @@ ] ], "2": [ - "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + "versions.yml:md5,c147699f0ed05149779e085eca4e16c9" ], "tagdir": [ [ @@ -50,15 +50,15 @@ ] ], "versions": [ - "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + "versions.yml:md5,c147699f0ed05149779e085eca4e16c9" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.03.0" + "nf-test": "0.9.2", + "nextflow": "24.10.1" }, - "timestamp": "2024-05-17T14:25:33.3566233" + "timestamp": "2024-11-23T20:09:27.816027" }, "stub": { "content": [ @@ -69,11 +69,11 @@ "id": "test" }, [ - "MT192765.1.tags.tsv:md5,e29522171ca2169b57396495f8b97485", - "tagAutocorrelation.txt:md5,62b107c4971b94126fb89a0bc2800455", - "tagCountDistribution.txt:md5,fd4ee7ce7c5dfd7c9d739534b8180578", - "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e", - "tagLengthDistribution.txt:md5,e5aa2b9843ca9c04ace297280aed6af4" + "genome.1.tags.tsv:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagAutocorrelation.txt:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagCountDistribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagInfo.txt:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagLengthDistribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ] ], @@ -82,11 +82,11 @@ { "id": "test" }, - "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e" + "tagInfo.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], "2": [ - "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + "versions.yml:md5,c147699f0ed05149779e085eca4e16c9" ], "tagdir": [ [ @@ -94,11 +94,11 @@ "id": "test" }, [ - "MT192765.1.tags.tsv:md5,e29522171ca2169b57396495f8b97485", - "tagAutocorrelation.txt:md5,62b107c4971b94126fb89a0bc2800455", - "tagCountDistribution.txt:md5,fd4ee7ce7c5dfd7c9d739534b8180578", - "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e", - "tagLengthDistribution.txt:md5,e5aa2b9843ca9c04ace297280aed6af4" + "genome.1.tags.tsv:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagAutocorrelation.txt:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagCountDistribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagInfo.txt:md5,d41d8cd98f00b204e9800998ecf8427e", + "tagLengthDistribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ] ], @@ -107,19 +107,19 @@ { "id": "test" }, - "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e" + "tagInfo.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], "versions": [ - "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + "versions.yml:md5,c147699f0ed05149779e085eca4e16c9" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.03.0" + "nf-test": "0.9.2", + "nextflow": "24.10.1" }, - "timestamp": "2024-05-17T14:25:52.525282663" + "timestamp": "2024-11-23T20:30:59.036543" }, "bam": { "content": [ @@ -147,7 +147,7 @@ ] ], "2": [ - "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + "versions.yml:md5,c147699f0ed05149779e085eca4e16c9" ], "tagdir": [ [ @@ -172,14 +172,14 @@ ] ], "versions": [ - "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + "versions.yml:md5,c147699f0ed05149779e085eca4e16c9" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.03.0" + "nf-test": "0.9.2", + "nextflow": "24.10.1" }, - "timestamp": "2024-05-17T14:28:11.567501705" + "timestamp": "2024-11-23T20:09:32.164517" } } \ No newline at end of file diff --git a/modules/nf-core/homer/makeucscfile/environment.yml b/modules/nf-core/homer/makeucscfile/environment.yml index 79963b34..05b3acf2 100644 --- a/modules/nf-core/homer/makeucscfile/environment.yml +++ b/modules/nf-core/homer/makeucscfile/environment.yml @@ -1,7 +1,11 @@ -name: homer_makeucscfile channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::homer=4.11=pl526hc9558a2_3 + - bioconda::bioconductor-deseq2=1.42.0 + - bioconda::bioconductor-edger=4.0.16 + # renovate: datasource=conda depName=bioconda/homer + - bioconda::homer=4.11 + - bioconda::samtools=1.21 + - conda-forge::r-essentials=4.3 + - conda-forge::wget=1.21.4 diff --git a/modules/nf-core/homer/makeucscfile/main.nf b/modules/nf-core/homer/makeucscfile/main.nf index 113d051d..b1f19334 100644 --- a/modules/nf-core/homer/makeucscfile/main.nf +++ b/modules/nf-core/homer/makeucscfile/main.nf @@ -1,19 +1,17 @@ process HOMER_MAKEUCSCFILE { - tag "$meta.id" + tag "${meta.id}" label 'process_medium' - - // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions. conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : - 'biocontainers/homer:4.11--pl526hc9558a2_3' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/0f/0fe4a3875b78dce3c66b43fb96489769cc32e55e329e2525d2af09096af2252a/data' + : 'community.wave.seqera.io/library/bioconductor-deseq2_bioconductor-edger_homer_samtools_pruned:a8f4c58755bb281b'}" input: tuple val(meta), path(tagDir) output: tuple val(meta), path("*.bedGraph.gz"), emit: bedGraph - path "versions.yml" , emit: versions + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when @@ -21,16 +19,31 @@ process HOMER_MAKEUCSCFILE { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. """ makeUCSCfile \\ - $tagDir \\ + ${tagDir} \\ -o ${prefix}.bedGraph \\ - $args + ${args} + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: ${VERSION} + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + + """ + echo '' | gzip > ${prefix}.bedGraph.gz cat <<-END_VERSIONS > versions.yml "${task.process}": - homer: $VERSION + homer: ${VERSION} END_VERSIONS """ } diff --git a/modules/nf-core/homer/makeucscfile/meta.yml b/modules/nf-core/homer/makeucscfile/meta.yml index 808c310f..6271f466 100644 --- a/modules/nf-core/homer/makeucscfile/meta.yml +++ b/modules/nf-core/homer/makeucscfile/meta.yml @@ -11,30 +11,33 @@ tools: documentation: http://homer.ucsd.edu/homer/ doi: 10.1016/j.molcel.2010.05.004. licence: ["GPL-3.0-or-later"] + identifier: biotools:homer input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - tagDir: - type: directory - description: "The 'Tag Directory'" - pattern: "tagDir" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - tagDir: + type: directory + description: "The 'Tag Directory'" + pattern: "tagDir" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - bedGraph: - type: file - description: The UCSC bed graph - pattern: "*.bedGraph.gz" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.bedGraph.gz": + type: file + description: The UCSC bed graph + pattern: "*.bedGraph.gz" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@edmundmiller" maintainers: diff --git a/modules/nf-core/homer/makeucscfile/tests/main.nf.test b/modules/nf-core/homer/makeucscfile/tests/main.nf.test new file mode 100644 index 00000000..fd46eceb --- /dev/null +++ b/modules/nf-core/homer/makeucscfile/tests/main.nf.test @@ -0,0 +1,73 @@ +nextflow_process { + + name "Test Process HOMER_MAKEUCSCFILE" + script "../main.nf" + process "HOMER_MAKEUCSCFILE" + config "./nextflow.config" + + tag "modules" + tag "modules_nfcore" + tag "homer" + tag "homer/maketagdirectory" + tag "homer/makeucscfile" + + setup { + run("HOMER_MAKETAGDIRECTORY") { + script "../../maketagdirectory/main.nf" + process { + """ + input[0] = [ + [ id:'test' ], + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test2.bed', checkIfExists: true) + ] + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + """ + } + } + } + + test("sarscov2 - tagdir") { + when { + process { + """ + input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + path(process.out.bedGraph.get(0).get(1)).linesGzip.size(), + path(process.out.versions.get(0)).yaml, + ).match() }, + ) + } + + } + + test("sarscov2 - tagdir - stub") { + + options "-stub" + + when { + process { + """ + input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("stub") }, + { assert snapshot(path(process.out.versions.get(0)).yaml).match("versions") }, + ) + } + } +} \ No newline at end of file diff --git a/modules/nf-core/homer/makeucscfile/tests/main.nf.test.snap b/modules/nf-core/homer/makeucscfile/tests/main.nf.test.snap new file mode 100644 index 00000000..c91320af --- /dev/null +++ b/modules/nf-core/homer/makeucscfile/tests/main.nf.test.snap @@ -0,0 +1,64 @@ +{ + "versions": { + "content": [ + { + "HOMER_MAKEUCSCFILE": { + "homer": 4.11 + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-23T19:29:43.020205" + }, + "stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.bedGraph.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "1": [ + "versions.yml:md5,4862e2509d79cb95bb017bd165df3a8b" + ], + "bedGraph": [ + [ + { + "id": "test" + }, + "test.bedGraph.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "versions": [ + "versions.yml:md5,4862e2509d79cb95bb017bd165df3a8b" + ] + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-23T20:31:10.555894" + }, + "sarscov2 - tagdir": { + "content": [ + 12, + { + "HOMER_MAKEUCSCFILE": { + "homer": 4.11 + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-24T15:35:00.00909" + } +} \ No newline at end of file diff --git a/modules/nf-core/homer/makeucscfile/tests/nextflow.config b/modules/nf-core/homer/makeucscfile/tests/nextflow.config new file mode 100644 index 00000000..9d683050 --- /dev/null +++ b/modules/nf-core/homer/makeucscfile/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: HOMER_MAKETAGDIRECTORY { + ext.args = '-format bed' + } +} diff --git a/modules/nf-core/homer/pos2bed/environment.yml b/modules/nf-core/homer/pos2bed/environment.yml index 94ed9904..05b3acf2 100644 --- a/modules/nf-core/homer/pos2bed/environment.yml +++ b/modules/nf-core/homer/pos2bed/environment.yml @@ -1,7 +1,11 @@ -name: homer_pos2bed channels: - conda-forge - bioconda - - defaults dependencies: + - bioconda::bioconductor-deseq2=1.42.0 + - bioconda::bioconductor-edger=4.0.16 + # renovate: datasource=conda depName=bioconda/homer - bioconda::homer=4.11 + - bioconda::samtools=1.21 + - conda-forge::r-essentials=4.3 + - conda-forge::wget=1.21.4 diff --git a/modules/nf-core/homer/pos2bed/main.nf b/modules/nf-core/homer/pos2bed/main.nf index 467a06d7..84d48243 100644 --- a/modules/nf-core/homer/pos2bed/main.nf +++ b/modules/nf-core/homer/pos2bed/main.nf @@ -1,19 +1,17 @@ process HOMER_POS2BED { - tag "$meta.id" + tag "${meta.id}" label 'process_medium' - - // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions. conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/homer:4.11--pl526hc9558a2_3' : - 'biocontainers/homer:4.11--pl526hc9558a2_3' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/0f/0fe4a3875b78dce3c66b43fb96489769cc32e55e329e2525d2af09096af2252a/data' + : 'community.wave.seqera.io/library/bioconductor-deseq2_bioconductor-edger_homer_samtools_pruned:a8f4c58755bb281b'}" input: tuple val(meta), path(peaks) output: tuple val(meta), path("*.bed"), emit: bed - path "versions.yml" , emit: versions + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when @@ -21,13 +19,28 @@ process HOMER_POS2BED { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + """ + pos2bed.pl ${peaks} > ${prefix}.bed + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: ${VERSION} + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' + // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + """ - pos2bed.pl $peaks > ${prefix}.bed + touch ${prefix}.bed cat <<-END_VERSIONS > versions.yml "${task.process}": - homer: $VERSION + homer: ${VERSION} END_VERSIONS """ } diff --git a/modules/nf-core/homer/pos2bed/meta.yml b/modules/nf-core/homer/pos2bed/meta.yml index f870fa71..5fc5f9b1 100644 --- a/modules/nf-core/homer/pos2bed/meta.yml +++ b/modules/nf-core/homer/pos2bed/meta.yml @@ -13,30 +13,32 @@ tools: tool_dev_url: "http://homer.ucsd.edu/homer/ngs/miscellaneous.html" doi: 10.1016/j.molcel.2010.05.004. licence: ["GPL-3.0-or-later"] + identifier: biotools:homer input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - tagDir: - type: directory - description: "The 'Tag Directory'" - pattern: "tagDir" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - peaks: + type: file + description: Peak file to convert to BED format output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - bed: - type: file - description: BED file - pattern: "*.bed" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.bed": + type: file + description: BED file + pattern: "*.bed" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@edmundmiller" maintainers: diff --git a/modules/nf-core/homer/pos2bed/tests/main.nf.test b/modules/nf-core/homer/pos2bed/tests/main.nf.test index 906d5719..aac8138c 100644 --- a/modules/nf-core/homer/pos2bed/tests/main.nf.test +++ b/modules/nf-core/homer/pos2bed/tests/main.nf.test @@ -34,6 +34,7 @@ nextflow_process { process { """ input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + input[1] = [] """ } } @@ -79,4 +80,4 @@ nextflow_process { } -} +} \ No newline at end of file diff --git a/modules/nf-core/homer/pos2bed/tests/main.nf.test.snap b/modules/nf-core/homer/pos2bed/tests/main.nf.test.snap index 8ae3948e..6cd50051 100644 --- a/modules/nf-core/homer/pos2bed/tests/main.nf.test.snap +++ b/modules/nf-core/homer/pos2bed/tests/main.nf.test.snap @@ -27,10 +27,10 @@ } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.03.0" + "nf-test": "0.9.2", + "nextflow": "24.10.1" }, - "timestamp": "2024-05-17T14:35:47.996620099" + "timestamp": "2024-11-23T14:34:58.855011" }, "peaks": { "content": [ diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index b53f1162..890f5579 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -3,7 +3,7 @@ */ include { GROHMM } from '../grohmm' -include { HOMER_GROSEQ } from '../../nf-core/homer/groseq/main' +include { HOMER_GROSEQ } from '../../nf-core/homer_groseq' include { PINTS_CALLER } from '../../../modules/nf-core/pints/caller/main' include { SAMTOOLS_MERGE } from '../../../modules/nf-core/samtools/merge/main' include { CAT_CAT } from '../../../modules/nf-core/cat/cat/main' diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer_groseq/main.nf similarity index 70% rename from subworkflows/nf-core/homer/groseq/main.nf rename to subworkflows/nf-core/homer_groseq/main.nf index 09f41bde..cd30b98c 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer_groseq/main.nf @@ -2,12 +2,12 @@ * Identify transcripts with homer */ -include { UNZIP } from '../../../../modules/nf-core/unzip/main' +include { UNZIP } from '../../../modules/nf-core/unzip/main' -include { HOMER_MAKETAGDIRECTORY } from '../../../../modules/nf-core/homer/maketagdirectory/main' -include { HOMER_MAKEUCSCFILE } from '../../../../modules/nf-core/homer/makeucscfile/main' -include { HOMER_FINDPEAKS } from '../../../../modules/nf-core/homer/findpeaks/main' -include { HOMER_POS2BED } from '../../../../modules/nf-core/homer/pos2bed/main' +include { HOMER_MAKETAGDIRECTORY } from '../../../modules/nf-core/homer/maketagdirectory/main' +include { HOMER_MAKEUCSCFILE } from '../../../modules/nf-core/homer/makeucscfile/main' +include { HOMER_FINDPEAKS } from '../../../modules/nf-core/homer/findpeaks/main' +include { HOMER_POS2BED } from '../../../modules/nf-core/homer/pos2bed/main' workflow HOMER_GROSEQ { take: @@ -20,11 +20,13 @@ workflow HOMER_GROSEQ { ch_versions = Channel.empty() ch_uniqmap = Channel.empty() + if (!uniqmap) { ch_uniqmap = [] } else if (uniqmap.endsWith('.zip')) { ch_uniqmap = UNZIP([[:], uniqmap]).unzipped_archive.map { it[1] } + ch_versions = ch_versions.mix(UNZIP.out.versions) } else { ch_uniqmap = uniqmap @@ -34,25 +36,25 @@ workflow HOMER_GROSEQ { * Create a Tag Directory From The GRO-Seq experiment */ HOMER_MAKETAGDIRECTORY(bam, fasta) - ch_versions = ch_versions.mix(HOMER_MAKETAGDIRECTORY.out.versions.first()) + ch_versions = ch_versions.mix(HOMER_MAKETAGDIRECTORY.out.versions) /* * Creating UCSC Visualization Files */ HOMER_MAKEUCSCFILE(HOMER_MAKETAGDIRECTORY.out.tagdir) - ch_versions = ch_versions.mix(HOMER_MAKEUCSCFILE.out.versions.first()) + ch_versions = ch_versions.mix(HOMER_MAKEUCSCFILE.out.versions) /* * Find transcripts directly from GRO-Seq */ HOMER_FINDPEAKS(HOMER_MAKETAGDIRECTORY.out.tagdir, ch_uniqmap) - ch_versions = ch_versions.mix(HOMER_FINDPEAKS.out.versions.first()) + ch_versions = ch_versions.mix(HOMER_FINDPEAKS.out.versions) /* * Convert peak file to bed file */ HOMER_POS2BED(HOMER_FINDPEAKS.out.txt) - ch_versions = ch_versions.mix(HOMER_POS2BED.out.versions.first()) + ch_versions = ch_versions.mix(HOMER_POS2BED.out.versions) emit: tagdir = HOMER_MAKETAGDIRECTORY.out.tagdir // channel: [ val(meta), [ tagdir ] ] diff --git a/subworkflows/nf-core/homer/groseq/meta.yml b/subworkflows/nf-core/homer_groseq/meta.yml similarity index 69% rename from subworkflows/nf-core/homer/groseq/meta.yml rename to subworkflows/nf-core/homer_groseq/meta.yml index 11718b7a..fd1db63c 100644 --- a/subworkflows/nf-core/homer/groseq/meta.yml +++ b/subworkflows/nf-core/homer_groseq/meta.yml @@ -1,34 +1,35 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json name: homer_groseq -description: Perform variant calling on a set of normal samples using mutect2 panel of normals mode. Group them into a genomicsdbworkspace using genomicsdbimport, then use this to create a panel of normals using createsomaticpanelofnormals. +description: Basic process of trying to analyze GRO-Seq data with HOMER. From the + [GRO-Seq Analysis Tutorial](http://homer.ucsd.edu/homer/ngs/groseq/groseq.html). keywords: - homer - groseq - nascent components: + - unzip - homer/maketagdirectory - homer/makeucscfile - homer/findpeaks - homer/pos2bed input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test' ] - - input: - type: list + - bam: description: list of BAM files, also able to take SAM and BED as input pattern: "[ *.{bam/sam/bed} ]" - fasta: type: file description: The reference fasta file pattern: "*.fasta" + - uniqmap: + type: file + description: Optional HOMER uniqmap + pattern: "*.zip" output: - tagdir: type: directory description: The "Tag Directory" pattern: "*_tagdir" - - bedGraph: + - bed_graph: type: file description: The UCSC bed graph pattern: "*.bedGraph.gz" diff --git a/subworkflows/nf-core/homer_groseq/tests/bed.config b/subworkflows/nf-core/homer_groseq/tests/bed.config new file mode 100644 index 00000000..bdf78d14 --- /dev/null +++ b/subworkflows/nf-core/homer_groseq/tests/bed.config @@ -0,0 +1,5 @@ +process { + withName: 'HOMER_GROSEQ:HOMER_MAKETAGDIRECTORY' { + ext.args = "-checkGC -format bed -single" + } +} diff --git a/subworkflows/nf-core/homer_groseq/tests/main.nf.test b/subworkflows/nf-core/homer_groseq/tests/main.nf.test new file mode 100644 index 00000000..3461de03 --- /dev/null +++ b/subworkflows/nf-core/homer_groseq/tests/main.nf.test @@ -0,0 +1,139 @@ +nextflow_workflow { + + name "Test Workflow HOMER_GROSEQ" + script "../main.nf" + workflow "HOMER_GROSEQ" + + tag "subworkflows" + tag "subworkflows_nfcore" + tag "subworkflows/homer_groseq" + tag "homer" + tag "unzip" + tag "homer/maketagdirectory" + tag "homer/makeucscfile" + tag "homer/findpeaks" + tag "homer/pos2bed" + + test("Should run HOMER_GROSEQ with BAM input") { + + when { + workflow { + """ + input[0] = [ + [ id: 'test' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + input[2] = [] + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot( + // NOTE tagdir + path(workflow.out.bed_graph.get(0).get(1)).linesGzip.size(), + workflow.out.peaks, + workflow.out.bed, + path(workflow.out.versions.get(0)).yaml, + ).match() }, + ) + } + } + + test("Should run HOMER_GROSEQ with BED input") { + config "./bed.config" + + when { + workflow { + """ + input[0] = [ + [ id: 'test' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true), + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + input[2] = [] + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot( + // NOTE tagdir + path(workflow.out.bed_graph.get(0).get(1)).linesGzip.size(), + workflow.out.peaks, + workflow.out.bed, + path(workflow.out.versions.get(0)).yaml, + ).match() }, + ) + } + } + test("Test files from tutorial") { + config "./bed.config" + + when { + workflow { + """ + input[0] = [ + [ id: 'test' ], + file('ftp://ftp.ncbi.nlm.nih.gov/geo/samples/GSM340nnn/GSM340901/suppl/GSM340901_lib1_aligned.bed.gz', checkIfExists: true), + file('ftp://ftp.ncbi.nlm.nih.gov/geo/samples/GSM340nnn/GSM340902/suppl/GSM340902_lib2_aligned.bed.gz', checkIfExists: true), + ] + input[1] = file('https://hgdownload.soe.ucsc.edu/goldenPath/hg18/chromosomes/chr14.fa.gz', checkIfExists: true) + input[2] = [] + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot( + // NOTE tagdir + path(workflow.out.bed_graph.get(0).get(1)).linesGzip.size(), + workflow.out.peaks, + workflow.out.bed, + path(workflow.out.versions.get(0)).yaml, + ).match() }, + ) + } + } + + // TODO Test uniqmap + + test("sarscov2 - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = [ + [ id: 'test' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + input[2] = [] + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot( + // NOTE tagdir + path(workflow.out.bed_graph.get(0).get(1)).linesGzip.size(), + workflow.out.peaks, + workflow.out.bed, + path(workflow.out.versions.get(0)).yaml, + ).match() }, + { assert snapshot(path(workflow.out.versions.get(0)).yaml).match("versions") }, + ) + } + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap b/subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap new file mode 100644 index 00000000..ecb37fde --- /dev/null +++ b/subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap @@ -0,0 +1,140 @@ +{ + "sarscov2 - stub": { + "content": [ + 1, + [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + [ + [ + { + "id": "test" + }, + "test.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + { + "HOMER_GROSEQ:HOMER_POS2BED": { + "homer": 4.11 + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-23T20:49:13.598633" + }, + "versions": { + "content": [ + { + "HOMER_GROSEQ:HOMER_POS2BED": { + "homer": 4.11 + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-24T14:22:34.952862" + }, + "Should run HOMER_GROSEQ with BAM input": { + "content": [ + 346, + [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,470ad70471ef668cab50d9c41e5b124c" + ] + ], + [ + [ + { + "id": "test" + }, + "test.bed:md5,470ad70471ef668cab50d9c41e5b124c" + ] + ], + { + "HOMER_GROSEQ:HOMER_POS2BED": { + "homer": 4.11 + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-23T20:47:40.376043" + }, + "Test files from tutorial": { + "content": [ + 7856998, + [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,312199a96a41f67fe81b91289fefc6e1" + ] + ], + [ + [ + { + "id": "test" + }, + "test.bed:md5,45b36116aa3f75ddd4f655f97ab8dfd6" + ] + ], + { + "HOMER_GROSEQ:HOMER_POS2BED": { + "homer": 4.11 + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-24T15:36:33.428434" + }, + "Should run HOMER_GROSEQ with BED input": { + "content": [ + 6, + [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,0b0b174b135fd5404a9b462e27ab4ce1" + ] + ], + [ + [ + { + "id": "test" + }, + "test.bed:md5,0b0b174b135fd5404a9b462e27ab4ce1" + ] + ], + { + "HOMER_GROSEQ:HOMER_POS2BED": { + "homer": 4.11 + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.1" + }, + "timestamp": "2024-11-23T20:47:47.733612" + } +} \ No newline at end of file diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index ef0f16d1..410106e2 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -148,7 +148,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PRESEQ_CCURVE": { "preseq": "3.1.1" @@ -193,8 +193,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T19:57:28.2719" + "timestamp": "2024-11-25T20:49:15.410584" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index ab4147cd..a46448eb 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -158,9 +158,9 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:00:53.869213" + "timestamp": "2024-11-25T20:54:01.863106" }, "software_versions": { "content": [ @@ -218,7 +218,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -255,18 +255,18 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T19:59:25.439456" + "timestamp": "2024-11-25T20:52:24.857736" }, "Should work with BWA Index": { "content": [ 59 ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.1" }, - "timestamp": "2024-08-03T07:38:19.100788775" + "timestamp": "2024-11-25T20:53:19.738149" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 64f4ce2f..3ebf8b8f 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -151,7 +151,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -203,8 +203,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:02:08.491193" + "timestamp": "2024-11-25T20:55:33.341724" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index 4bf98dc9..cf21fed1 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -152,7 +152,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 1dd4bdd4..878b02e6 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -153,7 +153,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -205,8 +205,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:03:21.599808" + "timestamp": "2024-11-25T20:57:11.85382" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 21f9e229..5dfc6cde 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -5,9 +5,9 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:07:47.754134" + "timestamp": "2024-11-25T21:02:16.647189" }, "output_files": { "content": [ @@ -154,7 +154,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -191,9 +191,9 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:05:33.084407" + "timestamp": "2024-11-25T20:59:49.96856" }, "gzip_software_versions": { "content": [ @@ -247,7 +247,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -284,8 +284,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:07:47.638876" + "timestamp": "2024-11-25T21:02:16.63526" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 73f9cc01..a11d4016 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -151,7 +151,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -188,8 +188,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:09:08.515208" + "timestamp": "2024-11-25T21:03:46.970397" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index 4cc34186..448fdc41 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -151,7 +151,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -188,8 +188,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:10:29.552992" + "timestamp": "2024-11-25T21:05:15.91439" } } \ No newline at end of file diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 289ae258..29a8eb2b 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -154,7 +154,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -191,8 +191,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:11:49.433129" + "timestamp": "2024-11-25T21:06:43.182015" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index a05cb686..972ec3a7 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -107,7 +107,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -144,8 +144,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:17:44.444383" + "timestamp": "2024-11-25T21:15:19.100902" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index e1a6865f..346017f0 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -98,7 +98,7 @@ }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, - "samtools": 1.11 + "samtools": 1.21 }, "PINTS_CALLER": { "python": "3.12.6", @@ -135,8 +135,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T20:23:19.755524" + "timestamp": "2024-11-25T21:22:54.350234" } } \ No newline at end of file From c9a38ed6eebe7d4f72423884ee3a4e2926e0afb9 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 1 Dec 2024 11:38:35 -0600 Subject: [PATCH 206/255] fix(grohmm): Turn off publishing for parameter tuning --- conf/modules.config | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/conf/modules.config b/conf/modules.config index a38a87c0..139f2a8c 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -367,7 +367,13 @@ process { ] } - withName: "GROHMM_.*" { + withName: "GROHMM_PARAMETERTUNING" { + publishDir = [ + enabled: false + ] + } + + withName: "GROHMM_TRANSCRIPTCALLING" { publishDir = [ [ path: { "${params.outdir}/transcript_identification/grohmm" }, From 1d1aae5e5da91bd6272aef5f400ccfca5311bf3b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 1 Dec 2024 11:55:27 -0600 Subject: [PATCH 207/255] refactor: Remove deprecated each channels --- modules/local/grohmm/parametertuning/main.nf | 4 +--- subworkflows/local/grohmm/main.nf | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index 0d2a5069..ac56402f 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -9,10 +9,8 @@ process GROHMM_PARAMETERTUNING { 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" input: - tuple val(meta), path(bams), path(bais) + tuple val(meta), path(bams), path(bais), val(UTS), val(LtProbB) path gxf - each UTS - each LtProbB output: tuple val(meta), path("*.tuning.csv"), emit: tuning diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index 260e737d..77607319 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -27,10 +27,8 @@ workflow GROHMM { ch_ltprobb = channel.fromList((params.grohmm_min_ltprobb..params.grohmm_max_ltprobb).step(50)) GROHMM_PARAMETERTUNING ( - bams_bais, - gtf, - ch_uts, - ch_ltprobb, + bams_bais.combine(ch_uts).combine(ch_ltprobb), + gtf ) .tuning .collectFile( From 46964b2854ca4af6b20ebf190b126ee382cf4252 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 1 Dec 2024 11:57:45 -0600 Subject: [PATCH 208/255] chore: Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35b04775..f414a34c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#171](https://github.com/nf-core/nascent/pull/171) - Use assertAll in tests - [#165](https://github.com/nf-core/nascent/pull/165) - groHMM overhaul. Removed R mclapply calls and replaced with Nextflow scatter gather for parameter tuning. This creates a job for each parameter set. - [#174](https://github.com/nf-core/nascent/pull/174) - PINTS Scatter gather pattern by chromosome +- [#178](https://github.com/nf-core/nascent/pull/178) - Remove groHMM parameter tuning publishing and remove `each` inputs from parameter tuning module ### Removed From 901f3e14701dfefb6332cccc4d1aa4e815dc1054 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 2 Dec 2024 20:54:32 -0600 Subject: [PATCH 209/255] chore: Remove old template --- lib/Headers.groovy | 43 --------- lib/Schema.groovy | 228 --------------------------------------------- 2 files changed, 271 deletions(-) delete mode 100644 lib/Headers.groovy delete mode 100644 lib/Schema.groovy diff --git a/lib/Headers.groovy b/lib/Headers.groovy deleted file mode 100644 index 15d1d388..00000000 --- a/lib/Headers.groovy +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file holds several functions used to render the nf-core ANSI header. - */ - -class Headers { - - private static Map log_colours(Boolean monochrome_logs) { - Map colorcodes = [:] - colorcodes['reset'] = monochrome_logs ? '' : "\033[0m" - colorcodes['dim'] = monochrome_logs ? '' : "\033[2m" - colorcodes['black'] = monochrome_logs ? '' : "\033[0;30m" - colorcodes['green'] = monochrome_logs ? '' : "\033[0;32m" - colorcodes['yellow'] = monochrome_logs ? '' : "\033[0;33m" - colorcodes['yellow_bold'] = monochrome_logs ? '' : "\033[1;93m" - colorcodes['blue'] = monochrome_logs ? '' : "\033[0;34m" - colorcodes['purple'] = monochrome_logs ? '' : "\033[0;35m" - colorcodes['cyan'] = monochrome_logs ? '' : "\033[0;36m" - colorcodes['white'] = monochrome_logs ? '' : "\033[0;37m" - colorcodes['red'] = monochrome_logs ? '' : "\033[1;91m" - return colorcodes - } - - static String dashed_line(monochrome_logs) { - Map colors = log_colours(monochrome_logs) - return "-${colors.dim}----------------------------------------------------${colors.reset}-" - } - - static String nf_core(workflow, monochrome_logs) { - Map colors = log_colours(monochrome_logs) - String.format( - """\n - ${dashed_line(monochrome_logs)} - ${colors.green},--.${colors.black}/${colors.green},-.${colors.reset} - ${colors.blue} ___ __ __ __ ___ ${colors.green}/,-._.--~\'${colors.reset} - ${colors.blue} |\\ | |__ __ / ` / \\ |__) |__ ${colors.yellow}} {${colors.reset} - ${colors.blue} | \\| | \\__, \\__/ | \\ |___ ${colors.green}\\`-._,-`-,${colors.reset} - ${colors.green}`._,._,\'${colors.reset} - ${colors.purple} ${workflow.manifest.name} v${workflow.manifest.version}${colors.reset} - ${dashed_line(monochrome_logs)} - """.stripIndent() - ) - } -} diff --git a/lib/Schema.groovy b/lib/Schema.groovy deleted file mode 100644 index d45d0005..00000000 --- a/lib/Schema.groovy +++ /dev/null @@ -1,228 +0,0 @@ -/* - * This file holds several functions used to perform JSON parameter validation, help and summary rendering for the nf-core pipeline template. - */ - -import groovy.json.JsonSlurper - -class Schema { - /* - * This method tries to read a JSON params file - */ - private static LinkedHashMap params_load(String json_schema) { - def params_map = new LinkedHashMap() - try { - params_map = params_read(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 params_read(String json_schema) throws Exception { - def json = new File(json_schema).text - def Map json_params = (Map) new JsonSlurper().parseText(json).get('definitions') - /* 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 - */ - def params_map = new LinkedHashMap() - json_params.each { key, val -> - def Map group = json_params."$key".properties // Gets the property object of the group - def title = json_params."$key".title - def sub_params = new LinkedHashMap() - group.each { innerkey, value -> - sub_params.put(innerkey, value) - } - params_map.put(title, sub_params) - } - return params_map - } - - /* - * Get maximum number of characters across all parameter names - */ - private static Integer params_max_chars(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 - } - - /* - * Beautify parameters for --help - */ - private static String params_help(workflow, params, json_schema, command) { - String output = Headers.nf_core(workflow, params.monochrome_logs) + "\n" - output += "Typical pipeline command:\n\n" - output += " ${command}\n\n" - def params_map = params_load(json_schema) - def max_chars = params_max_chars(params_map) + 1 - for (group in params_map.keySet()) { - output += group + "\n" - def group_params = params_map.get(group) // This gets the parameters of that particular group - for (param in group_params.keySet()) { - def type = "[" + group_params.get(param).type + "]" - def description = group_params.get(param).description - output += " \u001B[1m--" + param.padRight(max_chars) + "\u001B[1m" + type.padRight(10) + description + "\n" - } - output += "\n" - } - output += Headers.dashed_line(params.monochrome_logs) - output += "\n\n" + Checks.citation(workflow) - output += "\n\n" + Headers.dashed_line(params.monochrome_logs) - return output - } - - /* - * Groovy Map summarising parameters/workflow options used by the pipeline - */ - private static LinkedHashMap params_summary_map(workflow, params, json_schema) { - // 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 blacklist = ['hostnames'] - def params_map = params_load(json_schema) - 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) && !blacklist.contains(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 == 'boolean') { - schema_value = false - } - if (param_type == 'string') { - schema_value = '' - } - if (param_type == 'integer') { - schema_value = 0 - } - } else { - 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 - } - } - } - } - - if (params_value != schema_value) { - 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 - */ - private static String params_summary_log(workflow, params, json_schema) { - String output = Headers.nf_core(workflow, params.monochrome_logs) + "\n" - def params_map = params_summary_map(workflow, params, json_schema) - def max_chars = params_max_chars(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 += group + "\n" - for (param in group_params.keySet()) { - output += " \u001B[1m" + param.padRight(max_chars) + ": \u001B[1m" + group_params.get(param) + "\n" - } - output += "\n" - } - } - output += Headers.dashed_line(params.monochrome_logs) - output += "\n\n" + Checks.citation(workflow) - output += "\n\n" + Headers.dashed_line(params.monochrome_logs) - return output - } - - static String params_summary_multiqc(workflow, summary) { - String summary_section = '' - for (group in summary.keySet()) { - def group_params = summary.get(group) // This gets the parameters of that particular group - if (group_params) { - summary_section += "

    $group

    \n" - summary_section += "
    \n" - for (param in group_params.keySet()) { - summary_section += "
    $param
    ${group_params.get(param) ?: 'N/A'}
    \n" - } - summary_section += "
    \n" - } - } - - String yaml_file_text = "id: '${workflow.manifest.name.replace('/','-')}-summary'\n" - yaml_file_text += "description: ' - this information is collected when the pipeline is started.'\n" - yaml_file_text += "section_name: '${workflow.manifest.name} Workflow Summary'\n" - yaml_file_text += "section_href: 'https://github.com/${workflow.manifest.name}'\n" - yaml_file_text += "plot_type: 'html'\n" - yaml_file_text += "data: |\n" - yaml_file_text += "${summary_section}" - return yaml_file_text - } -} From c12ab1d890f087871ec597c9beb0d180765badf3 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Dec 2024 10:56:51 -0600 Subject: [PATCH 210/255] test: Use nft-utils removeNextflowVersion --- nf-test.config | 1 + tests/lib/UTILS.groovy | 9 --------- workflows/tests/aligner/bowtie2.nf.test | 2 +- workflows/tests/aligner/bwa.nf.test | 2 +- workflows/tests/aligner/bwamem2.nf.test | 2 +- workflows/tests/aligner/dragmap.nf.test | 2 +- workflows/tests/aligner/hisat2.nf.test | 2 +- workflows/tests/aligner/star.nf.test | 4 ++-- workflows/tests/inputs/gff/main.nf.test | 2 +- workflows/tests/inputs/gzipped_gff/main.nf.test | 2 +- workflows/tests/inputs/only_gff/main.nf.test | 2 +- .../grohmm/only_gff/main.nf.test | 2 +- .../grohmm/tuning/main.nf.test | 2 +- 13 files changed, 13 insertions(+), 21 deletions(-) diff --git a/nf-test.config b/nf-test.config index d8258c96..a7619e30 100644 --- a/nf-test.config +++ b/nf-test.config @@ -6,6 +6,7 @@ config { profile "test" plugins { load "nft-bam@0.3.0" + load "nft-utils@0.0.3" } triggers "nextflow.config", "nf-test.config", "conf/modules.config", "conf/test.config", "tests/nextflow.config" diff --git a/tests/lib/UTILS.groovy b/tests/lib/UTILS.groovy index 9e436d9b..a5c780ee 100644 --- a/tests/lib/UTILS.groovy +++ b/tests/lib/UTILS.groovy @@ -1,13 +1,4 @@ class UTILS { - // Function to remove Nextflow version from pipeline_software_mqc_versions.yml - public static Object removeNextflowVersion(pipeline_software_mqc_versions) { - def softwareVersions = path(pipeline_software_mqc_versions).yaml - if (softwareVersions.containsKey("Workflow")) { - softwareVersions.Workflow.remove("Nextflow") - } - return softwareVersions - } - // Recursively list all files in a directory and its sub-directories, matching a given suffix // TODO: use regex pattern instead of suffix? public static getAllFilesFromDir(dir, suffix) { diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index 12d14359..b5ad252c 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -17,7 +17,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 9add36bd..89274620 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -18,7 +18,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test index e8dd2d71..c08c35d1 100644 --- a/workflows/tests/aligner/bwamem2.nf.test +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -15,7 +15,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index 3479fbed..9fce8a95 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -15,7 +15,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 7c2d9e53..6067b79c 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -18,7 +18,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test index b647b57d..3b5150d3 100644 --- a/workflows/tests/aligner/star.nf.test +++ b/workflows/tests/aligner/star.nf.test @@ -17,7 +17,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), @@ -58,7 +58,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("gzip_software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("gzip_software_versions") }, { assert snapshot( workflow.trace.tasks().size(), ).match() diff --git a/workflows/tests/inputs/gff/main.nf.test b/workflows/tests/inputs/gff/main.nf.test index 43090ba8..b4870c76 100644 --- a/workflows/tests/inputs/gff/main.nf.test +++ b/workflows/tests/inputs/gff/main.nf.test @@ -17,7 +17,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test b/workflows/tests/inputs/gzipped_gff/main.nf.test index b8e5f8f3..7b8f07b5 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test @@ -17,7 +17,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/inputs/only_gff/main.nf.test b/workflows/tests/inputs/only_gff/main.nf.test index e91fdf74..e9850df9 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test +++ b/workflows/tests/inputs/only_gff/main.nf.test @@ -19,7 +19,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test index 362f87d5..4321fe1a 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test @@ -23,7 +23,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), path("$outputDir/transcript_identification/homer/cd4.bed"), diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index 90c84a15..8ff3fa64 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -15,7 +15,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), path("$outputDir/transcript_identification/homer/cd4.bed"), From 2a7e7691139c9468e2f877859e2fb4e301cba5df Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Dec 2024 11:33:44 -0600 Subject: [PATCH 211/255] chore: Bump nft-bam --- nf-test.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nf-test.config b/nf-test.config index a7619e30..b282ac78 100644 --- a/nf-test.config +++ b/nf-test.config @@ -5,7 +5,7 @@ config { configFile "tests/nextflow.config" profile "test" plugins { - load "nft-bam@0.3.0" + load "nft-bam@0.5.0" load "nft-utils@0.0.3" } triggers "nextflow.config", "nf-test.config", "conf/modules.config", "conf/test.config", "tests/nextflow.config" From 5bff846b20284935f099c90625ca7e83bb70d525 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Dec 2024 11:48:51 -0600 Subject: [PATCH 212/255] test: Switch to nft-utils --- tests/.nftignore | 16 + workflows/tests/aligner/bwa.nf.test | 48 +- workflows/tests/aligner/bwa.nf.test.snap | 737 ++++++++++++++++++----- 3 files changed, 606 insertions(+), 195 deletions(-) create mode 100644 tests/.nftignore diff --git a/tests/.nftignore b/tests/.nftignore new file mode 100644 index 00000000..5d94dd47 --- /dev/null +++ b/tests/.nftignore @@ -0,0 +1,16 @@ +fastqc/*.html +fastqc/zips/*.zip +multiqc/*/multiqc_data/*.{log,json} +multiqc/*/multiqc_data/multiqc_fastqc.txt +multiqc/*/multiqc_data/multiqc_general_stats.txt +multiqc/*/multiqc_data/multiqc_qualimap_bamqc_genome_results.txt +multiqc/*/multiqc_data/multiqc_software_versions.txt +multiqc/*/multiqc_data/multiqc_sources.txt +multiqc/*/multiqc_report.html +multiqc/*/multiqc_plots/{pdf,png,svg}/*.{pdf,png,svg} +pipeline_info/*.{html,json,txt,yml} + +*/alignments/logs/*.txt +*/{alignments,deduplicated}/*.{bam,bam.bai} +*/deduplicated/logs/*.txt +*/{reports,summary}/*.{html,txt} diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 89274620..70faf216 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -16,39 +16,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/cd4_REP3.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/cd4_REP4.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/jurkat_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/jurkat_REP2.sorted.bam").getSamLinesMD5(), - path("$outputDir/bwa/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // path("$outputDir/quantification/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } @@ -102,6 +89,5 @@ nextflow_pipeline { } ) } - } } diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index a46448eb..4ab3884d 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -1,169 +1,27 @@ { - "output_files": { + "Should work with gzipped references": { "content": [ - 149, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP3.trimmed.fastp.json:md5,c9c3a1dd0a2ebac77c9d7c3b0daf3790", - "cd4_REP4.trimmed.fastp.json:md5,c073bd26609ddca91396d0f374ec5b80", - "jurkat_REP1.trimmed.fastp.json:md5,329fd8e56421a196fc2ebd37ab3bc22d", - "jurkat_REP2.trimmed.fastp.json:md5,8bad5b02a27e5386255b998a6a69db15" - ], - "c529a16c839e85e119b98354f109352d", - "9e63b682af88fa902cf92b5c485845b1", - "2aa200bbbce374ec7dedb9b46ce4aae1", - "122274730dd5386e1b26c174df886a8b", - "c2adf5327ff6d4edda2fdad00c7cb9bf", - "63fea3b1e2e08e5f6fdf3f7ba0aa7818", - [ - "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", - "cd4_REP3.sorted.bam.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", - "cd4_REP3.sorted.bam.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", - "cd4_REP4.sorted.bam.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", - "cd4_REP4.sorted.bam.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam.stats:md5,edc57478278aa35b7376cee9afd634a7", - "jurkat_REP1.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat_REP1.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", - "jurkat_REP2.sorted.bam.flagstat:md5,86ed47bd41a745ab59de473082c7742d", - "jurkat_REP2.sorted.bam.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", - "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", - "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", - "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", - "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", - "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP3.lc_extrap.txt:md5,25ebbeabee46caa86a4d6d82dd0091f1", - "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP4.lc_extrap.txt:md5,d0df86774dd54421fd362d46faa3f937", - "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP1.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", - "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP2.lc_extrap.txt:md5,8ae0a77bcc59da38ec2da0fc1f973227" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "cd4_REP3.pos.DupRate.xls:md5,fd3e91bfe070deccef65b265957cb733", - "cd4_REP3.seq.DupRate.xls:md5,f4c9f61081e6ef309abe82bb34aa4bd0", - "cd4_REP4.pos.DupRate.xls:md5,7fb8a7e96fd521561f62ccf7bf490212", - "cd4_REP4.seq.DupRate.xls:md5,8c671e5b0029d396a666839029298828", - "jurkat_REP1.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat_REP1.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", - "jurkat_REP2.pos.DupRate.xls:md5,253ec69be4f5322dc92f6cb3fb41f7e0", - "jurkat_REP2.seq.DupRate.xls:md5,c7c83a29e6dfd49ff17858fe83dc07c8" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "cd4_REP3.DupRate_plot.r:md5,5b37293c52beaecc5980aa2b9bafd82c", - "cd4_REP4.DupRate_plot.r:md5,ffa0f611b7f86d36134f9d80c3e1c9de", - "jurkat_REP1.DupRate_plot.r:md5,8e4dc99cae73c94eda275aeee08a5390", - "jurkat_REP2.DupRate_plot.r:md5,3507444f5965ca98a448ab15659ba34f" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "cd4_REP3.infer_experiment.txt:md5,b0157d081d0ba0c27b370915f13c8c8a", - "cd4_REP4.infer_experiment.txt:md5,37ec4ee4ed5f707f073be5a7d4c9acfb", - "jurkat_REP1.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", - "jurkat_REP2.infer_experiment.txt:md5,cde67a32fc922fb61fe5c5ea4b0e5c92" - ], - [ - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "cd4_REP3.read_distribution.txt:md5,2f05c4cc866b4f8068e02008cad20cb3", - "cd4_REP4.read_distribution.txt:md5,ececae7f535b4fd5606bf763fdba7a34", - "jurkat_REP1.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", - "jurkat_REP2.read_distribution.txt:md5,a5f8bed2cff9d780a31c3ce43e289d9e" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", - "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", - "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", - "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", - "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", - "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", - "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", - "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", - "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", - "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", - "cd4_REP3.dreg.bedGraph:md5,201e690c619ee231416b643740141588", - "cd4_REP3.minus.bedGraph:md5,1c44c165f663d08c869a013b78f051b0", - "cd4_REP3.minus.bigWig:md5,aa3f5e86c635e182f9173543751cfbfd", - "cd4_REP3.plus.bedGraph:md5,a475098ed14da6f3242c4cfdf3abb713", - "cd4_REP3.plus.bigWig:md5,b255ae7c47424c223c537d00ecc025b5", - "cd4_REP4.dreg.bedGraph:md5,dfcfce7df666c0e24a3d0d4e21447a0b", - "cd4_REP4.minus.bedGraph:md5,b7a3d3c822155dfd8052c67a330fd6d5", - "cd4_REP4.minus.bigWig:md5,fc61c62613dc0f74a65c32419aba8f76", - "cd4_REP4.plus.bedGraph:md5,5623367b681562a2567afc62a8da4151", - "cd4_REP4.plus.bigWig:md5,ed00ad7a22c49860debc86cfa7ffb457", - "jurkat_REP1.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", - "jurkat_REP1.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", - "jurkat_REP1.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", - "jurkat_REP1.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", - "jurkat_REP1.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", - "jurkat_REP2.dreg.bedGraph:md5,aad861b6fd8d296fe6bb4bc82d5eeeed", - "jurkat_REP2.minus.bedGraph:md5,cd83486cb6bb71e6b6e31a69c94d0d85", - "jurkat_REP2.minus.bigWig:md5,686f719978de948f7045acc95f9d1c82", - "jurkat_REP2.plus.bedGraph:md5,569e8a25c9cf48d1ef953f3da77c48a1", - "jurkat_REP2.plus.bigWig:md5,cbe3fd38fe8f9508645bbfad83924212" - ], - "cd4.bed:md5,ab94918610a560772fdbec591200295f", - "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - [ - "cd4_intersect.bed:md5,c45718bf5c21eb28b810d4800296728b", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,9765d778862a20feefb94d407773bef3", - "jurkat_filtered.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8" - ], - true + 55 ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.0" + "nextflow": "24.10.1" }, - "timestamp": "2024-11-08T19:59:26.10702" + "timestamp": "2024-11-25T20:54:01.863106" }, - "Should work with gzipped references": { + "Should work with BWA Index": { "content": [ - 55 + 59 ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.1" }, - "timestamp": "2024-11-25T20:54:01.863106" + "timestamp": "2024-11-25T20:53:19.738149" }, - "software_versions": { + "Should run with defaults": { "content": [ + 149, { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -251,22 +109,573 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.1" - }, - "timestamp": "2024-11-25T20:52:24.857736" - }, - "Should work with BWA Index": { - "content": [ - 59 + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "bwa", + "bwa/cd4_REP1.sorted.bam", + "bwa/cd4_REP1.sorted.bam.bai", + "bwa/cd4_REP2.sorted.bam", + "bwa/cd4_REP2.sorted.bam.bai", + "bwa/cd4_REP3.sorted.bam", + "bwa/cd4_REP3.sorted.bam.bai", + "bwa/cd4_REP4.sorted.bam", + "bwa/cd4_REP4.sorted.bam.bai", + "bwa/jurkat_REP1.sorted.bam", + "bwa/jurkat_REP1.sorted.bam.bai", + "bwa/jurkat_REP2.sorted.bam", + "bwa/jurkat_REP2.sorted.bam.bai", + "bwa/samtools_stats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP3.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP3.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP3.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP4.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP4.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP4.sorted.bam.stats", + "bwa/samtools_stats/jurkat_REP1.sorted.bam.flagstat", + "bwa/samtools_stats/jurkat_REP1.sorted.bam.idxstats", + "bwa/samtools_stats/jurkat_REP1.sorted.bam.stats", + "bwa/samtools_stats/jurkat_REP2.sorted.bam.flagstat", + "bwa/samtools_stats/jurkat_REP2.sorted.bam.idxstats", + "bwa/samtools_stats/jurkat_REP2.sorted.bam.stats", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/cd4_REP3.dreg.bedGraph", + "coverage_graphs/cd4_REP3.minus.bedGraph", + "coverage_graphs/cd4_REP3.minus.bigWig", + "coverage_graphs/cd4_REP3.plus.bedGraph", + "coverage_graphs/cd4_REP3.plus.bigWig", + "coverage_graphs/cd4_REP4.dreg.bedGraph", + "coverage_graphs/cd4_REP4.minus.bedGraph", + "coverage_graphs/cd4_REP4.minus.bigWig", + "coverage_graphs/cd4_REP4.plus.bedGraph", + "coverage_graphs/cd4_REP4.plus.bigWig", + "coverage_graphs/jurkat_REP1.dreg.bedGraph", + "coverage_graphs/jurkat_REP1.minus.bedGraph", + "coverage_graphs/jurkat_REP1.minus.bigWig", + "coverage_graphs/jurkat_REP1.plus.bedGraph", + "coverage_graphs/jurkat_REP1.plus.bigWig", + "coverage_graphs/jurkat_REP2.dreg.bedGraph", + "coverage_graphs/jurkat_REP2.minus.bedGraph", + "coverage_graphs/jurkat_REP2.minus.bigWig", + "coverage_graphs/jurkat_REP2.plus.bedGraph", + "coverage_graphs/jurkat_REP2.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP3.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP3.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP3.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP4.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP4.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP4.trimmed.fastp.log", + "preprocessing/fastp/jurkat_REP1.trimmed.fastp.html", + "preprocessing/fastp/jurkat_REP1.trimmed.fastp.json", + "preprocessing/fastp/jurkat_REP1.trimmed.fastp.log", + "preprocessing/fastp/jurkat_REP2.trimmed.fastp.html", + "preprocessing/fastp/jurkat_REP2.trimmed.fastp.json", + "preprocessing/fastp/jurkat_REP2.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/cd4_REP3_fastqc.html", + "preprocessing/fastqc/cd4_REP3_fastqc.zip", + "preprocessing/fastqc/cd4_REP4_fastqc.html", + "preprocessing/fastqc/cd4_REP4_fastqc.zip", + "preprocessing/fastqc/jurkat_REP1_fastqc.html", + "preprocessing/fastqc/jurkat_REP1_fastqc.zip", + "preprocessing/fastqc/jurkat_REP2_fastqc.html", + "preprocessing/fastqc/jurkat_REP2_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP3.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP3.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP4.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP4.coverage.stats.txt", + "quality_control/bbsplit/jurkat_REP1.coverage.hist.txt", + "quality_control/bbsplit/jurkat_REP1.coverage.stats.txt", + "quality_control/bbsplit/jurkat_REP2.coverage.hist.txt", + "quality_control/bbsplit/jurkat_REP2.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/cd4_REP3.c_curve.txt", + "quality_control/preseq/cd4_REP3.lc_extrap.txt", + "quality_control/preseq/cd4_REP4.c_curve.txt", + "quality_control/preseq/cd4_REP4.lc_extrap.txt", + "quality_control/preseq/jurkat_REP1.c_curve.txt", + "quality_control/preseq/jurkat_REP1.lc_extrap.txt", + "quality_control/preseq/jurkat_REP2.c_curve.txt", + "quality_control/preseq/jurkat_REP2.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/cd4_REP3.command.log", + "quality_control/preseq/log/cd4_REP4.command.log", + "quality_control/preseq/log/jurkat_REP1.command.log", + "quality_control/preseq/log/jurkat_REP2.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP3.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP4.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat_REP2.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP3.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP4.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat_REP2.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP3.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP4.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP3.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP4.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP3.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP3.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP4.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP4.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat_REP2.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_17_45_00_44.log" + ], + [ + "cd4_intersect.saf:md5,635fcd8e2c060dc75db25564c2a664dc", + "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", + "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", + "cd4_REP3.sorted.bam:md5,87759126ce19e605d415e11d32b758b2", + "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", + "cd4_REP4.sorted.bam:md5,be020f98894a831a25b32e0e74d96edd", + "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", + "jurkat_REP1.sorted.bam:md5,322394245e8ba6fb51fb591b4ba2dc82", + "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", + "jurkat_REP2.sorted.bam:md5,ece1ae4ce266a64a4d27aa12b4bb630e", + "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP3.sorted.bam.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", + "cd4_REP3.sorted.bam.idxstats:md5,42de227ff397013cf288759871b0e938", + "cd4_REP3.sorted.bam.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", + "cd4_REP4.sorted.bam.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", + "cd4_REP4.sorted.bam.idxstats:md5,959dc185ae59de4cebe374026711a55e", + "cd4_REP4.sorted.bam.stats:md5,edc57478278aa35b7376cee9afd634a7", + "jurkat_REP1.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat_REP1.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat_REP1.sorted.bam.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", + "jurkat_REP2.sorted.bam.flagstat:md5,86ed47bd41a745ab59de473082c7742d", + "jurkat_REP2.sorted.bam.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", + "jurkat_REP2.sorted.bam.stats:md5,026c558e8c36136ef19bfbef6b12ce2b", + "cd4.bed:md5,76ee3b56d3e518f88a34b42039ec719c", + "jurkat.bed:md5,862a5e81119acc691845f3b426847401", + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "cd4_REP3.dreg.bedGraph:md5,201e690c619ee231416b643740141588", + "cd4_REP3.minus.bedGraph:md5,1c44c165f663d08c869a013b78f051b0", + "cd4_REP3.minus.bigWig:md5,aa3f5e86c635e182f9173543751cfbfd", + "cd4_REP3.plus.bedGraph:md5,a475098ed14da6f3242c4cfdf3abb713", + "cd4_REP3.plus.bigWig:md5,b255ae7c47424c223c537d00ecc025b5", + "cd4_REP4.dreg.bedGraph:md5,dfcfce7df666c0e24a3d0d4e21447a0b", + "cd4_REP4.minus.bedGraph:md5,b7a3d3c822155dfd8052c67a330fd6d5", + "cd4_REP4.minus.bigWig:md5,fc61c62613dc0f74a65c32419aba8f76", + "cd4_REP4.plus.bedGraph:md5,5623367b681562a2567afc62a8da4151", + "cd4_REP4.plus.bigWig:md5,ed00ad7a22c49860debc86cfa7ffb457", + "jurkat_REP1.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat_REP1.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat_REP1.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat_REP1.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat_REP1.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", + "jurkat_REP2.dreg.bedGraph:md5,aad861b6fd8d296fe6bb4bc82d5eeeed", + "jurkat_REP2.minus.bedGraph:md5,cd83486cb6bb71e6b6e31a69c94d0d85", + "jurkat_REP2.minus.bigWig:md5,686f719978de948f7045acc95f9d1c82", + "jurkat_REP2.plus.bedGraph:md5,569e8a25c9cf48d1ef953f3da77c48a1", + "jurkat_REP2.plus.bigWig:md5,cbe3fd38fe8f9508645bbfad83924212", + "fastqc-status-check-heatmap.txt:md5,54eaa9c4b747e892026ca0cb40e20d0e", + "fastqc_adapter_content_plot.txt:md5,de08191d660035f8e31cd20a39d49449", + "fastqc_overrepresented_sequences_plot.txt:md5,b80bcbee43bd8861e9ae7f985a963bf5", + "fastqc_per_base_n_content_plot.txt:md5,aba6fb9329f4bc05eb1dff9e2e6e4448", + "fastqc_per_base_sequence_quality_plot.txt:md5,9bffaf2c58e715bc7604bd3467145487", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7d87b4086af0fbb1da24a13a2b28b53c", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,9d57a5eff9d7f734ada23931e563db53", + "fastqc_per_sequence_quality_scores_plot.txt:md5,6b932566907be97642a291eab6a0419e", + "fastqc_sequence_counts_plot.txt:md5,26cdc4ed5c6261fbc940ae2341facd26", + "fastqc_sequence_duplication_levels_plot.txt:md5,e2b3be0c99270ea1e39c3c0bcb3957f4", + "fastqc_top_overrepresented_sequences_table.txt:md5,da8609080b5a16765f1b9cade4ff428e", + "homer-tag-directory-gc-content.txt:md5,60bb0ce90eddd137b5b2ca823051acbf", + "homer-tag-info-dist.txt:md5,ee9fe273399a253ab03d23808ad13769", + "homer-tag-length-dist.txt:md5,776999aa7958d892118e1f81605d2d6c", + "homer_tagdir.txt:md5,f8e1dbdd9cdfcf1c01b57e385fe3849b", + "multiqc.log:md5,4362bb9bc5429c8f83c520068bc30d93", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,221c15b73fa4807e41c76744645c784f", + "multiqc_fastqc.txt:md5,7d106f21a9fce707c0f2f80ebe423fdc", + "multiqc_general_stats.txt:md5,4cba40da02a1aa33239afa472ef8818a", + "multiqc_rseqc_infer_experiment.txt:md5,7742ec391ad8fbd6970ac8e76d8ed99e", + "multiqc_rseqc_read_distribution.txt:md5,f9d25d0d1556c5d6197a7ace48d42bad", + "multiqc_samtools_flagstat.txt:md5,97559507a36988f3cea0450004d14f1c", + "multiqc_samtools_idxstats.txt:md5,7470628b9c7653676a1726dba6750bcf", + "multiqc_samtools_stats.txt:md5,bf614e3f14ed5f319f1f60dab566a0c8", + "multiqc_software_versions.txt:md5,71b857625ebbe5f51be6501178fc5d49", + "multiqc_sources.txt:md5,d1cc92731f0987d72296dca6dcd18a05", + "preseq.txt:md5,d2605fe400e1665bf037fa5d25b17425", + "preseq_complexity_plot_molecules.txt:md5,90f9af51864a0a82a0d9e2d6551707a8", + "rseqc_infer_experiment_plot.txt:md5,7f99caa50e1282b7905d24e1c1529c4a", + "rseqc_read_distribution_plot.txt:md5,65b9b6607ace0282d8195d985fdbdcf2", + "rseqc_read_dups.txt:md5,2f7c77c35ce9ae82c0bd74258d4aaa9c", + "rseqc_read_dups_plot.txt:md5,b533ed50d90fa44323198a2e0ede4a0f", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,62286c20dc41719e5777c6ee56d3fdbb", + "samtools-flagstat-dp_Read_counts.txt:md5,9ad454ab09e33ac470abb51dcaaec113", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,7fb2808dc571e89f378d6e410ce0021b", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,7fb2808dc571e89f378d6e410ce0021b", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,d4aea3276fac660b6e7f3e8298308247", + "samtools-stats-dp.txt:md5,99661e2566270bc292ea89e8a8ae851b", + "samtools_alignment_plot.txt:md5,1a823e6914808802ccfbbefd4fc000ff", + "multiqc_report.html:md5,3e4da3b4b32738b00cc639840ec2b055", + "cd4_REP1.trimmed.fastp.html:md5,2b518e431576642417961818d5783cd1", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,f7a9f353c93a913c0fd28f65a11f1a73", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", + "cd4_REP3.trimmed.fastp.html:md5,172f80221f977edc194d79ef0f917dea", + "cd4_REP3.trimmed.fastp.json:md5,c9c3a1dd0a2ebac77c9d7c3b0daf3790", + "cd4_REP3.trimmed.fastp.log:md5,c3ba500272d8b3acf498dc5e9d38a2e8", + "cd4_REP4.trimmed.fastp.html:md5,902147cebc270195ea0e03910f914c35", + "cd4_REP4.trimmed.fastp.json:md5,c073bd26609ddca91396d0f374ec5b80", + "cd4_REP4.trimmed.fastp.log:md5,c7273ba6b0df79ab019b580b75855153", + "jurkat_REP1.trimmed.fastp.html:md5,0f6c7e18ca9dfa51a9377e0c01049dd4", + "jurkat_REP1.trimmed.fastp.json:md5,329fd8e56421a196fc2ebd37ab3bc22d", + "jurkat_REP1.trimmed.fastp.log:md5,85a85bfaeb8b88e0ff281e5353e8f5a7", + "jurkat_REP2.trimmed.fastp.html:md5,1712da81f2ffeb0ee039a41900192411", + "jurkat_REP2.trimmed.fastp.json:md5,8bad5b02a27e5386255b998a6a69db15", + "jurkat_REP2.trimmed.fastp.log:md5,1699efb244338013ce5240cd68be7501", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,37e350ea94e5cc33a5e9043c1b557cec", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,2c83180d9337fd4c8b29aa7a2a1ed1f5", + "cd4_REP3_fastqc.html:md5,312c2b6cc098cd87175e8037d606f9b8", + "cd4_REP3_fastqc.zip:md5,afb816a12e59699d0b062b8078ba947e", + "cd4_REP4_fastqc.html:md5,56639d924dea6958d8cbd21667bc28cf", + "cd4_REP4_fastqc.zip:md5,55bbd51063b83097399bfaa124288293", + "jurkat_REP1_fastqc.html:md5,2bacbec6c15d9c4bb316292dcb0d8fcf", + "jurkat_REP1_fastqc.zip:md5,c893b45377039c34f70921c8bdb397ac", + "jurkat_REP2_fastqc.html:md5,5b0cac2bd71e46e7536972241f380d53", + "jurkat_REP2_fastqc.zip:md5,40136cb3588b3abe9601a66b3fe7817d", + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", + "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", + "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", + "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", + "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", + "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP3.lc_extrap.txt:md5,25ebbeabee46caa86a4d6d82dd0091f1", + "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP4.lc_extrap.txt:md5,d0df86774dd54421fd362d46faa3f937", + "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat_REP1.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", + "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat_REP2.lc_extrap.txt:md5,8ae0a77bcc59da38ec2da0fc1f973227", + "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", + "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", + "cd4_REP3.command.log:md5,51c6f8c93c91ecd3ee5b8d8b8ab94f77", + "cd4_REP4.command.log:md5,32fe9fc65b8c92b6d3ceee4e5d8a507f", + "jurkat_REP1.command.log:md5,870a47f101cd5007d2756448b896c33d", + "jurkat_REP2.command.log:md5,754dcc46cd47bf300965522303bc065f", + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "cd4_REP3.infer_experiment.txt:md5,b0157d081d0ba0c27b370915f13c8c8a", + "cd4_REP4.infer_experiment.txt:md5,37ec4ee4ed5f707f073be5a7d4c9acfb", + "jurkat_REP1.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", + "jurkat_REP2.infer_experiment.txt:md5,cde67a32fc922fb61fe5c5ea4b0e5c92", + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "cd4_REP3.read_distribution.txt:md5,2f05c4cc866b4f8068e02008cad20cb3", + "cd4_REP4.read_distribution.txt:md5,ececae7f535b4fd5606bf763fdba7a34", + "jurkat_REP1.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", + "jurkat_REP2.read_distribution.txt:md5,a5f8bed2cff9d780a31c3ce43e289d9e", + "cd4_REP1.DupRate_plot.pdf:md5,47f2cce8a9125a14286ef5e8ddca5aa8", + "cd4_REP2.DupRate_plot.pdf:md5,6cdc12e8e4da6524b45464e4d1471602", + "cd4_REP3.DupRate_plot.pdf:md5,f6c35169934fe6c0119424ff64c3344f", + "cd4_REP4.DupRate_plot.pdf:md5,79956239dc01cbd79b738cf1d389880f", + "jurkat_REP1.DupRate_plot.pdf:md5,9cd3ec07dceffc796024e8e07676b2c7", + "jurkat_REP2.DupRate_plot.pdf:md5,1cd0328503c7ca4a7de20d74617a4611", + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "cd4_REP3.DupRate_plot.r:md5,5b37293c52beaecc5980aa2b9bafd82c", + "cd4_REP4.DupRate_plot.r:md5,ffa0f611b7f86d36134f9d80c3e1c9de", + "jurkat_REP1.DupRate_plot.r:md5,8e4dc99cae73c94eda275aeee08a5390", + "jurkat_REP2.DupRate_plot.r:md5,3507444f5965ca98a448ab15659ba34f", + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "cd4_REP3.pos.DupRate.xls:md5,fd3e91bfe070deccef65b265957cb733", + "cd4_REP3.seq.DupRate.xls:md5,f4c9f61081e6ef309abe82bb34aa4bd0", + "cd4_REP4.pos.DupRate.xls:md5,7fb8a7e96fd521561f62ccf7bf490212", + "cd4_REP4.seq.DupRate.xls:md5,8c671e5b0029d396a666839029298828", + "jurkat_REP1.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat_REP1.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", + "jurkat_REP2.pos.DupRate.xls:md5,253ec69be4f5322dc92f6cb3fb41f7e0", + "jurkat_REP2.seq.DupRate.xls:md5,c7c83a29e6dfd49ff17858fe83dc07c8", + "cd4.featureCounts.txt:md5,47a85f4f56eadbc8eae797a08100ce46", + "cd4.featureCounts.txt.summary:md5,c78e1e8eaa51aa97e141335166290e6e", + "jurkat.featureCounts.txt:md5,b8af15779d488ac710b8e830312bb605", + "jurkat.featureCounts.txt.summary:md5,205b13730ce401dfed6a94a61caf26ae", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,f78b148a5e48a9dfe65864efbe4d7ef5", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,93f83ecd6d3764cdb013c0916f946886", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,952eb95b9dc4081cffb14e6bf251a960", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,48137200120f4774746cd0995414c43d", + "cd4.bam:md5,593ac4fc591e04af424efdeb8750104a", + "jurkat.bam:md5,19e4f510b0a3005e72569569796a21c6", + "cd4_filtered.bed:md5,9765d778862a20feefb94d407773bef3", + "jurkat_filtered.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", + "cd4.bed:md5,ab94918610a560772fdbec591200295f", + "cd4.bedGraph.gz:md5,50fb367e6dd9f5ca58fd63820ae068ec", + "cd4.peaks.txt:md5,6edefe0a75b76240d3b49d12e49cb600", + "chr21.tags.tsv:md5,ab64a2b39cf47d981f97715852d3c290", + "genomeGCcontent.txt:md5,8818bb687d388a8f851df48c1c92a64c", + "tagAutocorrelation.txt:md5,255f195cb632e7f2e446011234d42f06", + "tagCountDistribution.txt:md5,99351ef6c7375ef3f02953cfd02cb190", + "tagFreq.txt:md5,ec112e6e9d4eba57ceae8450db94ed4c", + "tagFreqUniq.txt:md5,7b1a20d2d14ec3b42403f705ed96b723", + "tagGCcontent.txt:md5,9f423cebdc46a716e47e8fcbddb6c2de", + "tagInfo.txt:md5,1219bbf57a1748d73ab71a8427a921e3", + "tagLengthDistribution.txt:md5,ae99790fcb4004bf798294e76e0a8a24", + "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", + "jurkat.bedGraph.gz:md5,6f2aae5501f5883b620c5399880035ac", + "jurkat.peaks.txt:md5,1247c21dbc92f8114dbcb2320fa09a3a", + "chr21.tags.tsv:md5,8c7f268afb55f7b874ac518104377c01", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,d40fd40dd99740bc4219bd9abb80ebfe", + "tagCountDistribution.txt:md5,611508c79c2889d73983bbb2ad9e80ca", + "tagFreq.txt:md5,4805c5ac52acc6e5f381a97c3d433e2e", + "tagFreqUniq.txt:md5,d161bba3c52cd3e246e29000f349aff6", + "tagGCcontent.txt:md5,4a19e987ea5b2569d14cda12f1fbebf1", + "tagInfo.txt:md5,f2c7a1b2eed60842100fb066be5428a2", + "tagLengthDistribution.txt:md5,38241f577a1a15071dcd16161346dcba", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,c45718bf5c21eb28b810d4800296728b", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,4d8f9dc54f886f379b95609908a08662", + "jurkat_merged.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", + "cd4_chr21_1_unidirectional_peaks.bed:md5,76ee3b56d3e518f88a34b42039ec719c", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,862a5e81119acc691845f3b426847401", + "peakcalling_2024_12_15_17_45_00_44.log:md5,2988afa74c1d505a4242cc2ee2bcf33b" + ], + [ + [ + "cd4_REP1.sorted.bam", + "366dda72360cb6fef08914f246c23fe0" + ], + [ + "cd4_REP2.sorted.bam", + "7ff8b1c06b1d47b26062624d2baf83a5" + ], + [ + "cd4_REP3.sorted.bam", + "281fcd74eeaea3ccf15b864e60c70006" + ], + [ + "cd4_REP4.sorted.bam", + "1401ddb7b887f1b81644c516bfde7e88" + ], + [ + "jurkat_REP1.sorted.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ], + [ + "jurkat_REP2.sorted.bam", + "21970a646ce32e2ccb2aa3d99dc0ebc" + ], + [ + "cd4.bam", + "556453f9ab4a169290b24c3eb78fb3b1" + ], + [ + "jurkat.bam", + "5a50c610f835a57788aaa94f116ea713" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T20:53:19.738149" + "timestamp": "2024-12-15T11:45:42.473513" } } \ No newline at end of file From 6403b85d7115e9158cc36780cbb0d0324f6d0c51 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Dec 2024 13:35:41 -0600 Subject: [PATCH 213/255] test: Convert all tests to nft-utils --- workflows/tests/aligner/bowtie2.nf.test | 40 +- workflows/tests/aligner/bowtie2.nf.test.snap | 479 +++++++++--- workflows/tests/aligner/bwamem2.nf.test | 38 +- workflows/tests/aligner/bwamem2.nf.test.snap | 498 +++++++++--- workflows/tests/aligner/dragmap.nf.test | 41 +- workflows/tests/aligner/dragmap.nf.test.snap | 707 +++++++++++++++--- workflows/tests/aligner/hisat2.nf.test | 40 +- workflows/tests/aligner/hisat2.nf.test.snap | 516 ++++++++++--- workflows/tests/aligner/star.nf.test | 40 +- workflows/tests/aligner/star.nf.test.snap | 564 +++++++++++--- workflows/tests/inputs/gff/main.nf.test | 44 +- workflows/tests/inputs/gff/main.nf.test.snap | 498 +++++++++--- .../tests/inputs/gzipped_gff/main.nf.test | 44 +- .../inputs/gzipped_gff/main.nf.test.snap | 498 +++++++++--- workflows/tests/inputs/only_gff/main.nf.test | 44 +- .../tests/inputs/only_gff/main.nf.test.snap | 498 +++++++++--- .../grohmm/only_gff/main.nf.test | 44 +- .../grohmm/only_gff/main.nf.test.snap | 480 ++++++++++-- .../grohmm/tuning/main.nf.test | 44 +- .../grohmm/tuning/main.nf.test.snap | 478 ++++++++++-- 20 files changed, 4499 insertions(+), 1136 deletions(-) diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index b5ad252c..2cd748c3 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -15,32 +15,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - // NOTE Not deterministic - bam("$outputDir/bowtie2/cd4_REP1.sorted.bam").getHeaderMD5(), - bam("$outputDir/bowtie2/cd4_REP2.sorted.bam").getHeaderMD5(), - bam("$outputDir/bowtie2/jurkat.sorted.bam").getHeaderMD5(), - path("$outputDir/bowtie2/log").list(), - path("$outputDir/bowtie2/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 410106e2..a42aac26 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -1,107 +1,7 @@ { - "output_files": { + "Should run with defaults": { "content": [ 77, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "7945f971cd63ad99ff2d9cc81e19ea39", - "43982cec9077e7030428267841cf04ef", - "8813c6dd42cabd94042f4f9e4aee3560", - [ - "cd4_REP1.bowtie2.log:md5,024c3b6bca27f3836cdd86c0287d2971", - "cd4_REP2.bowtie2.log:md5,089af358aad637ec94c10172eb024773", - "jurkat.bowtie2.log:md5,24031e901f4ce11cfb227c7d30d1373a" - ], - [ - "cd4_REP1.sorted.bam.flagstat:md5,14e684e73cb41155ab1168a0a99a97e6", - "cd4_REP1.sorted.bam.idxstats:md5,e32ac3215ba948bb7dd1559dab6c3c36", - "cd4_REP1.sorted.bam.stats:md5,490f84b5520b83daa95653671ce43921", - "cd4_REP2.sorted.bam.flagstat:md5,e00d036bcbea6f944d45fb5cb7c34516", - "cd4_REP2.sorted.bam.idxstats:md5,0803f2dce4b972ccc14943e22145c3e8", - "cd4_REP2.sorted.bam.stats:md5,f8872ba7ef4b4e66b16a4ca3d63c1a65", - "jurkat.sorted.bam.flagstat:md5,1b24ceabc8cecf34d745d06cf9d43cd0", - "jurkat.sorted.bam.idxstats:md5,15e67d4d9d71c6cc6c37d5ce5414ede0", - "jurkat.sorted.bam.stats:md5,ff1a4b8f6456a539943a14c8daeb75d3" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,ffd8c0a94869dd782779fc871a9b781a", - "cd4_REP1.coverage.stats.txt:md5,bebdef1adcce4296878f8699a0f5cb32", - "cd4_REP2.coverage.hist.txt:md5,6e0ca13df7b06ff6a81fb21596df4ca4", - "cd4_REP2.coverage.stats.txt:md5,ffb701c2be33360a96ce85b1330b13f8", - "jurkat.coverage.hist.txt:md5,656e30e8c4bd12e45a036c62c18730c1", - "jurkat.coverage.stats.txt:md5,627f0ec96ea9bdbd7f41b09b64c389d6" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,cbacd5a2e62bccbb73a5d0f5d0791304", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,cd3d0f6bc45ff35f6729fb7d66ffaf09", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,85206c3788cd2d1cede39fbd6bab5a5c" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,8d377e230fc1df98fd10045ed686ba2b", - "cd4_REP1.seq.DupRate.xls:md5,9d01f20cefc5a5d76c42c64715933705", - "cd4_REP2.pos.DupRate.xls:md5,6939c35f32445351210b07b17a9e424d", - "cd4_REP2.seq.DupRate.xls:md5,ef56fed7d960a88eca66d5514faed7fb", - "jurkat.pos.DupRate.xls:md5,17f5622123e0d0b97f200e53fe7e165d", - "jurkat.seq.DupRate.xls:md5,566934dad135bc0168c36a8f8d297065" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,6b19f80622d25eab51fa5962deac7882", - "cd4_REP2.DupRate_plot.r:md5,94d0e7599e7a83a5ea2f251cb8f2b879", - "jurkat.DupRate_plot.r:md5,d081ee3f5ef5f85ff8fccd013fe04f71" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,a17e22cdbaa5db454d3dfa0624c8acdf", - "cd4_REP2.infer_experiment.txt:md5,d705d9b2c2d8fab525df84b4c943c34a", - "jurkat.infer_experiment.txt:md5,0b4fb80f4ec8466778fa224e4f274e4e" - ], - [ - "cd4_REP1.read_distribution.txt:md5,1df0ae48c81e68ea1d5602897a865f2b", - "cd4_REP2.read_distribution.txt:md5,ff1b593276f36df0cbf7bbc1361e6aad", - "jurkat.read_distribution.txt:md5,a67baffde38aa7a85223148532a18ba4" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,f48ab66b1ddaf0d1b4867183aedb670a", - "cd4_REP1.minus.bedGraph:md5,6930097f008d44b850d8bb5c681e0d1d", - "cd4_REP1.minus.bigWig:md5,a28d277b360522476ceead81b28adc7f", - "cd4_REP1.plus.bedGraph:md5,c9f9c25c6af4285d7535907e37d62793", - "cd4_REP1.plus.bigWig:md5,fb555dbbb1458d56f167660ebfa0f4f0", - "cd4_REP2.dreg.bedGraph:md5,754cbac7c960a8d3424a11f14f78ff71", - "cd4_REP2.minus.bedGraph:md5,843cdcf18dcd791a7d2030c37eb8d62f", - "cd4_REP2.minus.bigWig:md5,782c83b97ea4794f191a6ac7f9231151", - "cd4_REP2.plus.bedGraph:md5,12892778f9451ed5d3578955f14dda7e", - "cd4_REP2.plus.bigWig:md5,ef622d439b5b90bf6d0232ed2faa9ab6", - "jurkat.dreg.bedGraph:md5,01bab031eee63726446d9260f6ebd3eb", - "jurkat.minus.bedGraph:md5,529ad9cfc3f050366f54a2d99085b94b", - "jurkat.minus.bigWig:md5,f211b5371583f0e373c508ad6ab311ee", - "jurkat.plus.bedGraph:md5,2475bada8a001c763caffa12c5c0e98e", - "jurkat.plus.bigWig:md5,c30a99c3f603b268442f8b6081f6f2c9" - ], - "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", - "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", - [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,c8bb282144d8078c0e4c809fe0878a12", - "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495" - ], - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T19:57:28.384783" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -189,12 +89,383 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bowtie2", + "bowtie2/cd4_REP1.sorted.bam", + "bowtie2/cd4_REP1.sorted.bam.bai", + "bowtie2/cd4_REP2.sorted.bam", + "bowtie2/cd4_REP2.sorted.bam.bai", + "bowtie2/jurkat.sorted.bam", + "bowtie2/jurkat.sorted.bam.bai", + "bowtie2/log", + "bowtie2/log/cd4_REP1.bowtie2.log", + "bowtie2/log/cd4_REP2.bowtie2.log", + "bowtie2/log/jurkat.bowtie2.log", + "bowtie2/samtools_stats", + "bowtie2/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bowtie2/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bowtie2/samtools_stats/cd4_REP1.sorted.bam.stats", + "bowtie2/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bowtie2/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bowtie2/samtools_stats/cd4_REP2.sorted.bam.stats", + "bowtie2/samtools_stats/jurkat.sorted.bam.flagstat", + "bowtie2/samtools_stats/jurkat.sorted.bam.idxstats", + "bowtie2/samtools_stats/jurkat.sorted.bam.stats", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed" + ], + [ + "cd4_REP1.sorted.bam:md5,b76f2a8072f3b6a79af34acf60c567a2", + "cd4_REP1.sorted.bam.bai:md5,51c403cb04b2c69c35a67633649fab22", + "cd4_REP2.sorted.bam:md5,7b6a067e5ef315c43bc0e1ae06d70ff8", + "cd4_REP2.sorted.bam.bai:md5,020ca5435bf994ca7edf313e2443ea52", + "jurkat.sorted.bam:md5,a66e8e1f1813ed6ae5de5a00152f889b", + "jurkat.sorted.bam.bai:md5,2210ad584bce8ff514a6e555dfe5ca93", + "cd4_REP1.bowtie2.log:md5,024c3b6bca27f3836cdd86c0287d2971", + "cd4_REP2.bowtie2.log:md5,089af358aad637ec94c10172eb024773", + "jurkat.bowtie2.log:md5,24031e901f4ce11cfb227c7d30d1373a", + "cd4_REP1.sorted.bam.flagstat:md5,14e684e73cb41155ab1168a0a99a97e6", + "cd4_REP1.sorted.bam.idxstats:md5,e32ac3215ba948bb7dd1559dab6c3c36", + "cd4_REP1.sorted.bam.stats:md5,490f84b5520b83daa95653671ce43921", + "cd4_REP2.sorted.bam.flagstat:md5,e00d036bcbea6f944d45fb5cb7c34516", + "cd4_REP2.sorted.bam.idxstats:md5,0803f2dce4b972ccc14943e22145c3e8", + "cd4_REP2.sorted.bam.stats:md5,f8872ba7ef4b4e66b16a4ca3d63c1a65", + "jurkat.sorted.bam.flagstat:md5,1b24ceabc8cecf34d745d06cf9d43cd0", + "jurkat.sorted.bam.idxstats:md5,15e67d4d9d71c6cc6c37d5ce5414ede0", + "jurkat.sorted.bam.stats:md5,ff1a4b8f6456a539943a14c8daeb75d3", + "cd4_REP1.dreg.bedGraph:md5,f48ab66b1ddaf0d1b4867183aedb670a", + "cd4_REP1.minus.bedGraph:md5,6930097f008d44b850d8bb5c681e0d1d", + "cd4_REP1.minus.bigWig:md5,a28d277b360522476ceead81b28adc7f", + "cd4_REP1.plus.bedGraph:md5,c9f9c25c6af4285d7535907e37d62793", + "cd4_REP1.plus.bigWig:md5,fb555dbbb1458d56f167660ebfa0f4f0", + "cd4_REP2.dreg.bedGraph:md5,754cbac7c960a8d3424a11f14f78ff71", + "cd4_REP2.minus.bedGraph:md5,843cdcf18dcd791a7d2030c37eb8d62f", + "cd4_REP2.minus.bigWig:md5,782c83b97ea4794f191a6ac7f9231151", + "cd4_REP2.plus.bedGraph:md5,12892778f9451ed5d3578955f14dda7e", + "cd4_REP2.plus.bigWig:md5,ef622d439b5b90bf6d0232ed2faa9ab6", + "jurkat.dreg.bedGraph:md5,01bab031eee63726446d9260f6ebd3eb", + "jurkat.minus.bedGraph:md5,529ad9cfc3f050366f54a2d99085b94b", + "jurkat.minus.bigWig:md5,f211b5371583f0e373c508ad6ab311ee", + "jurkat.plus.bedGraph:md5,2475bada8a001c763caffa12c5c0e98e", + "jurkat.plus.bigWig:md5,c30a99c3f603b268442f8b6081f6f2c9", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", + "homer-tag-directory-gc-content.txt:md5,8a82322cdfe76225429b1b179f8688d1", + "homer-tag-info-dist.txt:md5,743e8bf5d15a7d1da7fa24c9c5fc90b6", + "homer-tag-length-dist.txt:md5,7afc6c569298244489054b48b7cd76da", + "homer_tagdir.txt:md5,5dc46aa51c80b976579e86496d4f07ff", + "multiqc.log:md5,adf84e0481b7b9a09074d45f245bfdd0", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,7cc1d508f04faf0ca734a0b91fc167e8", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,7766ca91356b0e3af368e8971d9e7f3f", + "multiqc_rseqc_infer_experiment.txt:md5,450ea82ae3a7b44b8b8ab00bf28b858a", + "multiqc_rseqc_read_distribution.txt:md5,a6f6d7bc8558b67e2ac36525afca6edb", + "multiqc_samtools_flagstat.txt:md5,bfe50754b69d75b699bce99ebe6abfb8", + "multiqc_samtools_idxstats.txt:md5,113cb09f55bda73d46a050189e855056", + "multiqc_samtools_stats.txt:md5,92e1669c97ceffc77b26c7da41169a6d", + "multiqc_software_versions.txt:md5,c63e5e2a7a68023d1c2624f36e88d00a", + "multiqc_sources.txt:md5,4e4de478303f639ea8767dd733f48b9a", + "preseq.txt:md5,8d0bedbab4f694d1f10f6f9173991ce4", + "preseq_complexity_plot_molecules.txt:md5,866c1172f0d24d715a19347b941219a2", + "rseqc_infer_experiment_plot.txt:md5,7b9b10702f3cfcb05a2d0c873beedba3", + "rseqc_read_distribution_plot.txt:md5,9249380f98dde2c545480e32be15a1d8", + "rseqc_read_dups.txt:md5,4a36325fe8aa5a5d2a3948a53d34a54c", + "rseqc_read_dups_plot.txt:md5,7fc6bbbc740f33d045cda618aaf79043", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,f32b5bd6a90dc7d8069abd2d089b3e14", + "samtools-flagstat-dp_Read_counts.txt:md5,d2b399af315dac01978b0992c5684e91", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,dbd30a68cd79a1dd45673ad1b9f5c7c8", + "samtools-stats-dp.txt:md5,0ec51d7fd99677fcbdcbff16efd2883b", + "samtools_alignment_plot.txt:md5,4645a285dcee3bc5b25b4f01303c80cb", + "multiqc_report.html:md5,6dae4ea9f8a93e20aee8e010faaf79d1", + "cd4_REP1.trimmed.fastp.html:md5,bc81b7b51625d3535968bde725875cd1", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,f738e23594788a08f10b9692c85be7b0", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", + "jurkat.trimmed.fastp.html:md5,e0f11ec4038b763b5aed3d8ad98bfc37", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,9d29fefe192b567ea7c77d5460c1ebc3", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,69b5d7a4fa4758a5e0d6c219177e9f62", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,f2a4ca52626ea81e7ff625dc8ea207f0", + "cd4_REP1.coverage.hist.txt:md5,ffd8c0a94869dd782779fc871a9b781a", + "cd4_REP1.coverage.stats.txt:md5,bebdef1adcce4296878f8699a0f5cb32", + "cd4_REP2.coverage.hist.txt:md5,6e0ca13df7b06ff6a81fb21596df4ca4", + "cd4_REP2.coverage.stats.txt:md5,ffb701c2be33360a96ce85b1330b13f8", + "jurkat.coverage.hist.txt:md5,656e30e8c4bd12e45a036c62c18730c1", + "jurkat.coverage.stats.txt:md5,627f0ec96ea9bdbd7f41b09b64c389d6", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,cbacd5a2e62bccbb73a5d0f5d0791304", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,cd3d0f6bc45ff35f6729fb7d66ffaf09", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,85206c3788cd2d1cede39fbd6bab5a5c", + "cd4_REP1.command.log:md5,f9ea2145145a8a7665af4b721a176b66", + "cd4_REP2.command.log:md5,9b8e7b17ea65fb4c7ad628414a48150a", + "jurkat.command.log:md5,a458c54791452442ed8aaae55e6149e4", + "cd4_REP1.infer_experiment.txt:md5,a17e22cdbaa5db454d3dfa0624c8acdf", + "cd4_REP2.infer_experiment.txt:md5,d705d9b2c2d8fab525df84b4c943c34a", + "jurkat.infer_experiment.txt:md5,0b4fb80f4ec8466778fa224e4f274e4e", + "cd4_REP1.read_distribution.txt:md5,1df0ae48c81e68ea1d5602897a865f2b", + "cd4_REP2.read_distribution.txt:md5,ff1b593276f36df0cbf7bbc1361e6aad", + "jurkat.read_distribution.txt:md5,a67baffde38aa7a85223148532a18ba4", + "cd4_REP1.DupRate_plot.pdf:md5,1f803a99b308f9183257fa8c88ba48f2", + "cd4_REP2.DupRate_plot.pdf:md5,472833acb07585894e39e5d5170f3b8b", + "jurkat.DupRate_plot.pdf:md5,940536f7ed7403e2c7d1a21e04c5961b", + "cd4_REP1.DupRate_plot.r:md5,6b19f80622d25eab51fa5962deac7882", + "cd4_REP2.DupRate_plot.r:md5,94d0e7599e7a83a5ea2f251cb8f2b879", + "jurkat.DupRate_plot.r:md5,d081ee3f5ef5f85ff8fccd013fe04f71", + "cd4_REP1.pos.DupRate.xls:md5,8d377e230fc1df98fd10045ed686ba2b", + "cd4_REP1.seq.DupRate.xls:md5,9d01f20cefc5a5d76c42c64715933705", + "cd4_REP2.pos.DupRate.xls:md5,6939c35f32445351210b07b17a9e424d", + "cd4_REP2.seq.DupRate.xls:md5,ef56fed7d960a88eca66d5514faed7fb", + "jurkat.pos.DupRate.xls:md5,17f5622123e0d0b97f200e53fe7e165d", + "jurkat.seq.DupRate.xls:md5,566934dad135bc0168c36a8f8d297065", + "cd4.featureCounts.txt:md5,7f341754a6b141398805dddd0ea3c76b", + "cd4.featureCounts.txt.summary:md5,775f3086fce250808a39476d88b7afdb", + "jurkat.featureCounts.txt:md5,95c7ab756ee8eee7246904dd32c4d570", + "jurkat.featureCounts.txt.summary:md5,4829231aaf0e43ec12da52a3d850bf6e", + "cd4.bam:md5,ce5d8aaeea9a5cf274a41a71e1b1f161", + "jurkat.bam:md5,65490dc5bea04bf13b1f520b9cb9a8e9", + "cd4_filtered.bed:md5,c8bb282144d8078c0e4c809fe0878a12", + "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495", + "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", + "cd4.bedGraph.gz:md5,b56af8345df8615e5c68100f34deb207", + "cd4.peaks.txt:md5,66589ceaf2aabf1e4e7bad64b94b6fd8", + "chr21.tags.tsv:md5,cf851d8ec227da2a7a4d52d2f3da550b", + "genomeGCcontent.txt:md5,490468501aac12c93a6c4fa36fb99112", + "tagAutocorrelation.txt:md5,75df13d6e6d4dce27591ab8bf0b5e174", + "tagCountDistribution.txt:md5,777f206539575190afb1203c02542307", + "tagFreq.txt:md5,63abb5f08f0f9055c4fb0ea5c59ddb74", + "tagFreqUniq.txt:md5,b0147e5dd3fc6a9cd7f6e331e0fe4fc8", + "tagGCcontent.txt:md5,3473d47a58f632328d3a45f336800ab6", + "tagInfo.txt:md5,df6f9805509920f3916a6f23f22f8284", + "tagLengthDistribution.txt:md5,c9b2749c7fad9896f925683c0cb9f386", + "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", + "jurkat.bedGraph.gz:md5,41ca91efa9fd5038376f969d84adf311", + "jurkat.peaks.txt:md5,100cb761b6b7abad3901775e499a6aa1", + "chr21.tags.tsv:md5,a6e15f137754d01a084b98186e1ddf70", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,8ef971a31030577dbe367b51bb06a9ec", + "tagCountDistribution.txt:md5,dc60411648656288129fa2a339b13b00", + "tagFreq.txt:md5,e3001b6f77c0c439a023657cbd2bfc0f", + "tagFreqUniq.txt:md5,c09f664f6e119fc8a09ea36f2eac80b6", + "tagGCcontent.txt:md5,36b5e9fdf908750829f30f83347aebd2", + "tagInfo.txt:md5,81051f16335ab02352007424ac6ed3be", + "tagLengthDistribution.txt:md5,ccdce0d5eb2050376727b3f80e176aa6", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + [ + "cd4_REP1.sorted.bam", + "aab93a37ba4fd975ca801c704b876fbb" + ], + [ + "cd4_REP2.sorted.bam", + "5eed61339ddc512670764768436bc4a8" + ], + [ + "jurkat.sorted.bam", + "adce9f0ed647f9781fbec5bcc09dc21" + ], + [ + "cd4.bam", + "fd4359b8877ec6fcc7568a1685b17e47" + ], + [ + "jurkat.bam", + "adce9f0ed647f9781fbec5bcc09dc21" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T20:49:15.410584" + "timestamp": "2024-12-15T11:55:09.917179" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test index c08c35d1..d4593470 100644 --- a/workflows/tests/aligner/bwamem2.nf.test +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -13,30 +13,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/bwamem2/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwamem2/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwamem2/jurkat.sorted.bam").getSamLinesMD5(), - path("$outputDir/bwamem2/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 3ebf8b8f..81b04236 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -1,102 +1,7 @@ { - "output_files": { + "Should run with defaults": { "content": [ 92, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "c529a16c839e85e119b98354f109352d", - "9e63b682af88fa902cf92b5c485845b1", - "c2adf5327ff6d4edda2fdad00c7cb9bf", - [ - "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", - "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" - ], - [ - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", - "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", - "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", - "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", - "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", - "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", - "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", - "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", - "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", - "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", - "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", - "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", - "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", - "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", - "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" - ], - "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - [ - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" - ], - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:02:08.759585" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -199,12 +104,407 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "bwamem2", + "bwamem2/cd4_REP1.sorted.bam", + "bwamem2/cd4_REP1.sorted.bam.bai", + "bwamem2/cd4_REP2.sorted.bam", + "bwamem2/cd4_REP2.sorted.bam.bai", + "bwamem2/jurkat.sorted.bam", + "bwamem2/jurkat.sorted.bam.bai", + "bwamem2/samtools_stats", + "bwamem2/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bwamem2/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bwamem2/samtools_stats/cd4_REP1.sorted.bam.stats", + "bwamem2/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bwamem2/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bwamem2/samtools_stats/cd4_REP2.sorted.bam.stats", + "bwamem2/samtools_stats/jurkat.sorted.bam.flagstat", + "bwamem2/samtools_stats/jurkat.sorted.bam.idxstats", + "bwamem2/samtools_stats/jurkat.sorted.bam.stats", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_17_56_42_44.log", + "transcript_identification/pints/peakcalling_2024_12_15_17_56_42_45.log" + ], + [ + "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", + "cd4_REP1.sorted.bam:md5,43a9fccfbbe9825bb795bdd7c0788f62", + "cd4_REP1.sorted.bam.bai:md5,941ed9d1bf8e04ab916967a4f6c03db4", + "cd4_REP2.sorted.bam:md5,974e4a49c44d039eb5b7c4980f456b93", + "cd4_REP2.sorted.bam.bai:md5,a89d7777e8172df5a13872061f358ee6", + "jurkat.sorted.bam:md5,34f4272bbd68ac9e91e5865ab2259034", + "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", + "homer-tag-directory-gc-content.txt:md5,213706733eb7a6c9e1345e7961f9a266", + "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", + "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", + "homer_tagdir.txt:md5,ad54384ccd9668de175a540cd44310f2", + "multiqc.log:md5,f298938874b05b767efe2fa3745d0a28", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,b52ef1401f2009da28eda69f2f59f20e", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", + "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", + "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", + "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", + "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", + "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", + "multiqc_software_versions.txt:md5,78249c4b31b317d8ff4015fd12fb5a2f", + "multiqc_sources.txt:md5,8bace21dbef21c498ccee5775d7d836e", + "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", + "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", + "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", + "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", + "rseqc_read_dups.txt:md5,680c3c892d67c8e334c25d3044a89805", + "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", + "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", + "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", + "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", + "multiqc_report.html:md5,ae3250bd9de858ddb69702a9d09395cb", + "cd4_REP1.trimmed.fastp.html:md5,1c9eab4ef6d60cba7dfafebb7589485e", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,0e0b009b4d35dfd5254b445d4730313b", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", + "jurkat.trimmed.fastp.html:md5,24a97fa482fee4ee717dc04e15f9a049", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,321dfa64c470daf4e1706f363c0b613f", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,417c65a1d3587d31d63ee48d5d7cf25d", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,d7ef0dc8ed3951d2d7de964a8f9a97cc", + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", + "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", + "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", + "jurkat.command.log:md5,870a47f101cd5007d2756448b896c33d", + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", + "cd4_REP1.DupRate_plot.pdf:md5,1abb98ad8ba6e750cd465a1e85a58116", + "cd4_REP2.DupRate_plot.pdf:md5,a5db47514019c4d0ac6443d8b39277e3", + "jurkat.DupRate_plot.pdf:md5,4cefedfcde7b7b5c68fe401480528a94", + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", + "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", + "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", + "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", + "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", + "cd4.bam:md5,d93f87630c701965a7b3168e99b8e94e", + "jurkat.bam:md5,2fd6cb82a46491e133335a7a73ca67a2", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "cd4.bedGraph.gz:md5,3cec76e93de4dfa41821379340520881", + "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", + "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", + "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", + "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", + "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", + "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", + "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", + "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", + "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", + "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + "jurkat.bedGraph.gz:md5,75f873abf009c13f0dc685e33cbaf7b1", + "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", + "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", + "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", + "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", + "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", + "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", + "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", + "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", + "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "peakcalling_2024_12_15_17_56_42_44.log:md5,5ca1688a6c30db974e9916387ef988ab", + "peakcalling_2024_12_15_17_56_42_45.log:md5,a70d92561d80fa92bf46a1d081c5c317" + ], + [ + [ + "cd4_REP1.sorted.bam", + "366dda72360cb6fef08914f246c23fe0" + ], + [ + "cd4_REP2.sorted.bam", + "7ff8b1c06b1d47b26062624d2baf83a5" + ], + [ + "jurkat.sorted.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ], + [ + "cd4.bam", + "bcdfc1a81d5240c8ce9fcabe46a30af1" + ], + [ + "jurkat.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T20:55:33.341724" + "timestamp": "2024-12-15T11:57:19.26958" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index 9fce8a95..76f50879 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -13,33 +13,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - // NOTE Not deterministic - bam("$outputDir/dragmap/cd4_REP1.sorted.bam").getHeaderMD5(), - bam("$outputDir/dragmap/cd4_REP2.sorted.bam").getHeaderMD5(), - bam("$outputDir/dragmap/jurkat.sorted.bam").getHeaderMD5(), - // NOTE Not deterministic - // path("$outputDir/dragmap/log").list(), - path("$outputDir/dragmap/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index cf21fed1..9d2a0a08 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -1,102 +1,7 @@ { - "output_files": { + "Should run with defaults": { "content": [ 92, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "9294458e8828aa4446fc6ea24f828d11", - "767cae9340255d914b40f5f0a76f9d65", - "b47414b7dada10ad11535d36af2e2cb", - [ - "cd4_REP1.sorted.bam.flagstat:md5,6a27aa41830e5f10a2c54c8a05611f9a", - "cd4_REP1.sorted.bam.idxstats:md5,75eaf648cea73812913344af3851ce16", - "cd4_REP1.sorted.bam.stats:md5,80bfe47bc5be703b51313a4b2fbcc57f", - "cd4_REP2.sorted.bam.flagstat:md5,0355e87e727027ee381053c49123336f", - "cd4_REP2.sorted.bam.idxstats:md5,4a68a3a04440acdced8802c29ffc634c", - "cd4_REP2.sorted.bam.stats:md5,24a85ae13a01fdbd1e6e882cf3ef55e0", - "jurkat.sorted.bam.flagstat:md5,2ac2d8fdb09b0bf5061d9e24501c41c3", - "jurkat.sorted.bam.idxstats:md5,8aebada21b179c96f888d08bb4ae1651", - "jurkat.sorted.bam.stats:md5,104f00b802be80cc252beb0d4cfd709b" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", - "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", - "cd4_REP2.coverage.hist.txt:md5,edadf440d1c3658118ffd6b6a46821f8", - "cd4_REP2.coverage.stats.txt:md5,cb1ce057d05fc53e7ad9b0b2e3d5aaad", - "jurkat.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", - "jurkat.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,a2dfb0a61cd0ada1f306aaf8c7cc7b8f", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,f5bc717609e44a4e94a1b1c626c1aaad", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,129145e5b3fa3cd8a6908bcbe75ea010" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,c53ebd47cad3f3524dafd3d0bdd2cc71", - "cd4_REP1.seq.DupRate.xls:md5,6fc39432eb1815a1aebac84c5c46aa97", - "cd4_REP2.pos.DupRate.xls:md5,96b7100c85fd83d7634ebcd199de2aea", - "cd4_REP2.seq.DupRate.xls:md5,dac033fb9e548d1e23069d9f76f9e67d", - "jurkat.pos.DupRate.xls:md5,3389108003e203614790dd835c84bd81", - "jurkat.seq.DupRate.xls:md5,0950602857db220cdf550f66e0ad69b8" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,d04a5d1a2c83c2be6dd373710d63fecf", - "cd4_REP2.DupRate_plot.r:md5,18afd2c9eb78d75dab9ac483b38111f8", - "jurkat.DupRate_plot.r:md5,2265434abacdb7130dd1643114482c8c" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,e257827c09d08e0211e6b55b78c09817", - "cd4_REP2.infer_experiment.txt:md5,cfc76745a36e9144eb03b85abb40a2bc", - "jurkat.infer_experiment.txt:md5,14af4229684e813974e4c4ac5724bd81" - ], - [ - "cd4_REP1.read_distribution.txt:md5,82bb213b23ea5a2c719c09ed993b576d", - "cd4_REP2.read_distribution.txt:md5,139a91e2f36b9c93b09fe36aff3414cd", - "jurkat.read_distribution.txt:md5,982e7cb76ca5978ff8c8bc63d17a1fbe" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,aefd2accdaf19635f5a566e6e36a578e", - "cd4_REP1.minus.bedGraph:md5,d4ddabe2599211e89c0eeb07544a2bf2", - "cd4_REP1.minus.bigWig:md5,7f0614afba6a3f37d507d1ee0ce4de2f", - "cd4_REP1.plus.bedGraph:md5,2ebf9f9cf845e8403cceda70e254be03", - "cd4_REP1.plus.bigWig:md5,de63345606909c31c3dfa2a0d57e68bc", - "cd4_REP2.dreg.bedGraph:md5,68cb12ce50649175d359aa8d7cbaae06", - "cd4_REP2.minus.bedGraph:md5,96876aaaca35003be86a25c78733c8f9", - "cd4_REP2.minus.bigWig:md5,228ed1c4fef63675c260c4f750b7c8f3", - "cd4_REP2.plus.bedGraph:md5,a6f04b8484428786a3e089ea5509240b", - "cd4_REP2.plus.bigWig:md5,cfea092121f880010f3ae652025e446b", - "jurkat.dreg.bedGraph:md5,337d974e56a047cea3ce1aa2a694b1ac", - "jurkat.minus.bedGraph:md5,c57d91865736e23f13660f9d7ecb6e5d", - "jurkat.minus.bigWig:md5,22daac83d393dcca8f1cc96580d3d4f3", - "jurkat.plus.bedGraph:md5,ddabf19e2172df4b80b7ce434035403e", - "jurkat.plus.bigWig:md5,ca73f44638c066f25261efffa1eedc7f" - ], - "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", - "jurkat.bed:md5,31454804c53975171a763d3049406598", - [ - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,c9f505b59820e0e5f3589de3e2300a83", - "jurkat_filtered.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c" - ], - true - ], - "meta": { - "nf-test": "0.9.0", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-09T01:33:02.135866793" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -200,12 +105,614 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "dragmap", + "dragmap/cd4_REP1.sorted.bam", + "dragmap/cd4_REP1.sorted.bam.bai", + "dragmap/cd4_REP2.sorted.bam", + "dragmap/cd4_REP2.sorted.bam.bai", + "dragmap/jurkat.sorted.bam", + "dragmap/jurkat.sorted.bam.bai", + "dragmap/log", + "dragmap/log/cd4_REP1.dragmap.log", + "dragmap/log/cd4_REP2.dragmap.log", + "dragmap/log/jurkat.dragmap.log", + "dragmap/samtools_stats", + "dragmap/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "dragmap/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "dragmap/samtools_stats/cd4_REP1.sorted.bam.stats", + "dragmap/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "dragmap/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "dragmap/samtools_stats/cd4_REP2.sorted.bam.stats", + "dragmap/samtools_stats/jurkat.sorted.bam.flagstat", + "dragmap/samtools_stats/jurkat.sorted.bam.idxstats", + "dragmap/samtools_stats/jurkat.sorted.bam.stats", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_plots", + "multiqc/multiqc_plots/pdf", + "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", + "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", + "multiqc/multiqc_plots/pdf/general_stats_table.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", + "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", + "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", + "multiqc/multiqc_plots/png", + "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", + "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", + "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", + "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", + "multiqc/multiqc_plots/png/general_stats_table.png", + "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", + "multiqc/multiqc_plots/png/homer-tag-length-dist.png", + "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", + "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", + "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-stats-dp.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", + "multiqc/multiqc_plots/svg", + "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", + "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", + "multiqc/multiqc_plots/svg/general_stats_table.svg", + "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", + "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", + "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", + "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", + "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_20_51_02_61.log" + ], + [ + "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", + "cd4.bed:md5,6c7e6c49f4d80f9b980bddac85617616", + "jurkat.bed:md5,5fd13a128a16a78a0f96077780a7726e", + "cd4_REP1.dreg.bedGraph:md5,aefd2accdaf19635f5a566e6e36a578e", + "cd4_REP1.minus.bedGraph:md5,d4ddabe2599211e89c0eeb07544a2bf2", + "cd4_REP1.minus.bigWig:md5,7f0614afba6a3f37d507d1ee0ce4de2f", + "cd4_REP1.plus.bedGraph:md5,2ebf9f9cf845e8403cceda70e254be03", + "cd4_REP1.plus.bigWig:md5,de63345606909c31c3dfa2a0d57e68bc", + "cd4_REP2.dreg.bedGraph:md5,68cb12ce50649175d359aa8d7cbaae06", + "cd4_REP2.minus.bedGraph:md5,96876aaaca35003be86a25c78733c8f9", + "cd4_REP2.minus.bigWig:md5,228ed1c4fef63675c260c4f750b7c8f3", + "cd4_REP2.plus.bedGraph:md5,a6f04b8484428786a3e089ea5509240b", + "cd4_REP2.plus.bigWig:md5,cfea092121f880010f3ae652025e446b", + "jurkat.dreg.bedGraph:md5,337d974e56a047cea3ce1aa2a694b1ac", + "jurkat.minus.bedGraph:md5,c57d91865736e23f13660f9d7ecb6e5d", + "jurkat.minus.bigWig:md5,22daac83d393dcca8f1cc96580d3d4f3", + "jurkat.plus.bedGraph:md5,ddabf19e2172df4b80b7ce434035403e", + "jurkat.plus.bigWig:md5,ca73f44638c066f25261efffa1eedc7f", + "cd4_REP1.sorted.bam:md5,2622fc57e8b754d4e84ecb9f3e4276cc", + "cd4_REP1.sorted.bam.bai:md5,957a9abb20fc6b52c242fffd01473d6e", + "cd4_REP2.sorted.bam:md5,e1bd400352e7809137d06055f16438a5", + "cd4_REP2.sorted.bam.bai:md5,5c7d201e3c4587780287671c2fd7cf0e", + "jurkat.sorted.bam:md5,fb2d30a7f193a8df7caedd820ff15377", + "jurkat.sorted.bam.bai:md5,0c23df1ef94a96981def4e1727f8160d", + "cd4_REP1.dragmap.log:md5,3af10dc85800166c8cef5137508e3f95", + "cd4_REP2.dragmap.log:md5,99afce2788e3d0eeae4672903a7b5dd7", + "jurkat.dragmap.log:md5,8584413b5a4e6d68c157a195411d6e0f", + "cd4_REP1.sorted.bam.flagstat:md5,6a27aa41830e5f10a2c54c8a05611f9a", + "cd4_REP1.sorted.bam.idxstats:md5,75eaf648cea73812913344af3851ce16", + "cd4_REP1.sorted.bam.stats:md5,80bfe47bc5be703b51313a4b2fbcc57f", + "cd4_REP2.sorted.bam.flagstat:md5,0355e87e727027ee381053c49123336f", + "cd4_REP2.sorted.bam.idxstats:md5,4a68a3a04440acdced8802c29ffc634c", + "cd4_REP2.sorted.bam.stats:md5,24a85ae13a01fdbd1e6e882cf3ef55e0", + "jurkat.sorted.bam.flagstat:md5,2ac2d8fdb09b0bf5061d9e24501c41c3", + "jurkat.sorted.bam.idxstats:md5,8aebada21b179c96f888d08bb4ae1651", + "jurkat.sorted.bam.stats:md5,104f00b802be80cc252beb0d4cfd709b", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", + "homer-tag-directory-gc-content.txt:md5,cb2520bd84614eede28992553375beb1", + "homer-tag-info-dist.txt:md5,28c0be2b0a184b510575d47bd1cba705", + "homer-tag-length-dist.txt:md5,f69abc9072088e4e2d84414626fbea17", + "homer_tagdir.txt:md5,00b39cee169d38087ca748c3d35b5eb9", + "multiqc.log:md5,3e8f80e86ac107e1a873abc4b6f30612", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,98a8849422d4e6977799f2a479ef9283", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,9f0bedd0fa34ededafcad637b5173109", + "multiqc_rseqc_infer_experiment.txt:md5,efa14bf87a649e1bd1d1d5aa24ef2997", + "multiqc_rseqc_read_distribution.txt:md5,3ad9f9fee7cf47c2b6770fcb4a95fc41", + "multiqc_samtools_flagstat.txt:md5,007105e445f492516310f672f7911543", + "multiqc_samtools_idxstats.txt:md5,0eabaa59de66930a36507c3dc92f1fcc", + "multiqc_samtools_stats.txt:md5,524f65e08c29112a473c365b6bc1bd9e", + "multiqc_software_versions.txt:md5,e6a86a4c85f30eb38071212c8c6a5eed", + "multiqc_sources.txt:md5,05ef2c47b9905828cd569a899cf773a1", + "preseq.txt:md5,3b75a8101e8dccfd67b6e8b03cba691b", + "preseq_complexity_plot_molecules.txt:md5,e93aa98e7a76dbf7021f4365365a966e", + "rseqc_infer_experiment_plot.txt:md5,b0ba3477debd992d27674547b76e7025", + "rseqc_read_distribution_plot.txt:md5,351eac2505410832e4f727daf7158cc8", + "rseqc_read_dups.txt:md5,f3d1e8afcee7fdaeb1600558e7d93c60", + "rseqc_read_dups_plot.txt:md5,e01b680e539786565097e877da58ca5c", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,3f96b11d5ba1c3c64e2ba5e3a1fbaa9d", + "samtools-flagstat-dp_Read_counts.txt:md5,fea16eb94f71133f9f628cf72da3062f", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,62358a9a5b36bc0c0836e753bb2db316", + "samtools-stats-dp.txt:md5,96361e70a475ec24edd881d81315b26f", + "samtools_alignment_plot.txt:md5,2b88db7a659982f999791146d26e4b38", + "fastqc-status-check-heatmap.pdf:md5,e7508bfcc0c430fb667363ef71985a03", + "fastqc_adapter_content_plot.pdf:md5,9e405bf835a6d60872f3d7c6edd7e297", + "fastqc_overrepresented_sequences_plot.pdf:md5,277379eee21d57bcc9f1a619175a0cbb", + "fastqc_per_base_n_content_plot.pdf:md5,1d0fb1c08855a422da5631f4167bfbfb", + "fastqc_per_base_sequence_quality_plot.pdf:md5,eef90284d18073c927c8d94c708e30b2", + "fastqc_per_sequence_gc_content_plot_Counts.pdf:md5,6a9874d79827e99c99be90cacfd83ef8", + "fastqc_per_sequence_gc_content_plot_Percentages.pdf:md5,c7578e14109573b7a84e56f7844af684", + "fastqc_per_sequence_quality_scores_plot.pdf:md5,a8cde07ccb2338f604d11ca84d6a7d3d", + "fastqc_sequence_counts_plot-cnt.pdf:md5,9daac14370808336fbf71924345392a1", + "fastqc_sequence_counts_plot-pct.pdf:md5,fba4738a612ed375217f4b79a6077a29", + "fastqc_sequence_duplication_levels_plot.pdf:md5,b3cf349ec6b3eb16e75407f797ad75d5", + "fastqc_top_overrepresented_sequences_table.pdf:md5,c1778a9360e4d34a18a67fb56f59a76d", + "general_stats_table.pdf:md5,4194c2d07bc7b6e92e37e0aac1390078", + "homer-tag-directory-gc-content.pdf:md5,9c2bf70c0e7caf5cccbe7f5016709912", + "homer-tag-info-dist-cnt.pdf:md5,e72edf46aa9bae3a3211abb5508641a7", + "homer-tag-info-dist-pct.pdf:md5,7eef06db5a5af26104d6dac178519caa", + "homer-tag-length-dist.pdf:md5,7d3acba029bd5ea0ea0bb4c264ea92c2", + "preseq_complexity_plot_molecules.pdf:md5,148da0de8140a838900ad300391a0328", + "rseqc_infer_experiment_plot.pdf:md5,a736776c45032c830a65ec728f5776b1", + "rseqc_read_distribution_plot-cnt.pdf:md5,782311f91ed51c4f310b7b6a1279f37f", + "rseqc_read_distribution_plot-pct.pdf:md5,f85495647a5651d0cac68270b8e07985", + "rseqc_read_dups_plot.pdf:md5,f071a2c04cc0345ca6fd433bd3d69299", + "samtools-flagstat-dp_Percentage_of_total.pdf:md5,15a2c32240871319266b1338c21eabdf", + "samtools-flagstat-dp_Read_counts.pdf:md5,f112560f2a7a2a3a918a72893867a6b8", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf:md5,1f3f6081c26f7ee6cc2e9ebdb7a8a5f0", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf:md5,009491bdb3f643cf76509fb333d75505", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf:md5,35ad9649cf318980e0220bc7ca3d51bd", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf:md5,a4879cd3dfe50f6281921f70a26f0136", + "samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf:md5,b7b147eb5b5bbee0c4a5f2deab7c2677", + "samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf:md5,1362c72eb932bd4721792c64513711a0", + "samtools-stats-dp.pdf:md5,bc6c97ee80635eb7a921090d433ae74d", + "samtools_alignment_plot-cnt.pdf:md5,716d5904dd6e1f924aab45b91ed81f3f", + "samtools_alignment_plot-pct.pdf:md5,267698e622f292af9cb3262ea0ce22da", + "fastqc-status-check-heatmap.png:md5,4a1ddda986f81413112660633f82c5d6", + "fastqc_adapter_content_plot.png:md5,32efdebb305e0266339d882fa162f074", + "fastqc_overrepresented_sequences_plot.png:md5,a7dd2a12f574306233f9edc606a1aaad", + "fastqc_per_base_n_content_plot.png:md5,d728893a0ce22b5f87d5b6d6f136e5ea", + "fastqc_per_base_sequence_quality_plot.png:md5,c408a3c56d02896e54b521a58b2307a4", + "fastqc_per_sequence_gc_content_plot_Counts.png:md5,beb6b40783528b0ea364daea301fa17b", + "fastqc_per_sequence_gc_content_plot_Percentages.png:md5,77f64ef84400d3165f20e1c87ecb1cd8", + "fastqc_per_sequence_quality_scores_plot.png:md5,726d671e21c7ac8116fca13c43ffc9c0", + "fastqc_sequence_counts_plot-cnt.png:md5,b53fd28651c1b6cd57a00027338fa196", + "fastqc_sequence_counts_plot-pct.png:md5,5ce9a1d3cec4e6621899c8f2605bc925", + "fastqc_sequence_duplication_levels_plot.png:md5,bc6147bdc3d59f796b71d45a636a85c7", + "fastqc_top_overrepresented_sequences_table.png:md5,fc0ff3848d89adb027eeb37cf65d69fb", + "general_stats_table.png:md5,bf1279aa30f3e0c3059e1e66a9cfbd8f", + "homer-tag-directory-gc-content.png:md5,74e2562929589afe688d382567b3f69c", + "homer-tag-info-dist-cnt.png:md5,93b784f5e8ae326118e844b037d18976", + "homer-tag-info-dist-pct.png:md5,bc341ba31e303df97ae9ef42a1ce4b78", + "homer-tag-length-dist.png:md5,da4759ce87b032d3cbfffaeec0307b17", + "preseq_complexity_plot_molecules.png:md5,459d8145367486cfcb28918193a28815", + "rseqc_infer_experiment_plot.png:md5,7e9a30629920550dcf2812509a28c0d0", + "rseqc_read_distribution_plot-cnt.png:md5,1596c061fd9cc87929645a0aedd1d8cb", + "rseqc_read_distribution_plot-pct.png:md5,237f8ee85c60482d0bdc3d2d81cd1493", + "rseqc_read_dups_plot.png:md5,6eebe003179b3cf7714c940f8f746b91", + "samtools-flagstat-dp_Percentage_of_total.png:md5,6d33af495920e86c35b5e4df2b988dd5", + "samtools-flagstat-dp_Read_counts.png:md5,7389033f7f612593b96cb5408b371c9a", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png:md5,39cd1784ee278d9cb222f9363fd5d013", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png:md5,4865b3f4fc84df66e9a511f9a0fbba9e", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png:md5,2b98b3ce9a11603c84c368f89c034355", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png:md5,3c04436c178bf2a9de9083cb9e4432a9", + "samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png:md5,78f24659ddb439e3d45b0a938d6c5401", + "samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png:md5,b8c21d4c41d6d9f6cf6e37e1b1f3fe76", + "samtools-stats-dp.png:md5,69d51dced405b1f173d94c8f92ef4d7f", + "samtools_alignment_plot-cnt.png:md5,8aabd26cf7d3ca810d56ba230b535d59", + "samtools_alignment_plot-pct.png:md5,92e5a6a4308632318d2759371794d967", + "fastqc-status-check-heatmap.svg:md5,15d5da8aeef63b66890119f03982cbcb", + "fastqc_adapter_content_plot.svg:md5,0e776d31ff21c5d938ee34e479977c7b", + "fastqc_overrepresented_sequences_plot.svg:md5,20134a8a21b03e4521cef0b7ed76fc39", + "fastqc_per_base_n_content_plot.svg:md5,6eee5e9991b522bf02dc8506d3551a52", + "fastqc_per_base_sequence_quality_plot.svg:md5,3acd46d4e905088131ff500b7d2a83ed", + "fastqc_per_sequence_gc_content_plot_Counts.svg:md5,9be552de069ad309fe0e196784b21cae", + "fastqc_per_sequence_gc_content_plot_Percentages.svg:md5,0e97b9e38616d84870ba1e5aa8d2cb5d", + "fastqc_per_sequence_quality_scores_plot.svg:md5,26b566c2a235a85b4e364963c19e02ab", + "fastqc_sequence_counts_plot-cnt.svg:md5,c83b8ae146c1b45f211c820e42ac0e56", + "fastqc_sequence_counts_plot-pct.svg:md5,7d0f44c0faa1294038a2b171ea3646ff", + "fastqc_sequence_duplication_levels_plot.svg:md5,2b76fcb2c16ee55a59ddc2fc6cbb1f81", + "fastqc_top_overrepresented_sequences_table.svg:md5,0213d032845cdb9ae0f8be85fc0bb7c8", + "general_stats_table.svg:md5,a5aabdc440af366a0405fe30e81895ca", + "homer-tag-directory-gc-content.svg:md5,42f9ca07a3d5c92731bda723a3d69a83", + "homer-tag-info-dist-cnt.svg:md5,5762ba6aaa7ebea9b899613b236c3d8e", + "homer-tag-info-dist-pct.svg:md5,ecb4ce86efdf9fc611ce11ab2d26a30c", + "homer-tag-length-dist.svg:md5,2869ff8ff4a772a99d06b4187c2cbb6a", + "preseq_complexity_plot_molecules.svg:md5,64d692dccb00d3a6e0b189bd7ee8d132", + "rseqc_infer_experiment_plot.svg:md5,ee6709df9b1a0b51202bfde2cde02e2d", + "rseqc_read_distribution_plot-cnt.svg:md5,ddd04b8a89f1d8271cafe93d65de218c", + "rseqc_read_distribution_plot-pct.svg:md5,9601b60164cdfdb5b2587a5c27af4aa4", + "rseqc_read_dups_plot.svg:md5,f785dace8f24221ec4104d44abb8066a", + "samtools-flagstat-dp_Percentage_of_total.svg:md5,0c8e409ccec79e42ebce88989eae6300", + "samtools-flagstat-dp_Read_counts.svg:md5,7e1da579882e30abb23fd5706291b9fc", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg:md5,af6e76af47ce2a5680335d0fb3c96b1c", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg:md5,7f5bdfce8b732f9f6df9a768b8282769", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg:md5,483ab9f6f10840c684e5d2d64d0d3653", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg:md5,cc221df71fdedd3ca56c37609231eb08", + "samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg:md5,65bfcef4615054ac8a01182be6f0fb8c", + "samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg:md5,d3d6e3fbf094cd8b9a550e726b637071", + "samtools-stats-dp.svg:md5,650377751232d5de1e7d7e1e64e544c2", + "samtools_alignment_plot-cnt.svg:md5,274c8ffc543b62aaf2874256d56584c9", + "samtools_alignment_plot-pct.svg:md5,53ecebebd1fd4252e5ea5589c547c7fa", + "multiqc_report.html:md5,79abc0e64f9ee90d14927ad3424dfef6", + "cd4_REP1.trimmed.fastp.html:md5,6d046d3b305c984117e7ac7b2997c313", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,751fb0e9c3ad33366fe4575c14362549", + "cd4_REP2.trimmed.fastp.html:md5,665154d68a076509c2ef8eed36a28cbb", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,d67224cf7c93d93407a048236ecd7d69", + "jurkat.trimmed.fastp.html:md5,ab4b17b7396824ac9668bcd51b04fa77", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,1b09c5742f149fd57890f0e8f37f2b81", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,ee4caa657d6f9fa8fc4cf0eeb5b34ca9", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,6026ab6a56202df1f5726f9a3cdc255c", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,9ba2030370c15128c6bc04d92bd73cac", + "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", + "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", + "cd4_REP2.coverage.hist.txt:md5,edadf440d1c3658118ffd6b6a46821f8", + "cd4_REP2.coverage.stats.txt:md5,cb1ce057d05fc53e7ad9b0b2e3d5aaad", + "jurkat.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", + "jurkat.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,a2dfb0a61cd0ada1f306aaf8c7cc7b8f", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,f5bc717609e44a4e94a1b1c626c1aaad", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,129145e5b3fa3cd8a6908bcbe75ea010", + "cd4_REP1.command.log:md5,a209e8a99730ff481b817a91ec59691c", + "cd4_REP2.command.log:md5,5edd0a21c7a92c4254c9d6cf4b3ff916", + "jurkat.command.log:md5,c8a2849a246aa1f31a25cd45aa34c2f9", + "cd4_REP1.infer_experiment.txt:md5,e257827c09d08e0211e6b55b78c09817", + "cd4_REP2.infer_experiment.txt:md5,cfc76745a36e9144eb03b85abb40a2bc", + "jurkat.infer_experiment.txt:md5,14af4229684e813974e4c4ac5724bd81", + "cd4_REP1.read_distribution.txt:md5,82bb213b23ea5a2c719c09ed993b576d", + "cd4_REP2.read_distribution.txt:md5,139a91e2f36b9c93b09fe36aff3414cd", + "jurkat.read_distribution.txt:md5,982e7cb76ca5978ff8c8bc63d17a1fbe", + "cd4_REP1.DupRate_plot.pdf:md5,c4b369fc4c7546d1baebc3cc3e2b5f09", + "cd4_REP2.DupRate_plot.pdf:md5,86e8ba78a14f8bdac14d469da69e6d4e", + "jurkat.DupRate_plot.pdf:md5,15a84b61f1054819cda58ba0f74d832d", + "cd4_REP1.DupRate_plot.r:md5,d04a5d1a2c83c2be6dd373710d63fecf", + "cd4_REP2.DupRate_plot.r:md5,18afd2c9eb78d75dab9ac483b38111f8", + "jurkat.DupRate_plot.r:md5,2265434abacdb7130dd1643114482c8c", + "cd4_REP1.pos.DupRate.xls:md5,c53ebd47cad3f3524dafd3d0bdd2cc71", + "cd4_REP1.seq.DupRate.xls:md5,6fc39432eb1815a1aebac84c5c46aa97", + "cd4_REP2.pos.DupRate.xls:md5,96b7100c85fd83d7634ebcd199de2aea", + "cd4_REP2.seq.DupRate.xls:md5,dac033fb9e548d1e23069d9f76f9e67d", + "jurkat.pos.DupRate.xls:md5,3389108003e203614790dd835c84bd81", + "jurkat.seq.DupRate.xls:md5,0950602857db220cdf550f66e0ad69b8", + "cd4.featureCounts.txt:md5,965288887b3cd0bfb40f76ee58aea361", + "cd4.featureCounts.txt.summary:md5,79ca06d4bfcd2e5e2563da4e074c185f", + "jurkat.featureCounts.txt:md5,63a3fb8a37040362e544a22ae94f1ea9", + "jurkat.featureCounts.txt.summary:md5,b34a314a5a9af3351d7ecdfed2d4ac88", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,55bf0d917f9eaffbc37026ec0ece9753", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,1ff5774e6ccaf2cae4b66cd2de2af406", + "cd4.bam:md5,e48afb73985a25b0bdda32b6f3f683da", + "jurkat.bam:md5,0e7ced7ce697b1b834cd19397936f577", + "cd4_filtered.bed:md5,063a59e4a2612e8eedaa443d02f6d271", + "jurkat_filtered.bed:md5,6625c2c4f2bbbf9ff2c93e587990b906", + "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", + "cd4.bedGraph.gz:md5,2f47e8712ab868e9a4393f7791966d74", + "cd4.peaks.txt:md5,0d95c28f2bfdfd9df28803e34c2c7730", + "chr21.tags.tsv:md5,73f87f94e447d89d2db66abde8682634", + "genomeGCcontent.txt:md5,1c845a646d9960a2cf4204bc017bd112", + "tagAutocorrelation.txt:md5,568b0cdbf1e066680ef50a4d2c8cbaf4", + "tagCountDistribution.txt:md5,9c0089a20313541fbcb85c5b5d44edd0", + "tagFreq.txt:md5,c3f74bd379a62a9c1a48b3fa0543211e", + "tagFreqUniq.txt:md5,0c79f2f324063b562f959610ffbde0f6", + "tagGCcontent.txt:md5,e464a5dfd9bb814f1e4a513557901e33", + "tagInfo.txt:md5,0151393adcf38dcb1fd7544d5de3cad9", + "tagLengthDistribution.txt:md5,da439675310911d20f8729e03de8a4d2", + "jurkat.bed:md5,31454804c53975171a763d3049406598", + "jurkat.bedGraph.gz:md5,ef115f87271893dda35ad2761eb22ce0", + "jurkat.peaks.txt:md5,b59cdb942bb6037a4689dd2d68960699", + "chr21.tags.tsv:md5,07be21e2a8c01d61142bcde22c022f9d", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,25cb7a33a9fb656a7eae658880e02d80", + "tagCountDistribution.txt:md5,2e72d2d33ab65402d64ad1177f611e26", + "tagFreq.txt:md5,acf53c3f34e50d1be236b932846b25c0", + "tagFreqUniq.txt:md5,ac33c48e1d580183edaa54ec9a0d78ce", + "tagGCcontent.txt:md5,e48b091066c39fca17466ff0504715ee", + "tagInfo.txt:md5,b653092ec557ebda65ff47844ce9a845", + "tagLengthDistribution.txt:md5,69493a127e47c6a80e07f72af2990c34", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,449fbe4373c1220a7882ee22d71f6321", + "jurkat_merged.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c", + "cd4_chr21_1_unidirectional_peaks.bed:md5,6c7e6c49f4d80f9b980bddac85617616", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,5fd13a128a16a78a0f96077780a7726e", + "peakcalling_2024_12_15_20_51_02_61.log:md5,672066adc915296be7072e11abf6f803" + ], + [ + [ + "cd4_REP1.sorted.bam", + "75904e6044960604c7279e9d0348a2e5" + ], + [ + "cd4_REP2.sorted.bam", + "2ee6306cd88c6a997287e296d4464bf1" + ], + [ + "jurkat.sorted.bam", + "8d711541138750a51d6fa77f82f05268" + ], + [ + "cd4.bam", + "4e35c571485f308a628df474a4decd8d" + ], + [ + "jurkat.bam", + "8d711541138750a51d6fa77f82f05268" + ] + ] ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.10.0" + "nf-test": "0.9.2", + "nextflow": "24.10.2" }, - "timestamp": "2024-11-09T01:33:02.04958832" + "timestamp": "2024-12-15T20:53:14.719426069" } } diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 6067b79c..0328c9ac 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -16,32 +16,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - // NOTE Flaky test. Tried getSamLinesMD5, .getHeaderMD5, .getHeader, which sets the tmp dir /tmp/38.unp - bam("$outputDir/hisat2/cd4_REP1.sorted.bam").getFileType(), - bam("$outputDir/hisat2/cd4_REP2.sorted.bam").getFileType(), - bam("$outputDir/hisat2/jurkat.sorted.bam").getFileType(), - path("$outputDir/hisat2/log").list(), - path("$outputDir/hisat2/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 878b02e6..3ed3b24a 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -1,107 +1,7 @@ { - "output_files": { + "Should run with defaults": { "content": [ 89, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "BAM", - "BAM", - "BAM", - [ - "cd4_REP1.hisat2.summary.log:md5,4f8f6e777e142473bad3c3dcdab8f6d3", - "cd4_REP2.hisat2.summary.log:md5,7a95dbf6b50b5d527416232e9af55d86", - "jurkat.hisat2.summary.log:md5,3547ecf137d5c08695b29a5f78d09ddb" - ], - [ - "cd4_REP1.sorted.bam.flagstat:md5,aa26d19a689b2fe97e254f125e1f7bcb", - "cd4_REP1.sorted.bam.idxstats:md5,d523e6e25ce8659871df4104dab503b0", - "cd4_REP1.sorted.bam.stats:md5,57b98494241870644c74edda7d503232", - "cd4_REP2.sorted.bam.flagstat:md5,6235482c2c1be02a23826261e2f8a033", - "cd4_REP2.sorted.bam.idxstats:md5,89de35c9f4f1eafa6944d5d574db1675", - "cd4_REP2.sorted.bam.stats:md5,aaa17a5a0018fa03cbadb1f5e354fa49", - "jurkat.sorted.bam.flagstat:md5,8e59ad91dd9df6003cb6c3070b0aa34c", - "jurkat.sorted.bam.idxstats:md5,56608a565532fc8ae2b93a3be28d5e8d", - "jurkat.sorted.bam.stats:md5,e100d7f3a79bb29ea3a99e610245e6c8" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", - "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", - "cd4_REP2.coverage.hist.txt:md5,ca9e862c16d556b3f1baa230d565e0a7", - "cd4_REP2.coverage.stats.txt:md5,14d8e9d53e129de3caf98fe6c8f52ace", - "jurkat.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", - "jurkat.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,ef2d2279e5b4a381d98ab15088a82ada", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,52cd440c876e0036d822491bc4408d3c", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,3022ec570c7309819d53687439eea28e" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,f310a69c06f98d74ad7777f9654c6a5e", - "cd4_REP1.seq.DupRate.xls:md5,38e5d22ea87cbc72d3d193f2cfe71be6", - "cd4_REP2.pos.DupRate.xls:md5,3798988e2db44c870a96d1d6a411a7df", - "cd4_REP2.seq.DupRate.xls:md5,0446112b47237c5ced58ae84d05f4e98", - "jurkat.pos.DupRate.xls:md5,2afe47e0b733adcf27027466688b0eed", - "jurkat.seq.DupRate.xls:md5,f5fb592ddeb04e6b0cf943e192629648" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,8b5faff4bfdf9a9aea0fb70034fa490c", - "cd4_REP2.DupRate_plot.r:md5,069417fefa3372751b0d6b631f730b4b", - "jurkat.DupRate_plot.r:md5,504b1a3db273e05246389299ae6e7eb3" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,223944c6503efda309695bb51cb546f3", - "cd4_REP2.infer_experiment.txt:md5,09ddb72f44716e13c7fefba987d2343d", - "jurkat.infer_experiment.txt:md5,0a2e5683b2cc3e4b6e843979745f430f" - ], - [ - "cd4_REP1.read_distribution.txt:md5,2bdadf1ad1eea97f8d0a7f8a1e7c5934", - "cd4_REP2.read_distribution.txt:md5,392d6d311d922c75f2b75e060bac4ad2", - "jurkat.read_distribution.txt:md5,44b9aa3f1b43ecbe5303714a55cd0bc0" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,9afeff7c6ca37640e946de7c6153f77f", - "cd4_REP1.minus.bedGraph:md5,22f749f499c9a66e77d7cb4d0b05f115", - "cd4_REP1.minus.bigWig:md5,7430ec6b29bad01cc195bff48e7c3318", - "cd4_REP1.plus.bedGraph:md5,a5371fb8da790607b820b449711efda9", - "cd4_REP1.plus.bigWig:md5,051b50fa9bb4de523d54a37b2d7353f5", - "cd4_REP2.dreg.bedGraph:md5,7db28452604d25f084f5c90a844acfaa", - "cd4_REP2.minus.bedGraph:md5,ccbc07a515c079678fe9aac66943a94d", - "cd4_REP2.minus.bigWig:md5,59d6c644860efb1852d1d88f12e5328e", - "cd4_REP2.plus.bedGraph:md5,47a5ac385c35a0a12fca2fea5c060a30", - "cd4_REP2.plus.bigWig:md5,7e1f1319b32f591d6704050447317108", - "jurkat.dreg.bedGraph:md5,2263e002f2867d8c306e52cf0a5ed495", - "jurkat.minus.bedGraph:md5,b06abe7efd4e332e73fa1895e554dc06", - "jurkat.minus.bigWig:md5,8a0ca6db6626d3fefb518f0d35dd1abc", - "jurkat.plus.bedGraph:md5,835edbd98f6d5d69e56de05e1a837b7c", - "jurkat.plus.bigWig:md5,66e82005e6c6730e970f7506bf93325c" - ], - "cd4.bed:md5,d8c78818eb1666575ef4c2534ea3727e", - "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", - [ - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,057f04ad44d3c2bf223be225b390fe0e", - "jurkat_filtered.bed:md5,bd6458d033db136523d32ffba259f564" - ], - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:03:21.644125" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -201,12 +101,420 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "hisat2", + "hisat2/cd4_REP1.sorted.bam", + "hisat2/cd4_REP1.sorted.bam.bai", + "hisat2/cd4_REP2.sorted.bam", + "hisat2/cd4_REP2.sorted.bam.bai", + "hisat2/jurkat.sorted.bam", + "hisat2/jurkat.sorted.bam.bai", + "hisat2/log", + "hisat2/log/cd4_REP1.hisat2.summary.log", + "hisat2/log/cd4_REP2.hisat2.summary.log", + "hisat2/log/jurkat.hisat2.summary.log", + "hisat2/samtools_stats", + "hisat2/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "hisat2/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "hisat2/samtools_stats/cd4_REP1.sorted.bam.stats", + "hisat2/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "hisat2/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "hisat2/samtools_stats/cd4_REP2.sorted.bam.stats", + "hisat2/samtools_stats/jurkat.sorted.bam.flagstat", + "hisat2/samtools_stats/jurkat.sorted.bam.idxstats", + "hisat2/samtools_stats/jurkat.sorted.bam.stats", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_17_59_00_42.log", + "transcript_identification/pints/peakcalling_2024_12_15_17_59_01_45.log", + "untar", + "untar/GRCh38_chr21_hisat2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.1.ht2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.2.ht2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.3.ht2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.4.ht2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.5.ht2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.6.ht2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.7.ht2", + "untar/GRCh38_chr21_hisat2/GRCh38_chr21.8.ht2" + ], + [ + "cd4.bed:md5,1c4f3b80b9b606855d0e6b1609fc90a3", + "jurkat.bed:md5,1a07210f46be7235f6fd3ea7260c2a55", + "cd4_REP1.dreg.bedGraph:md5,9afeff7c6ca37640e946de7c6153f77f", + "cd4_REP1.minus.bedGraph:md5,22f749f499c9a66e77d7cb4d0b05f115", + "cd4_REP1.minus.bigWig:md5,7430ec6b29bad01cc195bff48e7c3318", + "cd4_REP1.plus.bedGraph:md5,a5371fb8da790607b820b449711efda9", + "cd4_REP1.plus.bigWig:md5,051b50fa9bb4de523d54a37b2d7353f5", + "cd4_REP2.dreg.bedGraph:md5,7db28452604d25f084f5c90a844acfaa", + "cd4_REP2.minus.bedGraph:md5,ccbc07a515c079678fe9aac66943a94d", + "cd4_REP2.minus.bigWig:md5,59d6c644860efb1852d1d88f12e5328e", + "cd4_REP2.plus.bedGraph:md5,47a5ac385c35a0a12fca2fea5c060a30", + "cd4_REP2.plus.bigWig:md5,7e1f1319b32f591d6704050447317108", + "jurkat.dreg.bedGraph:md5,2263e002f2867d8c306e52cf0a5ed495", + "jurkat.minus.bedGraph:md5,b06abe7efd4e332e73fa1895e554dc06", + "jurkat.minus.bigWig:md5,8a0ca6db6626d3fefb518f0d35dd1abc", + "jurkat.plus.bedGraph:md5,835edbd98f6d5d69e56de05e1a837b7c", + "jurkat.plus.bigWig:md5,66e82005e6c6730e970f7506bf93325c", + "cd4_REP1.sorted.bam:md5,7ab21673335995f586ad24c1ff6a5da4", + "cd4_REP1.sorted.bam.bai:md5,6fe65f381bb4521186769b47756d50c2", + "cd4_REP2.sorted.bam:md5,4746b2f80c7284be78340a9dcd834bb2", + "cd4_REP2.sorted.bam.bai:md5,20760a1b0d9f2059920c7e5f9a24fc45", + "jurkat.sorted.bam:md5,fde777f3360545114968471b2f0e5742", + "jurkat.sorted.bam.bai:md5,993fb21a43fca0a5b99344303ec18614", + "cd4_REP1.hisat2.summary.log:md5,4f8f6e777e142473bad3c3dcdab8f6d3", + "cd4_REP2.hisat2.summary.log:md5,7a95dbf6b50b5d527416232e9af55d86", + "jurkat.hisat2.summary.log:md5,3547ecf137d5c08695b29a5f78d09ddb", + "cd4_REP1.sorted.bam.flagstat:md5,aa26d19a689b2fe97e254f125e1f7bcb", + "cd4_REP1.sorted.bam.idxstats:md5,d523e6e25ce8659871df4104dab503b0", + "cd4_REP1.sorted.bam.stats:md5,57b98494241870644c74edda7d503232", + "cd4_REP2.sorted.bam.flagstat:md5,6235482c2c1be02a23826261e2f8a033", + "cd4_REP2.sorted.bam.idxstats:md5,89de35c9f4f1eafa6944d5d574db1675", + "cd4_REP2.sorted.bam.stats:md5,aaa17a5a0018fa03cbadb1f5e354fa49", + "jurkat.sorted.bam.flagstat:md5,8e59ad91dd9df6003cb6c3070b0aa34c", + "jurkat.sorted.bam.idxstats:md5,56608a565532fc8ae2b93a3be28d5e8d", + "jurkat.sorted.bam.stats:md5,e100d7f3a79bb29ea3a99e610245e6c8", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", + "homer-tag-directory-gc-content.txt:md5,fa7f9ae7811267028159a18d39abaf81", + "homer-tag-info-dist.txt:md5,a3344ba92542fab32a611c618127eea1", + "homer-tag-length-dist.txt:md5,5b470fac16f0f588b8cf458b79d66fc1", + "homer_tagdir.txt:md5,b370c12dafdb968b8fcc4447822f58ce", + "multiqc.log:md5,72d26b2ffee91a24d4b9ffe91cb15e39", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,446545fe5b8f1d5535c6235d88794487", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,56e68f968976fc5ff7fe191a0f2a19e4", + "multiqc_rseqc_infer_experiment.txt:md5,0979fc3217b59127d0724a7e9eff208c", + "multiqc_rseqc_read_distribution.txt:md5,0c534510f3fdbccc602a53e649db503d", + "multiqc_samtools_flagstat.txt:md5,edb7fd0cdef0009f5f89cc94ba2f7dfb", + "multiqc_samtools_idxstats.txt:md5,80d8c1e331f97ee8283b187bbec307d1", + "multiqc_samtools_stats.txt:md5,6089a90e4d9a7ee49554d3042c23a833", + "multiqc_software_versions.txt:md5,15445c223b19b592820c586ead03393d", + "multiqc_sources.txt:md5,3bcf52a0266588fd3f7032c9b3a8ebda", + "preseq.txt:md5,9d51e94a75dbdfefe3a8434541ae6daf", + "preseq_complexity_plot_molecules.txt:md5,5ff3a991b8a3c0920a642c27e8ad507a", + "rseqc_infer_experiment_plot.txt:md5,98e9de037637309a7e1c54651b9db51b", + "rseqc_read_distribution_plot.txt:md5,0f6f4157a4f6a24a593a6ec0ba1e4231", + "rseqc_read_dups.txt:md5,bbd45f846c6ad21311b01faf12b907eb", + "rseqc_read_dups_plot.txt:md5,77969804082b1b5a74ca098cb6b38c72", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,13bedcacaf88e815bfb818c0cff57ad3", + "samtools-flagstat-dp_Read_counts.txt:md5,3cad3fe4b4d2b796b870ead026d4f00a", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,67d13819494ee20408c66a37a1c9ab47", + "samtools-stats-dp.txt:md5,771468d8f8d27cc8b799e952ca297c0d", + "samtools_alignment_plot.txt:md5,b67cae4f4addc9ad2fd30a858fc3f0e5", + "multiqc_report.html:md5,ec9f5ca369c36fe493298f2bc043eeb1", + "cd4_REP1.trimmed.fastp.html:md5,bcb88e8bc86d8d1c0d4fbc1a9b46060b", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,451d06594d5138788d4a0433ac80483e", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", + "jurkat.trimmed.fastp.html:md5,fc01d9c28088eac270a66da30b554074", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,7c141f324ff068b122bbb6115321ac65", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,918d6a28ff35674aaba41bdab43b4f08", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,9400483ac94ab67878a2efd383e9292a", + "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", + "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", + "cd4_REP2.coverage.hist.txt:md5,ca9e862c16d556b3f1baa230d565e0a7", + "cd4_REP2.coverage.stats.txt:md5,14d8e9d53e129de3caf98fe6c8f52ace", + "jurkat.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", + "jurkat.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,ef2d2279e5b4a381d98ab15088a82ada", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,52cd440c876e0036d822491bc4408d3c", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,3022ec570c7309819d53687439eea28e", + "cd4_REP1.command.log:md5,4a1a87afc7cb200a93e16d7a5f8fad9d", + "cd4_REP2.command.log:md5,68b32c8a61abfbc130d3a9a1c118219d", + "jurkat.command.log:md5,ce57404d38af2301bcd9c659b620de36", + "cd4_REP1.infer_experiment.txt:md5,223944c6503efda309695bb51cb546f3", + "cd4_REP2.infer_experiment.txt:md5,09ddb72f44716e13c7fefba987d2343d", + "jurkat.infer_experiment.txt:md5,0a2e5683b2cc3e4b6e843979745f430f", + "cd4_REP1.read_distribution.txt:md5,2bdadf1ad1eea97f8d0a7f8a1e7c5934", + "cd4_REP2.read_distribution.txt:md5,392d6d311d922c75f2b75e060bac4ad2", + "jurkat.read_distribution.txt:md5,44b9aa3f1b43ecbe5303714a55cd0bc0", + "cd4_REP1.DupRate_plot.pdf:md5,d936e75943f9bd2a6531117a4ea5dfe2", + "cd4_REP2.DupRate_plot.pdf:md5,67a9c8b987cf2e5287debc5b51f4013a", + "jurkat.DupRate_plot.pdf:md5,37448c7f950f31b32723bbcb1fd0bda0", + "cd4_REP1.DupRate_plot.r:md5,8b5faff4bfdf9a9aea0fb70034fa490c", + "cd4_REP2.DupRate_plot.r:md5,069417fefa3372751b0d6b631f730b4b", + "jurkat.DupRate_plot.r:md5,504b1a3db273e05246389299ae6e7eb3", + "cd4_REP1.pos.DupRate.xls:md5,f310a69c06f98d74ad7777f9654c6a5e", + "cd4_REP1.seq.DupRate.xls:md5,38e5d22ea87cbc72d3d193f2cfe71be6", + "cd4_REP2.pos.DupRate.xls:md5,3798988e2db44c870a96d1d6a411a7df", + "cd4_REP2.seq.DupRate.xls:md5,0446112b47237c5ced58ae84d05f4e98", + "jurkat.pos.DupRate.xls:md5,2afe47e0b733adcf27027466688b0eed", + "jurkat.seq.DupRate.xls:md5,f5fb592ddeb04e6b0cf943e192629648", + "cd4.featureCounts.txt:md5,e4f2a70d27eb7c1945a971597e7bf362", + "cd4.featureCounts.txt.summary:md5,b9612702dd788551c927c95cdd8c00fe", + "jurkat.featureCounts.txt:md5,c14351b071bdf5ebb4e295889fbf27c6", + "jurkat.featureCounts.txt.summary:md5,d479b1aaf1621bc894912e8379ec1474", + "cd4.bam:md5,53fbca75eebe57e731fb3e21dd73d594", + "jurkat.bam:md5,5568b1194896c198cb094aca91b095a7", + "cd4_filtered.bed:md5,057f04ad44d3c2bf223be225b390fe0e", + "jurkat_filtered.bed:md5,bd6458d033db136523d32ffba259f564", + "cd4.bed:md5,d8c78818eb1666575ef4c2534ea3727e", + "cd4.bedGraph.gz:md5,2288d6c77343815f540d6f03eb7e98f1", + "cd4.peaks.txt:md5,8bb1c5655a1cce187290a3409e82a43b", + "chr21.tags.tsv:md5,09c0118480c3ae294a7d188ffad20d75", + "genomeGCcontent.txt:md5,3eb1623e89ce4db027c1e30507eee0a8", + "tagAutocorrelation.txt:md5,1b2c7081f86a9a0e80c84e098ed7cb0e", + "tagCountDistribution.txt:md5,22ddddca0742303abf8e85ae98d63c6e", + "tagFreq.txt:md5,4098cd8a80fc51f6cbdbe096ef00f4bb", + "tagFreqUniq.txt:md5,06baef1b59c883d3fd681f001a287a5c", + "tagGCcontent.txt:md5,ad973a1f660cd9b07641b129a357fcb9", + "tagInfo.txt:md5,c5937cd34d90ade812f5e39354636e34", + "tagLengthDistribution.txt:md5,2570a4eea85a10732584e57f934bf5a8", + "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", + "jurkat.bedGraph.gz:md5,8e06315f2e4a2aaecf1c5f66de20ea54", + "jurkat.peaks.txt:md5,f514028265e7c4881f155f860211cbba", + "chr21.tags.tsv:md5,b0a8a501fb74274b70aa82a4e2b33c28", + "genomeGCcontent.txt:md5,a96352e5915ca702471940484fc00f5e", + "tagAutocorrelation.txt:md5,f6c8addd29bc60be801b39d2b68153b1", + "tagCountDistribution.txt:md5,ae57665c2177f09d92bee376ab3d5d18", + "tagFreq.txt:md5,5cd74c4f834ff2dbe0c777f6470a5e27", + "tagFreqUniq.txt:md5,5e48e415fb62e812193869ade88de1a5", + "tagGCcontent.txt:md5,1aeb8b21ef62c51f6dd1644ef79ae86e", + "tagInfo.txt:md5,3f22cefc75cb68e3c14f721041bf1605", + "tagLengthDistribution.txt:md5,d9423f5b5d825faafa3d018590584ec8", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,d71436c8df71a82bfbe0e9afb74145df", + "jurkat_merged.bed:md5,bd6458d033db136523d32ffba259f564", + "cd4_chr21_1_unidirectional_peaks.bed:md5,1c4f3b80b9b606855d0e6b1609fc90a3", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,1a07210f46be7235f6fd3ea7260c2a55", + "peakcalling_2024_12_15_17_59_00_42.log:md5,9696f6e9fbfb499905cc02e23c93f20e", + "peakcalling_2024_12_15_17_59_01_45.log:md5,890a1810f5f0cc2c9a19bc944cf05ea3", + "GRCh38_chr21.1.ht2:md5,eb322cf410ecc616d7fe63cc1be2785b", + "GRCh38_chr21.2.ht2:md5,46be3356d4c236ebd5d1e52e9eaf4e12", + "GRCh38_chr21.3.ht2:md5,dbf5af96efd98d6b03f1e5d2baed848a", + "GRCh38_chr21.4.ht2:md5,bd952f748321c4c230671e8fce7b1650", + "GRCh38_chr21.5.ht2:md5,103032edf695164b32cc9e6781e8f08b", + "GRCh38_chr21.6.ht2:md5,242e36d01cd1719b6bd05f157c644eed", + "GRCh38_chr21.7.ht2:md5,24e7d0673a77e07fbe40400f9a6b3db6", + "GRCh38_chr21.8.ht2:md5,5e0626bdb7f7a267990f72ae45c3e44a" + ], + [ + [ + "cd4_REP1.sorted.bam", + "7c6f110b93f069f6767d508f24e46986" + ], + [ + "cd4_REP2.sorted.bam", + "4b9dc03040268548300072c1ce32566f" + ], + [ + "jurkat.sorted.bam", + "d434e4ca752838ed82474bded157c92b" + ], + [ + "cd4.bam", + "7a1c450413463a964685e225722dd8d3" + ], + [ + "jurkat.bam", + "d434e4ca752838ed82474bded157c92b" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T20:57:11.85382" + "timestamp": "2024-12-15T11:59:31.802279" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test index 3b5150d3..938042f5 100644 --- a/workflows/tests/aligner/star.nf.test +++ b/workflows/tests/aligner/star.nf.test @@ -15,32 +15,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/star/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/star/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/star/jurkat.sorted.bam").getSamLinesMD5(), - // NOTE Not deterministic - // path("$outputDir/star/log").list(), - path("$outputDir/star/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 5dfc6cde..2495e1ed 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -9,104 +9,9 @@ }, "timestamp": "2024-11-25T21:02:16.647189" }, - "output_files": { + "Should run with defaults": { "content": [ 97, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "4df1ea73be642288f18fa0d84f2f2820", - "32b824f32b196761243365d93065a0da", - "519b0eb7154a059df04f6a74e01c0578", - [ - "cd4_REP1.sorted.bam.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", - "cd4_REP1.sorted.bam.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", - "cd4_REP1.sorted.bam.stats:md5,bec325c0cd30bafd9758c0535f99cf49", - "cd4_REP2.sorted.bam.flagstat:md5,ab83e3fbca17cf463fc5293a82e4bb3a", - "cd4_REP2.sorted.bam.idxstats:md5,9cdf3dd50a9862a02592c3768071fe32", - "cd4_REP2.sorted.bam.stats:md5,c7a92c340bb5735414d035da30b9b53f", - "jurkat.sorted.bam.flagstat:md5,b5f1d127de493e406882aced667210c9", - "jurkat.sorted.bam.idxstats:md5,5e4a68fda75c954324d659af58d12c62", - "jurkat.sorted.bam.stats:md5,0b7a4d6e0823d159ab2d9cdc1b2c8310" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", - "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", - "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", - "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", - "jurkat.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", - "jurkat.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,c84d218ba0a58b9ea5476ad207224162", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,9159cf4286e88b3c5740cf9c2884d4f1", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,639ea055621d77eadb836505eaf07ca8" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,251ff0f73b7a2d98894fcaaf763a9059", - "cd4_REP1.seq.DupRate.xls:md5,fb59902a9ab77c1859a48bd763578560", - "cd4_REP2.pos.DupRate.xls:md5,f784231fb3973ec46c0996d4ba2f9591", - "cd4_REP2.seq.DupRate.xls:md5,6c00870ce14b0383bdccd352d7c6012a", - "jurkat.pos.DupRate.xls:md5,0937fe59aa436407b807660978c4423e", - "jurkat.seq.DupRate.xls:md5,ef59a2a23975a1a3aa2770ca8525ac51" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,a33f83aef06fa207ac55b8002741aff7", - "cd4_REP2.DupRate_plot.r:md5,834a386b72bab13bfb9678ebb09d814e", - "jurkat.DupRate_plot.r:md5,eb8151edec9ac1e29b5a579cfdb45a0d" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,615958cef592f55bf190346b8aec2886", - "cd4_REP2.infer_experiment.txt:md5,fbe67ba4bd4ed6a1759a4ec676332e36", - "jurkat.infer_experiment.txt:md5,9accbdaac1d7d8c9e665e87a48328842" - ], - [ - "cd4_REP1.read_distribution.txt:md5,2b5ff7e11fc0e542b6cc2b175fe9e8ab", - "cd4_REP2.read_distribution.txt:md5,748d618cbb6bebc5922a89af78932f60", - "jurkat.read_distribution.txt:md5,5ec2c28ee0ff01e0fa0889b16136624f" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,6ecfb93ba1a56308ce7d3c4703e0e5e3", - "cd4_REP1.minus.bedGraph:md5,9e07f1d5637b2193f55da08d6877bd93", - "cd4_REP1.minus.bigWig:md5,fa4743c954c2d96c38d1d53511ebf647", - "cd4_REP1.plus.bedGraph:md5,c111dc157dc7ecd53e7f6b8ce8d5ccc0", - "cd4_REP1.plus.bigWig:md5,37f187a2a476cba99a00ab7683079f84", - "cd4_REP2.dreg.bedGraph:md5,949a822bee0b968f118fb4d2d0fcf251", - "cd4_REP2.minus.bedGraph:md5,d0bdd2bf54e343a00d620d41da32e2f3", - "cd4_REP2.minus.bigWig:md5,9f8cb0bdf31650b1af341b5522cf7634", - "cd4_REP2.plus.bedGraph:md5,268311481da2d62204f71a1a8bc5d43b", - "cd4_REP2.plus.bigWig:md5,4f5f27b5e3258ebf2ee7bf1f8fe17357", - "jurkat.dreg.bedGraph:md5,9a2a287e9d8e73185d5754442051055b", - "jurkat.minus.bedGraph:md5,964feef1a4988cbf900840fa572a676e", - "jurkat.minus.bigWig:md5,172ea254e30275889eb94a2f2f7f04cf", - "jurkat.plus.bedGraph:md5,198a0f027ca6799ecc74196232402c81", - "jurkat.plus.bigWig:md5,0bd721f298a8dde14ffdbda6db303f93" - ], - "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", - "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", - [ - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,57cde1c26fabdc9c416326ba825b3f15", - "jurkat_filtered.bed:md5,95a5279ec2387dfa0b4c2e7820083527" - ], - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:05:33.881075" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -187,13 +92,474 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "samtools/jurkat.bam.bai", + "samtools/jurkat.flagstat", + "samtools/jurkat.idxstats", + "samtools/jurkat.stats", + "star", + "star/cd4_REP1.sorted.bam", + "star/cd4_REP1.sorted.bam.bai", + "star/cd4_REP2.sorted.bam", + "star/cd4_REP2.sorted.bam.bai", + "star/jurkat.sorted.bam", + "star/jurkat.sorted.bam.bai", + "star/log", + "star/log/cd4_REP1.Log.final.out", + "star/log/cd4_REP1.Log.out", + "star/log/cd4_REP1.Log.progress.out", + "star/log/cd4_REP1.SJ.out.tab", + "star/log/cd4_REP2.Log.final.out", + "star/log/cd4_REP2.Log.out", + "star/log/cd4_REP2.Log.progress.out", + "star/log/cd4_REP2.SJ.out.tab", + "star/log/jurkat.Log.final.out", + "star/log/jurkat.Log.out", + "star/log/jurkat.Log.progress.out", + "star/log/jurkat.SJ.out.tab", + "star/samtools_stats", + "star/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "star/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "star/samtools_stats/cd4_REP1.sorted.bam.stats", + "star/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "star/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "star/samtools_stats/cd4_REP2.sorted.bam.stats", + "star/samtools_stats/jurkat.sorted.bam.flagstat", + "star/samtools_stats/jurkat.sorted.bam.idxstats", + "star/samtools_stats/jurkat.sorted.bam.stats", + "star/star", + "star/star/Genome", + "star/star/Log.out", + "star/star/SA", + "star/star/SAindex", + "star/star/chrLength.txt", + "star/star/chrName.txt", + "star/star/chrNameLength.txt", + "star/star/chrStart.txt", + "star/star/exonGeTrInfo.tab", + "star/star/exonInfo.tab", + "star/star/geneInfo.tab", + "star/star/genomeParameters.txt", + "star/star/sjdbInfo.txt", + "star/star/sjdbList.fromGTF.out.tab", + "star/star/sjdbList.out.tab", + "star/star/transcriptInfo.tab", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_18_02_46_43.log", + "transcript_identification/pints/peakcalling_2024_12_15_18_02_51_43.log" + ], + [ + "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", + "cd4.bed:md5,26765aa153cb1d6bb668f5786da5763e", + "jurkat.bed:md5,15a3bec7a3ffb53c1e621665b3f45873", + "cd4_REP1.dreg.bedGraph:md5,6ecfb93ba1a56308ce7d3c4703e0e5e3", + "cd4_REP1.minus.bedGraph:md5,9e07f1d5637b2193f55da08d6877bd93", + "cd4_REP1.minus.bigWig:md5,fa4743c954c2d96c38d1d53511ebf647", + "cd4_REP1.plus.bedGraph:md5,c111dc157dc7ecd53e7f6b8ce8d5ccc0", + "cd4_REP1.plus.bigWig:md5,37f187a2a476cba99a00ab7683079f84", + "cd4_REP2.dreg.bedGraph:md5,949a822bee0b968f118fb4d2d0fcf251", + "cd4_REP2.minus.bedGraph:md5,d0bdd2bf54e343a00d620d41da32e2f3", + "cd4_REP2.minus.bigWig:md5,9f8cb0bdf31650b1af341b5522cf7634", + "cd4_REP2.plus.bedGraph:md5,268311481da2d62204f71a1a8bc5d43b", + "cd4_REP2.plus.bigWig:md5,4f5f27b5e3258ebf2ee7bf1f8fe17357", + "jurkat.dreg.bedGraph:md5,9a2a287e9d8e73185d5754442051055b", + "jurkat.minus.bedGraph:md5,964feef1a4988cbf900840fa572a676e", + "jurkat.minus.bigWig:md5,172ea254e30275889eb94a2f2f7f04cf", + "jurkat.plus.bedGraph:md5,198a0f027ca6799ecc74196232402c81", + "jurkat.plus.bigWig:md5,0bd721f298a8dde14ffdbda6db303f93", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", + "homer-tag-directory-gc-content.txt:md5,fbb85c705772c12359260d1631634b9d", + "homer-tag-info-dist.txt:md5,e6692e665116ced7843dd413a65a8ffa", + "homer-tag-length-dist.txt:md5,f8b1a5ec331fac75663b642eb06ab693", + "homer_tagdir.txt:md5,8fa485104e6e2cf338e8acf41dd82f34", + "multiqc.log:md5,8581b5e7a741f8c806d9ed671c518ed7", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,c2eb2150f080c203832f35e879c6a571", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,e5eff439d34c2b025fbcfaef74eea0ee", + "multiqc_rseqc_infer_experiment.txt:md5,d912439cdfb0626b360d2dcc5368e617", + "multiqc_rseqc_read_distribution.txt:md5,bebec920c316aecb6187397f730d32e8", + "multiqc_samtools_flagstat.txt:md5,cbb876b834a2aa6351b4962fff6d428c", + "multiqc_samtools_idxstats.txt:md5,98a9f4e463cb8e8b7a542db18d1d1e44", + "multiqc_samtools_stats.txt:md5,8e9fa83253dbe720d92429ebb133609f", + "multiqc_software_versions.txt:md5,0a481cc93d31af59bb038f2ef578c566", + "multiqc_sources.txt:md5,fab43f624f6a3cf57a34922cc5941b51", + "preseq.txt:md5,4c550f1bc5c8465863ec10a76c35871e", + "preseq_complexity_plot_molecules.txt:md5,4a813edf604700f888efc2f6f55581dc", + "rseqc_infer_experiment_plot.txt:md5,243b978fa978ca4226dd0913ab5645ef", + "rseqc_read_distribution_plot.txt:md5,c5b3598110d9bae171dbc48a6e92fec1", + "rseqc_read_dups.txt:md5,fb71c3f140086c76fc9189090d9e187c", + "rseqc_read_dups_plot.txt:md5,914b03b546e5d1675f762f88043df3f3", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,f09b2e5afc3c8f22372b21725b7ea2f4", + "samtools-flagstat-dp_Read_counts.txt:md5,844692eabe799b8e5bae374b9098a6fe", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,43542108fd8c21cae169136f50059ddb", + "samtools-stats-dp.txt:md5,9dfc0fa78ce7102d48c2d0732c755229", + "samtools_alignment_plot.txt:md5,a015c34f0734a4fd5b8f00464c0aae6e", + "multiqc_report.html:md5,be9936bdb288f1ce25012287404b0de7", + "cd4_REP1.trimmed.fastp.html:md5,36a53ebfaca1034d8da15fb9a1d11968", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,929ad58f7d0fd7044b3dca768e724a50", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,52daa61826da3e772236654f4d6c2d12", + "jurkat.trimmed.fastp.html:md5,836a6cf111cecab6f14a1eef132dd5bc", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,ebc93d4a9ecfa454adad95c01bf9e9a7", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,5739c0a9b2b60636f4ba0336a29eee1e", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,dfced42eeb97685bdb6332c99b13481b", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,12fac7bd7ff8953b6eee2c19f81d385a", + "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", + "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", + "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", + "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", + "jurkat.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", + "jurkat.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,c84d218ba0a58b9ea5476ad207224162", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,9159cf4286e88b3c5740cf9c2884d4f1", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,639ea055621d77eadb836505eaf07ca8", + "cd4_REP1.command.log:md5,b919be23822d88e9262fd8d155a16021", + "cd4_REP2.command.log:md5,d195a704f64afb9087265e2f465c757f", + "jurkat.command.log:md5,a4cd8e90678caadfeb4989f737e215d3", + "cd4_REP1.infer_experiment.txt:md5,615958cef592f55bf190346b8aec2886", + "cd4_REP2.infer_experiment.txt:md5,fbe67ba4bd4ed6a1759a4ec676332e36", + "jurkat.infer_experiment.txt:md5,9accbdaac1d7d8c9e665e87a48328842", + "cd4_REP1.read_distribution.txt:md5,2b5ff7e11fc0e542b6cc2b175fe9e8ab", + "cd4_REP2.read_distribution.txt:md5,748d618cbb6bebc5922a89af78932f60", + "jurkat.read_distribution.txt:md5,5ec2c28ee0ff01e0fa0889b16136624f", + "cd4_REP1.DupRate_plot.pdf:md5,bdf1ab756e84280851bea014237d64c6", + "cd4_REP2.DupRate_plot.pdf:md5,b4c5aa3a571e0dbc5a2b2ad552bdcf50", + "jurkat.DupRate_plot.pdf:md5,343434ebd3b44ecc02406d75a8d8e4f8", + "cd4_REP1.DupRate_plot.r:md5,a33f83aef06fa207ac55b8002741aff7", + "cd4_REP2.DupRate_plot.r:md5,834a386b72bab13bfb9678ebb09d814e", + "jurkat.DupRate_plot.r:md5,eb8151edec9ac1e29b5a579cfdb45a0d", + "cd4_REP1.pos.DupRate.xls:md5,251ff0f73b7a2d98894fcaaf763a9059", + "cd4_REP1.seq.DupRate.xls:md5,fb59902a9ab77c1859a48bd763578560", + "cd4_REP2.pos.DupRate.xls:md5,f784231fb3973ec46c0996d4ba2f9591", + "cd4_REP2.seq.DupRate.xls:md5,6c00870ce14b0383bdccd352d7c6012a", + "jurkat.pos.DupRate.xls:md5,0937fe59aa436407b807660978c4423e", + "jurkat.seq.DupRate.xls:md5,ef59a2a23975a1a3aa2770ca8525ac51", + "cd4.featureCounts.txt:md5,440b6ad0eefb5f47f63c0bfd715c0c82", + "cd4.featureCounts.txt.summary:md5,591bac955b8897231d4e25dbfdf19bc0", + "jurkat.featureCounts.txt:md5,3b050fa1986268a4f9a0a23b25788d0c", + "jurkat.featureCounts.txt.summary:md5,8e9e875a8da2834fd00ca3e0c4f785c6", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,3f9182960fc4262c583640857a7cc990", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,ac973ce75c7eccdb95a4d862c535ce8b", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,986cc37ce2179cf92e777240269fc561", + "cd4.bam:md5,04ea49bda2233d1d87a71501bae08c68", + "jurkat.bam:md5,7aef3616419da2fb53d94321c187c3f2", + "jurkat.bam.bai:md5,b4c0a4a9360342f9f79cf08f64c1170b", + "jurkat.flagstat:md5,2e10f27f80137c7ca4d340f110aa8fcf", + "jurkat.idxstats:md5,8e38ac91c083ef3c5cf77ba782b836a5", + "jurkat.stats:md5,46d40815316f079c846963982c0f7d3d", + "cd4_REP1.sorted.bam:md5,8b898d641c3ac4ca0efb1e611ded2182", + "cd4_REP1.sorted.bam.bai:md5,5c3efc16ee79b67942a59be89e38349a", + "cd4_REP2.sorted.bam:md5,45e3d3d1c36bf13ea212285972afdd71", + "cd4_REP2.sorted.bam.bai:md5,1d639a8126abc6bfecddb9f3930207b5", + "jurkat.sorted.bam:md5,5f4b37da8533af304e60a5dec7315572", + "jurkat.sorted.bam.bai:md5,937213f6ada1636d9ac6df15e330e3ab", + "cd4_REP1.Log.final.out:md5,e98e0d462abf9bc2c6c84fdf07ea936a", + "cd4_REP1.Log.out:md5,78fa5092bf79ed4474c9cfbbd95c6f51", + "cd4_REP1.Log.progress.out:md5,7674ec7982b64b4281c5ced4bc05792f", + "cd4_REP1.SJ.out.tab:md5,991ac1fa28719c078a4827fcf66e90b0", + "cd4_REP2.Log.final.out:md5,65534c0a1c720b714becb50cb9cb8631", + "cd4_REP2.Log.out:md5,1f63968fffa2021e370bb35cce9d4689", + "cd4_REP2.Log.progress.out:md5,a754f1b948db7ce2fec566107e840bda", + "cd4_REP2.SJ.out.tab:md5,5accd405e613d28731f111dfd070a3ba", + "jurkat.Log.final.out:md5,d418f757881078630ef7b4952fa9e146", + "jurkat.Log.out:md5,108b46d74bfa50d3593511ac1e1a057b", + "jurkat.Log.progress.out:md5,a8e27da69ef48584e8623e7afed34b0b", + "jurkat.SJ.out.tab:md5,8e5de2dc83e2478528528a86a2ffd456", + "cd4_REP1.sorted.bam.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", + "cd4_REP1.sorted.bam.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", + "cd4_REP1.sorted.bam.stats:md5,bec325c0cd30bafd9758c0535f99cf49", + "cd4_REP2.sorted.bam.flagstat:md5,ab83e3fbca17cf463fc5293a82e4bb3a", + "cd4_REP2.sorted.bam.idxstats:md5,9cdf3dd50a9862a02592c3768071fe32", + "cd4_REP2.sorted.bam.stats:md5,c7a92c340bb5735414d035da30b9b53f", + "jurkat.sorted.bam.flagstat:md5,b5f1d127de493e406882aced667210c9", + "jurkat.sorted.bam.idxstats:md5,5e4a68fda75c954324d659af58d12c62", + "jurkat.sorted.bam.stats:md5,0b7a4d6e0823d159ab2d9cdc1b2c8310", + "Genome:md5,612664e3cfde5e1b73ad541d93752b31", + "Log.out:md5,3078e4ee3151f0fdbe3c6e03461c777c", + "SA:md5,074ae54177bb7b9cb981382f043f36e5", + "SAindex:md5,1c9cd646313f1abb1cfc205ccab73464", + "chrLength.txt:md5,b0be0a56ddefa84552742c72d4859eac", + "chrName.txt:md5,e99d7d1051eee43ceab5563c2d09fcee", + "chrNameLength.txt:md5,c985a141685e8431ec27c782816cb744", + "chrStart.txt:md5,6925b594ea2eeb964ba87cd6d42ab98f", + "exonGeTrInfo.tab:md5,ea42dd46e177f95a72a8f6a2925f7348", + "exonInfo.tab:md5,42a3ce2024f396b2298c0a84b07fb6e4", + "geneInfo.tab:md5,d0092fb1ea6fcdac270c4df788de70fb", + "genomeParameters.txt:md5,2fec04098057094f4b2e5a9ec4371a7d", + "sjdbInfo.txt:md5,12fb05dc7cea89735a0c19e1c0df61cb", + "sjdbList.fromGTF.out.tab:md5,5d9761b49920fb70a77d74e390d196b9", + "sjdbList.out.tab:md5,766fbca932681f8666b3a9e5fb3640bd", + "transcriptInfo.tab:md5,21c1f470ffe3b55b23900e7b7eaec2f4", + "cd4_filtered.bed:md5,57cde1c26fabdc9c416326ba825b3f15", + "jurkat_filtered.bed:md5,95a5279ec2387dfa0b4c2e7820083527", + "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", + "cd4.bedGraph.gz:md5,d42e5ad1738c0b5af09190fcb7bed2cb", + "cd4.peaks.txt:md5,4ab7c16a5f6d0e78275448bbce7c21c2", + "chr21.tags.tsv:md5,7f133ee4d24c534ca46c67a965cc7ff8", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,04774fe517af08394f87b1eef3da5a53", + "tagCountDistribution.txt:md5,6a0bb0fdf84aca0aea880a4a3dcf3093", + "tagFreq.txt:md5,954d9ab7662a572826e3eee71bf278c7", + "tagFreqUniq.txt:md5,c39b5b1ed1dbf8080a0d87b445246357", + "tagGCcontent.txt:md5,3d78d82176800ccfdf56327d695d1975", + "tagInfo.txt:md5,1b961a6dfc00ee98f8c90fe1a8436575", + "tagLengthDistribution.txt:md5,39d83a53c249a5b30937a1d352f058ef", + "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", + "jurkat.bedGraph.gz:md5,ee1ee88f0ee102bf8775f9436eb334fd", + "jurkat.peaks.txt:md5,91e7580ebde81aceaf3bb1b1c3c3db1c", + "chr21.tags.tsv:md5,c71046d9c6fb1651a802bb7079fe2093", + "genomeGCcontent.txt:md5,d59c851087427d57aa0344660b041775", + "tagAutocorrelation.txt:md5,ee25ecd1e3231ce7eff6a97bc90031cb", + "tagCountDistribution.txt:md5,27c063c484df8ab3fbabc86899fd5913", + "tagFreq.txt:md5,1f9af257dd2b417de50d44dffa130d9a", + "tagFreqUniq.txt:md5,ecf0f4d5f09ea7750fadad3dc9d65ec8", + "tagGCcontent.txt:md5,195a7cccfd4fe0c7859519892a1c17fb", + "tagInfo.txt:md5,0e1ab5de2e523c908538faac4f8115cb", + "tagLengthDistribution.txt:md5,0cba6b131d3788e8153006637564ba82", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,07860f90354c4f5f66eddbed3e5d3bd2", + "jurkat_merged.bed:md5,95a5279ec2387dfa0b4c2e7820083527", + "cd4_chr21_1_unidirectional_peaks.bed:md5,26765aa153cb1d6bb668f5786da5763e", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,15a3bec7a3ffb53c1e621665b3f45873", + "peakcalling_2024_12_15_18_02_46_43.log:md5,246ed02a60215863b65f6653c6c9d334", + "peakcalling_2024_12_15_18_02_51_43.log:md5,cdb43da71841cbad515e435191f22a0f" + ], + [ + [ + "cd4.bam", + "62d46450ed2b3bdf7f02bfb76a5e5365" + ], + [ + "jurkat.bam", + "fa22f29727ce9c1a50cec37049d65fb5" + ], + [ + "cd4_REP1.sorted.bam", + "d46f82aca0d563ac1d4ec5e92a3dd751" + ], + [ + "cd4_REP2.sorted.bam", + "3f3233a2b9f9d23531e0e08f31f11af2" + ], + [ + "jurkat.sorted.bam", + "fa22f29727ce9c1a50cec37049d65fb5" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T20:59:49.96856" + "timestamp": "2024-12-15T12:04:27.202939" }, "gzip_software_versions": { "content": [ diff --git a/workflows/tests/inputs/gff/main.nf.test b/workflows/tests/inputs/gff/main.nf.test index b4870c76..cb308be6 100644 --- a/workflows/tests/inputs/gff/main.nf.test +++ b/workflows/tests/inputs/gff/main.nf.test @@ -15,36 +15,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/jurkat.sorted.bam").getSamLinesMD5(), - path("$outputDir/bwa/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // path("$outputDir/quantification/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index a11d4016..83bdd763 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -1,102 +1,7 @@ { - "output_files": { + "Should run with an unzipped GFF file": { "content": [ 92, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "c529a16c839e85e119b98354f109352d", - "9e63b682af88fa902cf92b5c485845b1", - "c2adf5327ff6d4edda2fdad00c7cb9bf", - [ - "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", - "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" - ], - [ - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", - "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", - "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", - "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", - "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", - "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", - "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", - "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", - "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", - "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", - "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", - "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", - "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", - "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", - "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" - ], - "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - [ - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" - ], - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:09:08.76233" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -184,12 +89,407 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "bwa", + "bwa/cd4_REP1.sorted.bam", + "bwa/cd4_REP1.sorted.bam.bai", + "bwa/cd4_REP2.sorted.bam", + "bwa/cd4_REP2.sorted.bam.bai", + "bwa/jurkat.sorted.bam", + "bwa/jurkat.sorted.bam.bai", + "bwa/samtools_stats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.stats", + "bwa/samtools_stats/jurkat.sorted.bam.flagstat", + "bwa/samtools_stats/jurkat.sorted.bam.idxstats", + "bwa/samtools_stats/jurkat.sorted.bam.stats", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_18_14_22_43.log", + "transcript_identification/pints/peakcalling_2024_12_15_18_14_23_44.log" + ], + [ + "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", + "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", + "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", + "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", + "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", + "homer-tag-directory-gc-content.txt:md5,213706733eb7a6c9e1345e7961f9a266", + "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", + "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", + "homer_tagdir.txt:md5,ad54384ccd9668de175a540cd44310f2", + "multiqc.log:md5,86bd2119bf45dd5209b95f269666f12e", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,03096360df3e6ecc722d7d60230db4b2", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", + "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", + "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", + "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", + "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", + "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", + "multiqc_software_versions.txt:md5,71b857625ebbe5f51be6501178fc5d49", + "multiqc_sources.txt:md5,e2a71513f3b44bec35b61768d8a5582e", + "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", + "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", + "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", + "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", + "rseqc_read_dups.txt:md5,9dd77594ea11e1ea2ca856683d8d99b1", + "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", + "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", + "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", + "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", + "multiqc_report.html:md5,6a9deadd0be4ff0b9809fa584c826912", + "cd4_REP1.trimmed.fastp.html:md5,3972b9e56153b53d03afed066264d42b", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,c01da6217a7bc3f9fb409d96d97339f0", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", + "jurkat.trimmed.fastp.html:md5,a0cfefa161a67d0d064c46ef499948f9", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,9a50a12813b556fc338776bade0d3f35", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,2df47f2f43176dfb5806c94b604e238c", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,81b845e46b7b0bf0bd20e2434e1fe272", + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", + "cd4_REP1.command.log:md5,611488b2a0f75fe9489e0d4488572efe", + "cd4_REP2.command.log:md5,e30dd4baeae30eec162275a7c1a620d0", + "jurkat.command.log:md5,500aa628ec58fe85d9ab2a88fc7f0fbf", + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", + "cd4_REP1.DupRate_plot.pdf:md5,70517054561f5074da64fbe570a71463", + "cd4_REP2.DupRate_plot.pdf:md5,12552e18d9f946b8f8e68ddbc7a2ef05", + "jurkat.DupRate_plot.pdf:md5,8fe5a21f60257eae629f24149f27a8b5", + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", + "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", + "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", + "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", + "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", + "cd4.bam:md5,13feaab792f913b608b17b4b144050ab", + "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "cd4.bedGraph.gz:md5,40960d2890a24bd19ac855e397da0c4b", + "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", + "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", + "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", + "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", + "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", + "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", + "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", + "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", + "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", + "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + "jurkat.bedGraph.gz:md5,f9d912dc6ef6c389ec4b81e100ac7982", + "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", + "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", + "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", + "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", + "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", + "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", + "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", + "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", + "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "peakcalling_2024_12_15_18_14_22_43.log:md5,009aa5047a9d748d37ac0faaa58ae6cb", + "peakcalling_2024_12_15_18_14_23_44.log:md5,92b26ff9ea34bbc08d05387ebe9545ac" + ], + [ + [ + "cd4_REP1.sorted.bam", + "366dda72360cb6fef08914f246c23fe0" + ], + [ + "cd4_REP2.sorted.bam", + "7ff8b1c06b1d47b26062624d2baf83a5" + ], + [ + "jurkat.sorted.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ], + [ + "cd4.bam", + "bcdfc1a81d5240c8ce9fcabe46a30af1" + ], + [ + "jurkat.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T21:03:46.970397" + "timestamp": "2024-12-15T12:14:45.085369" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test b/workflows/tests/inputs/gzipped_gff/main.nf.test index 7b8f07b5..f15c29fb 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test @@ -15,36 +15,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/jurkat.sorted.bam").getSamLinesMD5(), - path("$outputDir/bwa/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // path("$outputDir/quantification/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index 448fdc41..5f900aaf 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -1,102 +1,7 @@ { - "output_files": { + "Should run with a gzipped GFF file": { "content": [ 92, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "c529a16c839e85e119b98354f109352d", - "9e63b682af88fa902cf92b5c485845b1", - "c2adf5327ff6d4edda2fdad00c7cb9bf", - [ - "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", - "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" - ], - [ - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", - "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", - "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", - "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", - "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", - "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", - "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", - "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", - "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", - "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", - "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", - "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", - "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", - "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", - "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" - ], - "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - [ - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" - ], - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:10:29.792013" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -184,12 +89,407 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "bwa", + "bwa/cd4_REP1.sorted.bam", + "bwa/cd4_REP1.sorted.bam.bai", + "bwa/cd4_REP2.sorted.bam", + "bwa/cd4_REP2.sorted.bam.bai", + "bwa/jurkat.sorted.bam", + "bwa/jurkat.sorted.bam.bai", + "bwa/samtools_stats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.stats", + "bwa/samtools_stats/jurkat.sorted.bam.flagstat", + "bwa/samtools_stats/jurkat.sorted.bam.idxstats", + "bwa/samtools_stats/jurkat.sorted.bam.stats", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_18_16_09_43.log", + "transcript_identification/pints/peakcalling_2024_12_15_18_16_09_44.log" + ], + [ + "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", + "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", + "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", + "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", + "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", + "homer-tag-directory-gc-content.txt:md5,213706733eb7a6c9e1345e7961f9a266", + "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", + "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", + "homer_tagdir.txt:md5,ad54384ccd9668de175a540cd44310f2", + "multiqc.log:md5,f2cee6782f0bd785fccf753625abb24b", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,4e089293948eec0636d9514a27cc00fa", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", + "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", + "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", + "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", + "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", + "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", + "multiqc_software_versions.txt:md5,71b857625ebbe5f51be6501178fc5d49", + "multiqc_sources.txt:md5,5f06d2a50a0c68a120d93b189378e2b1", + "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", + "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", + "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", + "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", + "rseqc_read_dups.txt:md5,c9659afbc17908e417d1bee10e094e29", + "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", + "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", + "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", + "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", + "multiqc_report.html:md5,a79b1a41ccdb014940a7f6bc61fa18a5", + "cd4_REP1.trimmed.fastp.html:md5,f7844f92f0aeb3abcce974f54ebc94d7", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,905ed9123dd1b7863b2dc0a94fdd2a3f", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", + "jurkat.trimmed.fastp.html:md5,97d524b162c29ea6de6366f8416b2185", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,9533d20faa831ed58e488b7ef9d26644", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,9d907993cde1fb73ed3eecb80faf1e10", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,4ce304fdb2bb662fcd2083386c539c69", + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", + "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", + "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", + "jurkat.command.log:md5,870a47f101cd5007d2756448b896c33d", + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", + "cd4_REP1.DupRate_plot.pdf:md5,f1868fa0fa447c35352024b93bc2f1ae", + "cd4_REP2.DupRate_plot.pdf:md5,7593adb739e3655d712265db48dd0c4f", + "jurkat.DupRate_plot.pdf:md5,4e9f3560c67a3584c4b1422b41049f07", + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", + "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", + "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", + "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", + "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", + "cd4.bam:md5,c1ba3818665448cbd252332733deb4cd", + "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "cd4.bedGraph.gz:md5,59cccd074030b656b23a64a54565cb3a", + "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", + "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", + "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", + "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", + "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", + "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", + "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", + "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", + "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", + "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + "jurkat.bedGraph.gz:md5,a6d6be72091f2f4f23ab07f1cec5d8c6", + "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", + "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", + "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", + "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", + "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", + "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", + "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", + "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", + "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "peakcalling_2024_12_15_18_16_09_43.log:md5,e5737e0fe6a5e2c9d36f808253f3d016", + "peakcalling_2024_12_15_18_16_09_44.log:md5,e832c8966d9c0167ada1f388d6ae78d3" + ], + [ + [ + "cd4_REP1.sorted.bam", + "366dda72360cb6fef08914f246c23fe0" + ], + [ + "cd4_REP2.sorted.bam", + "7ff8b1c06b1d47b26062624d2baf83a5" + ], + [ + "jurkat.sorted.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ], + [ + "cd4.bam", + "bcdfc1a81d5240c8ce9fcabe46a30af1" + ], + [ + "jurkat.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T21:05:15.91439" + "timestamp": "2024-12-15T12:16:35.87006" } } \ No newline at end of file diff --git a/workflows/tests/inputs/only_gff/main.nf.test b/workflows/tests/inputs/only_gff/main.nf.test index e9850df9..82ee4923 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test +++ b/workflows/tests/inputs/only_gff/main.nf.test @@ -17,36 +17,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/bwa/jurkat.sorted.bam").getSamLinesMD5(), - path("$outputDir/bwa/samtools_stats").list(), - path("$outputDir/quality_control/bbsplit").list(), - UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), - path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), - path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), - path("$outputDir/quality_control/rseqc/infer_experiment").list(), - path("$outputDir/quality_control/rseqc/read_distribution").list(), - path("$outputDir/coverage_graphs/").list(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // path("$outputDir/quantification/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 29a8eb2b..7027bf6f 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -1,102 +1,7 @@ { - "output_files": { + "Should run with only a GFF file": { "content": [ 93, - [ - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" - ], - "c529a16c839e85e119b98354f109352d", - "9e63b682af88fa902cf92b5c485845b1", - "c2adf5327ff6d4edda2fdad00c7cb9bf", - [ - "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", - "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" - ], - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" - ], - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" - ], - [ - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" - ], - [ - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" - ], - [ - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" - ], - [ - "cd4_REP1.read_distribution.txt:md5,59ab605365c2c66c2859a24c9697a175", - "cd4_REP2.read_distribution.txt:md5,0b9cec7d382b6cca9281c41e181b623a", - "jurkat.read_distribution.txt:md5,d8c024f88177bbe002e6c17055024a03" - ], - [ - "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", - "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", - "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", - "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", - "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", - "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", - "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", - "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", - "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", - "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", - "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", - "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", - "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", - "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", - "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" - ], - "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - [ - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe" - ], - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:11:49.680256" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -187,12 +92,407 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "bwa", + "bwa/cd4_REP1.sorted.bam", + "bwa/cd4_REP1.sorted.bam.bai", + "bwa/cd4_REP2.sorted.bam", + "bwa/cd4_REP2.sorted.bam.bai", + "bwa/jurkat.sorted.bam", + "bwa/jurkat.sorted.bam.bai", + "bwa/samtools_stats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.stats", + "bwa/samtools_stats/jurkat.sorted.bam.flagstat", + "bwa/samtools_stats/jurkat.sorted.bam.idxstats", + "bwa/samtools_stats/jurkat.sorted.bam.stats", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_18_17_40_43.log", + "transcript_identification/pints/peakcalling_2024_12_15_18_17_41_43.log" + ], + [ + "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", + "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", + "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", + "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", + "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", + "homer-tag-directory-gc-content.txt:md5,49dd23beeb8904f403290686f3513186", + "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", + "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", + "homer_tagdir.txt:md5,3307e852a7c200d77c3fed42a789fab2", + "multiqc.log:md5,aef00136c9e47fc92720c4f29760748a", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,efe248638a8387846fc180b26f372439", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", + "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", + "multiqc_rseqc_read_distribution.txt:md5,877d137fac942b76294a71c03f52fd3b", + "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", + "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", + "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", + "multiqc_software_versions.txt:md5,d5124cff158563c0c5f6c783a53235d1", + "multiqc_sources.txt:md5,2f17e070152f42f3cf18744a7d2380e3", + "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", + "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", + "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", + "rseqc_read_distribution_plot.txt:md5,085bd8353ecf616ece161a921db4e754", + "rseqc_read_dups.txt:md5,680c3c892d67c8e334c25d3044a89805", + "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", + "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", + "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", + "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", + "multiqc_report.html:md5,93a30f03a4467a4cd54118641fe34ae9", + "cd4_REP1.trimmed.fastp.html:md5,d9fbd33cf7f9594abd598e4f83fa1c70", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,32522787917b3050cfa37fb60d474ba4", + "cd4_REP2.trimmed.fastp.html:md5,de9cdc8a566d47313cb2f50c9b62fb52", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,52daa61826da3e772236654f4d6c2d12", + "jurkat.trimmed.fastp.html:md5,0780a806242307aaab35df44a755c263", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,b2ee4cb08097fb1fa7ecc78b4353be68", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,2e18e8cb45755c40ad86ca3db63fbbf0", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,104562068ed3af80aeb9f9edf8593007", + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", + "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", + "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", + "jurkat.command.log:md5,870a47f101cd5007d2756448b896c33d", + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", + "cd4_REP1.read_distribution.txt:md5,59ab605365c2c66c2859a24c9697a175", + "cd4_REP2.read_distribution.txt:md5,0b9cec7d382b6cca9281c41e181b623a", + "jurkat.read_distribution.txt:md5,d8c024f88177bbe002e6c17055024a03", + "cd4_REP1.DupRate_plot.pdf:md5,c282cae0ef685c2ee76a2d46d11dae16", + "cd4_REP2.DupRate_plot.pdf:md5,a048c8f92b3c6ede72707c58d72c9747", + "jurkat.DupRate_plot.pdf:md5,562cb6087010f5f8138238954d318b7e", + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", + "cd4.featureCounts.txt:md5,92b0ca814150194f2989dd1ba53accbe", + "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", + "jurkat.featureCounts.txt:md5,4caedb3fd80df2debfc5f96e6bef4f5e", + "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", + "cd4.bam:md5,9e3be2a6e0441dc13aa4860793a83d5b", + "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", + "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", + "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "cd4.bedGraph.gz:md5,b38c0ed8a5f7d2109c043a6d30d8ba13", + "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", + "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", + "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", + "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", + "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", + "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", + "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", + "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", + "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", + "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + "jurkat.bedGraph.gz:md5,70aa09344dc2496125754f724686794c", + "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", + "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", + "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", + "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", + "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", + "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", + "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", + "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", + "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "peakcalling_2024_12_15_18_17_40_43.log:md5,11908bc3288f412e0f8874ca0d83c130", + "peakcalling_2024_12_15_18_17_41_43.log:md5,7518d5e497f7783f1ceaf34158dd5db0" + ], + [ + [ + "cd4_REP1.sorted.bam", + "366dda72360cb6fef08914f246c23fe0" + ], + [ + "cd4_REP2.sorted.bam", + "7ff8b1c06b1d47b26062624d2baf83a5" + ], + [ + "jurkat.sorted.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ], + [ + "cd4.bam", + "bcdfc1a81d5240c8ce9fcabe46a30af1" + ], + [ + "jurkat.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T21:06:43.182015" + "timestamp": "2024-12-15T12:18:04.751932" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test index 4321fe1a..98ec9490 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test @@ -21,36 +21,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/transcript_identification/grohmm/cd4.eval.txt"), - path("$outputDir/transcript_identification/grohmm/cd4.final.transcripts.bed"), - path("$outputDir/transcript_identification/grohmm/cd4.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.png").exists(), - path("$outputDir/transcript_identification/grohmm/cd4.transcripts.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.eval.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.final.transcripts.bed"), - path("$outputDir/transcript_identification/grohmm/jurkat.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.png").exists(), - path("$outputDir/transcript_identification/grohmm/jurkat.transcripts.txt"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // path("$outputDir/quantification/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index 972ec3a7..0514104a 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -1,45 +1,7 @@ { - "output_files": { + "Should run groHMM with only a GFF file": { "content": [ 112, - "cd4.bed:md5,202652821e59d0357c699b217d02f755", - "jurkat.bed:md5,7c37a46578dac48f8bf15155cd78b214", - [ - "cd4_intersect.bed:md5,af5866394906d9262d99ff691f0a63db", - "jurkat_intersect.bed:md5,c4ee0f73a5d2f4f210cad1090237fb8b" - ], - [ - "cd4_filtered.bed:md5,e87e37f217df119d7b782150db375494", - "jurkat_filtered.bed:md5,e31353bc7016b44a2ad8a93dc26501e1" - ], - [ - "cd4_intersect.bed:md5,af5866394906d9262d99ff691f0a63db", - "jurkat_intersect.bed:md5,c4ee0f73a5d2f4f210cad1090237fb8b" - ], - [ - "cd4_filtered.bed:md5,e87e37f217df119d7b782150db375494", - "jurkat_filtered.bed:md5,e31353bc7016b44a2ad8a93dc26501e1" - ], - "cd4.eval.txt:md5,de1f790f721a67dfd1e1bf1592a7971a", - "cd4.final.transcripts.bed:md5,3707df9ae8e7a95b6b5bfc336cfb1c8a", - "cd4.tdFinal.txt:md5,f8db76ddb3212459405e0d780c1dc807", - true, - "cd4.transcripts.txt:md5,48d15103e5f67abc30b4da71a595243b", - "jurkat.eval.txt:md5,f8f6402c871cd55d6cfb9c2be04627b6", - "jurkat.final.transcripts.bed:md5,cd3ce78611dcad5a1893a6da3d70a39f", - "jurkat.tdFinal.txt:md5,4bb6a220a6ba29941d4ab28696816afd", - true, - "jurkat.transcripts.txt:md5,901825bc4b6b93e718f7082fb4c2c579", - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:17:44.462822" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -140,12 +102,446 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "bed2saf/jurkat_intersect.saf", + "bwa", + "bwa/cd4_REP1.sorted.bam", + "bwa/cd4_REP1.sorted.bam.bai", + "bwa/cd4_REP2.sorted.bam", + "bwa/cd4_REP2.sorted.bam.bai", + "bwa/jurkat.sorted.bam", + "bwa/jurkat.sorted.bam.bai", + "bwa/samtools_stats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.stats", + "bwa/samtools_stats/jurkat.sorted.bam.flagstat", + "bwa/samtools_stats/jurkat.sorted.bam.idxstats", + "bwa/samtools_stats/jurkat.sorted.bam.stats", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/cd4-group_jurkat_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_jurkat_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_jurkat_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_jurkat_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/grohmm", + "transcript_identification/grohmm/cd4.SE.tuning.csv", + "transcript_identification/grohmm/cd4.eval.txt", + "transcript_identification/grohmm/cd4.final.transcripts.bed", + "transcript_identification/grohmm/cd4.tdFinal.txt", + "transcript_identification/grohmm/cd4.tdFinal_mqc.csv", + "transcript_identification/grohmm/cd4.tdplot_mqc.png", + "transcript_identification/grohmm/cd4.transcripts.txt", + "transcript_identification/grohmm/jurkat.SE.tuning.csv", + "transcript_identification/grohmm/jurkat.eval.txt", + "transcript_identification/grohmm/jurkat.final.transcripts.bed", + "transcript_identification/grohmm/jurkat.tdFinal.txt", + "transcript_identification/grohmm/jurkat.tdFinal_mqc.csv", + "transcript_identification/grohmm/jurkat.tdplot_mqc.png", + "transcript_identification/grohmm/jurkat.transcripts.txt", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_18_21_11_44.log", + "transcript_identification/pints/peakcalling_2024_12_15_18_21_12_44.log" + ], + [ + "cd4_intersect.saf:md5,f1a0ef77b0e1409b859bba18190788ae", + "jurkat_intersect.saf:md5,8a0c5a2917d938c5bd055546eac53a99", + "cd4_REP1.sorted.bam:md5,a77698ed258a0657f2301e859c8c0971", + "cd4_REP1.sorted.bam.bai:md5,0ac6bd6cc0714380843e0d313f739a40", + "cd4_REP2.sorted.bam:md5,112c6ae7f3a0cd488ba8d1631b28e840", + "cd4_REP2.sorted.bam.bai:md5,5404aa6b08602886c23bb767eaddefa8", + "jurkat.sorted.bam:md5,0c143b9e315b155d56daaeb5c13c767b", + "jurkat.sorted.bam.bai:md5,5095ec2871dda3d0b3f39e15ed0d5290", + "cd4_REP1.sorted.bam.flagstat:md5,98ee509d07c1db03ccce634ccf410d07", + "cd4_REP1.sorted.bam.idxstats:md5,3f30696c4c8628b47029f63d9521f0e7", + "cd4_REP1.sorted.bam.stats:md5,4902e9a7e501f6150549e195b7dc44c0", + "cd4_REP2.sorted.bam.flagstat:md5,235f511666cc191d1ba0d0e7334eb6ad", + "cd4_REP2.sorted.bam.idxstats:md5,5eb0e894286a602d8c34b18ae226863e", + "cd4_REP2.sorted.bam.stats:md5,77abd3727f54071ce24ac389a91934ed", + "jurkat.sorted.bam.flagstat:md5,a1eec107305fe681a02771574de5c5fb", + "jurkat.sorted.bam.idxstats:md5,02590cdcaec907c42cf6507d62844a4c", + "jurkat.sorted.bam.stats:md5,824ca1525abba55d54e9df2c319be932", + "cd4.bed:md5,60e0da7e5691e55d86eb9df9f6ea0c46", + "jurkat.bed:md5,3584ff1a08cdecc92b6fcf6b2db8dc90", + "cd4_REP1.dreg.bedGraph:md5,35eb3dce09cf8a32e71fe459e0f4a0a5", + "cd4_REP1.minus.bedGraph:md5,141abb85ef58f8cd77b3908ac22a35c6", + "cd4_REP1.minus.bigWig:md5,52d93314a403c1303e91c34ea731b445", + "cd4_REP1.plus.bedGraph:md5,fac7dc18180431b03e367da72383da88", + "cd4_REP1.plus.bigWig:md5,8b869ed53753eafa00dcc63070078883", + "cd4_REP2.dreg.bedGraph:md5,b1fc188a70aa795a38649954fc41896c", + "cd4_REP2.minus.bedGraph:md5,5ff711ae9e757b1a60364131b8003880", + "cd4_REP2.minus.bigWig:md5,deb81acab23d25a991e26af82b33b04e", + "cd4_REP2.plus.bedGraph:md5,c48f7894fabd484661226fde193a67fb", + "cd4_REP2.plus.bigWig:md5,f308509ebc485ed7b1ba8616aba8e400", + "jurkat.dreg.bedGraph:md5,f5c6f0e6035c2d3f1cb803f532c3fb93", + "jurkat.minus.bedGraph:md5,4da08f7094f8ff6c2e1ab33ea982c328", + "jurkat.minus.bigWig:md5,378935c83fe428a878cb91490ce5e297", + "jurkat.plus.bedGraph:md5,1e801978023f381e151403b572a9bd70", + "jurkat.plus.bigWig:md5,59bbb8db066fb91c82685eff1c675823", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", + "homer-tag-directory-gc-content.txt:md5,0d446a0c3f63e9f164e0bf868b114a8f", + "homer-tag-info-dist.txt:md5,d22160c8fa8e7dd57aa35e01e85efc6c", + "homer-tag-length-dist.txt:md5,d8d80be95f06f67e22385aadbb4a475d", + "homer_tagdir.txt:md5,39b8cd90ae0f7ac8e22ae22755ac2fb2", + "multiqc.log:md5,1d1c942b2eed04a3c09cdd74c234f102", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,5d7a1044a3abcd31cff83b18bd18bf26", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,8e31e3c1b55832e05332d70f624bf1a9", + "multiqc_rseqc_infer_experiment.txt:md5,54a857f0586d5b30714f8bdfff0663bd", + "multiqc_rseqc_read_distribution.txt:md5,87d05821d2fb7c32b4c8d77b131004a1", + "multiqc_samtools_flagstat.txt:md5,c6e4f58319dbb3bb8912073d872d4753", + "multiqc_samtools_idxstats.txt:md5,e5d1f8a9a2207c0696ee14120a1fa8a2", + "multiqc_samtools_stats.txt:md5,1abc9d227d752e32e32ab2fbecec958b", + "multiqc_software_versions.txt:md5,3f18e68e12366456cc5daf96ada234f5", + "multiqc_sources.txt:md5,47320de21cb83ba421f2945d299653a3", + "preseq.txt:md5,eaf47d79e325bd71ee353e20dcfcedef", + "preseq_complexity_plot_molecules.txt:md5,78f58d6ca13cd511c496ee2371965811", + "rseqc_infer_experiment_plot.txt:md5,46bda5a4ea805b4f1871aaf3d73348de", + "rseqc_read_distribution_plot.txt:md5,837288896760a0aa58dd7b94fad8a28e", + "rseqc_read_dups.txt:md5,d22919dd9f888a5fc8e08deb509bee63", + "rseqc_read_dups_plot.txt:md5,5667d898e8c8bbca7c4ff433fa4d537e", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,fda7a0a052ccd49180008788cd804891", + "samtools-flagstat-dp_Read_counts.txt:md5,2e0c630a6b9cc83cd723ae6f69806865", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,54410ddc68550b3d08a8191b04a3f6f0", + "samtools-stats-dp.txt:md5,88d5541be6e4d22e988eac623c5a1747", + "samtools_alignment_plot.txt:md5,f4641c2bb638271eab28ef3855f1fb0b", + "multiqc_report.html:md5,f340567a465cdbadb1d77fd1cba3b6e2", + "cd4_REP1.trimmed.fastp.html:md5,829fb7064329d8abe52c3bab69906f5d", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", + "cd4_REP2.trimmed.fastp.html:md5,3a920cf04cbf9ee73353130c5185a037", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", + "jurkat.trimmed.fastp.html:md5,9f1db2862fc595948eafed69bd15d0ed", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,b9d4e5fba9c5cd63d34cdabecd139f8e", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,d3bfe4a6e52b2a406de622e0243035d2", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,131f866a8bf2367f7a614776bc888dc5", + "cd4_REP1.coverage.hist.txt:md5,0215c381b73f0a961a30b9356c5e6740", + "cd4_REP1.coverage.stats.txt:md5,4537d892d57f7fcad585a395ed758a97", + "cd4_REP2.coverage.hist.txt:md5,64b88d0265ebcf2c7c4fd6b59b05a148", + "cd4_REP2.coverage.stats.txt:md5,3b44ada2178198a6edc21b4211e8374c", + "jurkat.coverage.hist.txt:md5,43695697bd1732dbbf3a977b99b23613", + "jurkat.coverage.stats.txt:md5,1a417ac0669cfd2790d29c8cf3f9f508", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,050949598e9b8789f832b64858322967", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3f21116841fc8b185811ced90f686438", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,b9913faae8d99303e9fa123036addbd7", + "cd4_REP1.command.log:md5,663dc3e84f3839e0123e5d527b58465b", + "cd4_REP2.command.log:md5,5600468189fd44d2f44e26d5f313b1a5", + "jurkat.command.log:md5,990c1b8df0faac4ba425d10e8e98ffa5", + "cd4_REP1.infer_experiment.txt:md5,4c5b20851e7ad18df28a56acbb42d28d", + "cd4_REP2.infer_experiment.txt:md5,6e560b0b5307712741badd8c02454e7a", + "jurkat.infer_experiment.txt:md5,5cb308701023dbd6f6b5235d6dff96e3", + "cd4_REP1.read_distribution.txt:md5,b5970ff6682e64cdcc362f9877ffd8b4", + "cd4_REP2.read_distribution.txt:md5,ad2d32f66ffa6d8243ba726e5391771c", + "jurkat.read_distribution.txt:md5,ec85eca882ceb40a35a3ca25962a249d", + "cd4_REP1.DupRate_plot.pdf:md5,13b8ad3c0025d4c8d8fce517eab9436d", + "cd4_REP2.DupRate_plot.pdf:md5,cc0842aba5efd1ed6e0596d9217bc7f2", + "jurkat.DupRate_plot.pdf:md5,ef7c5fad3d8e5bbb0d12e1c7745f7fe8", + "cd4_REP1.DupRate_plot.r:md5,33b9b06d31d9562479988a3092ca7748", + "cd4_REP2.DupRate_plot.r:md5,521cc00de4ea59fe44c65b9390aac277", + "jurkat.DupRate_plot.r:md5,0f5f976328b37d9f7abb6e9c8ed62efb", + "cd4_REP1.pos.DupRate.xls:md5,38035550fbc241c27bea362cc1c4aeb9", + "cd4_REP1.seq.DupRate.xls:md5,6743c50da53b7c667ef5e044071503f2", + "cd4_REP2.pos.DupRate.xls:md5,305e90dd6be91c6e4a46198822ac3788", + "cd4_REP2.seq.DupRate.xls:md5,f95553fa93530eac4138bc85858ed793", + "jurkat.pos.DupRate.xls:md5,05ece3550edad3968cef71d73572d8ac", + "jurkat.seq.DupRate.xls:md5,a542bee20c970f00a442bf8f32fc7fca", + "cd4.featureCounts.txt:md5,ed8cf64830727cea3e42f187628abcba", + "cd4.featureCounts.txt.summary:md5,d8b532bf2da8770a680af6b8856cdce5", + "jurkat.featureCounts.txt:md5,0faf32577974b991f529eb92f30a9111", + "jurkat.featureCounts.txt.summary:md5,54a9d46f991dd140814023eca5010f6a", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,086f8d1b9646e01964d6b413f89e20db", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,79506f855f638b77eb1fb19a49255b29", + "cd4-group_jurkat_intersect-transcripts.featureCounts.txt:md5,c4cf4c5c8548e7570fda513b9b8f6e27", + "cd4-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,8991ab109e6ad6898bcce5b7202be198", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,b3d861347ca33f32c259a96baa7a61f1", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,41b1105201074746a32d7e6cba11bee4", + "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt:md5,786c1769a45c18a06bec03728ec7be14", + "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,07dedd69adaffa9658be2a2a51d8244d", + "cd4.bam:md5,f7aac1bee1a3c1027c939b7fe9227c63", + "jurkat.bam:md5,dbcc0f3aba1009c6a428c62d13ae773c", + "cd4_filtered.bed:md5,e87e37f217df119d7b782150db375494", + "jurkat_filtered.bed:md5,e31353bc7016b44a2ad8a93dc26501e1", + "cd4.SE.tuning.csv:md5,9d76e9a83079d587459fda16af8c4da8", + "cd4.eval.txt:md5,de1f790f721a67dfd1e1bf1592a7971a", + "cd4.final.transcripts.bed:md5,3707df9ae8e7a95b6b5bfc336cfb1c8a", + "cd4.tdFinal.txt:md5,f8db76ddb3212459405e0d780c1dc807", + "cd4.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", + "cd4.tdplot_mqc.png:md5,159224ca8b99bdf67f3f7d328bd741dd", + "cd4.transcripts.txt:md5,48d15103e5f67abc30b4da71a595243b", + "jurkat.SE.tuning.csv:md5,d339a8072a8789896d4df6b78eeef6a2", + "jurkat.eval.txt:md5,f8f6402c871cd55d6cfb9c2be04627b6", + "jurkat.final.transcripts.bed:md5,cd3ce78611dcad5a1893a6da3d70a39f", + "jurkat.tdFinal.txt:md5,4bb6a220a6ba29941d4ab28696816afd", + "jurkat.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", + "jurkat.tdplot_mqc.png:md5,91825f59df971e9e79256058da010f3f", + "jurkat.transcripts.txt:md5,901825bc4b6b93e718f7082fb4c2c579", + "cd4.bed:md5,202652821e59d0357c699b217d02f755", + "cd4.bedGraph.gz:md5,2f978ce347b5e99b564de3244775c3a2", + "cd4.peaks.txt:md5,84b08e639d17d480cbc90b465ecfff73", + "chr21.tags.tsv:md5,3a404fc3ab7ff5b3d353a425d38b0c8c", + "genomeGCcontent.txt:md5,70441de08dd75a2cfdd1aa35c3d41405", + "tagAutocorrelation.txt:md5,5d550fded2616cf861840ea8cdb8be56", + "tagCountDistribution.txt:md5,7642ad01d7d90c52f188fab8b5c723c1", + "tagFreq.txt:md5,781b09c61817eca899f483c330cfb713", + "tagFreqUniq.txt:md5,d8d2b62480ce9b3cc2f143439363f966", + "tagGCcontent.txt:md5,0c05c3da8258c9774ad2b76365c7e075", + "tagInfo.txt:md5,a0bfcc466f4689096fb66bdb62625c3c", + "tagLengthDistribution.txt:md5,9501eeee126bb8fe4684871bd49574fe", + "jurkat.bed:md5,7c37a46578dac48f8bf15155cd78b214", + "jurkat.bedGraph.gz:md5,d86b5ee6791c6277507ec2848bbacc0d", + "jurkat.peaks.txt:md5,4cc5640d1e7c84db1116d6514265a4c3", + "chr21.tags.tsv:md5,6d73d34ad73ab09ffa55a59d81ee2d20", + "genomeGCcontent.txt:md5,b7445dff3ac36fa33c9b41aa0420ce54", + "tagAutocorrelation.txt:md5,bfd73734f1887f4b3a3ccc71bc6f4781", + "tagCountDistribution.txt:md5,d7d3f22c38df033e84432880234a5e6a", + "tagFreq.txt:md5,028ba4bb683cf46d3539d79c2e453c83", + "tagFreqUniq.txt:md5,728cc7a6a8eaaf0ca46edb4d575f254f", + "tagGCcontent.txt:md5,09433d221388e178451aeed899cdc2c0", + "tagInfo.txt:md5,4493cc544bdced3fb301223a22903774", + "tagLengthDistribution.txt:md5,b9a234b4de2ee18e39e51d2cc30f645c", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,af5866394906d9262d99ff691f0a63db", + "jurkat_intersect.bed:md5,c4ee0f73a5d2f4f210cad1090237fb8b", + "cd4_merged.bed:md5,f79432639c3f1b86787947e8d7242c75", + "jurkat_merged.bed:md5,a94e1ec47f0564122ae1eb0f73be4ebd", + "cd4_chr21_1_unidirectional_peaks.bed:md5,60e0da7e5691e55d86eb9df9f6ea0c46", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,3584ff1a08cdecc92b6fcf6b2db8dc90", + "peakcalling_2024_12_15_18_21_11_44.log:md5,8cb0ea637f501970d1374794427f6ad4", + "peakcalling_2024_12_15_18_21_12_44.log:md5,170cf41e144631671ff124b3f21d6fb2" + ], + [ + [ + "cd4_REP1.sorted.bam", + "21daaefcde22b2782ace5fa08813bf0a" + ], + [ + "cd4_REP2.sorted.bam", + "dd3cba41dbcd47caf3261741f82607cc" + ], + [ + "jurkat.sorted.bam", + "16cfcc507c9b3eb2bf8ad2f3f1f06e4c" + ], + [ + "cd4.bam", + "9734d7341eb2763e2a775b713716d95d" + ], + [ + "jurkat.bam", + "16cfcc507c9b3eb2bf8ad2f3f1f06e4c" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T21:15:19.100902" + "timestamp": "2024-12-15T12:24:24.323879" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index 8ff3fa64..9b6299c4 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -13,36 +13,26 @@ nextflow_pipeline { } then { + // stable_name: All files + folders in ${params.outdir}/ with a stable name + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + // stable_path: All files in ${params.outdir}/ with stable content + def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') + // bam_files: All bam files + def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/transcript_identification/homer/cd4.bed"), - path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/transcript_identification/intersect/").list(), - path("$outputDir/transcript_identification/filtered/").list(), - path("$outputDir/transcript_identification/grohmm/cd4.eval.txt"), - path("$outputDir/transcript_identification/grohmm/cd4.final.transcripts.bed"), - path("$outputDir/transcript_identification/grohmm/cd4.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/cd4.tdplot_mqc.png").exists(), - path("$outputDir/transcript_identification/grohmm/cd4.transcripts.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.eval.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.final.transcripts.bed"), - path("$outputDir/transcript_identification/grohmm/jurkat.tdFinal.txt"), - path("$outputDir/transcript_identification/grohmm/jurkat.tdplot_mqc.png").exists(), - path("$outputDir/transcript_identification/grohmm/jurkat.transcripts.txt"), - // FIXME Not determinstic because of the order of files - // Add to the other tests when fixed - // path("$outputDir/quantification/").list(), - path("$outputDir/multiqc/multiqc_report.html").exists(), - ).match("output_files") - } + // Number of tasks + workflow.trace.succeeded().size(), + // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions + removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + // All stable path name + stable_name, + // All files with stable contents + stable_path, + // All bam files + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + ).match() } ) } } diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 346017f0..34dc3793 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -1,45 +1,7 @@ { - "output_files": { + "Should run with defaults": { "content": [ 112, - "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - [ - "cd4_intersect.bed:md5,ca03c888e605b1de100c3af9f975051e", - "jurkat_intersect.bed:md5,c30da7861bb57a96e051bf70ee882887" - ], - [ - "cd4_filtered.bed:md5,2e235f9fe4e337a4e3f14c459ecd7988", - "jurkat_filtered.bed:md5,75086096f2ee6dab198228a0d2af1fad" - ], - [ - "cd4_intersect.bed:md5,ca03c888e605b1de100c3af9f975051e", - "jurkat_intersect.bed:md5,c30da7861bb57a96e051bf70ee882887" - ], - [ - "cd4_filtered.bed:md5,2e235f9fe4e337a4e3f14c459ecd7988", - "jurkat_filtered.bed:md5,75086096f2ee6dab198228a0d2af1fad" - ], - "cd4.eval.txt:md5,6f688621a2acb60f2e48163f132d390c", - "cd4.final.transcripts.bed:md5,5eb7209e5bb45744ae03f89010a162aa", - "cd4.tdFinal.txt:md5,83f65b2db4f2f584992a1d036fd8859d", - true, - "cd4.transcripts.txt:md5,4b339fcbf7ca955c12ca1198b2c0db36", - "jurkat.eval.txt:md5,dac8d86b680c5a9d59558b62a3fc896b", - "jurkat.final.transcripts.bed:md5,d7149560c228316a2de2af10b48361ec", - "jurkat.tdFinal.txt:md5,e21a5b8112deb8b747a17630f21eb723", - true, - "jurkat.transcripts.txt:md5,ad6c62cf26bcb7f56d073d5404bc8674", - true - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.0" - }, - "timestamp": "2024-11-08T20:23:19.772674" - }, - "software_versions": { - "content": [ { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -131,12 +93,444 @@ "Workflow": { "nf-core/nascent": "v2.3.0dev" } - } + }, + [ + "bed2saf", + "bed2saf/cd4_intersect.saf", + "bed2saf/jurkat_intersect.saf", + "bwa", + "bwa/cd4_REP1.sorted.bam", + "bwa/cd4_REP1.sorted.bam.bai", + "bwa/cd4_REP2.sorted.bam", + "bwa/cd4_REP2.sorted.bam.bai", + "bwa/jurkat.sorted.bam", + "bwa/jurkat.sorted.bam.bai", + "bwa/samtools_stats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP1.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP1.sorted.bam.stats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.flagstat", + "bwa/samtools_stats/cd4_REP2.sorted.bam.idxstats", + "bwa/samtools_stats/cd4_REP2.sorted.bam.stats", + "bwa/samtools_stats/jurkat.sorted.bam.flagstat", + "bwa/samtools_stats/jurkat.sorted.bam.idxstats", + "bwa/samtools_stats/jurkat.sorted.bam.stats", + "cat", + "cat/cd4.bed", + "cat/jurkat.bed", + "coverage_graphs", + "coverage_graphs/cd4_REP1.dreg.bedGraph", + "coverage_graphs/cd4_REP1.minus.bedGraph", + "coverage_graphs/cd4_REP1.minus.bigWig", + "coverage_graphs/cd4_REP1.plus.bedGraph", + "coverage_graphs/cd4_REP1.plus.bigWig", + "coverage_graphs/cd4_REP2.dreg.bedGraph", + "coverage_graphs/cd4_REP2.minus.bedGraph", + "coverage_graphs/cd4_REP2.minus.bigWig", + "coverage_graphs/cd4_REP2.plus.bedGraph", + "coverage_graphs/cd4_REP2.plus.bigWig", + "coverage_graphs/jurkat.dreg.bedGraph", + "coverage_graphs/jurkat.minus.bedGraph", + "coverage_graphs/jurkat.minus.bigWig", + "coverage_graphs/jurkat.plus.bedGraph", + "coverage_graphs/jurkat.plus.bigWig", + "multiqc", + "multiqc/multiqc_data", + "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", + "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", + "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", + "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", + "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", + "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", + "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", + "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", + "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", + "multiqc/multiqc_data/homer-tag-info-dist.txt", + "multiqc/multiqc_data/homer-tag-length-dist.txt", + "multiqc/multiqc_data/homer_tagdir.txt", + "multiqc/multiqc_data/multiqc.log", + "multiqc/multiqc_data/multiqc_citations.txt", + "multiqc/multiqc_data/multiqc_data.json", + "multiqc/multiqc_data/multiqc_fastqc.txt", + "multiqc/multiqc_data/multiqc_general_stats.txt", + "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", + "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", + "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", + "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", + "multiqc/multiqc_data/multiqc_samtools_stats.txt", + "multiqc/multiqc_data/multiqc_software_versions.txt", + "multiqc/multiqc_data/multiqc_sources.txt", + "multiqc/multiqc_data/preseq.txt", + "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", + "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", + "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", + "multiqc/multiqc_data/rseqc_read_dups.txt", + "multiqc/multiqc_data/rseqc_read_dups_plot.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", + "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", + "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", + "multiqc/multiqc_data/samtools-stats-dp.txt", + "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_report.html", + "pipeline_info", + "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "preprocessing", + "preprocessing/fastp", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", + "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", + "preprocessing/fastp/jurkat.trimmed.fastp.html", + "preprocessing/fastp/jurkat.trimmed.fastp.json", + "preprocessing/fastp/jurkat.trimmed.fastp.log", + "preprocessing/fastqc", + "preprocessing/fastqc/cd4_REP1_fastqc.html", + "preprocessing/fastqc/cd4_REP1_fastqc.zip", + "preprocessing/fastqc/cd4_REP2_fastqc.html", + "preprocessing/fastqc/cd4_REP2_fastqc.zip", + "preprocessing/fastqc/jurkat_fastqc.html", + "preprocessing/fastqc/jurkat_fastqc.zip", + "quality_control", + "quality_control/bbsplit", + "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", + "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", + "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", + "quality_control/bbsplit/jurkat.coverage.hist.txt", + "quality_control/bbsplit/jurkat.coverage.stats.txt", + "quality_control/preseq", + "quality_control/preseq/cd4_REP1.c_curve.txt", + "quality_control/preseq/cd4_REP1.lc_extrap.txt", + "quality_control/preseq/cd4_REP2.c_curve.txt", + "quality_control/preseq/cd4_REP2.lc_extrap.txt", + "quality_control/preseq/jurkat.c_curve.txt", + "quality_control/preseq/jurkat.lc_extrap.txt", + "quality_control/preseq/log", + "quality_control/preseq/log/cd4_REP1.command.log", + "quality_control/preseq/log/cd4_REP2.command.log", + "quality_control/preseq/log/jurkat.command.log", + "quality_control/rseqc", + "quality_control/rseqc/infer_experiment", + "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", + "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", + "quality_control/rseqc/read_distribution", + "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", + "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", + "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", + "quality_control/rseqc/read_duplication", + "quality_control/rseqc/read_duplication/pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", + "quality_control/rseqc/read_duplication/rscript", + "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", + "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", + "quality_control/rseqc/read_duplication/xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", + "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", + "quantification", + "quantification/gene", + "quantification/gene/cd4.featureCounts.txt", + "quantification/gene/cd4.featureCounts.txt.summary", + "quantification/gene/jurkat.featureCounts.txt", + "quantification/gene/jurkat.featureCounts.txt.summary", + "quantification/nascent", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/cd4-group_jurkat_intersect-transcripts.featureCounts.txt", + "quantification/nascent/cd4-group_jurkat_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", + "quantification/nascent/jurkat-group_jurkat_intersect-transcripts.featureCounts.txt", + "quantification/nascent/jurkat-group_jurkat_intersect-transcripts.featureCounts.txt.summary", + "samtools", + "samtools/cd4.bam", + "samtools/jurkat.bam", + "transcript_identification", + "transcript_identification/filtered", + "transcript_identification/filtered/cd4_filtered.bed", + "transcript_identification/filtered/jurkat_filtered.bed", + "transcript_identification/grohmm", + "transcript_identification/grohmm/cd4.SE.tuning.csv", + "transcript_identification/grohmm/cd4.eval.txt", + "transcript_identification/grohmm/cd4.final.transcripts.bed", + "transcript_identification/grohmm/cd4.tdFinal.txt", + "transcript_identification/grohmm/cd4.tdFinal_mqc.csv", + "transcript_identification/grohmm/cd4.tdplot_mqc.png", + "transcript_identification/grohmm/cd4.transcripts.txt", + "transcript_identification/grohmm/jurkat.SE.tuning.csv", + "transcript_identification/grohmm/jurkat.eval.txt", + "transcript_identification/grohmm/jurkat.final.transcripts.bed", + "transcript_identification/grohmm/jurkat.tdFinal.txt", + "transcript_identification/grohmm/jurkat.tdFinal_mqc.csv", + "transcript_identification/grohmm/jurkat.tdplot_mqc.png", + "transcript_identification/grohmm/jurkat.transcripts.txt", + "transcript_identification/homer", + "transcript_identification/homer/cd4.bed", + "transcript_identification/homer/cd4.bedGraph.gz", + "transcript_identification/homer/cd4.peaks.txt", + "transcript_identification/homer/cd4_tagdir", + "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", + "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/cd4_tagdir/tagFreq.txt", + "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", + "transcript_identification/homer/cd4_tagdir/tagInfo.txt", + "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/jurkat.bed", + "transcript_identification/homer/jurkat.bedGraph.gz", + "transcript_identification/homer/jurkat.peaks.txt", + "transcript_identification/homer/jurkat_tagdir", + "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", + "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", + "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", + "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", + "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", + "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", + "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", + "transcript_identification/homer/versions.yml", + "transcript_identification/intersect", + "transcript_identification/intersect/cd4_intersect.bed", + "transcript_identification/intersect/jurkat_intersect.bed", + "transcript_identification/merged", + "transcript_identification/merged/cd4_merged.bed", + "transcript_identification/merged/jurkat_merged.bed", + "transcript_identification/pints", + "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", + "transcript_identification/pints/peakcalling_2024_12_15_18_27_13_44.log" + ], + [ + "cd4_intersect.saf:md5,e2e38ad07e9363e5c71a72d2faeec6ca", + "jurkat_intersect.saf:md5,cd18a95027d48289248d33d70b863fa4", + "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", + "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", + "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", + "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", + "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", + "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", + "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", + "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", + "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", + "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", + "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", + "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", + "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", + "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", + "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", + "homer-tag-directory-gc-content.txt:md5,49dd23beeb8904f403290686f3513186", + "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", + "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", + "homer_tagdir.txt:md5,3307e852a7c200d77c3fed42a789fab2", + "multiqc.log:md5,6107061ab52384df73d8cc14ceff11d1", + "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", + "multiqc_data.json:md5,3db60b3d0f123001bb00e0b75f4f238b", + "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", + "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", + "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", + "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", + "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", + "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", + "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", + "multiqc_software_versions.txt:md5,07f1745e744234cb60bc2a2930b23718", + "multiqc_sources.txt:md5,8e639e875b0b168dc6649f8629b6868e", + "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", + "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", + "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", + "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", + "rseqc_read_dups.txt:md5,9dd77594ea11e1ea2ca856683d8d99b1", + "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", + "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", + "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", + "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", + "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", + "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", + "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", + "multiqc_report.html:md5,73d2bdcc5074558bfe9adda9b73c2344", + "cd4_REP1.trimmed.fastp.html:md5,acea8d41e44648cd5c4bf8136300ffe1", + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP1.trimmed.fastp.log:md5,32522787917b3050cfa37fb60d474ba4", + "cd4_REP2.trimmed.fastp.html:md5,93f932fc762f02d6f0f16177bbb4a8b5", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP2.trimmed.fastp.log:md5,52daa61826da3e772236654f4d6c2d12", + "jurkat.trimmed.fastp.html:md5,0cb855ab802421e8e66bb4047ab33815", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", + "jurkat.trimmed.fastp.log:md5,ebc93d4a9ecfa454adad95c01bf9e9a7", + "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", + "cd4_REP1_fastqc.zip:md5,c51dfa0208625ba41cf4107efbbc42e0", + "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", + "cd4_REP2_fastqc.zip:md5,ee3fd572934fa33856e441469a1458ac", + "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", + "jurkat_fastqc.zip:md5,1b6cb3bf6615c42cb19b1a400520ecd1", + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", + "cd4_REP1.command.log:md5,611488b2a0f75fe9489e0d4488572efe", + "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", + "jurkat.command.log:md5,500aa628ec58fe85d9ab2a88fc7f0fbf", + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", + "cd4_REP1.DupRate_plot.pdf:md5,7ac8baf54646661bac64f328f9ba4668", + "cd4_REP2.DupRate_plot.pdf:md5,9c9e42a783c0614966a360cfacb3c7e0", + "jurkat.DupRate_plot.pdf:md5,ccae8137c6850cb950480677d95739ab", + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", + "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", + "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", + "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", + "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,edf09437a7dbe221c080252b3cd369a9", + "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,c8f3c7e4da0f4857d4a73f1b721605ce", + "cd4-group_jurkat_intersect-transcripts.featureCounts.txt:md5,44aa00e892bcbfec64a02bedf5326547", + "cd4-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,6ca3f0ad57a8eabb83994387c6bbf2f8", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,49e7937259ed448f733969186bf95476", + "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,381ccfb35c5b1f2e93353a1af32b68c2", + "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt:md5,523f9b003005f7c0a7569935a559821f", + "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,0db4ca61975eac4420698cd6f396453d", + "cd4.bam:md5,273c553b02766c370e2ccc7074395ed7", + "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", + "cd4_filtered.bed:md5,2e235f9fe4e337a4e3f14c459ecd7988", + "jurkat_filtered.bed:md5,75086096f2ee6dab198228a0d2af1fad", + "cd4.SE.tuning.csv:md5,00e1c530e2ce3b09fd413b8f87eef5d0", + "cd4.eval.txt:md5,6f688621a2acb60f2e48163f132d390c", + "cd4.final.transcripts.bed:md5,5eb7209e5bb45744ae03f89010a162aa", + "cd4.tdFinal.txt:md5,83f65b2db4f2f584992a1d036fd8859d", + "cd4.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", + "cd4.tdplot_mqc.png:md5,ed0b167598cd9abf90954b00a5a28015", + "cd4.transcripts.txt:md5,4b339fcbf7ca955c12ca1198b2c0db36", + "jurkat.SE.tuning.csv:md5,6d6551f5ded9a49e05ffdbd233ae82b8", + "jurkat.eval.txt:md5,dac8d86b680c5a9d59558b62a3fc896b", + "jurkat.final.transcripts.bed:md5,d7149560c228316a2de2af10b48361ec", + "jurkat.tdFinal.txt:md5,e21a5b8112deb8b747a17630f21eb723", + "jurkat.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", + "jurkat.tdplot_mqc.png:md5,f88d76f5630a8ab4233682a616af6ca8", + "jurkat.transcripts.txt:md5,ad6c62cf26bcb7f56d073d5404bc8674", + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "cd4.bedGraph.gz:md5,6adc591cfb4a84898fc4f8eae9010f37", + "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", + "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", + "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", + "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", + "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", + "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", + "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", + "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", + "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", + "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + "jurkat.bedGraph.gz:md5,15e2d0ce0ade9394c974ff11dec466ce", + "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", + "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", + "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", + "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", + "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", + "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", + "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", + "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", + "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", + "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "cd4_intersect.bed:md5,ca03c888e605b1de100c3af9f975051e", + "jurkat_intersect.bed:md5,c30da7861bb57a96e051bf70ee882887", + "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", + "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", + "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", + "peakcalling_2024_12_15_18_27_13_44.log:md5,12590f950936e0b7630ae19996e4331a" + ], + [ + [ + "cd4_REP1.sorted.bam", + "366dda72360cb6fef08914f246c23fe0" + ], + [ + "cd4_REP2.sorted.bam", + "7ff8b1c06b1d47b26062624d2baf83a5" + ], + [ + "jurkat.sorted.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ], + [ + "cd4.bam", + "bcdfc1a81d5240c8ce9fcabe46a30af1" + ], + [ + "jurkat.bam", + "4a679dc8ae1fd96bed9da1e3f772daaa" + ] + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T21:22:54.350234" + "timestamp": "2024-12-15T12:46:34.911734" } } \ No newline at end of file From 05f81e6c3485a3f077a41566bf6fe3bf611627b4 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Dec 2024 16:21:04 -0600 Subject: [PATCH 214/255] test: Get more aggressive with the ignores --- conf/modules.config | 2 +- tests/.nftignore | 33 +++-- workflows/tests/aligner/bwa.nf.test | 2 +- workflows/tests/aligner/bwa.nf.test.snap | 173 ++--------------------- 4 files changed, 35 insertions(+), 175 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 139f2a8c..8b27c3a2 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -362,7 +362,7 @@ process { [ path: { "${params.outdir}/transcript_identification/pints" }, mode: params.publish_dir_mode, - saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + saveAs: { filename -> filename.equals('versions.yml') || filename.endsWith('.log') ? null : filename } ], ] } diff --git a/tests/.nftignore b/tests/.nftignore index 5d94dd47..9206fba0 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -1,16 +1,27 @@ -fastqc/*.html -fastqc/zips/*.zip -multiqc/*/multiqc_data/*.{log,json} -multiqc/*/multiqc_data/multiqc_fastqc.txt -multiqc/*/multiqc_data/multiqc_general_stats.txt -multiqc/*/multiqc_data/multiqc_qualimap_bamqc_genome_results.txt -multiqc/*/multiqc_data/multiqc_software_versions.txt -multiqc/*/multiqc_data/multiqc_sources.txt -multiqc/*/multiqc_report.html -multiqc/*/multiqc_plots/{pdf,png,svg}/*.{pdf,png,svg} +preprocessing/fastqc/*.html +preprocessing/fastqc/*.zip +multiqc/multiqc_data/*.{log,json} +multiqc/multiqc_data/multiqc_fastqc.txt +multiqc/multiqc_data/multiqc_general_stats.txt +multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt +multiqc/multiqc_data/homer_tagdir.txt +multiqc/multiqc_data/rseqc_read_dups.txt +multiqc/multiqc_data/multiqc_software_versions.txt +multiqc/multiqc_data/multiqc_sources.txt +multiqc/multiqc_report.html +multiqc/multiqc_plots/{pdf,png,svg}/*.{pdf,png,svg} pipeline_info/*.{html,json,txt,yml} */alignments/logs/*.txt -*/{alignments,deduplicated}/*.{bam,bam.bai} */deduplicated/logs/*.txt */{reports,summary}/*.{html,txt} +**/*.{html,txt} +**/*.log +**/*.command.log +**/*.bedGraph.gz +**/tagInfo.txt +**/*.bam +**/*.featureCounts.txt +**/*.featureCounts.txt.summary +**/DupRate_plot.pdf +**/*.pdf diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 70faf216..44653367 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -34,7 +34,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getHeaderMD5() ] } ).match() } ) } diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 4ab3884d..ac9ecd53 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -388,22 +388,15 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_17_45_00_44.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,635fcd8e2c060dc75db25564c2a664dc", - "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "cd4_REP3.sorted.bam:md5,87759126ce19e605d415e11d32b758b2", "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", - "cd4_REP4.sorted.bam:md5,be020f98894a831a25b32e0e74d96edd", "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", - "jurkat_REP1.sorted.bam:md5,322394245e8ba6fb51fb591b4ba2dc82", "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", - "jurkat_REP2.sorted.bam:md5,ece1ae4ce266a64a4d27aa12b4bb630e", "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", @@ -455,125 +448,12 @@ "jurkat_REP2.minus.bigWig:md5,686f719978de948f7045acc95f9d1c82", "jurkat_REP2.plus.bedGraph:md5,569e8a25c9cf48d1ef953f3da77c48a1", "jurkat_REP2.plus.bigWig:md5,cbe3fd38fe8f9508645bbfad83924212", - "fastqc-status-check-heatmap.txt:md5,54eaa9c4b747e892026ca0cb40e20d0e", - "fastqc_adapter_content_plot.txt:md5,de08191d660035f8e31cd20a39d49449", - "fastqc_overrepresented_sequences_plot.txt:md5,b80bcbee43bd8861e9ae7f985a963bf5", - "fastqc_per_base_n_content_plot.txt:md5,aba6fb9329f4bc05eb1dff9e2e6e4448", - "fastqc_per_base_sequence_quality_plot.txt:md5,9bffaf2c58e715bc7604bd3467145487", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7d87b4086af0fbb1da24a13a2b28b53c", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,9d57a5eff9d7f734ada23931e563db53", - "fastqc_per_sequence_quality_scores_plot.txt:md5,6b932566907be97642a291eab6a0419e", - "fastqc_sequence_counts_plot.txt:md5,26cdc4ed5c6261fbc940ae2341facd26", - "fastqc_sequence_duplication_levels_plot.txt:md5,e2b3be0c99270ea1e39c3c0bcb3957f4", - "fastqc_top_overrepresented_sequences_table.txt:md5,da8609080b5a16765f1b9cade4ff428e", - "homer-tag-directory-gc-content.txt:md5,60bb0ce90eddd137b5b2ca823051acbf", - "homer-tag-info-dist.txt:md5,ee9fe273399a253ab03d23808ad13769", - "homer-tag-length-dist.txt:md5,776999aa7958d892118e1f81605d2d6c", - "homer_tagdir.txt:md5,f8e1dbdd9cdfcf1c01b57e385fe3849b", - "multiqc.log:md5,4362bb9bc5429c8f83c520068bc30d93", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,221c15b73fa4807e41c76744645c784f", - "multiqc_fastqc.txt:md5,7d106f21a9fce707c0f2f80ebe423fdc", - "multiqc_general_stats.txt:md5,4cba40da02a1aa33239afa472ef8818a", - "multiqc_rseqc_infer_experiment.txt:md5,7742ec391ad8fbd6970ac8e76d8ed99e", - "multiqc_rseqc_read_distribution.txt:md5,f9d25d0d1556c5d6197a7ace48d42bad", - "multiqc_samtools_flagstat.txt:md5,97559507a36988f3cea0450004d14f1c", - "multiqc_samtools_idxstats.txt:md5,7470628b9c7653676a1726dba6750bcf", - "multiqc_samtools_stats.txt:md5,bf614e3f14ed5f319f1f60dab566a0c8", - "multiqc_software_versions.txt:md5,71b857625ebbe5f51be6501178fc5d49", - "multiqc_sources.txt:md5,d1cc92731f0987d72296dca6dcd18a05", - "preseq.txt:md5,d2605fe400e1665bf037fa5d25b17425", - "preseq_complexity_plot_molecules.txt:md5,90f9af51864a0a82a0d9e2d6551707a8", - "rseqc_infer_experiment_plot.txt:md5,7f99caa50e1282b7905d24e1c1529c4a", - "rseqc_read_distribution_plot.txt:md5,65b9b6607ace0282d8195d985fdbdcf2", - "rseqc_read_dups.txt:md5,2f7c77c35ce9ae82c0bd74258d4aaa9c", - "rseqc_read_dups_plot.txt:md5,b533ed50d90fa44323198a2e0ede4a0f", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,62286c20dc41719e5777c6ee56d3fdbb", - "samtools-flagstat-dp_Read_counts.txt:md5,9ad454ab09e33ac470abb51dcaaec113", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,7fb2808dc571e89f378d6e410ce0021b", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,7fb2808dc571e89f378d6e410ce0021b", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,d4aea3276fac660b6e7f3e8298308247", - "samtools-stats-dp.txt:md5,99661e2566270bc292ea89e8a8ae851b", - "samtools_alignment_plot.txt:md5,1a823e6914808802ccfbbefd4fc000ff", - "multiqc_report.html:md5,3e4da3b4b32738b00cc639840ec2b055", - "cd4_REP1.trimmed.fastp.html:md5,2b518e431576642417961818d5783cd1", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,f7a9f353c93a913c0fd28f65a11f1a73", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", - "cd4_REP3.trimmed.fastp.html:md5,172f80221f977edc194d79ef0f917dea", "cd4_REP3.trimmed.fastp.json:md5,c9c3a1dd0a2ebac77c9d7c3b0daf3790", - "cd4_REP3.trimmed.fastp.log:md5,c3ba500272d8b3acf498dc5e9d38a2e8", - "cd4_REP4.trimmed.fastp.html:md5,902147cebc270195ea0e03910f914c35", "cd4_REP4.trimmed.fastp.json:md5,c073bd26609ddca91396d0f374ec5b80", - "cd4_REP4.trimmed.fastp.log:md5,c7273ba6b0df79ab019b580b75855153", - "jurkat_REP1.trimmed.fastp.html:md5,0f6c7e18ca9dfa51a9377e0c01049dd4", "jurkat_REP1.trimmed.fastp.json:md5,329fd8e56421a196fc2ebd37ab3bc22d", - "jurkat_REP1.trimmed.fastp.log:md5,85a85bfaeb8b88e0ff281e5353e8f5a7", - "jurkat_REP2.trimmed.fastp.html:md5,1712da81f2ffeb0ee039a41900192411", "jurkat_REP2.trimmed.fastp.json:md5,8bad5b02a27e5386255b998a6a69db15", - "jurkat_REP2.trimmed.fastp.log:md5,1699efb244338013ce5240cd68be7501", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,37e350ea94e5cc33a5e9043c1b557cec", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,2c83180d9337fd4c8b29aa7a2a1ed1f5", - "cd4_REP3_fastqc.html:md5,312c2b6cc098cd87175e8037d606f9b8", - "cd4_REP3_fastqc.zip:md5,afb816a12e59699d0b062b8078ba947e", - "cd4_REP4_fastqc.html:md5,56639d924dea6958d8cbd21667bc28cf", - "cd4_REP4_fastqc.zip:md5,55bbd51063b83097399bfaa124288293", - "jurkat_REP1_fastqc.html:md5,2bacbec6c15d9c4bb316292dcb0d8fcf", - "jurkat_REP1_fastqc.zip:md5,c893b45377039c34f70921c8bdb397ac", - "jurkat_REP2_fastqc.html:md5,5b0cac2bd71e46e7536972241f380d53", - "jurkat_REP2_fastqc.zip:md5,40136cb3588b3abe9601a66b3fe7817d", - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", - "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", - "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", - "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", - "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", - "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP3.lc_extrap.txt:md5,25ebbeabee46caa86a4d6d82dd0091f1", - "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP4.lc_extrap.txt:md5,d0df86774dd54421fd362d46faa3f937", - "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP1.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", - "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP2.lc_extrap.txt:md5,8ae0a77bcc59da38ec2da0fc1f973227", - "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", - "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", - "cd4_REP3.command.log:md5,51c6f8c93c91ecd3ee5b8d8b8ab94f77", - "cd4_REP4.command.log:md5,32fe9fc65b8c92b6d3ceee4e5d8a507f", - "jurkat_REP1.command.log:md5,870a47f101cd5007d2756448b896c33d", - "jurkat_REP2.command.log:md5,754dcc46cd47bf300965522303bc065f", - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "cd4_REP3.infer_experiment.txt:md5,b0157d081d0ba0c27b370915f13c8c8a", - "cd4_REP4.infer_experiment.txt:md5,37ec4ee4ed5f707f073be5a7d4c9acfb", - "jurkat_REP1.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", - "jurkat_REP2.infer_experiment.txt:md5,cde67a32fc922fb61fe5c5ea4b0e5c92", - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "cd4_REP3.read_distribution.txt:md5,2f05c4cc866b4f8068e02008cad20cb3", - "cd4_REP4.read_distribution.txt:md5,ececae7f535b4fd5606bf763fdba7a34", - "jurkat_REP1.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", - "jurkat_REP2.read_distribution.txt:md5,a5f8bed2cff9d780a31c3ce43e289d9e", - "cd4_REP1.DupRate_plot.pdf:md5,47f2cce8a9125a14286ef5e8ddca5aa8", - "cd4_REP2.DupRate_plot.pdf:md5,6cdc12e8e4da6524b45464e4d1471602", - "cd4_REP3.DupRate_plot.pdf:md5,f6c35169934fe6c0119424ff64c3344f", - "cd4_REP4.DupRate_plot.pdf:md5,79956239dc01cbd79b738cf1d389880f", - "jurkat_REP1.DupRate_plot.pdf:md5,9cd3ec07dceffc796024e8e07676b2c7", - "jurkat_REP2.DupRate_plot.pdf:md5,1cd0328503c7ca4a7de20d74617a4611", "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", "cd4_REP3.DupRate_plot.r:md5,5b37293c52beaecc5980aa2b9bafd82c", @@ -592,83 +472,52 @@ "jurkat_REP1.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", "jurkat_REP2.pos.DupRate.xls:md5,253ec69be4f5322dc92f6cb3fb41f7e0", "jurkat_REP2.seq.DupRate.xls:md5,c7c83a29e6dfd49ff17858fe83dc07c8", - "cd4.featureCounts.txt:md5,47a85f4f56eadbc8eae797a08100ce46", - "cd4.featureCounts.txt.summary:md5,c78e1e8eaa51aa97e141335166290e6e", - "jurkat.featureCounts.txt:md5,b8af15779d488ac710b8e830312bb605", - "jurkat.featureCounts.txt.summary:md5,205b13730ce401dfed6a94a61caf26ae", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,f78b148a5e48a9dfe65864efbe4d7ef5", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,93f83ecd6d3764cdb013c0916f946886", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,952eb95b9dc4081cffb14e6bf251a960", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,48137200120f4774746cd0995414c43d", - "cd4.bam:md5,593ac4fc591e04af424efdeb8750104a", - "jurkat.bam:md5,19e4f510b0a3005e72569569796a21c6", "cd4_filtered.bed:md5,9765d778862a20feefb94d407773bef3", "jurkat_filtered.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", "cd4.bed:md5,ab94918610a560772fdbec591200295f", - "cd4.bedGraph.gz:md5,50fb367e6dd9f5ca58fd63820ae068ec", - "cd4.peaks.txt:md5,6edefe0a75b76240d3b49d12e49cb600", "chr21.tags.tsv:md5,ab64a2b39cf47d981f97715852d3c290", - "genomeGCcontent.txt:md5,8818bb687d388a8f851df48c1c92a64c", - "tagAutocorrelation.txt:md5,255f195cb632e7f2e446011234d42f06", - "tagCountDistribution.txt:md5,99351ef6c7375ef3f02953cfd02cb190", - "tagFreq.txt:md5,ec112e6e9d4eba57ceae8450db94ed4c", - "tagFreqUniq.txt:md5,7b1a20d2d14ec3b42403f705ed96b723", - "tagGCcontent.txt:md5,9f423cebdc46a716e47e8fcbddb6c2de", - "tagInfo.txt:md5,1219bbf57a1748d73ab71a8427a921e3", - "tagLengthDistribution.txt:md5,ae99790fcb4004bf798294e76e0a8a24", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - "jurkat.bedGraph.gz:md5,6f2aae5501f5883b620c5399880035ac", - "jurkat.peaks.txt:md5,1247c21dbc92f8114dbcb2320fa09a3a", "chr21.tags.tsv:md5,8c7f268afb55f7b874ac518104377c01", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,d40fd40dd99740bc4219bd9abb80ebfe", - "tagCountDistribution.txt:md5,611508c79c2889d73983bbb2ad9e80ca", - "tagFreq.txt:md5,4805c5ac52acc6e5f381a97c3d433e2e", - "tagFreqUniq.txt:md5,d161bba3c52cd3e246e29000f349aff6", - "tagGCcontent.txt:md5,4a19e987ea5b2569d14cda12f1fbebf1", - "tagInfo.txt:md5,f2c7a1b2eed60842100fb066be5428a2", - "tagLengthDistribution.txt:md5,38241f577a1a15071dcd16161346dcba", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,c45718bf5c21eb28b810d4800296728b", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,4d8f9dc54f886f379b95609908a08662", "jurkat_merged.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", "cd4_chr21_1_unidirectional_peaks.bed:md5,76ee3b56d3e518f88a34b42039ec719c", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,862a5e81119acc691845f3b426847401", - "peakcalling_2024_12_15_17_45_00_44.log:md5,2988afa74c1d505a4242cc2ee2bcf33b" + "jurkat_chr21_1_unidirectional_peaks.bed:md5,862a5e81119acc691845f3b426847401" ], [ [ "cd4_REP1.sorted.bam", - "366dda72360cb6fef08914f246c23fe0" + "224e6469eaa3c670cb8b0988de4930ff" ], [ "cd4_REP2.sorted.bam", - "7ff8b1c06b1d47b26062624d2baf83a5" + "ac04b13bf59325b68a34beb5d217de08" ], [ "cd4_REP3.sorted.bam", - "281fcd74eeaea3ccf15b864e60c70006" + "1af4ad21f4257b9bc8046541efd82f07" ], [ "cd4_REP4.sorted.bam", - "1401ddb7b887f1b81644c516bfde7e88" + "22d531b3dd55f4a559d801c62f6acdc8" ], [ "jurkat_REP1.sorted.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" + "5d9d54eb52cc3b827565842cf2500673" ], [ "jurkat_REP2.sorted.bam", - "21970a646ce32e2ccb2aa3d99dc0ebc" + "5a8e86e68b9dfa53344b0c8f22bea633" ], [ "cd4.bam", - "556453f9ab4a169290b24c3eb78fb3b1" + "7454212a168614d624dc77b7d257d048" ], [ "jurkat.bam", - "5a50c610f835a57788aaa94f116ea713" + "a23e3431a5d194dfcec4f3a98e2a51fe" ] ] ], @@ -676,6 +525,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T11:45:42.473513" + "timestamp": "2024-12-15T16:59:38.97993" } } \ No newline at end of file From 5404d649c938121cd475428200538b40911fa1ce Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 15 Dec 2024 18:33:46 -0600 Subject: [PATCH 215/255] test: Skip bam checks I'll fix this with the cram file publishing Remove bam files --- .gitignore | 2 +- tests/.nftignore | 2 +- workflows/tests/aligner/bowtie2.nf.test | 2 +- workflows/tests/aligner/bowtie2.nf.test.snap | 239 +++++++-------- workflows/tests/aligner/bwa.nf.test | 2 +- workflows/tests/aligner/bwa.nf.test.snap | 145 ++++++--- workflows/tests/aligner/bwamem2.nf.test | 2 +- workflows/tests/aligner/bwamem2.nf.test.snap | 248 +++++++--------- workflows/tests/aligner/dragmap.nf.test | 2 +- workflows/tests/aligner/dragmap.nf.test.snap | 253 +--------------- workflows/tests/aligner/hisat2.nf.test | 2 +- workflows/tests/aligner/hisat2.nf.test.snap | 243 +++++++--------- workflows/tests/aligner/star.nf.test | 2 +- workflows/tests/aligner/star.nf.test.snap | 275 ++++++++---------- workflows/tests/inputs/gff/main.nf.test | 2 +- .../tests/inputs/gzipped_gff/main.nf.test | 2 +- workflows/tests/inputs/only_gff/main.nf.test | 2 +- .../grohmm/only_gff/main.nf.test | 2 +- .../grohmm/tuning/main.nf.test | 2 +- 19 files changed, 554 insertions(+), 875 deletions(-) diff --git a/.gitignore b/.gitignore index 776b82fe..23b0c7de 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ testing/ testing* *.pyc null/ -.nf-test +.nf-test* diff --git a/tests/.nftignore b/tests/.nftignore index 9206fba0..195dff12 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -20,7 +20,7 @@ pipeline_info/*.{html,json,txt,yml} **/*.command.log **/*.bedGraph.gz **/tagInfo.txt -**/*.bam +**/*.{bam,bai} **/*.featureCounts.txt **/*.featureCounts.txt.summary **/DupRate_plot.pdf diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index 2cd748c3..41fead5f 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -33,7 +33,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index a42aac26..5248d97c 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -170,6 +170,109 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_plots", + "multiqc/multiqc_plots/pdf", + "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", + "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", + "multiqc/multiqc_plots/pdf/general_stats_table.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", + "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", + "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", + "multiqc/multiqc_plots/png", + "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", + "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", + "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", + "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", + "multiqc/multiqc_plots/png/general_stats_table.png", + "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", + "multiqc/multiqc_plots/png/homer-tag-length-dist.png", + "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", + "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", + "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-stats-dp.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", + "multiqc/multiqc_plots/svg", + "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", + "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", + "multiqc/multiqc_plots/svg/general_stats_table.svg", + "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", + "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", + "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", + "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", + "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -281,15 +384,6 @@ "transcript_identification/intersect/jurkat_intersect.bed" ], [ - "cd4_REP1.sorted.bam:md5,b76f2a8072f3b6a79af34acf60c567a2", - "cd4_REP1.sorted.bam.bai:md5,51c403cb04b2c69c35a67633649fab22", - "cd4_REP2.sorted.bam:md5,7b6a067e5ef315c43bc0e1ae06d70ff8", - "cd4_REP2.sorted.bam.bai:md5,020ca5435bf994ca7edf313e2443ea52", - "jurkat.sorted.bam:md5,a66e8e1f1813ed6ae5de5a00152f889b", - "jurkat.sorted.bam.bai:md5,2210ad584bce8ff514a6e555dfe5ca93", - "cd4_REP1.bowtie2.log:md5,024c3b6bca27f3836cdd86c0287d2971", - "cd4_REP2.bowtie2.log:md5,089af358aad637ec94c10172eb024773", - "jurkat.bowtie2.log:md5,24031e901f4ce11cfb227c7d30d1373a", "cd4_REP1.sorted.bam.flagstat:md5,14e684e73cb41155ab1168a0a99a97e6", "cd4_REP1.sorted.bam.idxstats:md5,e32ac3215ba948bb7dd1559dab6c3c36", "cd4_REP1.sorted.bam.stats:md5,490f84b5520b83daa95653671ce43921", @@ -314,86 +408,9 @@ "jurkat.minus.bigWig:md5,f211b5371583f0e373c508ad6ab311ee", "jurkat.plus.bedGraph:md5,2475bada8a001c763caffa12c5c0e98e", "jurkat.plus.bigWig:md5,c30a99c3f603b268442f8b6081f6f2c9", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", - "homer-tag-directory-gc-content.txt:md5,8a82322cdfe76225429b1b179f8688d1", - "homer-tag-info-dist.txt:md5,743e8bf5d15a7d1da7fa24c9c5fc90b6", - "homer-tag-length-dist.txt:md5,7afc6c569298244489054b48b7cd76da", - "homer_tagdir.txt:md5,5dc46aa51c80b976579e86496d4f07ff", - "multiqc.log:md5,adf84e0481b7b9a09074d45f245bfdd0", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,7cc1d508f04faf0ca734a0b91fc167e8", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,7766ca91356b0e3af368e8971d9e7f3f", - "multiqc_rseqc_infer_experiment.txt:md5,450ea82ae3a7b44b8b8ab00bf28b858a", - "multiqc_rseqc_read_distribution.txt:md5,a6f6d7bc8558b67e2ac36525afca6edb", - "multiqc_samtools_flagstat.txt:md5,bfe50754b69d75b699bce99ebe6abfb8", - "multiqc_samtools_idxstats.txt:md5,113cb09f55bda73d46a050189e855056", - "multiqc_samtools_stats.txt:md5,92e1669c97ceffc77b26c7da41169a6d", - "multiqc_software_versions.txt:md5,c63e5e2a7a68023d1c2624f36e88d00a", - "multiqc_sources.txt:md5,4e4de478303f639ea8767dd733f48b9a", - "preseq.txt:md5,8d0bedbab4f694d1f10f6f9173991ce4", - "preseq_complexity_plot_molecules.txt:md5,866c1172f0d24d715a19347b941219a2", - "rseqc_infer_experiment_plot.txt:md5,7b9b10702f3cfcb05a2d0c873beedba3", - "rseqc_read_distribution_plot.txt:md5,9249380f98dde2c545480e32be15a1d8", - "rseqc_read_dups.txt:md5,4a36325fe8aa5a5d2a3948a53d34a54c", - "rseqc_read_dups_plot.txt:md5,7fc6bbbc740f33d045cda618aaf79043", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,f32b5bd6a90dc7d8069abd2d089b3e14", - "samtools-flagstat-dp_Read_counts.txt:md5,d2b399af315dac01978b0992c5684e91", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,dbd30a68cd79a1dd45673ad1b9f5c7c8", - "samtools-stats-dp.txt:md5,0ec51d7fd99677fcbdcbff16efd2883b", - "samtools_alignment_plot.txt:md5,4645a285dcee3bc5b25b4f01303c80cb", - "multiqc_report.html:md5,6dae4ea9f8a93e20aee8e010faaf79d1", - "cd4_REP1.trimmed.fastp.html:md5,bc81b7b51625d3535968bde725875cd1", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,f738e23594788a08f10b9692c85be7b0", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", - "jurkat.trimmed.fastp.html:md5,e0f11ec4038b763b5aed3d8ad98bfc37", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,9d29fefe192b567ea7c77d5460c1ebc3", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,69b5d7a4fa4758a5e0d6c219177e9f62", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,f2a4ca52626ea81e7ff625dc8ea207f0", - "cd4_REP1.coverage.hist.txt:md5,ffd8c0a94869dd782779fc871a9b781a", - "cd4_REP1.coverage.stats.txt:md5,bebdef1adcce4296878f8699a0f5cb32", - "cd4_REP2.coverage.hist.txt:md5,6e0ca13df7b06ff6a81fb21596df4ca4", - "cd4_REP2.coverage.stats.txt:md5,ffb701c2be33360a96ce85b1330b13f8", - "jurkat.coverage.hist.txt:md5,656e30e8c4bd12e45a036c62c18730c1", - "jurkat.coverage.stats.txt:md5,627f0ec96ea9bdbd7f41b09b64c389d6", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,cbacd5a2e62bccbb73a5d0f5d0791304", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,cd3d0f6bc45ff35f6729fb7d66ffaf09", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,85206c3788cd2d1cede39fbd6bab5a5c", - "cd4_REP1.command.log:md5,f9ea2145145a8a7665af4b721a176b66", - "cd4_REP2.command.log:md5,9b8e7b17ea65fb4c7ad628414a48150a", - "jurkat.command.log:md5,a458c54791452442ed8aaae55e6149e4", - "cd4_REP1.infer_experiment.txt:md5,a17e22cdbaa5db454d3dfa0624c8acdf", - "cd4_REP2.infer_experiment.txt:md5,d705d9b2c2d8fab525df84b4c943c34a", - "jurkat.infer_experiment.txt:md5,0b4fb80f4ec8466778fa224e4f274e4e", - "cd4_REP1.read_distribution.txt:md5,1df0ae48c81e68ea1d5602897a865f2b", - "cd4_REP2.read_distribution.txt:md5,ff1b593276f36df0cbf7bbc1361e6aad", - "jurkat.read_distribution.txt:md5,a67baffde38aa7a85223148532a18ba4", - "cd4_REP1.DupRate_plot.pdf:md5,1f803a99b308f9183257fa8c88ba48f2", - "cd4_REP2.DupRate_plot.pdf:md5,472833acb07585894e39e5d5170f3b8b", - "jurkat.DupRate_plot.pdf:md5,940536f7ed7403e2c7d1a21e04c5961b", "cd4_REP1.DupRate_plot.r:md5,6b19f80622d25eab51fa5962deac7882", "cd4_REP2.DupRate_plot.r:md5,94d0e7599e7a83a5ea2f251cb8f2b879", "jurkat.DupRate_plot.r:md5,d081ee3f5ef5f85ff8fccd013fe04f71", @@ -403,69 +420,21 @@ "cd4_REP2.seq.DupRate.xls:md5,ef56fed7d960a88eca66d5514faed7fb", "jurkat.pos.DupRate.xls:md5,17f5622123e0d0b97f200e53fe7e165d", "jurkat.seq.DupRate.xls:md5,566934dad135bc0168c36a8f8d297065", - "cd4.featureCounts.txt:md5,7f341754a6b141398805dddd0ea3c76b", - "cd4.featureCounts.txt.summary:md5,775f3086fce250808a39476d88b7afdb", - "jurkat.featureCounts.txt:md5,95c7ab756ee8eee7246904dd32c4d570", - "jurkat.featureCounts.txt.summary:md5,4829231aaf0e43ec12da52a3d850bf6e", - "cd4.bam:md5,ce5d8aaeea9a5cf274a41a71e1b1f161", - "jurkat.bam:md5,65490dc5bea04bf13b1f520b9cb9a8e9", "cd4_filtered.bed:md5,c8bb282144d8078c0e4c809fe0878a12", "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495", "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", - "cd4.bedGraph.gz:md5,b56af8345df8615e5c68100f34deb207", - "cd4.peaks.txt:md5,66589ceaf2aabf1e4e7bad64b94b6fd8", "chr21.tags.tsv:md5,cf851d8ec227da2a7a4d52d2f3da550b", - "genomeGCcontent.txt:md5,490468501aac12c93a6c4fa36fb99112", - "tagAutocorrelation.txt:md5,75df13d6e6d4dce27591ab8bf0b5e174", - "tagCountDistribution.txt:md5,777f206539575190afb1203c02542307", - "tagFreq.txt:md5,63abb5f08f0f9055c4fb0ea5c59ddb74", - "tagFreqUniq.txt:md5,b0147e5dd3fc6a9cd7f6e331e0fe4fc8", - "tagGCcontent.txt:md5,3473d47a58f632328d3a45f336800ab6", - "tagInfo.txt:md5,df6f9805509920f3916a6f23f22f8284", - "tagLengthDistribution.txt:md5,c9b2749c7fad9896f925683c0cb9f386", "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", - "jurkat.bedGraph.gz:md5,41ca91efa9fd5038376f969d84adf311", - "jurkat.peaks.txt:md5,100cb761b6b7abad3901775e499a6aa1", "chr21.tags.tsv:md5,a6e15f137754d01a084b98186e1ddf70", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,8ef971a31030577dbe367b51bb06a9ec", - "tagCountDistribution.txt:md5,dc60411648656288129fa2a339b13b00", - "tagFreq.txt:md5,e3001b6f77c0c439a023657cbd2bfc0f", - "tagFreqUniq.txt:md5,c09f664f6e119fc8a09ea36f2eac80b6", - "tagGCcontent.txt:md5,36b5e9fdf908750829f30f83347aebd2", - "tagInfo.txt:md5,81051f16335ab02352007424ac6ed3be", - "tagLengthDistribution.txt:md5,ccdce0d5eb2050376727b3f80e176aa6", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" - ], - [ - [ - "cd4_REP1.sorted.bam", - "aab93a37ba4fd975ca801c704b876fbb" - ], - [ - "cd4_REP2.sorted.bam", - "5eed61339ddc512670764768436bc4a8" - ], - [ - "jurkat.sorted.bam", - "adce9f0ed647f9781fbec5bcc09dc21" - ], - [ - "cd4.bam", - "fd4359b8877ec6fcc7568a1685b17e47" - ], - [ - "jurkat.bam", - "adce9f0ed647f9781fbec5bcc09dc21" - ] ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T11:55:09.917179" + "timestamp": "2024-12-16T02:18:37.673464926" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 44653367..e9d182d0 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -34,7 +34,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getHeaderMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getHeaderMD5() ] } ).match() } ) } diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index ac9ecd53..2f0d9be8 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -221,6 +221,109 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_plots", + "multiqc/multiqc_plots/pdf", + "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", + "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", + "multiqc/multiqc_plots/pdf/general_stats_table.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", + "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", + "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", + "multiqc/multiqc_plots/png", + "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", + "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", + "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", + "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", + "multiqc/multiqc_plots/png/general_stats_table.png", + "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", + "multiqc/multiqc_plots/png/homer-tag-length-dist.png", + "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", + "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", + "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-stats-dp.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", + "multiqc/multiqc_plots/svg", + "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", + "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", + "multiqc/multiqc_plots/svg/general_stats_table.svg", + "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", + "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", + "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", + "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", + "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -392,12 +495,6 @@ ], [ "cd4_intersect.saf:md5,635fcd8e2c060dc75db25564c2a664dc", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", - "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", - "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", - "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -485,46 +582,12 @@ "jurkat_merged.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", "cd4_chr21_1_unidirectional_peaks.bed:md5,76ee3b56d3e518f88a34b42039ec719c", "jurkat_chr21_1_unidirectional_peaks.bed:md5,862a5e81119acc691845f3b426847401" - ], - [ - [ - "cd4_REP1.sorted.bam", - "224e6469eaa3c670cb8b0988de4930ff" - ], - [ - "cd4_REP2.sorted.bam", - "ac04b13bf59325b68a34beb5d217de08" - ], - [ - "cd4_REP3.sorted.bam", - "1af4ad21f4257b9bc8046541efd82f07" - ], - [ - "cd4_REP4.sorted.bam", - "22d531b3dd55f4a559d801c62f6acdc8" - ], - [ - "jurkat_REP1.sorted.bam", - "5d9d54eb52cc3b827565842cf2500673" - ], - [ - "jurkat_REP2.sorted.bam", - "5a8e86e68b9dfa53344b0c8f22bea633" - ], - [ - "cd4.bam", - "7454212a168614d624dc77b7d257d048" - ], - [ - "jurkat.bam", - "a23e3431a5d194dfcec4f3a98e2a51fe" - ] ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T16:59:38.97993" + "timestamp": "2024-12-16T02:22:23.367403695" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test index d4593470..59ecc17c 100644 --- a/workflows/tests/aligner/bwamem2.nf.test +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -31,7 +31,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 81b04236..8c7d04e9 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -186,6 +186,109 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_plots", + "multiqc/multiqc_plots/pdf", + "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", + "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", + "multiqc/multiqc_plots/pdf/general_stats_table.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", + "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", + "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", + "multiqc/multiqc_plots/png", + "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", + "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", + "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", + "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", + "multiqc/multiqc_plots/png/general_stats_table.png", + "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", + "multiqc/multiqc_plots/png/homer-tag-length-dist.png", + "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", + "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", + "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-stats-dp.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", + "multiqc/multiqc_plots/svg", + "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", + "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", + "multiqc/multiqc_plots/svg/general_stats_table.svg", + "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", + "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", + "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", + "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", + "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -305,18 +408,10 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_17_56_42_44.log", - "transcript_identification/pints/peakcalling_2024_12_15_17_56_42_45.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", - "cd4_REP1.sorted.bam:md5,43a9fccfbbe9825bb795bdd7c0788f62", - "cd4_REP1.sorted.bam.bai:md5,941ed9d1bf8e04ab916967a4f6c03db4", - "cd4_REP2.sorted.bam:md5,974e4a49c44d039eb5b7c4980f456b93", - "cd4_REP2.sorted.bam.bai:md5,a89d7777e8172df5a13872061f358ee6", - "jurkat.sorted.bam:md5,34f4272bbd68ac9e91e5865ab2259034", - "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -343,86 +438,9 @@ "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", - "homer-tag-directory-gc-content.txt:md5,213706733eb7a6c9e1345e7961f9a266", - "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", - "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", - "homer_tagdir.txt:md5,ad54384ccd9668de175a540cd44310f2", - "multiqc.log:md5,f298938874b05b767efe2fa3745d0a28", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,b52ef1401f2009da28eda69f2f59f20e", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", - "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", - "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", - "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", - "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", - "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", - "multiqc_software_versions.txt:md5,78249c4b31b317d8ff4015fd12fb5a2f", - "multiqc_sources.txt:md5,8bace21dbef21c498ccee5775d7d836e", - "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", - "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", - "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", - "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", - "rseqc_read_dups.txt:md5,680c3c892d67c8e334c25d3044a89805", - "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", - "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", - "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", - "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", - "multiqc_report.html:md5,ae3250bd9de858ddb69702a9d09395cb", - "cd4_REP1.trimmed.fastp.html:md5,1c9eab4ef6d60cba7dfafebb7589485e", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,0e0b009b4d35dfd5254b445d4730313b", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", - "jurkat.trimmed.fastp.html:md5,24a97fa482fee4ee717dc04e15f9a049", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,321dfa64c470daf4e1706f363c0b613f", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,417c65a1d3587d31d63ee48d5d7cf25d", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,d7ef0dc8ed3951d2d7de964a8f9a97cc", - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", - "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", - "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", - "jurkat.command.log:md5,870a47f101cd5007d2756448b896c33d", - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", - "cd4_REP1.DupRate_plot.pdf:md5,1abb98ad8ba6e750cd465a1e85a58116", - "cd4_REP2.DupRate_plot.pdf:md5,a5db47514019c4d0ac6443d8b39277e3", - "jurkat.DupRate_plot.pdf:md5,4cefedfcde7b7b5c68fe401480528a94", "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", @@ -432,79 +450,25 @@ "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", - "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", - "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", - "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", - "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", - "cd4.bam:md5,d93f87630c701965a7b3168e99b8e94e", - "jurkat.bam:md5,2fd6cb82a46491e133335a7a73ca67a2", "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "cd4.bedGraph.gz:md5,3cec76e93de4dfa41821379340520881", - "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", - "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", - "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", - "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", - "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", - "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", - "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", - "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", - "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - "jurkat.bedGraph.gz:md5,75f873abf009c13f0dc685e33cbaf7b1", - "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", - "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", - "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", - "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", - "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", - "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", - "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", - "peakcalling_2024_12_15_17_56_42_44.log:md5,5ca1688a6c30db974e9916387ef988ab", - "peakcalling_2024_12_15_17_56_42_45.log:md5,a70d92561d80fa92bf46a1d081c5c317" - ], - [ - [ - "cd4_REP1.sorted.bam", - "366dda72360cb6fef08914f246c23fe0" - ], - [ - "cd4_REP2.sorted.bam", - "7ff8b1c06b1d47b26062624d2baf83a5" - ], - [ - "jurkat.sorted.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ], - [ - "cd4.bam", - "bcdfc1a81d5240c8ce9fcabe46a30af1" - ], - [ - "jurkat.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T11:57:19.26958" + "timestamp": "2024-12-16T02:27:44.713604463" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index 76f50879..818763ed 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -31,7 +31,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index 9d2a0a08..11cb04f5 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -413,8 +413,7 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_20_51_02_61.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", @@ -435,15 +434,6 @@ "jurkat.minus.bigWig:md5,22daac83d393dcca8f1cc96580d3d4f3", "jurkat.plus.bedGraph:md5,ddabf19e2172df4b80b7ce434035403e", "jurkat.plus.bigWig:md5,ca73f44638c066f25261efffa1eedc7f", - "cd4_REP1.sorted.bam:md5,2622fc57e8b754d4e84ecb9f3e4276cc", - "cd4_REP1.sorted.bam.bai:md5,957a9abb20fc6b52c242fffd01473d6e", - "cd4_REP2.sorted.bam:md5,e1bd400352e7809137d06055f16438a5", - "cd4_REP2.sorted.bam.bai:md5,5c7d201e3c4587780287671c2fd7cf0e", - "jurkat.sorted.bam:md5,fb2d30a7f193a8df7caedd820ff15377", - "jurkat.sorted.bam.bai:md5,0c23df1ef94a96981def4e1727f8160d", - "cd4_REP1.dragmap.log:md5,3af10dc85800166c8cef5137508e3f95", - "cd4_REP2.dragmap.log:md5,99afce2788e3d0eeae4672903a7b5dd7", - "jurkat.dragmap.log:md5,8584413b5a4e6d68c157a195411d6e0f", "cd4_REP1.sorted.bam.flagstat:md5,6a27aa41830e5f10a2c54c8a05611f9a", "cd4_REP1.sorted.bam.idxstats:md5,75eaf648cea73812913344af3851ce16", "cd4_REP1.sorted.bam.stats:md5,80bfe47bc5be703b51313a4b2fbcc57f", @@ -453,185 +443,9 @@ "jurkat.sorted.bam.flagstat:md5,2ac2d8fdb09b0bf5061d9e24501c41c3", "jurkat.sorted.bam.idxstats:md5,8aebada21b179c96f888d08bb4ae1651", "jurkat.sorted.bam.stats:md5,104f00b802be80cc252beb0d4cfd709b", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", - "homer-tag-directory-gc-content.txt:md5,cb2520bd84614eede28992553375beb1", - "homer-tag-info-dist.txt:md5,28c0be2b0a184b510575d47bd1cba705", - "homer-tag-length-dist.txt:md5,f69abc9072088e4e2d84414626fbea17", - "homer_tagdir.txt:md5,00b39cee169d38087ca748c3d35b5eb9", - "multiqc.log:md5,3e8f80e86ac107e1a873abc4b6f30612", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,98a8849422d4e6977799f2a479ef9283", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,9f0bedd0fa34ededafcad637b5173109", - "multiqc_rseqc_infer_experiment.txt:md5,efa14bf87a649e1bd1d1d5aa24ef2997", - "multiqc_rseqc_read_distribution.txt:md5,3ad9f9fee7cf47c2b6770fcb4a95fc41", - "multiqc_samtools_flagstat.txt:md5,007105e445f492516310f672f7911543", - "multiqc_samtools_idxstats.txt:md5,0eabaa59de66930a36507c3dc92f1fcc", - "multiqc_samtools_stats.txt:md5,524f65e08c29112a473c365b6bc1bd9e", - "multiqc_software_versions.txt:md5,e6a86a4c85f30eb38071212c8c6a5eed", - "multiqc_sources.txt:md5,05ef2c47b9905828cd569a899cf773a1", - "preseq.txt:md5,3b75a8101e8dccfd67b6e8b03cba691b", - "preseq_complexity_plot_molecules.txt:md5,e93aa98e7a76dbf7021f4365365a966e", - "rseqc_infer_experiment_plot.txt:md5,b0ba3477debd992d27674547b76e7025", - "rseqc_read_distribution_plot.txt:md5,351eac2505410832e4f727daf7158cc8", - "rseqc_read_dups.txt:md5,f3d1e8afcee7fdaeb1600558e7d93c60", - "rseqc_read_dups_plot.txt:md5,e01b680e539786565097e877da58ca5c", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,3f96b11d5ba1c3c64e2ba5e3a1fbaa9d", - "samtools-flagstat-dp_Read_counts.txt:md5,fea16eb94f71133f9f628cf72da3062f", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,62358a9a5b36bc0c0836e753bb2db316", - "samtools-stats-dp.txt:md5,96361e70a475ec24edd881d81315b26f", - "samtools_alignment_plot.txt:md5,2b88db7a659982f999791146d26e4b38", - "fastqc-status-check-heatmap.pdf:md5,e7508bfcc0c430fb667363ef71985a03", - "fastqc_adapter_content_plot.pdf:md5,9e405bf835a6d60872f3d7c6edd7e297", - "fastqc_overrepresented_sequences_plot.pdf:md5,277379eee21d57bcc9f1a619175a0cbb", - "fastqc_per_base_n_content_plot.pdf:md5,1d0fb1c08855a422da5631f4167bfbfb", - "fastqc_per_base_sequence_quality_plot.pdf:md5,eef90284d18073c927c8d94c708e30b2", - "fastqc_per_sequence_gc_content_plot_Counts.pdf:md5,6a9874d79827e99c99be90cacfd83ef8", - "fastqc_per_sequence_gc_content_plot_Percentages.pdf:md5,c7578e14109573b7a84e56f7844af684", - "fastqc_per_sequence_quality_scores_plot.pdf:md5,a8cde07ccb2338f604d11ca84d6a7d3d", - "fastqc_sequence_counts_plot-cnt.pdf:md5,9daac14370808336fbf71924345392a1", - "fastqc_sequence_counts_plot-pct.pdf:md5,fba4738a612ed375217f4b79a6077a29", - "fastqc_sequence_duplication_levels_plot.pdf:md5,b3cf349ec6b3eb16e75407f797ad75d5", - "fastqc_top_overrepresented_sequences_table.pdf:md5,c1778a9360e4d34a18a67fb56f59a76d", - "general_stats_table.pdf:md5,4194c2d07bc7b6e92e37e0aac1390078", - "homer-tag-directory-gc-content.pdf:md5,9c2bf70c0e7caf5cccbe7f5016709912", - "homer-tag-info-dist-cnt.pdf:md5,e72edf46aa9bae3a3211abb5508641a7", - "homer-tag-info-dist-pct.pdf:md5,7eef06db5a5af26104d6dac178519caa", - "homer-tag-length-dist.pdf:md5,7d3acba029bd5ea0ea0bb4c264ea92c2", - "preseq_complexity_plot_molecules.pdf:md5,148da0de8140a838900ad300391a0328", - "rseqc_infer_experiment_plot.pdf:md5,a736776c45032c830a65ec728f5776b1", - "rseqc_read_distribution_plot-cnt.pdf:md5,782311f91ed51c4f310b7b6a1279f37f", - "rseqc_read_distribution_plot-pct.pdf:md5,f85495647a5651d0cac68270b8e07985", - "rseqc_read_dups_plot.pdf:md5,f071a2c04cc0345ca6fd433bd3d69299", - "samtools-flagstat-dp_Percentage_of_total.pdf:md5,15a2c32240871319266b1338c21eabdf", - "samtools-flagstat-dp_Read_counts.pdf:md5,f112560f2a7a2a3a918a72893867a6b8", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf:md5,1f3f6081c26f7ee6cc2e9ebdb7a8a5f0", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf:md5,009491bdb3f643cf76509fb333d75505", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf:md5,35ad9649cf318980e0220bc7ca3d51bd", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf:md5,a4879cd3dfe50f6281921f70a26f0136", - "samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf:md5,b7b147eb5b5bbee0c4a5f2deab7c2677", - "samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf:md5,1362c72eb932bd4721792c64513711a0", - "samtools-stats-dp.pdf:md5,bc6c97ee80635eb7a921090d433ae74d", - "samtools_alignment_plot-cnt.pdf:md5,716d5904dd6e1f924aab45b91ed81f3f", - "samtools_alignment_plot-pct.pdf:md5,267698e622f292af9cb3262ea0ce22da", - "fastqc-status-check-heatmap.png:md5,4a1ddda986f81413112660633f82c5d6", - "fastqc_adapter_content_plot.png:md5,32efdebb305e0266339d882fa162f074", - "fastqc_overrepresented_sequences_plot.png:md5,a7dd2a12f574306233f9edc606a1aaad", - "fastqc_per_base_n_content_plot.png:md5,d728893a0ce22b5f87d5b6d6f136e5ea", - "fastqc_per_base_sequence_quality_plot.png:md5,c408a3c56d02896e54b521a58b2307a4", - "fastqc_per_sequence_gc_content_plot_Counts.png:md5,beb6b40783528b0ea364daea301fa17b", - "fastqc_per_sequence_gc_content_plot_Percentages.png:md5,77f64ef84400d3165f20e1c87ecb1cd8", - "fastqc_per_sequence_quality_scores_plot.png:md5,726d671e21c7ac8116fca13c43ffc9c0", - "fastqc_sequence_counts_plot-cnt.png:md5,b53fd28651c1b6cd57a00027338fa196", - "fastqc_sequence_counts_plot-pct.png:md5,5ce9a1d3cec4e6621899c8f2605bc925", - "fastqc_sequence_duplication_levels_plot.png:md5,bc6147bdc3d59f796b71d45a636a85c7", - "fastqc_top_overrepresented_sequences_table.png:md5,fc0ff3848d89adb027eeb37cf65d69fb", - "general_stats_table.png:md5,bf1279aa30f3e0c3059e1e66a9cfbd8f", - "homer-tag-directory-gc-content.png:md5,74e2562929589afe688d382567b3f69c", - "homer-tag-info-dist-cnt.png:md5,93b784f5e8ae326118e844b037d18976", - "homer-tag-info-dist-pct.png:md5,bc341ba31e303df97ae9ef42a1ce4b78", - "homer-tag-length-dist.png:md5,da4759ce87b032d3cbfffaeec0307b17", - "preseq_complexity_plot_molecules.png:md5,459d8145367486cfcb28918193a28815", - "rseqc_infer_experiment_plot.png:md5,7e9a30629920550dcf2812509a28c0d0", - "rseqc_read_distribution_plot-cnt.png:md5,1596c061fd9cc87929645a0aedd1d8cb", - "rseqc_read_distribution_plot-pct.png:md5,237f8ee85c60482d0bdc3d2d81cd1493", - "rseqc_read_dups_plot.png:md5,6eebe003179b3cf7714c940f8f746b91", - "samtools-flagstat-dp_Percentage_of_total.png:md5,6d33af495920e86c35b5e4df2b988dd5", - "samtools-flagstat-dp_Read_counts.png:md5,7389033f7f612593b96cb5408b371c9a", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png:md5,39cd1784ee278d9cb222f9363fd5d013", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png:md5,4865b3f4fc84df66e9a511f9a0fbba9e", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png:md5,2b98b3ce9a11603c84c368f89c034355", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png:md5,3c04436c178bf2a9de9083cb9e4432a9", - "samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png:md5,78f24659ddb439e3d45b0a938d6c5401", - "samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png:md5,b8c21d4c41d6d9f6cf6e37e1b1f3fe76", - "samtools-stats-dp.png:md5,69d51dced405b1f173d94c8f92ef4d7f", - "samtools_alignment_plot-cnt.png:md5,8aabd26cf7d3ca810d56ba230b535d59", - "samtools_alignment_plot-pct.png:md5,92e5a6a4308632318d2759371794d967", - "fastqc-status-check-heatmap.svg:md5,15d5da8aeef63b66890119f03982cbcb", - "fastqc_adapter_content_plot.svg:md5,0e776d31ff21c5d938ee34e479977c7b", - "fastqc_overrepresented_sequences_plot.svg:md5,20134a8a21b03e4521cef0b7ed76fc39", - "fastqc_per_base_n_content_plot.svg:md5,6eee5e9991b522bf02dc8506d3551a52", - "fastqc_per_base_sequence_quality_plot.svg:md5,3acd46d4e905088131ff500b7d2a83ed", - "fastqc_per_sequence_gc_content_plot_Counts.svg:md5,9be552de069ad309fe0e196784b21cae", - "fastqc_per_sequence_gc_content_plot_Percentages.svg:md5,0e97b9e38616d84870ba1e5aa8d2cb5d", - "fastqc_per_sequence_quality_scores_plot.svg:md5,26b566c2a235a85b4e364963c19e02ab", - "fastqc_sequence_counts_plot-cnt.svg:md5,c83b8ae146c1b45f211c820e42ac0e56", - "fastqc_sequence_counts_plot-pct.svg:md5,7d0f44c0faa1294038a2b171ea3646ff", - "fastqc_sequence_duplication_levels_plot.svg:md5,2b76fcb2c16ee55a59ddc2fc6cbb1f81", - "fastqc_top_overrepresented_sequences_table.svg:md5,0213d032845cdb9ae0f8be85fc0bb7c8", - "general_stats_table.svg:md5,a5aabdc440af366a0405fe30e81895ca", - "homer-tag-directory-gc-content.svg:md5,42f9ca07a3d5c92731bda723a3d69a83", - "homer-tag-info-dist-cnt.svg:md5,5762ba6aaa7ebea9b899613b236c3d8e", - "homer-tag-info-dist-pct.svg:md5,ecb4ce86efdf9fc611ce11ab2d26a30c", - "homer-tag-length-dist.svg:md5,2869ff8ff4a772a99d06b4187c2cbb6a", - "preseq_complexity_plot_molecules.svg:md5,64d692dccb00d3a6e0b189bd7ee8d132", - "rseqc_infer_experiment_plot.svg:md5,ee6709df9b1a0b51202bfde2cde02e2d", - "rseqc_read_distribution_plot-cnt.svg:md5,ddd04b8a89f1d8271cafe93d65de218c", - "rseqc_read_distribution_plot-pct.svg:md5,9601b60164cdfdb5b2587a5c27af4aa4", - "rseqc_read_dups_plot.svg:md5,f785dace8f24221ec4104d44abb8066a", - "samtools-flagstat-dp_Percentage_of_total.svg:md5,0c8e409ccec79e42ebce88989eae6300", - "samtools-flagstat-dp_Read_counts.svg:md5,7e1da579882e30abb23fd5706291b9fc", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg:md5,af6e76af47ce2a5680335d0fb3c96b1c", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg:md5,7f5bdfce8b732f9f6df9a768b8282769", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg:md5,483ab9f6f10840c684e5d2d64d0d3653", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg:md5,cc221df71fdedd3ca56c37609231eb08", - "samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg:md5,65bfcef4615054ac8a01182be6f0fb8c", - "samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg:md5,d3d6e3fbf094cd8b9a550e726b637071", - "samtools-stats-dp.svg:md5,650377751232d5de1e7d7e1e64e544c2", - "samtools_alignment_plot-cnt.svg:md5,274c8ffc543b62aaf2874256d56584c9", - "samtools_alignment_plot-pct.svg:md5,53ecebebd1fd4252e5ea5589c547c7fa", - "multiqc_report.html:md5,79abc0e64f9ee90d14927ad3424dfef6", - "cd4_REP1.trimmed.fastp.html:md5,6d046d3b305c984117e7ac7b2997c313", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,751fb0e9c3ad33366fe4575c14362549", - "cd4_REP2.trimmed.fastp.html:md5,665154d68a076509c2ef8eed36a28cbb", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,d67224cf7c93d93407a048236ecd7d69", - "jurkat.trimmed.fastp.html:md5,ab4b17b7396824ac9668bcd51b04fa77", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,1b09c5742f149fd57890f0e8f37f2b81", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,ee4caa657d6f9fa8fc4cf0eeb5b34ca9", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,6026ab6a56202df1f5726f9a3cdc255c", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,9ba2030370c15128c6bc04d92bd73cac", - "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", - "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", - "cd4_REP2.coverage.hist.txt:md5,edadf440d1c3658118ffd6b6a46821f8", - "cd4_REP2.coverage.stats.txt:md5,cb1ce057d05fc53e7ad9b0b2e3d5aaad", - "jurkat.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", - "jurkat.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,a2dfb0a61cd0ada1f306aaf8c7cc7b8f", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,f5bc717609e44a4e94a1b1c626c1aaad", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,129145e5b3fa3cd8a6908bcbe75ea010", - "cd4_REP1.command.log:md5,a209e8a99730ff481b817a91ec59691c", - "cd4_REP2.command.log:md5,5edd0a21c7a92c4254c9d6cf4b3ff916", - "jurkat.command.log:md5,c8a2849a246aa1f31a25cd45aa34c2f9", - "cd4_REP1.infer_experiment.txt:md5,e257827c09d08e0211e6b55b78c09817", - "cd4_REP2.infer_experiment.txt:md5,cfc76745a36e9144eb03b85abb40a2bc", - "jurkat.infer_experiment.txt:md5,14af4229684e813974e4c4ac5724bd81", - "cd4_REP1.read_distribution.txt:md5,82bb213b23ea5a2c719c09ed993b576d", - "cd4_REP2.read_distribution.txt:md5,139a91e2f36b9c93b09fe36aff3414cd", - "jurkat.read_distribution.txt:md5,982e7cb76ca5978ff8c8bc63d17a1fbe", - "cd4_REP1.DupRate_plot.pdf:md5,c4b369fc4c7546d1baebc3cc3e2b5f09", - "cd4_REP2.DupRate_plot.pdf:md5,86e8ba78a14f8bdac14d469da69e6d4e", - "jurkat.DupRate_plot.pdf:md5,15a84b61f1054819cda58ba0f74d832d", "cd4_REP1.DupRate_plot.r:md5,d04a5d1a2c83c2be6dd373710d63fecf", "cd4_REP2.DupRate_plot.r:md5,18afd2c9eb78d75dab9ac483b38111f8", "jurkat.DupRate_plot.r:md5,2265434abacdb7130dd1643114482c8c", @@ -641,78 +455,25 @@ "cd4_REP2.seq.DupRate.xls:md5,dac033fb9e548d1e23069d9f76f9e67d", "jurkat.pos.DupRate.xls:md5,3389108003e203614790dd835c84bd81", "jurkat.seq.DupRate.xls:md5,0950602857db220cdf550f66e0ad69b8", - "cd4.featureCounts.txt:md5,965288887b3cd0bfb40f76ee58aea361", - "cd4.featureCounts.txt.summary:md5,79ca06d4bfcd2e5e2563da4e074c185f", - "jurkat.featureCounts.txt:md5,63a3fb8a37040362e544a22ae94f1ea9", - "jurkat.featureCounts.txt.summary:md5,b34a314a5a9af3351d7ecdfed2d4ac88", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,55bf0d917f9eaffbc37026ec0ece9753", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,1ff5774e6ccaf2cae4b66cd2de2af406", - "cd4.bam:md5,e48afb73985a25b0bdda32b6f3f683da", - "jurkat.bam:md5,0e7ced7ce697b1b834cd19397936f577", - "cd4_filtered.bed:md5,063a59e4a2612e8eedaa443d02f6d271", - "jurkat_filtered.bed:md5,6625c2c4f2bbbf9ff2c93e587990b906", + "cd4_filtered.bed:md5,c9f505b59820e0e5f3589de3e2300a83", + "jurkat_filtered.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c", "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", - "cd4.bedGraph.gz:md5,2f47e8712ab868e9a4393f7791966d74", - "cd4.peaks.txt:md5,0d95c28f2bfdfd9df28803e34c2c7730", "chr21.tags.tsv:md5,73f87f94e447d89d2db66abde8682634", - "genomeGCcontent.txt:md5,1c845a646d9960a2cf4204bc017bd112", - "tagAutocorrelation.txt:md5,568b0cdbf1e066680ef50a4d2c8cbaf4", - "tagCountDistribution.txt:md5,9c0089a20313541fbcb85c5b5d44edd0", - "tagFreq.txt:md5,c3f74bd379a62a9c1a48b3fa0543211e", - "tagFreqUniq.txt:md5,0c79f2f324063b562f959610ffbde0f6", - "tagGCcontent.txt:md5,e464a5dfd9bb814f1e4a513557901e33", - "tagInfo.txt:md5,0151393adcf38dcb1fd7544d5de3cad9", - "tagLengthDistribution.txt:md5,da439675310911d20f8729e03de8a4d2", "jurkat.bed:md5,31454804c53975171a763d3049406598", - "jurkat.bedGraph.gz:md5,ef115f87271893dda35ad2761eb22ce0", - "jurkat.peaks.txt:md5,b59cdb942bb6037a4689dd2d68960699", "chr21.tags.tsv:md5,07be21e2a8c01d61142bcde22c022f9d", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,25cb7a33a9fb656a7eae658880e02d80", - "tagCountDistribution.txt:md5,2e72d2d33ab65402d64ad1177f611e26", - "tagFreq.txt:md5,acf53c3f34e50d1be236b932846b25c0", - "tagFreqUniq.txt:md5,ac33c48e1d580183edaa54ec9a0d78ce", - "tagGCcontent.txt:md5,e48b091066c39fca17466ff0504715ee", - "tagInfo.txt:md5,b653092ec557ebda65ff47844ce9a845", - "tagLengthDistribution.txt:md5,69493a127e47c6a80e07f72af2990c34", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,449fbe4373c1220a7882ee22d71f6321", "jurkat_merged.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c", "cd4_chr21_1_unidirectional_peaks.bed:md5,6c7e6c49f4d80f9b980bddac85617616", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,5fd13a128a16a78a0f96077780a7726e", - "peakcalling_2024_12_15_20_51_02_61.log:md5,672066adc915296be7072e11abf6f803" - ], - [ - [ - "cd4_REP1.sorted.bam", - "75904e6044960604c7279e9d0348a2e5" - ], - [ - "cd4_REP2.sorted.bam", - "2ee6306cd88c6a997287e296d4464bf1" - ], - [ - "jurkat.sorted.bam", - "8d711541138750a51d6fa77f82f05268" - ], - [ - "cd4.bam", - "4e35c571485f308a628df474a4decd8d" - ], - [ - "jurkat.bam", - "8d711541138750a51d6fa77f82f05268" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,5fd13a128a16a78a0f96077780a7726e" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T20:53:14.719426069" + "timestamp": "2024-12-16T02:31:00.42810535" } -} +} \ No newline at end of file diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 0328c9ac..4981f221 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -34,7 +34,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 3ed3b24a..e01a3450 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -185,6 +185,109 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_plots", + "multiqc/multiqc_plots/pdf", + "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", + "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", + "multiqc/multiqc_plots/pdf/general_stats_table.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", + "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", + "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", + "multiqc/multiqc_plots/png", + "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", + "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", + "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", + "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", + "multiqc/multiqc_plots/png/general_stats_table.png", + "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", + "multiqc/multiqc_plots/png/homer-tag-length-dist.png", + "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", + "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", + "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-stats-dp.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", + "multiqc/multiqc_plots/svg", + "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", + "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", + "multiqc/multiqc_plots/svg/general_stats_table.svg", + "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", + "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", + "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", + "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", + "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -300,8 +403,6 @@ "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_17_59_00_42.log", - "transcript_identification/pints/peakcalling_2024_12_15_17_59_01_45.log", "untar", "untar/GRCh38_chr21_hisat2", "untar/GRCh38_chr21_hisat2/GRCh38_chr21.1.ht2", @@ -331,15 +432,6 @@ "jurkat.minus.bigWig:md5,8a0ca6db6626d3fefb518f0d35dd1abc", "jurkat.plus.bedGraph:md5,835edbd98f6d5d69e56de05e1a837b7c", "jurkat.plus.bigWig:md5,66e82005e6c6730e970f7506bf93325c", - "cd4_REP1.sorted.bam:md5,7ab21673335995f586ad24c1ff6a5da4", - "cd4_REP1.sorted.bam.bai:md5,6fe65f381bb4521186769b47756d50c2", - "cd4_REP2.sorted.bam:md5,4746b2f80c7284be78340a9dcd834bb2", - "cd4_REP2.sorted.bam.bai:md5,20760a1b0d9f2059920c7e5f9a24fc45", - "jurkat.sorted.bam:md5,fde777f3360545114968471b2f0e5742", - "jurkat.sorted.bam.bai:md5,993fb21a43fca0a5b99344303ec18614", - "cd4_REP1.hisat2.summary.log:md5,4f8f6e777e142473bad3c3dcdab8f6d3", - "cd4_REP2.hisat2.summary.log:md5,7a95dbf6b50b5d527416232e9af55d86", - "jurkat.hisat2.summary.log:md5,3547ecf137d5c08695b29a5f78d09ddb", "cd4_REP1.sorted.bam.flagstat:md5,aa26d19a689b2fe97e254f125e1f7bcb", "cd4_REP1.sorted.bam.idxstats:md5,d523e6e25ce8659871df4104dab503b0", "cd4_REP1.sorted.bam.stats:md5,57b98494241870644c74edda7d503232", @@ -349,86 +441,9 @@ "jurkat.sorted.bam.flagstat:md5,8e59ad91dd9df6003cb6c3070b0aa34c", "jurkat.sorted.bam.idxstats:md5,56608a565532fc8ae2b93a3be28d5e8d", "jurkat.sorted.bam.stats:md5,e100d7f3a79bb29ea3a99e610245e6c8", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", - "homer-tag-directory-gc-content.txt:md5,fa7f9ae7811267028159a18d39abaf81", - "homer-tag-info-dist.txt:md5,a3344ba92542fab32a611c618127eea1", - "homer-tag-length-dist.txt:md5,5b470fac16f0f588b8cf458b79d66fc1", - "homer_tagdir.txt:md5,b370c12dafdb968b8fcc4447822f58ce", - "multiqc.log:md5,72d26b2ffee91a24d4b9ffe91cb15e39", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,446545fe5b8f1d5535c6235d88794487", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,56e68f968976fc5ff7fe191a0f2a19e4", - "multiqc_rseqc_infer_experiment.txt:md5,0979fc3217b59127d0724a7e9eff208c", - "multiqc_rseqc_read_distribution.txt:md5,0c534510f3fdbccc602a53e649db503d", - "multiqc_samtools_flagstat.txt:md5,edb7fd0cdef0009f5f89cc94ba2f7dfb", - "multiqc_samtools_idxstats.txt:md5,80d8c1e331f97ee8283b187bbec307d1", - "multiqc_samtools_stats.txt:md5,6089a90e4d9a7ee49554d3042c23a833", - "multiqc_software_versions.txt:md5,15445c223b19b592820c586ead03393d", - "multiqc_sources.txt:md5,3bcf52a0266588fd3f7032c9b3a8ebda", - "preseq.txt:md5,9d51e94a75dbdfefe3a8434541ae6daf", - "preseq_complexity_plot_molecules.txt:md5,5ff3a991b8a3c0920a642c27e8ad507a", - "rseqc_infer_experiment_plot.txt:md5,98e9de037637309a7e1c54651b9db51b", - "rseqc_read_distribution_plot.txt:md5,0f6f4157a4f6a24a593a6ec0ba1e4231", - "rseqc_read_dups.txt:md5,bbd45f846c6ad21311b01faf12b907eb", - "rseqc_read_dups_plot.txt:md5,77969804082b1b5a74ca098cb6b38c72", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,13bedcacaf88e815bfb818c0cff57ad3", - "samtools-flagstat-dp_Read_counts.txt:md5,3cad3fe4b4d2b796b870ead026d4f00a", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,67d13819494ee20408c66a37a1c9ab47", - "samtools-stats-dp.txt:md5,771468d8f8d27cc8b799e952ca297c0d", - "samtools_alignment_plot.txt:md5,b67cae4f4addc9ad2fd30a858fc3f0e5", - "multiqc_report.html:md5,ec9f5ca369c36fe493298f2bc043eeb1", - "cd4_REP1.trimmed.fastp.html:md5,bcb88e8bc86d8d1c0d4fbc1a9b46060b", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,451d06594d5138788d4a0433ac80483e", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", - "jurkat.trimmed.fastp.html:md5,fc01d9c28088eac270a66da30b554074", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,7c141f324ff068b122bbb6115321ac65", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,918d6a28ff35674aaba41bdab43b4f08", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,9400483ac94ab67878a2efd383e9292a", - "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", - "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", - "cd4_REP2.coverage.hist.txt:md5,ca9e862c16d556b3f1baa230d565e0a7", - "cd4_REP2.coverage.stats.txt:md5,14d8e9d53e129de3caf98fe6c8f52ace", - "jurkat.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", - "jurkat.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,ef2d2279e5b4a381d98ab15088a82ada", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,52cd440c876e0036d822491bc4408d3c", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,3022ec570c7309819d53687439eea28e", - "cd4_REP1.command.log:md5,4a1a87afc7cb200a93e16d7a5f8fad9d", - "cd4_REP2.command.log:md5,68b32c8a61abfbc130d3a9a1c118219d", - "jurkat.command.log:md5,ce57404d38af2301bcd9c659b620de36", - "cd4_REP1.infer_experiment.txt:md5,223944c6503efda309695bb51cb546f3", - "cd4_REP2.infer_experiment.txt:md5,09ddb72f44716e13c7fefba987d2343d", - "jurkat.infer_experiment.txt:md5,0a2e5683b2cc3e4b6e843979745f430f", - "cd4_REP1.read_distribution.txt:md5,2bdadf1ad1eea97f8d0a7f8a1e7c5934", - "cd4_REP2.read_distribution.txt:md5,392d6d311d922c75f2b75e060bac4ad2", - "jurkat.read_distribution.txt:md5,44b9aa3f1b43ecbe5303714a55cd0bc0", - "cd4_REP1.DupRate_plot.pdf:md5,d936e75943f9bd2a6531117a4ea5dfe2", - "cd4_REP2.DupRate_plot.pdf:md5,67a9c8b987cf2e5287debc5b51f4013a", - "jurkat.DupRate_plot.pdf:md5,37448c7f950f31b32723bbcb1fd0bda0", "cd4_REP1.DupRate_plot.r:md5,8b5faff4bfdf9a9aea0fb70034fa490c", "cd4_REP2.DupRate_plot.r:md5,069417fefa3372751b0d6b631f730b4b", "jurkat.DupRate_plot.r:md5,504b1a3db273e05246389299ae6e7eb3", @@ -438,38 +453,12 @@ "cd4_REP2.seq.DupRate.xls:md5,0446112b47237c5ced58ae84d05f4e98", "jurkat.pos.DupRate.xls:md5,2afe47e0b733adcf27027466688b0eed", "jurkat.seq.DupRate.xls:md5,f5fb592ddeb04e6b0cf943e192629648", - "cd4.featureCounts.txt:md5,e4f2a70d27eb7c1945a971597e7bf362", - "cd4.featureCounts.txt.summary:md5,b9612702dd788551c927c95cdd8c00fe", - "jurkat.featureCounts.txt:md5,c14351b071bdf5ebb4e295889fbf27c6", - "jurkat.featureCounts.txt.summary:md5,d479b1aaf1621bc894912e8379ec1474", - "cd4.bam:md5,53fbca75eebe57e731fb3e21dd73d594", - "jurkat.bam:md5,5568b1194896c198cb094aca91b095a7", "cd4_filtered.bed:md5,057f04ad44d3c2bf223be225b390fe0e", "jurkat_filtered.bed:md5,bd6458d033db136523d32ffba259f564", "cd4.bed:md5,d8c78818eb1666575ef4c2534ea3727e", - "cd4.bedGraph.gz:md5,2288d6c77343815f540d6f03eb7e98f1", - "cd4.peaks.txt:md5,8bb1c5655a1cce187290a3409e82a43b", "chr21.tags.tsv:md5,09c0118480c3ae294a7d188ffad20d75", - "genomeGCcontent.txt:md5,3eb1623e89ce4db027c1e30507eee0a8", - "tagAutocorrelation.txt:md5,1b2c7081f86a9a0e80c84e098ed7cb0e", - "tagCountDistribution.txt:md5,22ddddca0742303abf8e85ae98d63c6e", - "tagFreq.txt:md5,4098cd8a80fc51f6cbdbe096ef00f4bb", - "tagFreqUniq.txt:md5,06baef1b59c883d3fd681f001a287a5c", - "tagGCcontent.txt:md5,ad973a1f660cd9b07641b129a357fcb9", - "tagInfo.txt:md5,c5937cd34d90ade812f5e39354636e34", - "tagLengthDistribution.txt:md5,2570a4eea85a10732584e57f934bf5a8", "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", - "jurkat.bedGraph.gz:md5,8e06315f2e4a2aaecf1c5f66de20ea54", - "jurkat.peaks.txt:md5,f514028265e7c4881f155f860211cbba", "chr21.tags.tsv:md5,b0a8a501fb74274b70aa82a4e2b33c28", - "genomeGCcontent.txt:md5,a96352e5915ca702471940484fc00f5e", - "tagAutocorrelation.txt:md5,f6c8addd29bc60be801b39d2b68153b1", - "tagCountDistribution.txt:md5,ae57665c2177f09d92bee376ab3d5d18", - "tagFreq.txt:md5,5cd74c4f834ff2dbe0c777f6470a5e27", - "tagFreqUniq.txt:md5,5e48e415fb62e812193869ade88de1a5", - "tagGCcontent.txt:md5,1aeb8b21ef62c51f6dd1644ef79ae86e", - "tagInfo.txt:md5,3f22cefc75cb68e3c14f721041bf1605", - "tagLengthDistribution.txt:md5,d9423f5b5d825faafa3d018590584ec8", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", @@ -477,8 +466,6 @@ "jurkat_merged.bed:md5,bd6458d033db136523d32ffba259f564", "cd4_chr21_1_unidirectional_peaks.bed:md5,1c4f3b80b9b606855d0e6b1609fc90a3", "jurkat_chr21_1_unidirectional_peaks.bed:md5,1a07210f46be7235f6fd3ea7260c2a55", - "peakcalling_2024_12_15_17_59_00_42.log:md5,9696f6e9fbfb499905cc02e23c93f20e", - "peakcalling_2024_12_15_17_59_01_45.log:md5,890a1810f5f0cc2c9a19bc944cf05ea3", "GRCh38_chr21.1.ht2:md5,eb322cf410ecc616d7fe63cc1be2785b", "GRCh38_chr21.2.ht2:md5,46be3356d4c236ebd5d1e52e9eaf4e12", "GRCh38_chr21.3.ht2:md5,dbf5af96efd98d6b03f1e5d2baed848a", @@ -487,34 +474,12 @@ "GRCh38_chr21.6.ht2:md5,242e36d01cd1719b6bd05f157c644eed", "GRCh38_chr21.7.ht2:md5,24e7d0673a77e07fbe40400f9a6b3db6", "GRCh38_chr21.8.ht2:md5,5e0626bdb7f7a267990f72ae45c3e44a" - ], - [ - [ - "cd4_REP1.sorted.bam", - "7c6f110b93f069f6767d508f24e46986" - ], - [ - "cd4_REP2.sorted.bam", - "4b9dc03040268548300072c1ce32566f" - ], - [ - "jurkat.sorted.bam", - "d434e4ca752838ed82474bded157c92b" - ], - [ - "cd4.bam", - "7a1c450413463a964685e225722dd8d3" - ], - [ - "jurkat.bam", - "d434e4ca752838ed82474bded157c92b" - ] ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T11:59:31.802279" + "timestamp": "2024-12-16T02:34:03.729876999" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test index 938042f5..b115f60d 100644 --- a/workflows/tests/aligner/star.nf.test +++ b/workflows/tests/aligner/star.nf.test @@ -33,7 +33,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 2495e1ed..41279ebc 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -157,6 +157,109 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", + "multiqc/multiqc_plots", + "multiqc/multiqc_plots/pdf", + "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", + "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", + "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", + "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", + "multiqc/multiqc_plots/pdf/general_stats_table.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", + "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", + "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", + "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", + "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", + "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", + "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", + "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", + "multiqc/multiqc_plots/png", + "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", + "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", + "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", + "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", + "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", + "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", + "multiqc/multiqc_plots/png/general_stats_table.png", + "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", + "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", + "multiqc/multiqc_plots/png/homer-tag-length-dist.png", + "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", + "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", + "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", + "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", + "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", + "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", + "multiqc/multiqc_plots/png/samtools-stats-dp.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", + "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", + "multiqc/multiqc_plots/svg", + "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", + "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", + "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", + "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", + "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", + "multiqc/multiqc_plots/svg/general_stats_table.svg", + "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", + "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", + "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", + "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", + "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", + "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", + "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", + "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", + "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", + "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", + "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -327,9 +430,7 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_18_02_46_43.log", - "transcript_identification/pints/peakcalling_2024_12_15_18_02_51_43.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", @@ -350,86 +451,9 @@ "jurkat.minus.bigWig:md5,172ea254e30275889eb94a2f2f7f04cf", "jurkat.plus.bedGraph:md5,198a0f027ca6799ecc74196232402c81", "jurkat.plus.bigWig:md5,0bd721f298a8dde14ffdbda6db303f93", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", - "homer-tag-directory-gc-content.txt:md5,fbb85c705772c12359260d1631634b9d", - "homer-tag-info-dist.txt:md5,e6692e665116ced7843dd413a65a8ffa", - "homer-tag-length-dist.txt:md5,f8b1a5ec331fac75663b642eb06ab693", - "homer_tagdir.txt:md5,8fa485104e6e2cf338e8acf41dd82f34", - "multiqc.log:md5,8581b5e7a741f8c806d9ed671c518ed7", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,c2eb2150f080c203832f35e879c6a571", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,e5eff439d34c2b025fbcfaef74eea0ee", - "multiqc_rseqc_infer_experiment.txt:md5,d912439cdfb0626b360d2dcc5368e617", - "multiqc_rseqc_read_distribution.txt:md5,bebec920c316aecb6187397f730d32e8", - "multiqc_samtools_flagstat.txt:md5,cbb876b834a2aa6351b4962fff6d428c", - "multiqc_samtools_idxstats.txt:md5,98a9f4e463cb8e8b7a542db18d1d1e44", - "multiqc_samtools_stats.txt:md5,8e9fa83253dbe720d92429ebb133609f", - "multiqc_software_versions.txt:md5,0a481cc93d31af59bb038f2ef578c566", - "multiqc_sources.txt:md5,fab43f624f6a3cf57a34922cc5941b51", - "preseq.txt:md5,4c550f1bc5c8465863ec10a76c35871e", - "preseq_complexity_plot_molecules.txt:md5,4a813edf604700f888efc2f6f55581dc", - "rseqc_infer_experiment_plot.txt:md5,243b978fa978ca4226dd0913ab5645ef", - "rseqc_read_distribution_plot.txt:md5,c5b3598110d9bae171dbc48a6e92fec1", - "rseqc_read_dups.txt:md5,fb71c3f140086c76fc9189090d9e187c", - "rseqc_read_dups_plot.txt:md5,914b03b546e5d1675f762f88043df3f3", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,f09b2e5afc3c8f22372b21725b7ea2f4", - "samtools-flagstat-dp_Read_counts.txt:md5,844692eabe799b8e5bae374b9098a6fe", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,43542108fd8c21cae169136f50059ddb", - "samtools-stats-dp.txt:md5,9dfc0fa78ce7102d48c2d0732c755229", - "samtools_alignment_plot.txt:md5,a015c34f0734a4fd5b8f00464c0aae6e", - "multiqc_report.html:md5,be9936bdb288f1ce25012287404b0de7", - "cd4_REP1.trimmed.fastp.html:md5,36a53ebfaca1034d8da15fb9a1d11968", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,929ad58f7d0fd7044b3dca768e724a50", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,52daa61826da3e772236654f4d6c2d12", - "jurkat.trimmed.fastp.html:md5,836a6cf111cecab6f14a1eef132dd5bc", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,ebc93d4a9ecfa454adad95c01bf9e9a7", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,5739c0a9b2b60636f4ba0336a29eee1e", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,dfced42eeb97685bdb6332c99b13481b", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,12fac7bd7ff8953b6eee2c19f81d385a", - "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", - "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", - "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", - "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", - "jurkat.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", - "jurkat.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,c84d218ba0a58b9ea5476ad207224162", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,9159cf4286e88b3c5740cf9c2884d4f1", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,639ea055621d77eadb836505eaf07ca8", - "cd4_REP1.command.log:md5,b919be23822d88e9262fd8d155a16021", - "cd4_REP2.command.log:md5,d195a704f64afb9087265e2f465c757f", - "jurkat.command.log:md5,a4cd8e90678caadfeb4989f737e215d3", - "cd4_REP1.infer_experiment.txt:md5,615958cef592f55bf190346b8aec2886", - "cd4_REP2.infer_experiment.txt:md5,fbe67ba4bd4ed6a1759a4ec676332e36", - "jurkat.infer_experiment.txt:md5,9accbdaac1d7d8c9e665e87a48328842", - "cd4_REP1.read_distribution.txt:md5,2b5ff7e11fc0e542b6cc2b175fe9e8ab", - "cd4_REP2.read_distribution.txt:md5,748d618cbb6bebc5922a89af78932f60", - "jurkat.read_distribution.txt:md5,5ec2c28ee0ff01e0fa0889b16136624f", - "cd4_REP1.DupRate_plot.pdf:md5,bdf1ab756e84280851bea014237d64c6", - "cd4_REP2.DupRate_plot.pdf:md5,b4c5aa3a571e0dbc5a2b2ad552bdcf50", - "jurkat.DupRate_plot.pdf:md5,343434ebd3b44ecc02406d75a8d8e4f8", "cd4_REP1.DupRate_plot.r:md5,a33f83aef06fa207ac55b8002741aff7", "cd4_REP2.DupRate_plot.r:md5,834a386b72bab13bfb9678ebb09d814e", "jurkat.DupRate_plot.r:md5,eb8151edec9ac1e29b5a579cfdb45a0d", @@ -439,37 +463,20 @@ "cd4_REP2.seq.DupRate.xls:md5,6c00870ce14b0383bdccd352d7c6012a", "jurkat.pos.DupRate.xls:md5,0937fe59aa436407b807660978c4423e", "jurkat.seq.DupRate.xls:md5,ef59a2a23975a1a3aa2770ca8525ac51", - "cd4.featureCounts.txt:md5,440b6ad0eefb5f47f63c0bfd715c0c82", - "cd4.featureCounts.txt.summary:md5,591bac955b8897231d4e25dbfdf19bc0", - "jurkat.featureCounts.txt:md5,3b050fa1986268a4f9a0a23b25788d0c", - "jurkat.featureCounts.txt.summary:md5,8e9e875a8da2834fd00ca3e0c4f785c6", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,3f9182960fc4262c583640857a7cc990", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,ac973ce75c7eccdb95a4d862c535ce8b", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,986cc37ce2179cf92e777240269fc561", - "cd4.bam:md5,04ea49bda2233d1d87a71501bae08c68", - "jurkat.bam:md5,7aef3616419da2fb53d94321c187c3f2", - "jurkat.bam.bai:md5,b4c0a4a9360342f9f79cf08f64c1170b", "jurkat.flagstat:md5,2e10f27f80137c7ca4d340f110aa8fcf", "jurkat.idxstats:md5,8e38ac91c083ef3c5cf77ba782b836a5", "jurkat.stats:md5,46d40815316f079c846963982c0f7d3d", - "cd4_REP1.sorted.bam:md5,8b898d641c3ac4ca0efb1e611ded2182", - "cd4_REP1.sorted.bam.bai:md5,5c3efc16ee79b67942a59be89e38349a", - "cd4_REP2.sorted.bam:md5,45e3d3d1c36bf13ea212285972afdd71", - "cd4_REP2.sorted.bam.bai:md5,1d639a8126abc6bfecddb9f3930207b5", - "jurkat.sorted.bam:md5,5f4b37da8533af304e60a5dec7315572", - "jurkat.sorted.bam.bai:md5,937213f6ada1636d9ac6df15e330e3ab", - "cd4_REP1.Log.final.out:md5,e98e0d462abf9bc2c6c84fdf07ea936a", - "cd4_REP1.Log.out:md5,78fa5092bf79ed4474c9cfbbd95c6f51", - "cd4_REP1.Log.progress.out:md5,7674ec7982b64b4281c5ced4bc05792f", + "cd4_REP1.Log.final.out:md5,8e0981befb7402b9bc607f3dddf204db", + "cd4_REP1.Log.out:md5,f3ca8f5da8965b2948820fd3ae073085", + "cd4_REP1.Log.progress.out:md5,ed4b1af569321298d22fcac7ae27dc0c", "cd4_REP1.SJ.out.tab:md5,991ac1fa28719c078a4827fcf66e90b0", - "cd4_REP2.Log.final.out:md5,65534c0a1c720b714becb50cb9cb8631", - "cd4_REP2.Log.out:md5,1f63968fffa2021e370bb35cce9d4689", - "cd4_REP2.Log.progress.out:md5,a754f1b948db7ce2fec566107e840bda", + "cd4_REP2.Log.final.out:md5,60ad4e0c6bc9d79087e5a3c7309971c5", + "cd4_REP2.Log.out:md5,1e35e7c52a927a4f7c53a00fae53ebac", + "cd4_REP2.Log.progress.out:md5,196fc939a0e2772c286bf3b590e03c0e", "cd4_REP2.SJ.out.tab:md5,5accd405e613d28731f111dfd070a3ba", - "jurkat.Log.final.out:md5,d418f757881078630ef7b4952fa9e146", - "jurkat.Log.out:md5,108b46d74bfa50d3593511ac1e1a057b", - "jurkat.Log.progress.out:md5,a8e27da69ef48584e8623e7afed34b0b", + "jurkat.Log.final.out:md5,8822310368a9f97bf993ea75b4b1b4e2", + "jurkat.Log.out:md5,fd0c47aeb138147baaf0e73feb906845", + "jurkat.Log.progress.out:md5,1646f19dcabd4b7b7dd62da5fff98d57", "jurkat.SJ.out.tab:md5,8e5de2dc83e2478528528a86a2ffd456", "cd4_REP1.sorted.bam.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", "cd4_REP1.sorted.bam.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", @@ -481,85 +488,35 @@ "jurkat.sorted.bam.idxstats:md5,5e4a68fda75c954324d659af58d12c62", "jurkat.sorted.bam.stats:md5,0b7a4d6e0823d159ab2d9cdc1b2c8310", "Genome:md5,612664e3cfde5e1b73ad541d93752b31", - "Log.out:md5,3078e4ee3151f0fdbe3c6e03461c777c", + "Log.out:md5,bf16bc06b62351e1fab8e5bca0bd5ec7", "SA:md5,074ae54177bb7b9cb981382f043f36e5", "SAindex:md5,1c9cd646313f1abb1cfc205ccab73464", - "chrLength.txt:md5,b0be0a56ddefa84552742c72d4859eac", - "chrName.txt:md5,e99d7d1051eee43ceab5563c2d09fcee", - "chrNameLength.txt:md5,c985a141685e8431ec27c782816cb744", - "chrStart.txt:md5,6925b594ea2eeb964ba87cd6d42ab98f", "exonGeTrInfo.tab:md5,ea42dd46e177f95a72a8f6a2925f7348", "exonInfo.tab:md5,42a3ce2024f396b2298c0a84b07fb6e4", "geneInfo.tab:md5,d0092fb1ea6fcdac270c4df788de70fb", - "genomeParameters.txt:md5,2fec04098057094f4b2e5a9ec4371a7d", - "sjdbInfo.txt:md5,12fb05dc7cea89735a0c19e1c0df61cb", "sjdbList.fromGTF.out.tab:md5,5d9761b49920fb70a77d74e390d196b9", "sjdbList.out.tab:md5,766fbca932681f8666b3a9e5fb3640bd", "transcriptInfo.tab:md5,21c1f470ffe3b55b23900e7b7eaec2f4", "cd4_filtered.bed:md5,57cde1c26fabdc9c416326ba825b3f15", "jurkat_filtered.bed:md5,95a5279ec2387dfa0b4c2e7820083527", "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", - "cd4.bedGraph.gz:md5,d42e5ad1738c0b5af09190fcb7bed2cb", - "cd4.peaks.txt:md5,4ab7c16a5f6d0e78275448bbce7c21c2", "chr21.tags.tsv:md5,7f133ee4d24c534ca46c67a965cc7ff8", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,04774fe517af08394f87b1eef3da5a53", - "tagCountDistribution.txt:md5,6a0bb0fdf84aca0aea880a4a3dcf3093", - "tagFreq.txt:md5,954d9ab7662a572826e3eee71bf278c7", - "tagFreqUniq.txt:md5,c39b5b1ed1dbf8080a0d87b445246357", - "tagGCcontent.txt:md5,3d78d82176800ccfdf56327d695d1975", - "tagInfo.txt:md5,1b961a6dfc00ee98f8c90fe1a8436575", - "tagLengthDistribution.txt:md5,39d83a53c249a5b30937a1d352f058ef", "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", - "jurkat.bedGraph.gz:md5,ee1ee88f0ee102bf8775f9436eb334fd", - "jurkat.peaks.txt:md5,91e7580ebde81aceaf3bb1b1c3c3db1c", "chr21.tags.tsv:md5,c71046d9c6fb1651a802bb7079fe2093", - "genomeGCcontent.txt:md5,d59c851087427d57aa0344660b041775", - "tagAutocorrelation.txt:md5,ee25ecd1e3231ce7eff6a97bc90031cb", - "tagCountDistribution.txt:md5,27c063c484df8ab3fbabc86899fd5913", - "tagFreq.txt:md5,1f9af257dd2b417de50d44dffa130d9a", - "tagFreqUniq.txt:md5,ecf0f4d5f09ea7750fadad3dc9d65ec8", - "tagGCcontent.txt:md5,195a7cccfd4fe0c7859519892a1c17fb", - "tagInfo.txt:md5,0e1ab5de2e523c908538faac4f8115cb", - "tagLengthDistribution.txt:md5,0cba6b131d3788e8153006637564ba82", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,07860f90354c4f5f66eddbed3e5d3bd2", "jurkat_merged.bed:md5,95a5279ec2387dfa0b4c2e7820083527", "cd4_chr21_1_unidirectional_peaks.bed:md5,26765aa153cb1d6bb668f5786da5763e", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,15a3bec7a3ffb53c1e621665b3f45873", - "peakcalling_2024_12_15_18_02_46_43.log:md5,246ed02a60215863b65f6653c6c9d334", - "peakcalling_2024_12_15_18_02_51_43.log:md5,cdb43da71841cbad515e435191f22a0f" - ], - [ - [ - "cd4.bam", - "62d46450ed2b3bdf7f02bfb76a5e5365" - ], - [ - "jurkat.bam", - "fa22f29727ce9c1a50cec37049d65fb5" - ], - [ - "cd4_REP1.sorted.bam", - "d46f82aca0d563ac1d4ec5e92a3dd751" - ], - [ - "cd4_REP2.sorted.bam", - "3f3233a2b9f9d23531e0e08f31f11af2" - ], - [ - "jurkat.sorted.bam", - "fa22f29727ce9c1a50cec37049d65fb5" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,15a3bec7a3ffb53c1e621665b3f45873" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T12:04:27.202939" + "timestamp": "2024-12-16T02:38:39.216287268" }, "gzip_software_versions": { "content": [ diff --git a/workflows/tests/inputs/gff/main.nf.test b/workflows/tests/inputs/gff/main.nf.test index cb308be6..c8831904 100644 --- a/workflows/tests/inputs/gff/main.nf.test +++ b/workflows/tests/inputs/gff/main.nf.test @@ -33,7 +33,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test b/workflows/tests/inputs/gzipped_gff/main.nf.test index f15c29fb..4d00252f 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test @@ -33,7 +33,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/inputs/only_gff/main.nf.test b/workflows/tests/inputs/only_gff/main.nf.test index 82ee4923..489fe820 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test +++ b/workflows/tests/inputs/only_gff/main.nf.test @@ -35,7 +35,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test index 98ec9490..935c8f1c 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test @@ -39,7 +39,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index 9b6299c4..cbdd0fd3 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -31,7 +31,7 @@ nextflow_pipeline { // All files with stable contents stable_path, // All bam files - bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } + // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } ).match() } ) } From 2713cfcd0a10df17f2f16c754af41b54dc13dabd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 16 Dec 2024 21:41:43 -0600 Subject: [PATCH 216/255] test: Remove plots --- workflows/tests/aligner/bwa.nf.test.snap | 105 +---------------------- 1 file changed, 1 insertion(+), 104 deletions(-) diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 2f0d9be8..b9560415 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -221,109 +221,6 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", - "multiqc/multiqc_plots", - "multiqc/multiqc_plots/pdf", - "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", - "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", - "multiqc/multiqc_plots/pdf/general_stats_table.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", - "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", - "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", - "multiqc/multiqc_plots/png", - "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", - "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", - "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", - "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", - "multiqc/multiqc_plots/png/general_stats_table.png", - "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", - "multiqc/multiqc_plots/png/homer-tag-length-dist.png", - "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", - "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", - "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-stats-dp.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", - "multiqc/multiqc_plots/svg", - "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", - "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", - "multiqc/multiqc_plots/svg/general_stats_table.svg", - "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", - "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", - "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", - "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", - "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -588,6 +485,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-16T02:22:23.367403695" + "timestamp": "2024-12-16T19:45:08.588217" } } \ No newline at end of file From 3d34f5550cbd215d85467b44e2b529b9b75cc10b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 18 Dec 2024 09:00:56 -0600 Subject: [PATCH 217/255] test: Give up on Dragmap testing --- workflows/tests/aligner/dragmap.nf.test | 19 +- workflows/tests/aligner/dragmap.nf.test.snap | 479 ------------------- 2 files changed, 1 insertion(+), 497 deletions(-) delete mode 100644 workflows/tests/aligner/dragmap.nf.test.snap diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index 818763ed..72948f1f 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -13,26 +13,9 @@ nextflow_pipeline { } then { - // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) - // stable_path: All files in ${params.outdir}/ with stable content - def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') - // bam_files: All bam files - def bam_files = getAllFilesFromDir(params.outdir, include: ['**/*.bam']) + // FIXME Broken on ARM and difficult to maintain, considering deprecating assertAll( { assert workflow.success }, - { assert snapshot( - // Number of tasks - workflow.trace.succeeded().size(), - // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), - // All stable path name - stable_name, - // All files with stable contents - stable_path, - // All bam files - // FIXME bam_files.collect{ file -> [ file.getName(), bam(file.toString()).getReadsMD5() ] } - ).match() } ) } } diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap deleted file mode 100644 index 11cb04f5..00000000 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ /dev/null @@ -1,479 +0,0 @@ -{ - "Should run with defaults": { - "content": [ - 92, - { - "BBMAP_PILEUP": { - "bbmap": 39.01, - "samtools": "1.16.1", - "pigz": 2.6 - }, - "BEDTOOLS_GENOMECOV_MINUS": { - "bedtools": "2.31.1" - }, - "BEDTOOLS_GENOMECOV_PLUS": { - "bedtools": "2.31.1" - }, - "BEDTOOLS_INTERSECT": { - "bedtools": "2.31.1" - }, - "BEDTOOLS_INTERSECT_FILTER": { - "bedtools": "2.31.1" - }, - "BEDTOOLS_MERGE": { - "bedtools": "2.31.1" - }, - "BEDTOOLS_SORT": { - "bedtools": "2.31.1" - }, - "CAT_CAT": { - "pigz": "2.3.4" - }, - "CUSTOM_GETCHROMSIZES": { - "getchromsizes": 1.2 - }, - "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" - }, - "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" - }, - "DRAGMAP_ALIGN": { - "dragmap": "1.2.1", - "samtools": "1.15.1", - "pigz": "2.3.4" - }, - "DRAGMAP_HASHTABLE": { - "dragmap": "1.3.0" - }, - "FASTP": { - "fastp": "0.23.4" - }, - "FASTQC": { - "fastqc": "0.12.1" - }, - "GTF2BED": { - "perl": "5.26.2" - }, - "HOMER_MAKETAGDIRECTORY": { - "homer": 4.11, - "samtools": 1.21 - }, - "PINTS_CALLER": { - "python": "3.12.6", - "pints": "1.1.13" - }, - "PRESEQ_CCURVE": { - "preseq": "3.1.1" - }, - "PRESEQ_LCEXTRAP": { - "preseq": "3.1.1" - }, - "RSEQC_INFEREXPERIMENT": { - "rseqc": "5.0.2" - }, - "RSEQC_READDISTRIBUTION": { - "rseqc": "5.0.2" - }, - "RSEQC_READDUPLICATION": { - "rseqc": "5.0.2" - }, - "SAMTOOLS_FLAGSTAT": { - "samtools": 1.2 - }, - "SAMTOOLS_IDXSTATS": { - "samtools": 1.2 - }, - "SAMTOOLS_INDEX": { - "samtools": 1.2 - }, - "SAMTOOLS_MERGE": { - "samtools": 1.21 - }, - "SAMTOOLS_SORT": { - "samtools": 1.2 - }, - "SAMTOOLS_STATS": { - "samtools": 1.2 - }, - "SUBREAD_FEATURECOUNTS_GENE": { - "subread": "2.0.1" - }, - "SUBREAD_FEATURECOUNTS_PREDICTED": { - "subread": "2.0.1" - }, - "Workflow": { - "nf-core/nascent": "v2.3.0dev" - } - }, - [ - "bed2saf", - "bed2saf/cd4_intersect.saf", - "cat", - "cat/cd4.bed", - "cat/jurkat.bed", - "coverage_graphs", - "coverage_graphs/cd4_REP1.dreg.bedGraph", - "coverage_graphs/cd4_REP1.minus.bedGraph", - "coverage_graphs/cd4_REP1.minus.bigWig", - "coverage_graphs/cd4_REP1.plus.bedGraph", - "coverage_graphs/cd4_REP1.plus.bigWig", - "coverage_graphs/cd4_REP2.dreg.bedGraph", - "coverage_graphs/cd4_REP2.minus.bedGraph", - "coverage_graphs/cd4_REP2.minus.bigWig", - "coverage_graphs/cd4_REP2.plus.bedGraph", - "coverage_graphs/cd4_REP2.plus.bigWig", - "coverage_graphs/jurkat.dreg.bedGraph", - "coverage_graphs/jurkat.minus.bedGraph", - "coverage_graphs/jurkat.minus.bigWig", - "coverage_graphs/jurkat.plus.bedGraph", - "coverage_graphs/jurkat.plus.bigWig", - "dragmap", - "dragmap/cd4_REP1.sorted.bam", - "dragmap/cd4_REP1.sorted.bam.bai", - "dragmap/cd4_REP2.sorted.bam", - "dragmap/cd4_REP2.sorted.bam.bai", - "dragmap/jurkat.sorted.bam", - "dragmap/jurkat.sorted.bam.bai", - "dragmap/log", - "dragmap/log/cd4_REP1.dragmap.log", - "dragmap/log/cd4_REP2.dragmap.log", - "dragmap/log/jurkat.dragmap.log", - "dragmap/samtools_stats", - "dragmap/samtools_stats/cd4_REP1.sorted.bam.flagstat", - "dragmap/samtools_stats/cd4_REP1.sorted.bam.idxstats", - "dragmap/samtools_stats/cd4_REP1.sorted.bam.stats", - "dragmap/samtools_stats/cd4_REP2.sorted.bam.flagstat", - "dragmap/samtools_stats/cd4_REP2.sorted.bam.idxstats", - "dragmap/samtools_stats/cd4_REP2.sorted.bam.stats", - "dragmap/samtools_stats/jurkat.sorted.bam.flagstat", - "dragmap/samtools_stats/jurkat.sorted.bam.idxstats", - "dragmap/samtools_stats/jurkat.sorted.bam.stats", - "multiqc", - "multiqc/multiqc_data", - "multiqc/multiqc_data/fastqc-status-check-heatmap.txt", - "multiqc/multiqc_data/fastqc_adapter_content_plot.txt", - "multiqc/multiqc_data/fastqc_overrepresented_sequences_plot.txt", - "multiqc/multiqc_data/fastqc_per_base_n_content_plot.txt", - "multiqc/multiqc_data/fastqc_per_base_sequence_quality_plot.txt", - "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Counts.txt", - "multiqc/multiqc_data/fastqc_per_sequence_gc_content_plot_Percentages.txt", - "multiqc/multiqc_data/fastqc_per_sequence_quality_scores_plot.txt", - "multiqc/multiqc_data/fastqc_sequence_counts_plot.txt", - "multiqc/multiqc_data/fastqc_sequence_duplication_levels_plot.txt", - "multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt", - "multiqc/multiqc_data/homer-tag-directory-gc-content.txt", - "multiqc/multiqc_data/homer-tag-info-dist.txt", - "multiqc/multiqc_data/homer-tag-length-dist.txt", - "multiqc/multiqc_data/homer_tagdir.txt", - "multiqc/multiqc_data/multiqc.log", - "multiqc/multiqc_data/multiqc_citations.txt", - "multiqc/multiqc_data/multiqc_data.json", - "multiqc/multiqc_data/multiqc_fastqc.txt", - "multiqc/multiqc_data/multiqc_general_stats.txt", - "multiqc/multiqc_data/multiqc_rseqc_infer_experiment.txt", - "multiqc/multiqc_data/multiqc_rseqc_read_distribution.txt", - "multiqc/multiqc_data/multiqc_samtools_flagstat.txt", - "multiqc/multiqc_data/multiqc_samtools_idxstats.txt", - "multiqc/multiqc_data/multiqc_samtools_stats.txt", - "multiqc/multiqc_data/multiqc_software_versions.txt", - "multiqc/multiqc_data/multiqc_sources.txt", - "multiqc/multiqc_data/preseq.txt", - "multiqc/multiqc_data/preseq_complexity_plot_molecules.txt", - "multiqc/multiqc_data/rseqc_infer_experiment_plot.txt", - "multiqc/multiqc_data/rseqc_read_distribution_plot.txt", - "multiqc/multiqc_data/rseqc_read_dups.txt", - "multiqc/multiqc_data/rseqc_read_dups_plot.txt", - "multiqc/multiqc_data/samtools-flagstat-dp_Percentage_of_total.txt", - "multiqc/multiqc_data/samtools-flagstat-dp_Read_counts.txt", - "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt", - "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt", - "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", - "multiqc/multiqc_data/samtools-stats-dp.txt", - "multiqc/multiqc_data/samtools_alignment_plot.txt", - "multiqc/multiqc_plots", - "multiqc/multiqc_plots/pdf", - "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", - "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", - "multiqc/multiqc_plots/pdf/general_stats_table.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", - "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", - "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", - "multiqc/multiqc_plots/png", - "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", - "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", - "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", - "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", - "multiqc/multiqc_plots/png/general_stats_table.png", - "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", - "multiqc/multiqc_plots/png/homer-tag-length-dist.png", - "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", - "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", - "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-stats-dp.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", - "multiqc/multiqc_plots/svg", - "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", - "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", - "multiqc/multiqc_plots/svg/general_stats_table.svg", - "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", - "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", - "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", - "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", - "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", - "multiqc/multiqc_report.html", - "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", - "preprocessing", - "preprocessing/fastp", - "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", - "preprocessing/fastp/cd4_REP1.trimmed.fastp.json", - "preprocessing/fastp/cd4_REP1.trimmed.fastp.log", - "preprocessing/fastp/cd4_REP2.trimmed.fastp.html", - "preprocessing/fastp/cd4_REP2.trimmed.fastp.json", - "preprocessing/fastp/cd4_REP2.trimmed.fastp.log", - "preprocessing/fastp/jurkat.trimmed.fastp.html", - "preprocessing/fastp/jurkat.trimmed.fastp.json", - "preprocessing/fastp/jurkat.trimmed.fastp.log", - "preprocessing/fastqc", - "preprocessing/fastqc/cd4_REP1_fastqc.html", - "preprocessing/fastqc/cd4_REP1_fastqc.zip", - "preprocessing/fastqc/cd4_REP2_fastqc.html", - "preprocessing/fastqc/cd4_REP2_fastqc.zip", - "preprocessing/fastqc/jurkat_fastqc.html", - "preprocessing/fastqc/jurkat_fastqc.zip", - "quality_control", - "quality_control/bbsplit", - "quality_control/bbsplit/cd4_REP1.coverage.hist.txt", - "quality_control/bbsplit/cd4_REP1.coverage.stats.txt", - "quality_control/bbsplit/cd4_REP2.coverage.hist.txt", - "quality_control/bbsplit/cd4_REP2.coverage.stats.txt", - "quality_control/bbsplit/jurkat.coverage.hist.txt", - "quality_control/bbsplit/jurkat.coverage.stats.txt", - "quality_control/preseq", - "quality_control/preseq/cd4_REP1.c_curve.txt", - "quality_control/preseq/cd4_REP1.lc_extrap.txt", - "quality_control/preseq/cd4_REP2.c_curve.txt", - "quality_control/preseq/cd4_REP2.lc_extrap.txt", - "quality_control/preseq/jurkat.c_curve.txt", - "quality_control/preseq/jurkat.lc_extrap.txt", - "quality_control/preseq/log", - "quality_control/preseq/log/cd4_REP1.command.log", - "quality_control/preseq/log/cd4_REP2.command.log", - "quality_control/preseq/log/jurkat.command.log", - "quality_control/rseqc", - "quality_control/rseqc/infer_experiment", - "quality_control/rseqc/infer_experiment/cd4_REP1.infer_experiment.txt", - "quality_control/rseqc/infer_experiment/cd4_REP2.infer_experiment.txt", - "quality_control/rseqc/infer_experiment/jurkat.infer_experiment.txt", - "quality_control/rseqc/read_distribution", - "quality_control/rseqc/read_distribution/cd4_REP1.read_distribution.txt", - "quality_control/rseqc/read_distribution/cd4_REP2.read_distribution.txt", - "quality_control/rseqc/read_distribution/jurkat.read_distribution.txt", - "quality_control/rseqc/read_duplication", - "quality_control/rseqc/read_duplication/pdf", - "quality_control/rseqc/read_duplication/pdf/cd4_REP1.DupRate_plot.pdf", - "quality_control/rseqc/read_duplication/pdf/cd4_REP2.DupRate_plot.pdf", - "quality_control/rseqc/read_duplication/pdf/jurkat.DupRate_plot.pdf", - "quality_control/rseqc/read_duplication/rscript", - "quality_control/rseqc/read_duplication/rscript/cd4_REP1.DupRate_plot.r", - "quality_control/rseqc/read_duplication/rscript/cd4_REP2.DupRate_plot.r", - "quality_control/rseqc/read_duplication/rscript/jurkat.DupRate_plot.r", - "quality_control/rseqc/read_duplication/xls", - "quality_control/rseqc/read_duplication/xls/cd4_REP1.pos.DupRate.xls", - "quality_control/rseqc/read_duplication/xls/cd4_REP1.seq.DupRate.xls", - "quality_control/rseqc/read_duplication/xls/cd4_REP2.pos.DupRate.xls", - "quality_control/rseqc/read_duplication/xls/cd4_REP2.seq.DupRate.xls", - "quality_control/rseqc/read_duplication/xls/jurkat.pos.DupRate.xls", - "quality_control/rseqc/read_duplication/xls/jurkat.seq.DupRate.xls", - "quantification", - "quantification/gene", - "quantification/gene/cd4.featureCounts.txt", - "quantification/gene/cd4.featureCounts.txt.summary", - "quantification/gene/jurkat.featureCounts.txt", - "quantification/gene/jurkat.featureCounts.txt.summary", - "quantification/nascent", - "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt", - "quantification/nascent/cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary", - "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt", - "quantification/nascent/jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary", - "samtools", - "samtools/cd4.bam", - "samtools/jurkat.bam", - "transcript_identification", - "transcript_identification/filtered", - "transcript_identification/filtered/cd4_filtered.bed", - "transcript_identification/filtered/jurkat_filtered.bed", - "transcript_identification/homer", - "transcript_identification/homer/cd4.bed", - "transcript_identification/homer/cd4.bedGraph.gz", - "transcript_identification/homer/cd4.peaks.txt", - "transcript_identification/homer/cd4_tagdir", - "transcript_identification/homer/cd4_tagdir/chr21.tags.tsv", - "transcript_identification/homer/cd4_tagdir/genomeGCcontent.txt", - "transcript_identification/homer/cd4_tagdir/tagAutocorrelation.txt", - "transcript_identification/homer/cd4_tagdir/tagCountDistribution.txt", - "transcript_identification/homer/cd4_tagdir/tagFreq.txt", - "transcript_identification/homer/cd4_tagdir/tagFreqUniq.txt", - "transcript_identification/homer/cd4_tagdir/tagGCcontent.txt", - "transcript_identification/homer/cd4_tagdir/tagInfo.txt", - "transcript_identification/homer/cd4_tagdir/tagLengthDistribution.txt", - "transcript_identification/homer/jurkat.bed", - "transcript_identification/homer/jurkat.bedGraph.gz", - "transcript_identification/homer/jurkat.peaks.txt", - "transcript_identification/homer/jurkat_tagdir", - "transcript_identification/homer/jurkat_tagdir/chr21.tags.tsv", - "transcript_identification/homer/jurkat_tagdir/genomeGCcontent.txt", - "transcript_identification/homer/jurkat_tagdir/tagAutocorrelation.txt", - "transcript_identification/homer/jurkat_tagdir/tagCountDistribution.txt", - "transcript_identification/homer/jurkat_tagdir/tagFreq.txt", - "transcript_identification/homer/jurkat_tagdir/tagFreqUniq.txt", - "transcript_identification/homer/jurkat_tagdir/tagGCcontent.txt", - "transcript_identification/homer/jurkat_tagdir/tagInfo.txt", - "transcript_identification/homer/jurkat_tagdir/tagLengthDistribution.txt", - "transcript_identification/homer/versions.yml", - "transcript_identification/intersect", - "transcript_identification/intersect/cd4_intersect.bed", - "transcript_identification/intersect/jurkat_intersect.bed", - "transcript_identification/merged", - "transcript_identification/merged/cd4_merged.bed", - "transcript_identification/merged/jurkat_merged.bed", - "transcript_identification/pints", - "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" - ], - [ - "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", - "cd4.bed:md5,6c7e6c49f4d80f9b980bddac85617616", - "jurkat.bed:md5,5fd13a128a16a78a0f96077780a7726e", - "cd4_REP1.dreg.bedGraph:md5,aefd2accdaf19635f5a566e6e36a578e", - "cd4_REP1.minus.bedGraph:md5,d4ddabe2599211e89c0eeb07544a2bf2", - "cd4_REP1.minus.bigWig:md5,7f0614afba6a3f37d507d1ee0ce4de2f", - "cd4_REP1.plus.bedGraph:md5,2ebf9f9cf845e8403cceda70e254be03", - "cd4_REP1.plus.bigWig:md5,de63345606909c31c3dfa2a0d57e68bc", - "cd4_REP2.dreg.bedGraph:md5,68cb12ce50649175d359aa8d7cbaae06", - "cd4_REP2.minus.bedGraph:md5,96876aaaca35003be86a25c78733c8f9", - "cd4_REP2.minus.bigWig:md5,228ed1c4fef63675c260c4f750b7c8f3", - "cd4_REP2.plus.bedGraph:md5,a6f04b8484428786a3e089ea5509240b", - "cd4_REP2.plus.bigWig:md5,cfea092121f880010f3ae652025e446b", - "jurkat.dreg.bedGraph:md5,337d974e56a047cea3ce1aa2a694b1ac", - "jurkat.minus.bedGraph:md5,c57d91865736e23f13660f9d7ecb6e5d", - "jurkat.minus.bigWig:md5,22daac83d393dcca8f1cc96580d3d4f3", - "jurkat.plus.bedGraph:md5,ddabf19e2172df4b80b7ce434035403e", - "jurkat.plus.bigWig:md5,ca73f44638c066f25261efffa1eedc7f", - "cd4_REP1.sorted.bam.flagstat:md5,6a27aa41830e5f10a2c54c8a05611f9a", - "cd4_REP1.sorted.bam.idxstats:md5,75eaf648cea73812913344af3851ce16", - "cd4_REP1.sorted.bam.stats:md5,80bfe47bc5be703b51313a4b2fbcc57f", - "cd4_REP2.sorted.bam.flagstat:md5,0355e87e727027ee381053c49123336f", - "cd4_REP2.sorted.bam.idxstats:md5,4a68a3a04440acdced8802c29ffc634c", - "cd4_REP2.sorted.bam.stats:md5,24a85ae13a01fdbd1e6e882cf3ef55e0", - "jurkat.sorted.bam.flagstat:md5,2ac2d8fdb09b0bf5061d9e24501c41c3", - "jurkat.sorted.bam.idxstats:md5,8aebada21b179c96f888d08bb4ae1651", - "jurkat.sorted.bam.stats:md5,104f00b802be80cc252beb0d4cfd709b", - "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_REP1.DupRate_plot.r:md5,d04a5d1a2c83c2be6dd373710d63fecf", - "cd4_REP2.DupRate_plot.r:md5,18afd2c9eb78d75dab9ac483b38111f8", - "jurkat.DupRate_plot.r:md5,2265434abacdb7130dd1643114482c8c", - "cd4_REP1.pos.DupRate.xls:md5,c53ebd47cad3f3524dafd3d0bdd2cc71", - "cd4_REP1.seq.DupRate.xls:md5,6fc39432eb1815a1aebac84c5c46aa97", - "cd4_REP2.pos.DupRate.xls:md5,96b7100c85fd83d7634ebcd199de2aea", - "cd4_REP2.seq.DupRate.xls:md5,dac033fb9e548d1e23069d9f76f9e67d", - "jurkat.pos.DupRate.xls:md5,3389108003e203614790dd835c84bd81", - "jurkat.seq.DupRate.xls:md5,0950602857db220cdf550f66e0ad69b8", - "cd4_filtered.bed:md5,c9f505b59820e0e5f3589de3e2300a83", - "jurkat_filtered.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c", - "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", - "chr21.tags.tsv:md5,73f87f94e447d89d2db66abde8682634", - "jurkat.bed:md5,31454804c53975171a763d3049406598", - "chr21.tags.tsv:md5,07be21e2a8c01d61142bcde22c022f9d", - "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_merged.bed:md5,449fbe4373c1220a7882ee22d71f6321", - "jurkat_merged.bed:md5,3a939a0a1c8a747f2ee68cc49eded20c", - "cd4_chr21_1_unidirectional_peaks.bed:md5,6c7e6c49f4d80f9b980bddac85617616", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,5fd13a128a16a78a0f96077780a7726e" - ] - ], - "meta": { - "nf-test": "0.9.2", - "nextflow": "24.10.2" - }, - "timestamp": "2024-12-16T02:31:00.42810535" - } -} \ No newline at end of file From 3c0ebaeb4e61a325d312eec82cde698e3cfd6d63 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 18 Dec 2024 09:01:47 -0600 Subject: [PATCH 218/255] test: Update unstable files --- tests/.nftignore | 104 +++++++++++- workflows/tests/aligner/bowtie2.nf.test.snap | 121 +------------- workflows/tests/aligner/bwa.nf.test.snap | 28 +--- workflows/tests/aligner/bwamem2.nf.test.snap | 118 +------------ workflows/tests/aligner/hisat2.nf.test.snap | 127 +------------- workflows/tests/aligner/star.nf.test.snap | 144 +++------------- workflows/tests/inputs/gff/main.nf.test.snap | 154 +---------------- .../inputs/gzipped_gff/main.nf.test.snap | 154 +---------------- .../tests/inputs/only_gff/main.nf.test.snap | 154 +---------------- .../grohmm/only_gff/main.nf.test.snap | 158 +----------------- .../grohmm/tuning/main.nf.test.snap | 156 +---------------- 11 files changed, 149 insertions(+), 1269 deletions(-) diff --git a/tests/.nftignore b/tests/.nftignore index 195dff12..136612a3 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -1,7 +1,8 @@ -preprocessing/fastqc/*.html -preprocessing/fastqc/*.zip +preprocessing/fastqc/*.{html,zip} +preprocessing/fastp/*.{html,log} + +multiqc/multiqc_data/** multiqc/multiqc_data/*.{log,json} -multiqc/multiqc_data/multiqc_fastqc.txt multiqc/multiqc_data/multiqc_general_stats.txt multiqc/multiqc_data/fastqc_top_overrepresented_sequences_table.txt multiqc/multiqc_data/homer_tagdir.txt @@ -15,13 +16,104 @@ pipeline_info/*.{html,json,txt,yml} */alignments/logs/*.txt */deduplicated/logs/*.txt */{reports,summary}/*.{html,txt} -**/*.{html,txt} -**/*.log **/*.command.log **/*.bedGraph.gz **/tagInfo.txt **/*.{bam,bai} **/*.featureCounts.txt **/*.featureCounts.txt.summary -**/DupRate_plot.pdf **/*.pdf + +transcript_identification/homer/*_tagdir/* + +quality_control/bbsplit/*.stats.txt +quality_control/** +**/DupRate_plot.pdf + +hisat2/log/*.hisat2.summary.log +kallisto/*/abundance.{h5,tsv} +kallisto/*/kallisto_quant.log +kallisto/*/run_info.json +kallisto/kallisto.* +pipeline_info/*.{html,json,txt,yml} +sortmerna/*.sortmerna.log +star_rsem/*.stat/*.{cnt,model,theta} +star_rsem/*.{genes,isoforms}.results +star_rsem/log/*.log +star_salmon/log/*.Log.{final.out,out,progress.out} +trimgalore/*fastq.gz_trimming_report.txt +{hisat2,star_rsem,star_salmon}/*.{bam,bam.bai} +{hisat2,star_rsem,star_salmon}/bigwig/*.{forward,reverse}.bigWig +{hisat2,star_rsem,star_salmon}/dupradar/box_plot/*_duprateExpBoxplot.pdf +{hisat2,star_rsem,star_salmon}/dupradar/histogram/*_expressionHist.pdf +{hisat2,star_rsem,star_salmon}/dupradar/scatter_plot/*_duprateExpDens.pdf +{hisat2,star_rsem,star_salmon}/featurecounts/*.featureCounts.txt.summary +{hisat2,star_rsem,star_salmon}/picard_metrics/*.MarkDuplicates.metrics.txt +{hisat2,star_rsem,star_salmon}/qualimap/*/css/* +{hisat2,star_rsem,star_salmon}/qualimap/*/images_qualimapReport/* +{hisat2,star_rsem,star_salmon}/qualimap/*/qualimapReport.html +{hisat2,star_rsem,star_salmon}/qualimap/*/rnaseq_qc_results.txt +{hisat2,star_rsem,star_salmon}/rseqc/bam_stat/*.bam_stat.txt +{hisat2,star_rsem,star_salmon}/rseqc/read_distribution/*.read_distribution.txt +{hisat2,star_rsem,star_salmon}/rseqc/{inner_distance,junction_annotation,junction_saturation,read_duplication}/{bed,log,pdf,rscript,txt,xls}/* +{hisat2,star_rsem,star_salmon}/samtools_stats/*.bam.{flagstat,idxstats,stats} +{hisat2,star_rsem,star_salmon}/stringtie/*.ballgown/t_data.ctab +{hisat2,star_rsem,star_salmon}/stringtie/*.gene.abundance.txt +{hisat2,star_rsem,star_salmon}/stringtie/*.{coverage,transcripts}.gtf +{multiqc,multiqc/**}/multiqc_report.html +{multiqc,multiqc/**}/multiqc_report_data/fastqc_{raw,trimmed}_top_overrepresented_sequences_table.txt +{multiqc,multiqc/**}/multiqc_report_data/hisat2_pe_plot.txt +{multiqc,multiqc/**}/multiqc_report_data/hisat2_se_plot.txt +{multiqc,multiqc/**}/multiqc_report_data/junction_saturation_known.txt +{multiqc,multiqc/**}/multiqc_report_data/junction_saturation_novel.txt +{multiqc,multiqc/**}/multiqc_report_data/kallisto_alignment.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc.log +{multiqc,multiqc/**}/multiqc_report_data/multiqc_data.json +{multiqc,multiqc/**}/multiqc_report_data/multiqc_dupradar.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_fail_strand_check_table.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_general_stats.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_hisat2.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_kallisto.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_picard_dups.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_rsem.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_bam_stat.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_infer_experiment.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_junction_annotation.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_read_distribution.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_salmon.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_sample-relationships*.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_samtools_{flagstat,stats}.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_software_versions.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_sortmerna.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_sources.txt +{multiqc,multiqc/**}/multiqc_report_data/multiqc_star.txt +{multiqc,multiqc/**}/multiqc_report_data/picard_deduplication.txt +{multiqc,multiqc/**}/multiqc_report_data/qualimap_genomic_origin.txt +{multiqc,multiqc/**}/multiqc_report_data/qualimap_rnaseq_genome_results.txt +{multiqc,multiqc/**}/multiqc_report_data/rsem_assignment_plot.txt +{multiqc,multiqc/**}/multiqc_report_data/rsem_multimapping_rates.txt +{multiqc,multiqc/**}/multiqc_report_data/rseqc_bam_stat.txt +{multiqc,multiqc/**}/multiqc_report_data/rseqc_inner_distance*.txt +{multiqc,multiqc/**}/multiqc_report_data/rseqc_junction_{annotation,saturation}_*.txt +{multiqc,multiqc/**}/multiqc_report_data/rseqc_read_*.txt +{multiqc,multiqc/**}/multiqc_report_data/salmon_plot.txt +{multiqc,multiqc/**}/multiqc_report_data/samtools-flagstat-dp_*.txt +{multiqc,multiqc/**}/multiqc_report_data/samtools-stats-dp.txt +{multiqc,multiqc/**}/multiqc_report_data/samtools_alignment_plot.txt +{multiqc,multiqc/**}/multiqc_report_data/sortmerna-detailed-plot.txt +{multiqc,multiqc/**}/multiqc_report_data/star_alignment_plot.txt +{multiqc,multiqc/**}/multiqc_report_data/star_summary_table.txt +{multiqc,multiqc/**}/multiqc_report_plots/{pdf,png,svg}/*.{pdf,png,svg} +{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.dds.RData +{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.pca.vals.txt +{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.plots.pdf +{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.sample.dists.txt +{salmon,star_rsem,star_salmon}/deseq2_qc/size_factors/*.txt +{salmon,star_rsem,star_salmon}/deseq2_qc/size_factors/deseq2.size_factors.RData +{salmon,star_salmon}/*/aux_info/fld.gz +{salmon,star_salmon}/*/aux_info/meta_info.json +{salmon,star_salmon}/*/libParams/flenDist.txt +{salmon,star_salmon}/*/logs/salmon_quant.log +{salmon,star_salmon}/*/quant.genes.sf +{salmon,star_salmon}/*/quant.sf +{salmon,star_salmon}/salmon.* diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 5248d97c..3cca3654 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -170,109 +170,6 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", - "multiqc/multiqc_plots", - "multiqc/multiqc_plots/pdf", - "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", - "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", - "multiqc/multiqc_plots/pdf/general_stats_table.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", - "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", - "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", - "multiqc/multiqc_plots/png", - "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", - "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", - "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", - "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", - "multiqc/multiqc_plots/png/general_stats_table.png", - "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", - "multiqc/multiqc_plots/png/homer-tag-length-dist.png", - "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", - "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", - "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-stats-dp.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", - "multiqc/multiqc_plots/svg", - "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", - "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", - "multiqc/multiqc_plots/svg/general_stats_table.svg", - "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", - "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", - "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", - "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", - "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -384,6 +281,9 @@ "transcript_identification/intersect/jurkat_intersect.bed" ], [ + "cd4_REP1.bowtie2.log:md5,024c3b6bca27f3836cdd86c0287d2971", + "cd4_REP2.bowtie2.log:md5,089af358aad637ec94c10172eb024773", + "jurkat.bowtie2.log:md5,24031e901f4ce11cfb227c7d30d1373a", "cd4_REP1.sorted.bam.flagstat:md5,14e684e73cb41155ab1168a0a99a97e6", "cd4_REP1.sorted.bam.idxstats:md5,e32ac3215ba948bb7dd1559dab6c3c36", "cd4_REP1.sorted.bam.stats:md5,490f84b5520b83daa95653671ce43921", @@ -411,21 +311,12 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_REP1.DupRate_plot.r:md5,6b19f80622d25eab51fa5962deac7882", - "cd4_REP2.DupRate_plot.r:md5,94d0e7599e7a83a5ea2f251cb8f2b879", - "jurkat.DupRate_plot.r:md5,d081ee3f5ef5f85ff8fccd013fe04f71", - "cd4_REP1.pos.DupRate.xls:md5,8d377e230fc1df98fd10045ed686ba2b", - "cd4_REP1.seq.DupRate.xls:md5,9d01f20cefc5a5d76c42c64715933705", - "cd4_REP2.pos.DupRate.xls:md5,6939c35f32445351210b07b17a9e424d", - "cd4_REP2.seq.DupRate.xls:md5,ef56fed7d960a88eca66d5514faed7fb", - "jurkat.pos.DupRate.xls:md5,17f5622123e0d0b97f200e53fe7e165d", - "jurkat.seq.DupRate.xls:md5,566934dad135bc0168c36a8f8d297065", "cd4_filtered.bed:md5,c8bb282144d8078c0e4c809fe0878a12", "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495", "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", - "chr21.tags.tsv:md5,cf851d8ec227da2a7a4d52d2f3da550b", + "cd4.peaks.txt:md5,66589ceaf2aabf1e4e7bad64b94b6fd8", "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", - "chr21.tags.tsv:md5,a6e15f137754d01a084b98186e1ddf70", + "jurkat.peaks.txt:md5,100cb761b6b7abad3901775e499a6aa1", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" @@ -435,6 +326,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-16T02:18:37.673464926" + "timestamp": "2024-12-18T07:25:45.87987" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index b9560415..eee06454 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -15,9 +15,9 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T20:53:19.738149" + "timestamp": "2024-12-18T08:28:08.960886" }, "Should run with defaults": { "content": [ @@ -448,30 +448,12 @@ "cd4_REP4.trimmed.fastp.json:md5,c073bd26609ddca91396d0f374ec5b80", "jurkat_REP1.trimmed.fastp.json:md5,329fd8e56421a196fc2ebd37ab3bc22d", "jurkat_REP2.trimmed.fastp.json:md5,8bad5b02a27e5386255b998a6a69db15", - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "cd4_REP3.DupRate_plot.r:md5,5b37293c52beaecc5980aa2b9bafd82c", - "cd4_REP4.DupRate_plot.r:md5,ffa0f611b7f86d36134f9d80c3e1c9de", - "jurkat_REP1.DupRate_plot.r:md5,8e4dc99cae73c94eda275aeee08a5390", - "jurkat_REP2.DupRate_plot.r:md5,3507444f5965ca98a448ab15659ba34f", - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "cd4_REP3.pos.DupRate.xls:md5,fd3e91bfe070deccef65b265957cb733", - "cd4_REP3.seq.DupRate.xls:md5,f4c9f61081e6ef309abe82bb34aa4bd0", - "cd4_REP4.pos.DupRate.xls:md5,7fb8a7e96fd521561f62ccf7bf490212", - "cd4_REP4.seq.DupRate.xls:md5,8c671e5b0029d396a666839029298828", - "jurkat_REP1.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat_REP1.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", - "jurkat_REP2.pos.DupRate.xls:md5,253ec69be4f5322dc92f6cb3fb41f7e0", - "jurkat_REP2.seq.DupRate.xls:md5,c7c83a29e6dfd49ff17858fe83dc07c8", "cd4_filtered.bed:md5,9765d778862a20feefb94d407773bef3", "jurkat_filtered.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", "cd4.bed:md5,ab94918610a560772fdbec591200295f", - "chr21.tags.tsv:md5,ab64a2b39cf47d981f97715852d3c290", + "cd4.peaks.txt:md5,6edefe0a75b76240d3b49d12e49cb600", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - "chr21.tags.tsv:md5,8c7f268afb55f7b874ac518104377c01", + "jurkat.peaks.txt:md5,1247c21dbc92f8114dbcb2320fa09a3a", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,c45718bf5c21eb28b810d4800296728b", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", @@ -485,6 +467,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-16T19:45:08.588217" + "timestamp": "2024-12-18T07:07:22.737667" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 8c7d04e9..422e7d0a 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -186,109 +186,6 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", - "multiqc/multiqc_plots", - "multiqc/multiqc_plots/pdf", - "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", - "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", - "multiqc/multiqc_plots/pdf/general_stats_table.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", - "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", - "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", - "multiqc/multiqc_plots/png", - "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", - "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", - "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", - "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", - "multiqc/multiqc_plots/png/general_stats_table.png", - "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", - "multiqc/multiqc_plots/png/homer-tag-length-dist.png", - "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", - "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", - "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-stats-dp.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", - "multiqc/multiqc_plots/svg", - "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", - "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", - "multiqc/multiqc_plots/svg/general_stats_table.svg", - "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", - "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", - "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", - "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", - "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -441,21 +338,12 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", + "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", + "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", @@ -469,6 +357,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-16T02:27:44.713604463" + "timestamp": "2024-12-18T07:35:03.935996" } } \ No newline at end of file diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index e01a3450..3f437aa5 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -185,109 +185,6 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", - "multiqc/multiqc_plots", - "multiqc/multiqc_plots/pdf", - "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", - "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", - "multiqc/multiqc_plots/pdf/general_stats_table.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", - "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", - "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", - "multiqc/multiqc_plots/png", - "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", - "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", - "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", - "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", - "multiqc/multiqc_plots/png/general_stats_table.png", - "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", - "multiqc/multiqc_plots/png/homer-tag-length-dist.png", - "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", - "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", - "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-stats-dp.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", - "multiqc/multiqc_plots/svg", - "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", - "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", - "multiqc/multiqc_plots/svg/general_stats_table.svg", - "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", - "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", - "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", - "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", - "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -432,33 +329,15 @@ "jurkat.minus.bigWig:md5,8a0ca6db6626d3fefb518f0d35dd1abc", "jurkat.plus.bedGraph:md5,835edbd98f6d5d69e56de05e1a837b7c", "jurkat.plus.bigWig:md5,66e82005e6c6730e970f7506bf93325c", - "cd4_REP1.sorted.bam.flagstat:md5,aa26d19a689b2fe97e254f125e1f7bcb", - "cd4_REP1.sorted.bam.idxstats:md5,d523e6e25ce8659871df4104dab503b0", - "cd4_REP1.sorted.bam.stats:md5,57b98494241870644c74edda7d503232", - "cd4_REP2.sorted.bam.flagstat:md5,6235482c2c1be02a23826261e2f8a033", - "cd4_REP2.sorted.bam.idxstats:md5,89de35c9f4f1eafa6944d5d574db1675", - "cd4_REP2.sorted.bam.stats:md5,aaa17a5a0018fa03cbadb1f5e354fa49", - "jurkat.sorted.bam.flagstat:md5,8e59ad91dd9df6003cb6c3070b0aa34c", - "jurkat.sorted.bam.idxstats:md5,56608a565532fc8ae2b93a3be28d5e8d", - "jurkat.sorted.bam.stats:md5,e100d7f3a79bb29ea3a99e610245e6c8", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_REP1.DupRate_plot.r:md5,8b5faff4bfdf9a9aea0fb70034fa490c", - "cd4_REP2.DupRate_plot.r:md5,069417fefa3372751b0d6b631f730b4b", - "jurkat.DupRate_plot.r:md5,504b1a3db273e05246389299ae6e7eb3", - "cd4_REP1.pos.DupRate.xls:md5,f310a69c06f98d74ad7777f9654c6a5e", - "cd4_REP1.seq.DupRate.xls:md5,38e5d22ea87cbc72d3d193f2cfe71be6", - "cd4_REP2.pos.DupRate.xls:md5,3798988e2db44c870a96d1d6a411a7df", - "cd4_REP2.seq.DupRate.xls:md5,0446112b47237c5ced58ae84d05f4e98", - "jurkat.pos.DupRate.xls:md5,2afe47e0b733adcf27027466688b0eed", - "jurkat.seq.DupRate.xls:md5,f5fb592ddeb04e6b0cf943e192629648", "cd4_filtered.bed:md5,057f04ad44d3c2bf223be225b390fe0e", "jurkat_filtered.bed:md5,bd6458d033db136523d32ffba259f564", "cd4.bed:md5,d8c78818eb1666575ef4c2534ea3727e", - "chr21.tags.tsv:md5,09c0118480c3ae294a7d188ffad20d75", + "cd4.peaks.txt:md5,8bb1c5655a1cce187290a3409e82a43b", "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", - "chr21.tags.tsv:md5,b0a8a501fb74274b70aa82a4e2b33c28", + "jurkat.peaks.txt:md5,f514028265e7c4881f155f860211cbba", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", @@ -480,6 +359,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-16T02:34:03.729876999" + "timestamp": "2024-12-18T07:36:18.855708" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 41279ebc..07c641e1 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -157,109 +157,6 @@ "multiqc/multiqc_data/samtools-idxstats-mapped-reads-plot_Raw_Counts.txt", "multiqc/multiqc_data/samtools-stats-dp.txt", "multiqc/multiqc_data/samtools_alignment_plot.txt", - "multiqc/multiqc_plots", - "multiqc/multiqc_plots/pdf", - "multiqc/multiqc_plots/pdf/fastqc-status-check-heatmap.pdf", - "multiqc/multiqc_plots/pdf/fastqc_adapter_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_overrepresented_sequences_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_n_content_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_base_sequence_quality_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Counts.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_gc_content_plot_Percentages.pdf", - "multiqc/multiqc_plots/pdf/fastqc_per_sequence_quality_scores_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_counts_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/fastqc_sequence_duplication_levels_plot.pdf", - "multiqc/multiqc_plots/pdf/fastqc_top_overrepresented_sequences_table.pdf", - "multiqc/multiqc_plots/pdf/general_stats_table.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-directory-gc-content.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-cnt.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-info-dist-pct.pdf", - "multiqc/multiqc_plots/pdf/homer-tag-length-dist.pdf", - "multiqc/multiqc_plots/pdf/preseq_complexity_plot_molecules.pdf", - "multiqc/multiqc_plots/pdf/rseqc_infer_experiment_plot.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_distribution_plot-pct.pdf", - "multiqc/multiqc_plots/pdf/rseqc_read_dups_plot.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Percentage_of_total.pdf", - "multiqc/multiqc_plots/pdf/samtools-flagstat-dp_Read_counts.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.pdf", - "multiqc/multiqc_plots/pdf/samtools-stats-dp.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-cnt.pdf", - "multiqc/multiqc_plots/pdf/samtools_alignment_plot-pct.pdf", - "multiqc/multiqc_plots/png", - "multiqc/multiqc_plots/png/fastqc-status-check-heatmap.png", - "multiqc/multiqc_plots/png/fastqc_adapter_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_overrepresented_sequences_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_n_content_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_base_sequence_quality_plot.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Counts.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_gc_content_plot_Percentages.png", - "multiqc/multiqc_plots/png/fastqc_per_sequence_quality_scores_plot.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-cnt.png", - "multiqc/multiqc_plots/png/fastqc_sequence_counts_plot-pct.png", - "multiqc/multiqc_plots/png/fastqc_sequence_duplication_levels_plot.png", - "multiqc/multiqc_plots/png/fastqc_top_overrepresented_sequences_table.png", - "multiqc/multiqc_plots/png/general_stats_table.png", - "multiqc/multiqc_plots/png/homer-tag-directory-gc-content.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-cnt.png", - "multiqc/multiqc_plots/png/homer-tag-info-dist-pct.png", - "multiqc/multiqc_plots/png/homer-tag-length-dist.png", - "multiqc/multiqc_plots/png/preseq_complexity_plot_molecules.png", - "multiqc/multiqc_plots/png/rseqc_infer_experiment_plot.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-cnt.png", - "multiqc/multiqc_plots/png/rseqc_read_distribution_plot-pct.png", - "multiqc/multiqc_plots/png/rseqc_read_dups_plot.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Percentage_of_total.png", - "multiqc/multiqc_plots/png/samtools-flagstat-dp_Read_counts.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.png", - "multiqc/multiqc_plots/png/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.png", - "multiqc/multiqc_plots/png/samtools-stats-dp.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-cnt.png", - "multiqc/multiqc_plots/png/samtools_alignment_plot-pct.png", - "multiqc/multiqc_plots/svg", - "multiqc/multiqc_plots/svg/fastqc-status-check-heatmap.svg", - "multiqc/multiqc_plots/svg/fastqc_adapter_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_overrepresented_sequences_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_n_content_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_base_sequence_quality_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Counts.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_gc_content_plot_Percentages.svg", - "multiqc/multiqc_plots/svg/fastqc_per_sequence_quality_scores_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-cnt.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_counts_plot-pct.svg", - "multiqc/multiqc_plots/svg/fastqc_sequence_duplication_levels_plot.svg", - "multiqc/multiqc_plots/svg/fastqc_top_overrepresented_sequences_table.svg", - "multiqc/multiqc_plots/svg/general_stats_table.svg", - "multiqc/multiqc_plots/svg/homer-tag-directory-gc-content.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-cnt.svg", - "multiqc/multiqc_plots/svg/homer-tag-info-dist-pct.svg", - "multiqc/multiqc_plots/svg/homer-tag-length-dist.svg", - "multiqc/multiqc_plots/svg/preseq_complexity_plot_molecules.svg", - "multiqc/multiqc_plots/svg/rseqc_infer_experiment_plot.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-cnt.svg", - "multiqc/multiqc_plots/svg/rseqc_read_distribution_plot-pct.svg", - "multiqc/multiqc_plots/svg/rseqc_read_dups_plot.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Percentage_of_total.svg", - "multiqc/multiqc_plots/svg/samtools-flagstat-dp_Read_counts.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Normalised_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-cnt.svg", - "multiqc/multiqc_plots/svg/samtools-idxstats-mapped-reads-plot_Raw_Counts-log.svg", - "multiqc/multiqc_plots/svg/samtools-stats-dp.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-cnt.svg", - "multiqc/multiqc_plots/svg/samtools_alignment_plot-pct.svg", "multiqc/multiqc_report.html", "pipeline_info", "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", @@ -454,29 +351,20 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_REP1.DupRate_plot.r:md5,a33f83aef06fa207ac55b8002741aff7", - "cd4_REP2.DupRate_plot.r:md5,834a386b72bab13bfb9678ebb09d814e", - "jurkat.DupRate_plot.r:md5,eb8151edec9ac1e29b5a579cfdb45a0d", - "cd4_REP1.pos.DupRate.xls:md5,251ff0f73b7a2d98894fcaaf763a9059", - "cd4_REP1.seq.DupRate.xls:md5,fb59902a9ab77c1859a48bd763578560", - "cd4_REP2.pos.DupRate.xls:md5,f784231fb3973ec46c0996d4ba2f9591", - "cd4_REP2.seq.DupRate.xls:md5,6c00870ce14b0383bdccd352d7c6012a", - "jurkat.pos.DupRate.xls:md5,0937fe59aa436407b807660978c4423e", - "jurkat.seq.DupRate.xls:md5,ef59a2a23975a1a3aa2770ca8525ac51", "jurkat.flagstat:md5,2e10f27f80137c7ca4d340f110aa8fcf", "jurkat.idxstats:md5,8e38ac91c083ef3c5cf77ba782b836a5", "jurkat.stats:md5,46d40815316f079c846963982c0f7d3d", - "cd4_REP1.Log.final.out:md5,8e0981befb7402b9bc607f3dddf204db", - "cd4_REP1.Log.out:md5,f3ca8f5da8965b2948820fd3ae073085", - "cd4_REP1.Log.progress.out:md5,ed4b1af569321298d22fcac7ae27dc0c", + "cd4_REP1.Log.final.out:md5,e17966756179f743939a05e6e4d63e00", + "cd4_REP1.Log.out:md5,4233cd1dd8505ab9c8d0a1fed7c243db", + "cd4_REP1.Log.progress.out:md5,141a3c5768b0be41a9f601044a497d46", "cd4_REP1.SJ.out.tab:md5,991ac1fa28719c078a4827fcf66e90b0", - "cd4_REP2.Log.final.out:md5,60ad4e0c6bc9d79087e5a3c7309971c5", - "cd4_REP2.Log.out:md5,1e35e7c52a927a4f7c53a00fae53ebac", - "cd4_REP2.Log.progress.out:md5,196fc939a0e2772c286bf3b590e03c0e", + "cd4_REP2.Log.final.out:md5,998df17294b17662ac748d3632ab0fd9", + "cd4_REP2.Log.out:md5,ff8434154ed3ee2bcf96554242f982b2", + "cd4_REP2.Log.progress.out:md5,174a6db4862b84c9524d9a1363b42ce1", "cd4_REP2.SJ.out.tab:md5,5accd405e613d28731f111dfd070a3ba", - "jurkat.Log.final.out:md5,8822310368a9f97bf993ea75b4b1b4e2", - "jurkat.Log.out:md5,fd0c47aeb138147baaf0e73feb906845", - "jurkat.Log.progress.out:md5,1646f19dcabd4b7b7dd62da5fff98d57", + "jurkat.Log.final.out:md5,c470756754cad2cb0795b5cec5c08418", + "jurkat.Log.out:md5,32e0501862067b746ef645208a1cb972", + "jurkat.Log.progress.out:md5,c0dcce268773db73c93bcbd4635dbd21", "jurkat.SJ.out.tab:md5,8e5de2dc83e2478528528a86a2ffd456", "cd4_REP1.sorted.bam.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", "cd4_REP1.sorted.bam.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", @@ -488,21 +376,27 @@ "jurkat.sorted.bam.idxstats:md5,5e4a68fda75c954324d659af58d12c62", "jurkat.sorted.bam.stats:md5,0b7a4d6e0823d159ab2d9cdc1b2c8310", "Genome:md5,612664e3cfde5e1b73ad541d93752b31", - "Log.out:md5,bf16bc06b62351e1fab8e5bca0bd5ec7", + "Log.out:md5,b551a05446c3f8fc7add2e9002256271", "SA:md5,074ae54177bb7b9cb981382f043f36e5", "SAindex:md5,1c9cd646313f1abb1cfc205ccab73464", + "chrLength.txt:md5,b0be0a56ddefa84552742c72d4859eac", + "chrName.txt:md5,e99d7d1051eee43ceab5563c2d09fcee", + "chrNameLength.txt:md5,c985a141685e8431ec27c782816cb744", + "chrStart.txt:md5,6925b594ea2eeb964ba87cd6d42ab98f", "exonGeTrInfo.tab:md5,ea42dd46e177f95a72a8f6a2925f7348", "exonInfo.tab:md5,42a3ce2024f396b2298c0a84b07fb6e4", "geneInfo.tab:md5,d0092fb1ea6fcdac270c4df788de70fb", + "genomeParameters.txt:md5,2fec04098057094f4b2e5a9ec4371a7d", + "sjdbInfo.txt:md5,12fb05dc7cea89735a0c19e1c0df61cb", "sjdbList.fromGTF.out.tab:md5,5d9761b49920fb70a77d74e390d196b9", "sjdbList.out.tab:md5,766fbca932681f8666b3a9e5fb3640bd", "transcriptInfo.tab:md5,21c1f470ffe3b55b23900e7b7eaec2f4", "cd4_filtered.bed:md5,57cde1c26fabdc9c416326ba825b3f15", "jurkat_filtered.bed:md5,95a5279ec2387dfa0b4c2e7820083527", "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", - "chr21.tags.tsv:md5,7f133ee4d24c534ca46c67a965cc7ff8", + "cd4.peaks.txt:md5,4ab7c16a5f6d0e78275448bbce7c21c2", "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", - "chr21.tags.tsv:md5,c71046d9c6fb1651a802bb7079fe2093", + "jurkat.peaks.txt:md5,91e7580ebde81aceaf3bb1b1c3c3db1c", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", @@ -516,7 +410,7 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-16T02:38:39.216287268" + "timestamp": "2024-12-18T07:38:33.228153" }, "gzip_software_versions": { "content": [ diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 83bdd763..886a0adb 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -290,18 +290,10 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_18_14_22_43.log", - "transcript_identification/pints/peakcalling_2024_12_15_18_14_23_44.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", - "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", - "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -328,168 +320,28 @@ "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", - "homer-tag-directory-gc-content.txt:md5,213706733eb7a6c9e1345e7961f9a266", - "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", - "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", - "homer_tagdir.txt:md5,ad54384ccd9668de175a540cd44310f2", - "multiqc.log:md5,86bd2119bf45dd5209b95f269666f12e", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,03096360df3e6ecc722d7d60230db4b2", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", - "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", - "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", - "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", - "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", - "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", - "multiqc_software_versions.txt:md5,71b857625ebbe5f51be6501178fc5d49", - "multiqc_sources.txt:md5,e2a71513f3b44bec35b61768d8a5582e", - "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", - "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", - "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", - "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", - "rseqc_read_dups.txt:md5,9dd77594ea11e1ea2ca856683d8d99b1", - "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", - "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", - "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", - "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", - "multiqc_report.html:md5,6a9deadd0be4ff0b9809fa584c826912", - "cd4_REP1.trimmed.fastp.html:md5,3972b9e56153b53d03afed066264d42b", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,c01da6217a7bc3f9fb409d96d97339f0", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", - "jurkat.trimmed.fastp.html:md5,a0cfefa161a67d0d064c46ef499948f9", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,9a50a12813b556fc338776bade0d3f35", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,2df47f2f43176dfb5806c94b604e238c", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,81b845e46b7b0bf0bd20e2434e1fe272", - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", - "cd4_REP1.command.log:md5,611488b2a0f75fe9489e0d4488572efe", - "cd4_REP2.command.log:md5,e30dd4baeae30eec162275a7c1a620d0", - "jurkat.command.log:md5,500aa628ec58fe85d9ab2a88fc7f0fbf", - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", - "cd4_REP1.DupRate_plot.pdf:md5,70517054561f5074da64fbe570a71463", - "cd4_REP2.DupRate_plot.pdf:md5,12552e18d9f946b8f8e68ddbc7a2ef05", - "jurkat.DupRate_plot.pdf:md5,8fe5a21f60257eae629f24149f27a8b5", - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", - "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", - "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", - "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", - "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", - "cd4.bam:md5,13feaab792f913b608b17b4b144050ab", - "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "cd4.bedGraph.gz:md5,40960d2890a24bd19ac855e397da0c4b", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", - "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", - "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", - "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", - "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", - "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", - "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", - "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", - "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", - "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - "jurkat.bedGraph.gz:md5,f9d912dc6ef6c389ec4b81e100ac7982", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", - "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", - "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", - "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", - "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", - "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", - "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", - "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", - "peakcalling_2024_12_15_18_14_22_43.log:md5,009aa5047a9d748d37ac0faaa58ae6cb", - "peakcalling_2024_12_15_18_14_23_44.log:md5,92b26ff9ea34bbc08d05387ebe9545ac" - ], - [ - [ - "cd4_REP1.sorted.bam", - "366dda72360cb6fef08914f246c23fe0" - ], - [ - "cd4_REP2.sorted.bam", - "7ff8b1c06b1d47b26062624d2baf83a5" - ], - [ - "jurkat.sorted.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ], - [ - "cd4.bam", - "bcdfc1a81d5240c8ce9fcabe46a30af1" - ], - [ - "jurkat.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T12:14:45.085369" + "timestamp": "2024-12-18T07:45:33.920337" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index 5f900aaf..ba1188b0 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -290,18 +290,10 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_18_16_09_43.log", - "transcript_identification/pints/peakcalling_2024_12_15_18_16_09_44.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", - "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", - "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -328,168 +320,28 @@ "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", - "homer-tag-directory-gc-content.txt:md5,213706733eb7a6c9e1345e7961f9a266", - "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", - "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", - "homer_tagdir.txt:md5,ad54384ccd9668de175a540cd44310f2", - "multiqc.log:md5,f2cee6782f0bd785fccf753625abb24b", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,4e089293948eec0636d9514a27cc00fa", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", - "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", - "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", - "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", - "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", - "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", - "multiqc_software_versions.txt:md5,71b857625ebbe5f51be6501178fc5d49", - "multiqc_sources.txt:md5,5f06d2a50a0c68a120d93b189378e2b1", - "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", - "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", - "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", - "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", - "rseqc_read_dups.txt:md5,c9659afbc17908e417d1bee10e094e29", - "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", - "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", - "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", - "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", - "multiqc_report.html:md5,a79b1a41ccdb014940a7f6bc61fa18a5", - "cd4_REP1.trimmed.fastp.html:md5,f7844f92f0aeb3abcce974f54ebc94d7", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,905ed9123dd1b7863b2dc0a94fdd2a3f", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", - "jurkat.trimmed.fastp.html:md5,97d524b162c29ea6de6366f8416b2185", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,9533d20faa831ed58e488b7ef9d26644", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,9d907993cde1fb73ed3eecb80faf1e10", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,4ce304fdb2bb662fcd2083386c539c69", - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", - "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", - "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", - "jurkat.command.log:md5,870a47f101cd5007d2756448b896c33d", - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", - "cd4_REP1.DupRate_plot.pdf:md5,f1868fa0fa447c35352024b93bc2f1ae", - "cd4_REP2.DupRate_plot.pdf:md5,7593adb739e3655d712265db48dd0c4f", - "jurkat.DupRate_plot.pdf:md5,4e9f3560c67a3584c4b1422b41049f07", - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", - "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", - "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", - "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", - "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", - "cd4.bam:md5,c1ba3818665448cbd252332733deb4cd", - "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "cd4.bedGraph.gz:md5,59cccd074030b656b23a64a54565cb3a", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", - "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", - "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", - "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", - "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", - "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", - "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", - "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", - "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", - "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - "jurkat.bedGraph.gz:md5,a6d6be72091f2f4f23ab07f1cec5d8c6", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", - "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", - "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", - "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", - "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", - "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", - "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", - "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", - "peakcalling_2024_12_15_18_16_09_43.log:md5,e5737e0fe6a5e2c9d36f808253f3d016", - "peakcalling_2024_12_15_18_16_09_44.log:md5,e832c8966d9c0167ada1f388d6ae78d3" - ], - [ - [ - "cd4_REP1.sorted.bam", - "366dda72360cb6fef08914f246c23fe0" - ], - [ - "cd4_REP2.sorted.bam", - "7ff8b1c06b1d47b26062624d2baf83a5" - ], - [ - "jurkat.sorted.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ], - [ - "cd4.bam", - "bcdfc1a81d5240c8ce9fcabe46a30af1" - ], - [ - "jurkat.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T12:16:35.87006" + "timestamp": "2024-12-18T07:53:43.251101" } } \ No newline at end of file diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 7027bf6f..90e535f1 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -293,18 +293,10 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_18_17_40_43.log", - "transcript_identification/pints/peakcalling_2024_12_15_18_17_41_43.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", - "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", - "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -331,168 +323,28 @@ "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", - "homer-tag-directory-gc-content.txt:md5,49dd23beeb8904f403290686f3513186", - "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", - "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", - "homer_tagdir.txt:md5,3307e852a7c200d77c3fed42a789fab2", - "multiqc.log:md5,aef00136c9e47fc92720c4f29760748a", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,efe248638a8387846fc180b26f372439", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", - "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", - "multiqc_rseqc_read_distribution.txt:md5,877d137fac942b76294a71c03f52fd3b", - "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", - "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", - "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", - "multiqc_software_versions.txt:md5,d5124cff158563c0c5f6c783a53235d1", - "multiqc_sources.txt:md5,2f17e070152f42f3cf18744a7d2380e3", - "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", - "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", - "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", - "rseqc_read_distribution_plot.txt:md5,085bd8353ecf616ece161a921db4e754", - "rseqc_read_dups.txt:md5,680c3c892d67c8e334c25d3044a89805", - "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", - "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", - "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", - "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", - "multiqc_report.html:md5,93a30f03a4467a4cd54118641fe34ae9", - "cd4_REP1.trimmed.fastp.html:md5,d9fbd33cf7f9594abd598e4f83fa1c70", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,32522787917b3050cfa37fb60d474ba4", - "cd4_REP2.trimmed.fastp.html:md5,de9cdc8a566d47313cb2f50c9b62fb52", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,52daa61826da3e772236654f4d6c2d12", - "jurkat.trimmed.fastp.html:md5,0780a806242307aaab35df44a755c263", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,b2ee4cb08097fb1fa7ecc78b4353be68", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,2e18e8cb45755c40ad86ca3db63fbbf0", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,104562068ed3af80aeb9f9edf8593007", - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", - "cd4_REP1.command.log:md5,ba1e20cbe1e988962cf66a0062baa68e", - "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", - "jurkat.command.log:md5,870a47f101cd5007d2756448b896c33d", - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", - "cd4_REP1.read_distribution.txt:md5,59ab605365c2c66c2859a24c9697a175", - "cd4_REP2.read_distribution.txt:md5,0b9cec7d382b6cca9281c41e181b623a", - "jurkat.read_distribution.txt:md5,d8c024f88177bbe002e6c17055024a03", - "cd4_REP1.DupRate_plot.pdf:md5,c282cae0ef685c2ee76a2d46d11dae16", - "cd4_REP2.DupRate_plot.pdf:md5,a048c8f92b3c6ede72707c58d72c9747", - "jurkat.DupRate_plot.pdf:md5,562cb6087010f5f8138238954d318b7e", - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", - "cd4.featureCounts.txt:md5,92b0ca814150194f2989dd1ba53accbe", - "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", - "jurkat.featureCounts.txt:md5,4caedb3fd80df2debfc5f96e6bef4f5e", - "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,2b435d460d10da000cd903a672debfb9", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,47facc3e9b409920714f8c3fef20f4fd", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,7acce56b7d5e1d0cc2d581e16198c02d", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,2a6fb23433b34608e3ada0acf69cbbbc", - "cd4.bam:md5,9e3be2a6e0441dc13aa4860793a83d5b", - "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "cd4.bedGraph.gz:md5,b38c0ed8a5f7d2109c043a6d30d8ba13", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", - "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", - "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", - "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", - "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", - "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", - "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", - "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", - "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", - "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - "jurkat.bedGraph.gz:md5,70aa09344dc2496125754f724686794c", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", - "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", - "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", - "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", - "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", - "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", - "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", - "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", - "peakcalling_2024_12_15_18_17_40_43.log:md5,11908bc3288f412e0f8874ca0d83c130", - "peakcalling_2024_12_15_18_17_41_43.log:md5,7518d5e497f7783f1ceaf34158dd5db0" - ], - [ - [ - "cd4_REP1.sorted.bam", - "366dda72360cb6fef08914f246c23fe0" - ], - [ - "cd4_REP2.sorted.bam", - "7ff8b1c06b1d47b26062624d2baf83a5" - ], - [ - "jurkat.sorted.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ], - [ - "cd4.bam", - "bcdfc1a81d5240c8ce9fcabe46a30af1" - ], - [ - "jurkat.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T12:18:04.751932" + "timestamp": "2024-12-18T07:55:07.095505" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index 0514104a..e8c16d4f 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -323,19 +323,11 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_18_21_11_44.log", - "transcript_identification/pints/peakcalling_2024_12_15_18_21_12_44.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,f1a0ef77b0e1409b859bba18190788ae", "jurkat_intersect.saf:md5,8a0c5a2917d938c5bd055546eac53a99", - "cd4_REP1.sorted.bam:md5,a77698ed258a0657f2301e859c8c0971", - "cd4_REP1.sorted.bam.bai:md5,0ac6bd6cc0714380843e0d313f739a40", - "cd4_REP2.sorted.bam:md5,112c6ae7f3a0cd488ba8d1631b28e840", - "cd4_REP2.sorted.bam.bai:md5,5404aa6b08602886c23bb767eaddefa8", - "jurkat.sorted.bam:md5,0c143b9e315b155d56daaeb5c13c767b", - "jurkat.sorted.bam.bai:md5,5095ec2871dda3d0b3f39e15ed0d5290", "cd4_REP1.sorted.bam.flagstat:md5,98ee509d07c1db03ccce634ccf410d07", "cd4_REP1.sorted.bam.idxstats:md5,3f30696c4c8628b47029f63d9521f0e7", "cd4_REP1.sorted.bam.stats:md5,4902e9a7e501f6150549e195b7dc44c0", @@ -362,109 +354,9 @@ "jurkat.minus.bigWig:md5,378935c83fe428a878cb91490ce5e297", "jurkat.plus.bedGraph:md5,1e801978023f381e151403b572a9bd70", "jurkat.plus.bigWig:md5,59bbb8db066fb91c82685eff1c675823", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,d993b220502c5cde576a97cad10070fe", - "homer-tag-directory-gc-content.txt:md5,0d446a0c3f63e9f164e0bf868b114a8f", - "homer-tag-info-dist.txt:md5,d22160c8fa8e7dd57aa35e01e85efc6c", - "homer-tag-length-dist.txt:md5,d8d80be95f06f67e22385aadbb4a475d", - "homer_tagdir.txt:md5,39b8cd90ae0f7ac8e22ae22755ac2fb2", - "multiqc.log:md5,1d1c942b2eed04a3c09cdd74c234f102", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,5d7a1044a3abcd31cff83b18bd18bf26", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,8e31e3c1b55832e05332d70f624bf1a9", - "multiqc_rseqc_infer_experiment.txt:md5,54a857f0586d5b30714f8bdfff0663bd", - "multiqc_rseqc_read_distribution.txt:md5,87d05821d2fb7c32b4c8d77b131004a1", - "multiqc_samtools_flagstat.txt:md5,c6e4f58319dbb3bb8912073d872d4753", - "multiqc_samtools_idxstats.txt:md5,e5d1f8a9a2207c0696ee14120a1fa8a2", - "multiqc_samtools_stats.txt:md5,1abc9d227d752e32e32ab2fbecec958b", - "multiqc_software_versions.txt:md5,3f18e68e12366456cc5daf96ada234f5", - "multiqc_sources.txt:md5,47320de21cb83ba421f2945d299653a3", - "preseq.txt:md5,eaf47d79e325bd71ee353e20dcfcedef", - "preseq_complexity_plot_molecules.txt:md5,78f58d6ca13cd511c496ee2371965811", - "rseqc_infer_experiment_plot.txt:md5,46bda5a4ea805b4f1871aaf3d73348de", - "rseqc_read_distribution_plot.txt:md5,837288896760a0aa58dd7b94fad8a28e", - "rseqc_read_dups.txt:md5,d22919dd9f888a5fc8e08deb509bee63", - "rseqc_read_dups_plot.txt:md5,5667d898e8c8bbca7c4ff433fa4d537e", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,fda7a0a052ccd49180008788cd804891", - "samtools-flagstat-dp_Read_counts.txt:md5,2e0c630a6b9cc83cd723ae6f69806865", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,54410ddc68550b3d08a8191b04a3f6f0", - "samtools-stats-dp.txt:md5,88d5541be6e4d22e988eac623c5a1747", - "samtools_alignment_plot.txt:md5,f4641c2bb638271eab28ef3855f1fb0b", - "multiqc_report.html:md5,f340567a465cdbadb1d77fd1cba3b6e2", - "cd4_REP1.trimmed.fastp.html:md5,829fb7064329d8abe52c3bab69906f5d", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,3a3e16fa784eab41567542c2d577fd78", - "cd4_REP2.trimmed.fastp.html:md5,3a920cf04cbf9ee73353130c5185a037", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,8f6a7fc4c6476f086470f57265064d45", - "jurkat.trimmed.fastp.html:md5,9f1db2862fc595948eafed69bd15d0ed", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,27a3b7831dca27da06e69020ceb4ca00", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,b9d4e5fba9c5cd63d34cdabecd139f8e", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,d3bfe4a6e52b2a406de622e0243035d2", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,131f866a8bf2367f7a614776bc888dc5", - "cd4_REP1.coverage.hist.txt:md5,0215c381b73f0a961a30b9356c5e6740", - "cd4_REP1.coverage.stats.txt:md5,4537d892d57f7fcad585a395ed758a97", - "cd4_REP2.coverage.hist.txt:md5,64b88d0265ebcf2c7c4fd6b59b05a148", - "cd4_REP2.coverage.stats.txt:md5,3b44ada2178198a6edc21b4211e8374c", - "jurkat.coverage.hist.txt:md5,43695697bd1732dbbf3a977b99b23613", - "jurkat.coverage.stats.txt:md5,1a417ac0669cfd2790d29c8cf3f9f508", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,050949598e9b8789f832b64858322967", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3f21116841fc8b185811ced90f686438", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,b9913faae8d99303e9fa123036addbd7", - "cd4_REP1.command.log:md5,663dc3e84f3839e0123e5d527b58465b", - "cd4_REP2.command.log:md5,5600468189fd44d2f44e26d5f313b1a5", - "jurkat.command.log:md5,990c1b8df0faac4ba425d10e8e98ffa5", - "cd4_REP1.infer_experiment.txt:md5,4c5b20851e7ad18df28a56acbb42d28d", - "cd4_REP2.infer_experiment.txt:md5,6e560b0b5307712741badd8c02454e7a", - "jurkat.infer_experiment.txt:md5,5cb308701023dbd6f6b5235d6dff96e3", - "cd4_REP1.read_distribution.txt:md5,b5970ff6682e64cdcc362f9877ffd8b4", - "cd4_REP2.read_distribution.txt:md5,ad2d32f66ffa6d8243ba726e5391771c", - "jurkat.read_distribution.txt:md5,ec85eca882ceb40a35a3ca25962a249d", - "cd4_REP1.DupRate_plot.pdf:md5,13b8ad3c0025d4c8d8fce517eab9436d", - "cd4_REP2.DupRate_plot.pdf:md5,cc0842aba5efd1ed6e0596d9217bc7f2", - "jurkat.DupRate_plot.pdf:md5,ef7c5fad3d8e5bbb0d12e1c7745f7fe8", - "cd4_REP1.DupRate_plot.r:md5,33b9b06d31d9562479988a3092ca7748", - "cd4_REP2.DupRate_plot.r:md5,521cc00de4ea59fe44c65b9390aac277", - "jurkat.DupRate_plot.r:md5,0f5f976328b37d9f7abb6e9c8ed62efb", - "cd4_REP1.pos.DupRate.xls:md5,38035550fbc241c27bea362cc1c4aeb9", - "cd4_REP1.seq.DupRate.xls:md5,6743c50da53b7c667ef5e044071503f2", - "cd4_REP2.pos.DupRate.xls:md5,305e90dd6be91c6e4a46198822ac3788", - "cd4_REP2.seq.DupRate.xls:md5,f95553fa93530eac4138bc85858ed793", - "jurkat.pos.DupRate.xls:md5,05ece3550edad3968cef71d73572d8ac", - "jurkat.seq.DupRate.xls:md5,a542bee20c970f00a442bf8f32fc7fca", - "cd4.featureCounts.txt:md5,ed8cf64830727cea3e42f187628abcba", - "cd4.featureCounts.txt.summary:md5,d8b532bf2da8770a680af6b8856cdce5", - "jurkat.featureCounts.txt:md5,0faf32577974b991f529eb92f30a9111", - "jurkat.featureCounts.txt.summary:md5,54a9d46f991dd140814023eca5010f6a", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,086f8d1b9646e01964d6b413f89e20db", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,79506f855f638b77eb1fb19a49255b29", - "cd4-group_jurkat_intersect-transcripts.featureCounts.txt:md5,c4cf4c5c8548e7570fda513b9b8f6e27", - "cd4-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,8991ab109e6ad6898bcce5b7202be198", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,b3d861347ca33f32c259a96baa7a61f1", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,41b1105201074746a32d7e6cba11bee4", - "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt:md5,786c1769a45c18a06bec03728ec7be14", - "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,07dedd69adaffa9658be2a2a51d8244d", - "cd4.bam:md5,f7aac1bee1a3c1027c939b7fe9227c63", - "jurkat.bam:md5,dbcc0f3aba1009c6a428c62d13ae773c", "cd4_filtered.bed:md5,e87e37f217df119d7b782150db375494", "jurkat_filtered.bed:md5,e31353bc7016b44a2ad8a93dc26501e1", "cd4.SE.tuning.csv:md5,9d76e9a83079d587459fda16af8c4da8", @@ -482,66 +374,22 @@ "jurkat.tdplot_mqc.png:md5,91825f59df971e9e79256058da010f3f", "jurkat.transcripts.txt:md5,901825bc4b6b93e718f7082fb4c2c579", "cd4.bed:md5,202652821e59d0357c699b217d02f755", - "cd4.bedGraph.gz:md5,2f978ce347b5e99b564de3244775c3a2", "cd4.peaks.txt:md5,84b08e639d17d480cbc90b465ecfff73", - "chr21.tags.tsv:md5,3a404fc3ab7ff5b3d353a425d38b0c8c", - "genomeGCcontent.txt:md5,70441de08dd75a2cfdd1aa35c3d41405", - "tagAutocorrelation.txt:md5,5d550fded2616cf861840ea8cdb8be56", - "tagCountDistribution.txt:md5,7642ad01d7d90c52f188fab8b5c723c1", - "tagFreq.txt:md5,781b09c61817eca899f483c330cfb713", - "tagFreqUniq.txt:md5,d8d2b62480ce9b3cc2f143439363f966", - "tagGCcontent.txt:md5,0c05c3da8258c9774ad2b76365c7e075", - "tagInfo.txt:md5,a0bfcc466f4689096fb66bdb62625c3c", - "tagLengthDistribution.txt:md5,9501eeee126bb8fe4684871bd49574fe", "jurkat.bed:md5,7c37a46578dac48f8bf15155cd78b214", - "jurkat.bedGraph.gz:md5,d86b5ee6791c6277507ec2848bbacc0d", "jurkat.peaks.txt:md5,4cc5640d1e7c84db1116d6514265a4c3", - "chr21.tags.tsv:md5,6d73d34ad73ab09ffa55a59d81ee2d20", - "genomeGCcontent.txt:md5,b7445dff3ac36fa33c9b41aa0420ce54", - "tagAutocorrelation.txt:md5,bfd73734f1887f4b3a3ccc71bc6f4781", - "tagCountDistribution.txt:md5,d7d3f22c38df033e84432880234a5e6a", - "tagFreq.txt:md5,028ba4bb683cf46d3539d79c2e453c83", - "tagFreqUniq.txt:md5,728cc7a6a8eaaf0ca46edb4d575f254f", - "tagGCcontent.txt:md5,09433d221388e178451aeed899cdc2c0", - "tagInfo.txt:md5,4493cc544bdced3fb301223a22903774", - "tagLengthDistribution.txt:md5,b9a234b4de2ee18e39e51d2cc30f645c", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,af5866394906d9262d99ff691f0a63db", "jurkat_intersect.bed:md5,c4ee0f73a5d2f4f210cad1090237fb8b", "cd4_merged.bed:md5,f79432639c3f1b86787947e8d7242c75", "jurkat_merged.bed:md5,a94e1ec47f0564122ae1eb0f73be4ebd", "cd4_chr21_1_unidirectional_peaks.bed:md5,60e0da7e5691e55d86eb9df9f6ea0c46", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,3584ff1a08cdecc92b6fcf6b2db8dc90", - "peakcalling_2024_12_15_18_21_11_44.log:md5,8cb0ea637f501970d1374794427f6ad4", - "peakcalling_2024_12_15_18_21_12_44.log:md5,170cf41e144631671ff124b3f21d6fb2" - ], - [ - [ - "cd4_REP1.sorted.bam", - "21daaefcde22b2782ace5fa08813bf0a" - ], - [ - "cd4_REP2.sorted.bam", - "dd3cba41dbcd47caf3261741f82607cc" - ], - [ - "jurkat.sorted.bam", - "16cfcc507c9b3eb2bf8ad2f3f1f06e4c" - ], - [ - "cd4.bam", - "9734d7341eb2763e2a775b713716d95d" - ], - [ - "jurkat.bam", - "16cfcc507c9b3eb2bf8ad2f3f1f06e4c" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,3584ff1a08cdecc92b6fcf6b2db8dc90" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T12:24:24.323879" + "timestamp": "2024-12-18T08:07:15.190593" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 34dc3793..7c83e7e1 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -314,18 +314,11 @@ "transcript_identification/merged/jurkat_merged.bed", "transcript_identification/pints", "transcript_identification/pints/cd4_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed", - "transcript_identification/pints/peakcalling_2024_12_15_18_27_13_44.log" + "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ "cd4_intersect.saf:md5,e2e38ad07e9363e5c71a72d2faeec6ca", "jurkat_intersect.saf:md5,cd18a95027d48289248d33d70b863fa4", - "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "jurkat.sorted.bam:md5,ccb261d540d75d377e73a6bc579361c6", - "jurkat.sorted.bam.bai:md5,2f011fbac6305bd573b339e926efd1ed", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -352,109 +345,9 @@ "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", - "fastqc-status-check-heatmap.txt:md5,464104faada782efe296b913b892fd3a", - "fastqc_adapter_content_plot.txt:md5,9fd336d639ce1a9a6597e293afa70008", - "fastqc_overrepresented_sequences_plot.txt:md5,c6b6fd62fe80934918c34069957689ae", - "fastqc_per_base_n_content_plot.txt:md5,d9094256018f28348cf43aa412c28c11", - "fastqc_per_base_sequence_quality_plot.txt:md5,d766e42919d03d253e129acef51f3f7b", - "fastqc_per_sequence_gc_content_plot_Counts.txt:md5,7fb0493c872057c9dad6a6ed384f3975", - "fastqc_per_sequence_gc_content_plot_Percentages.txt:md5,33fadab22b18d33f0393e9e31ff3bd11", - "fastqc_per_sequence_quality_scores_plot.txt:md5,1ffa5c82b027318f62d095030d84a9c4", - "fastqc_sequence_counts_plot.txt:md5,1024c90493d60bb3c65c797e7dd7cf8c", - "fastqc_sequence_duplication_levels_plot.txt:md5,211a7b56acd901b4d171c9848812690b", - "fastqc_top_overrepresented_sequences_table.txt:md5,633be89cb88e2784a00ae58db4ce3873", - "homer-tag-directory-gc-content.txt:md5,49dd23beeb8904f403290686f3513186", - "homer-tag-info-dist.txt:md5,2f70b14f07536d2c8c730f89e452a3a2", - "homer-tag-length-dist.txt:md5,4ab0948c10442fd3f7c8b49efc63dda1", - "homer_tagdir.txt:md5,3307e852a7c200d77c3fed42a789fab2", - "multiqc.log:md5,6107061ab52384df73d8cc14ceff11d1", - "multiqc_citations.txt:md5,51017bc56474100a7d0f12f0e726935c", - "multiqc_data.json:md5,3db60b3d0f123001bb00e0b75f4f238b", - "multiqc_fastqc.txt:md5,34586f7fb5d43df85fc1799a17aa6e7a", - "multiqc_general_stats.txt:md5,37c1e78e2dda09deab218cec1a5b9391", - "multiqc_rseqc_infer_experiment.txt:md5,d1f2b2b86a7077a641e13b6b84216ee6", - "multiqc_rseqc_read_distribution.txt:md5,61bb5e0ab7d8f820dcbf3524ad6af12e", - "multiqc_samtools_flagstat.txt:md5,37ba1fa9f57d58c221ce1356ba8f7c2e", - "multiqc_samtools_idxstats.txt:md5,1a24fca8167b9ed6c2f94bdff9d91a8e", - "multiqc_samtools_stats.txt:md5,5ca1a0ad5e1c661962ca59ac4f379380", - "multiqc_software_versions.txt:md5,07f1745e744234cb60bc2a2930b23718", - "multiqc_sources.txt:md5,8e639e875b0b168dc6649f8629b6868e", - "preseq.txt:md5,0df08ac6c68e6a22fab8b62bd26b700f", - "preseq_complexity_plot_molecules.txt:md5,cc14d47a0ba231c814aeac81c1b0d8ba", - "rseqc_infer_experiment_plot.txt:md5,5c672a4683f673b9f47f76417022d6e7", - "rseqc_read_distribution_plot.txt:md5,c3641ab1a06f3cc26d5605ceed95f85f", - "rseqc_read_dups.txt:md5,9dd77594ea11e1ea2ca856683d8d99b1", - "rseqc_read_dups_plot.txt:md5,6bf2b0959732c197ce2f98f85dc67dc4", - "samtools-flagstat-dp_Percentage_of_total.txt:md5,333e835f63779959eaf8fb19f6696f6a", - "samtools-flagstat-dp_Read_counts.txt:md5,a8679b2354ebfc78a50bc03f26783db9", - "samtools-idxstats-mapped-reads-plot_Normalised_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Observed_over_Expected_Counts.txt:md5,a1d979e6acee6e2d931c2a18bf673157", - "samtools-idxstats-mapped-reads-plot_Raw_Counts.txt:md5,59e96be88ce2b40ac02a90bc6924bb39", - "samtools-stats-dp.txt:md5,05504290a44c5c1ded4028725c6d625b", - "samtools_alignment_plot.txt:md5,2b20d7e4def44eb4de2c637e5cb004c0", - "multiqc_report.html:md5,73d2bdcc5074558bfe9adda9b73c2344", - "cd4_REP1.trimmed.fastp.html:md5,acea8d41e44648cd5c4bf8136300ffe1", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", - "cd4_REP1.trimmed.fastp.log:md5,32522787917b3050cfa37fb60d474ba4", - "cd4_REP2.trimmed.fastp.html:md5,93f932fc762f02d6f0f16177bbb4a8b5", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", - "cd4_REP2.trimmed.fastp.log:md5,52daa61826da3e772236654f4d6c2d12", - "jurkat.trimmed.fastp.html:md5,0cb855ab802421e8e66bb4047ab33815", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.trimmed.fastp.log:md5,ebc93d4a9ecfa454adad95c01bf9e9a7", - "cd4_REP1_fastqc.html:md5,6e2db41130efce7f49c13db6fa5a375a", - "cd4_REP1_fastqc.zip:md5,c51dfa0208625ba41cf4107efbbc42e0", - "cd4_REP2_fastqc.html:md5,bd60b96aef8f505a226c3420c45460b1", - "cd4_REP2_fastqc.zip:md5,ee3fd572934fa33856e441469a1458ac", - "jurkat_fastqc.html:md5,ec4671c34b0a6319f17ed731b1d1ff16", - "jurkat_fastqc.zip:md5,1b6cb3bf6615c42cb19b1a400520ecd1", - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", - "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", - "cd4_REP1.command.log:md5,611488b2a0f75fe9489e0d4488572efe", - "cd4_REP2.command.log:md5,ded97d17ea56e711e5fa78305c1980f0", - "jurkat.command.log:md5,500aa628ec58fe85d9ab2a88fc7f0fbf", - "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", - "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", - "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", - "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", - "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", - "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", - "cd4_REP1.DupRate_plot.pdf:md5,7ac8baf54646661bac64f328f9ba4668", - "cd4_REP2.DupRate_plot.pdf:md5,9c9e42a783c0614966a360cfacb3c7e0", - "jurkat.DupRate_plot.pdf:md5,ccae8137c6850cb950480677d95739ab", - "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", - "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", - "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae", - "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", - "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", - "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", - "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", - "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", - "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", - "cd4.featureCounts.txt:md5,fb67439635e12460fd67142c8f68acbb", - "cd4.featureCounts.txt.summary:md5,f0cafc16c84e1b2d0c46cd85da44daa9", - "jurkat.featureCounts.txt:md5,02273cbc9ac2461a0c9429503dffb0f5", - "jurkat.featureCounts.txt.summary:md5,5539f3c4286ed901934306a359722f04", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt:md5,edf09437a7dbe221c080252b3cd369a9", - "cd4-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,c8f3c7e4da0f4857d4a73f1b721605ce", - "cd4-group_jurkat_intersect-transcripts.featureCounts.txt:md5,44aa00e892bcbfec64a02bedf5326547", - "cd4-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,6ca3f0ad57a8eabb83994387c6bbf2f8", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt:md5,49e7937259ed448f733969186bf95476", - "jurkat-group_cd4_intersect-transcripts.featureCounts.txt.summary:md5,381ccfb35c5b1f2e93353a1af32b68c2", - "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt:md5,523f9b003005f7c0a7569935a559821f", - "jurkat-group_jurkat_intersect-transcripts.featureCounts.txt.summary:md5,0db4ca61975eac4420698cd6f396453d", - "cd4.bam:md5,273c553b02766c370e2ccc7074395ed7", - "jurkat.bam:md5,e0052d59b9fe67d042b33868738d5fcd", "cd4_filtered.bed:md5,2e235f9fe4e337a4e3f14c459ecd7988", "jurkat_filtered.bed:md5,75086096f2ee6dab198228a0d2af1fad", "cd4.SE.tuning.csv:md5,00e1c530e2ce3b09fd413b8f87eef5d0", @@ -472,65 +365,22 @@ "jurkat.tdplot_mqc.png:md5,f88d76f5630a8ab4233682a616af6ca8", "jurkat.transcripts.txt:md5,ad6c62cf26bcb7f56d073d5404bc8674", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", - "cd4.bedGraph.gz:md5,6adc591cfb4a84898fc4f8eae9010f37", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", - "chr21.tags.tsv:md5,7bddd91dc8de3ecc61ef6947b534429b", - "genomeGCcontent.txt:md5,73314e153962f92f4ff9f723a2f4f7f5", - "tagAutocorrelation.txt:md5,5f74b2d7f9e50b23a3d066f3efd1bd27", - "tagCountDistribution.txt:md5,4e7ee5b056bae00e0eacbec3c739d4e0", - "tagFreq.txt:md5,9ffb3f3063e8a6335efe5846d1393c62", - "tagFreqUniq.txt:md5,d41fc8f3400a995861c9e2d2e1cbf1ac", - "tagGCcontent.txt:md5,9e11b05ad03f24c60c8a61adbe59d4c4", - "tagInfo.txt:md5,a79bc03ae220447e57ba3d6c39373c2b", - "tagLengthDistribution.txt:md5,05d67738b969c7a03aad4162bc7933a9", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - "jurkat.bedGraph.gz:md5,15e2d0ce0ade9394c974ff11dec466ce", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", - "chr21.tags.tsv:md5,2c2741e29030db04fa02d2dc2976f3f0", - "genomeGCcontent.txt:md5,380eed73713125642b4c37607115e814", - "tagAutocorrelation.txt:md5,c8c9c7b493a22a9bab1aa6e4ff9424df", - "tagCountDistribution.txt:md5,75fb9f3f4973973005532cad142105ba", - "tagFreq.txt:md5,2e3f0ebead6fc1d784e469b2f3aec465", - "tagFreqUniq.txt:md5,5b0e0dc2695af638c28ea5f881bee928", - "tagGCcontent.txt:md5,8ea32a30ce6f5de1fec2fb43faac7302", - "tagInfo.txt:md5,877903f51b3b165fd1f5b77fdd612651", - "tagLengthDistribution.txt:md5,ed788048cffdbf2479de08cece4d863d", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_intersect.bed:md5,ca03c888e605b1de100c3af9f975051e", "jurkat_intersect.bed:md5,c30da7861bb57a96e051bf70ee882887", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", - "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", - "peakcalling_2024_12_15_18_27_13_44.log:md5,12590f950936e0b7630ae19996e4331a" - ], - [ - [ - "cd4_REP1.sorted.bam", - "366dda72360cb6fef08914f246c23fe0" - ], - [ - "cd4_REP2.sorted.bam", - "7ff8b1c06b1d47b26062624d2baf83a5" - ], - [ - "jurkat.sorted.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ], - [ - "cd4.bam", - "bcdfc1a81d5240c8ce9fcabe46a30af1" - ], - [ - "jurkat.bam", - "4a679dc8ae1fd96bed9da1e3f772daaa" - ] + "jurkat_chr21_1_unidirectional_peaks.bed:md5,cb6932229eea2e09f61d48d7dd397ae1" ] ], "meta": { "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-15T12:46:34.911734" + "timestamp": "2024-12-18T08:25:02.333169" } } \ No newline at end of file From 72aa5f133a20f7b4c769456bdd0d73b24a369adf Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 18 Dec 2024 18:46:42 -0600 Subject: [PATCH 219/255] ci: Hardcode total shards and bump nf-test --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be150680..57fceade 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ env: NXF_ANSI_LOG: false NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity - NFT_VER: "0.9.0" + NFT_VER: "0.9.2" NFT_WORKDIR: "~" NFT_DIFF: "pdiff" NFT_DIFF_ARGS: "--line-numbers --expand-tabs=2" @@ -101,13 +101,15 @@ jobs: - name: Clean up Disk space uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 - - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) + - name: Run Tests (Shard ${{ matrix.shard }}/4) run: | + NFT_WORKDIR=~ \ nf-test test \ --ci \ - --shard ${{ matrix.shard }}/${{ strategy.job-total }} \ + --shard ${{ matrix.shard }}/4 \ --changed-since HEAD^ \ --profile "+${{ matrix.profile }}" \ + --verbose \ --filter pipeline - name: Publish Test Report From d4ad53bf5e6f7b704820084c1b8136e0fa926fcf Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 18 Dec 2024 21:30:30 -0600 Subject: [PATCH 220/255] test: Ignore MultiQC plots because of OSX ARM https://github.com/MultiQC/MultiQC/issues/2667 --- tests/.nftignore | 1 + workflows/tests/aligner/bowtie2.nf.test | 2 +- workflows/tests/aligner/bwa.nf.test | 2 +- workflows/tests/aligner/bwamem2.nf.test | 2 +- workflows/tests/aligner/hisat2.nf.test | 2 +- workflows/tests/aligner/star.nf.test | 2 +- workflows/tests/inputs/gff/main.nf.test | 2 +- workflows/tests/inputs/gzipped_gff/main.nf.test | 2 +- workflows/tests/inputs/only_gff/main.nf.test | 2 +- .../transcript_indentification/grohmm/only_gff/main.nf.test | 2 +- .../tests/transcript_indentification/grohmm/tuning/main.nf.test | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/.nftignore b/tests/.nftignore index 136612a3..0ac02e5b 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -10,6 +10,7 @@ multiqc/multiqc_data/rseqc_read_dups.txt multiqc/multiqc_data/multiqc_software_versions.txt multiqc/multiqc_data/multiqc_sources.txt multiqc/multiqc_report.html +multiqc/multiqc_plots/** multiqc/multiqc_plots/{pdf,png,svg}/*.{pdf,png,svg} pipeline_info/*.{html,json,txt,yml} diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index 41fead5f..add662c6 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -16,7 +16,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index e9d182d0..0e1f6f66 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -17,7 +17,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test index 59ecc17c..ae80dd8d 100644 --- a/workflows/tests/aligner/bwamem2.nf.test +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -14,7 +14,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 4981f221..fc030f6e 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -17,7 +17,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test index b115f60d..34db1e0a 100644 --- a/workflows/tests/aligner/star.nf.test +++ b/workflows/tests/aligner/star.nf.test @@ -16,7 +16,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/inputs/gff/main.nf.test b/workflows/tests/inputs/gff/main.nf.test index c8831904..7bec5f64 100644 --- a/workflows/tests/inputs/gff/main.nf.test +++ b/workflows/tests/inputs/gff/main.nf.test @@ -16,7 +16,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test b/workflows/tests/inputs/gzipped_gff/main.nf.test index 4d00252f..0bf35086 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test @@ -16,7 +16,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/inputs/only_gff/main.nf.test b/workflows/tests/inputs/only_gff/main.nf.test index 489fe820..74841c14 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test +++ b/workflows/tests/inputs/only_gff/main.nf.test @@ -18,7 +18,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test index 935c8f1c..57367003 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test @@ -22,7 +22,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index cbdd0fd3..a300f206 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -14,7 +14,7 @@ nextflow_pipeline { then { // stable_name: All files + folders in ${params.outdir}/ with a stable name - def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}']) + def stable_name = getAllFilesFromDir(params.outdir, relative: true, includeDir: true, ignore: ['pipeline_info/*.{html,json,txt}', 'multiqc/multiqc_plots', 'multiqc/multiqc_plots/**']) // stable_path: All files in ${params.outdir}/ with stable content def stable_path = getAllFilesFromDir(params.outdir, ignoreFile: 'tests/.nftignore') // bam_files: All bam files From 6b4fbf5cfe8bdf913e3815dc6d865e5689431cab Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 19 Dec 2024 07:00:08 -0600 Subject: [PATCH 221/255] test: Ignore intersect.beds Which are unstable --- tests/.nftignore | 1 + workflows/tests/aligner/bowtie2.nf.test.snap | 2 -- workflows/tests/aligner/bwa.nf.test.snap | 4 +--- workflows/tests/aligner/bwamem2.nf.test.snap | 2 -- workflows/tests/aligner/hisat2.nf.test.snap | 2 -- workflows/tests/aligner/star.nf.test.snap | 2 -- workflows/tests/inputs/gff/main.nf.test.snap | 2 -- workflows/tests/inputs/gzipped_gff/main.nf.test.snap | 2 -- workflows/tests/inputs/only_gff/main.nf.test.snap | 2 -- .../grohmm/only_gff/main.nf.test.snap | 2 -- .../grohmm/tuning/main.nf.test.snap | 2 -- 11 files changed, 2 insertions(+), 21 deletions(-) diff --git a/tests/.nftignore b/tests/.nftignore index 0ac02e5b..a3c36709 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -26,6 +26,7 @@ pipeline_info/*.{html,json,txt,yml} **/*.pdf transcript_identification/homer/*_tagdir/* +transcript_identification/intersect/*_intersect.bed quality_control/bbsplit/*.stats.txt quality_control/** diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 3cca3654..24d33f9b 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -318,8 +318,6 @@ "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", "jurkat.peaks.txt:md5,100cb761b6b7abad3901775e499a6aa1", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], "meta": { diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index eee06454..73873d96 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -455,8 +455,6 @@ "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", "jurkat.peaks.txt:md5,1247c21dbc92f8114dbcb2320fa09a3a", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,c45718bf5c21eb28b810d4800296728b", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,4d8f9dc54f886f379b95609908a08662", "jurkat_merged.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", "cd4_chr21_1_unidirectional_peaks.bed:md5,76ee3b56d3e518f88a34b42039ec719c", @@ -469,4 +467,4 @@ }, "timestamp": "2024-12-18T07:07:22.737667" } -} \ No newline at end of file +} diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 422e7d0a..d9f62564 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -345,8 +345,6 @@ "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 3f437aa5..7e28c8f6 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -339,8 +339,6 @@ "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", "jurkat.peaks.txt:md5,f514028265e7c4881f155f860211cbba", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,d71436c8df71a82bfbe0e9afb74145df", "jurkat_merged.bed:md5,bd6458d033db136523d32ffba259f564", "cd4_chr21_1_unidirectional_peaks.bed:md5,1c4f3b80b9b606855d0e6b1609fc90a3", diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 07c641e1..c441f1d3 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -398,8 +398,6 @@ "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", "jurkat.peaks.txt:md5,91e7580ebde81aceaf3bb1b1c3c3db1c", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,07860f90354c4f5f66eddbed3e5d3bd2", "jurkat_merged.bed:md5,95a5279ec2387dfa0b4c2e7820083527", "cd4_chr21_1_unidirectional_peaks.bed:md5,26765aa153cb1d6bb668f5786da5763e", diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 886a0adb..d2564104 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -330,8 +330,6 @@ "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index ba1188b0..290cc552 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -330,8 +330,6 @@ "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 90e535f1..0b73cc6d 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -333,8 +333,6 @@ "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,a5d31a685d89293ae64daff9a9054568", - "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index e8c16d4f..dfe1bafa 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -378,8 +378,6 @@ "jurkat.bed:md5,7c37a46578dac48f8bf15155cd78b214", "jurkat.peaks.txt:md5,4cc5640d1e7c84db1116d6514265a4c3", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,af5866394906d9262d99ff691f0a63db", - "jurkat_intersect.bed:md5,c4ee0f73a5d2f4f210cad1090237fb8b", "cd4_merged.bed:md5,f79432639c3f1b86787947e8d7242c75", "jurkat_merged.bed:md5,a94e1ec47f0564122ae1eb0f73be4ebd", "cd4_chr21_1_unidirectional_peaks.bed:md5,60e0da7e5691e55d86eb9df9f6ea0c46", diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 7c83e7e1..5f012660 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -369,8 +369,6 @@ "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", "jurkat.peaks.txt:md5,d4914194eca6f06aadfe7eed08ab1bb8", "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", - "cd4_intersect.bed:md5,ca03c888e605b1de100c3af9f975051e", - "jurkat_intersect.bed:md5,c30da7861bb57a96e051bf70ee882887", "cd4_merged.bed:md5,9ace0ca4f1544bb0949355a20de98e6b", "jurkat_merged.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4_chr21_1_unidirectional_peaks.bed:md5,0193e58943726af89bfd00e9da2536d8", From c85ed67c408c2a4d9a4057c780692560c358cf1c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 19 Dec 2024 16:19:28 -0600 Subject: [PATCH 222/255] test: Skip filtered beds and unpublish saf --- conf/modules.config | 6 ++++++ tests/.nftignore | 1 + workflows/tests/aligner/bowtie2.nf.test.snap | 2 -- workflows/tests/aligner/bwa.nf.test.snap | 5 ----- workflows/tests/aligner/bwamem2.nf.test.snap | 5 ----- workflows/tests/aligner/hisat2.nf.test.snap | 2 -- workflows/tests/aligner/star.nf.test.snap | 5 ----- workflows/tests/inputs/gff/main.nf.test.snap | 5 ----- workflows/tests/inputs/gzipped_gff/main.nf.test.snap | 5 ----- workflows/tests/inputs/only_gff/main.nf.test.snap | 5 ----- .../grohmm/only_gff/main.nf.test.snap | 7 ------- .../grohmm/tuning/main.nf.test.snap | 7 ------- 12 files changed, 7 insertions(+), 48 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 8b27c3a2..4e763048 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -439,6 +439,12 @@ process { ] } + withName: BED2SAF { + publishDir = [ + enabled: false + ] + } + withName: SUBREAD_FEATURECOUNTS_PREDICTED { ext.prefix = { "${meta.id}-group_${annotation.baseName}-transcripts" } ext.args = '-F "SAF"' diff --git a/tests/.nftignore b/tests/.nftignore index a3c36709..ba48e962 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -26,6 +26,7 @@ pipeline_info/*.{html,json,txt,yml} **/*.pdf transcript_identification/homer/*_tagdir/* +transcript_identification/filtered/*_filtered.bed transcript_identification/intersect/*_intersect.bed quality_control/bbsplit/*.stats.txt diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 24d33f9b..65f2d4a2 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -311,8 +311,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,c8bb282144d8078c0e4c809fe0878a12", - "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495", "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", "cd4.peaks.txt:md5,66589ceaf2aabf1e4e7bad64b94b6fd8", "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 73873d96..cd341d37 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -111,8 +111,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", "bwa", "bwa/cd4_REP1.sorted.bam", "bwa/cd4_REP1.sorted.bam.bai", @@ -391,7 +389,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,635fcd8e2c060dc75db25564c2a664dc", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -448,8 +445,6 @@ "cd4_REP4.trimmed.fastp.json:md5,c073bd26609ddca91396d0f374ec5b80", "jurkat_REP1.trimmed.fastp.json:md5,329fd8e56421a196fc2ebd37ab3bc22d", "jurkat_REP2.trimmed.fastp.json:md5,8bad5b02a27e5386255b998a6a69db15", - "cd4_filtered.bed:md5,9765d778862a20feefb94d407773bef3", - "jurkat_filtered.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", "cd4.bed:md5,ab94918610a560772fdbec591200295f", "cd4.peaks.txt:md5,6edefe0a75b76240d3b49d12e49cb600", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index d9f62564..be3f1f96 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -106,8 +106,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", "bwamem2", "bwamem2/cd4_REP1.sorted.bam", "bwamem2/cd4_REP1.sorted.bam.bai", @@ -308,7 +306,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -338,8 +335,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 7e28c8f6..c7ba4cd7 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -332,8 +332,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,057f04ad44d3c2bf223be225b390fe0e", - "jurkat_filtered.bed:md5,bd6458d033db136523d32ffba259f564", "cd4.bed:md5,d8c78818eb1666575ef4c2534ea3727e", "cd4.peaks.txt:md5,8bb1c5655a1cce187290a3409e82a43b", "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index c441f1d3..92891148 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -94,8 +94,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", "cat", "cat/cd4.bed", "cat/jurkat.bed", @@ -330,7 +328,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", "cd4.bed:md5,26765aa153cb1d6bb668f5786da5763e", "jurkat.bed:md5,15a3bec7a3ffb53c1e621665b3f45873", "cd4_REP1.dreg.bedGraph:md5,6ecfb93ba1a56308ce7d3c4703e0e5e3", @@ -391,8 +388,6 @@ "sjdbList.fromGTF.out.tab:md5,5d9761b49920fb70a77d74e390d196b9", "sjdbList.out.tab:md5,766fbca932681f8666b3a9e5fb3640bd", "transcriptInfo.tab:md5,21c1f470ffe3b55b23900e7b7eaec2f4", - "cd4_filtered.bed:md5,57cde1c26fabdc9c416326ba825b3f15", - "jurkat_filtered.bed:md5,95a5279ec2387dfa0b4c2e7820083527", "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", "cd4.peaks.txt:md5,4ab7c16a5f6d0e78275448bbce7c21c2", "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index d2564104..0ffc76f9 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -91,8 +91,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", "bwa", "bwa/cd4_REP1.sorted.bam", "bwa/cd4_REP1.sorted.bam.bai", @@ -293,7 +291,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -323,8 +320,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index 290cc552..4660736c 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -91,8 +91,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", "bwa", "bwa/cd4_REP1.sorted.bam", "bwa/cd4_REP1.sorted.bam.bai", @@ -293,7 +291,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -323,8 +320,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 0b73cc6d..77e4d408 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -94,8 +94,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", "bwa", "bwa/cd4_REP1.sorted.bam", "bwa/cd4_REP1.sorted.bam.bai", @@ -296,7 +294,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,2528ed58898f6e1f9d3d54fc1381c4c6", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -326,8 +323,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,fe48a92889bc118c41e436989f85c65e", - "jurkat_filtered.bed:md5,f1dde43c4ad9dec972ff9fa38cc6f2fe", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index dfe1bafa..66d1544f 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -104,9 +104,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", - "bed2saf/jurkat_intersect.saf", "bwa", "bwa/cd4_REP1.sorted.bam", "bwa/cd4_REP1.sorted.bam.bai", @@ -326,8 +323,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,f1a0ef77b0e1409b859bba18190788ae", - "jurkat_intersect.saf:md5,8a0c5a2917d938c5bd055546eac53a99", "cd4_REP1.sorted.bam.flagstat:md5,98ee509d07c1db03ccce634ccf410d07", "cd4_REP1.sorted.bam.idxstats:md5,3f30696c4c8628b47029f63d9521f0e7", "cd4_REP1.sorted.bam.stats:md5,4902e9a7e501f6150549e195b7dc44c0", @@ -357,8 +352,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,e87e37f217df119d7b782150db375494", - "jurkat_filtered.bed:md5,e31353bc7016b44a2ad8a93dc26501e1", "cd4.SE.tuning.csv:md5,9d76e9a83079d587459fda16af8c4da8", "cd4.eval.txt:md5,de1f790f721a67dfd1e1bf1592a7971a", "cd4.final.transcripts.bed:md5,3707df9ae8e7a95b6b5bfc336cfb1c8a", diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 5f012660..093d9bbe 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -95,9 +95,6 @@ } }, [ - "bed2saf", - "bed2saf/cd4_intersect.saf", - "bed2saf/jurkat_intersect.saf", "bwa", "bwa/cd4_REP1.sorted.bam", "bwa/cd4_REP1.sorted.bam.bai", @@ -317,8 +314,6 @@ "transcript_identification/pints/jurkat_chr21_1_unidirectional_peaks.bed" ], [ - "cd4_intersect.saf:md5,e2e38ad07e9363e5c71a72d2faeec6ca", - "jurkat_intersect.saf:md5,cd18a95027d48289248d33d70b863fa4", "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", @@ -348,8 +343,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "cd4_filtered.bed:md5,2e235f9fe4e337a4e3f14c459ecd7988", - "jurkat_filtered.bed:md5,75086096f2ee6dab198228a0d2af1fad", "cd4.SE.tuning.csv:md5,00e1c530e2ce3b09fd413b8f87eef5d0", "cd4.eval.txt:md5,6f688621a2acb60f2e48163f132d390c", "cd4.final.transcripts.bed:md5,5eb7209e5bb45744ae03f89010a162aa", From 828cad24a907f391c4c4b1fa21369001be81fbc6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 19 Dec 2024 19:18:14 -0600 Subject: [PATCH 223/255] test: Remove Star logs --- tests/.nftignore | 2 ++ workflows/tests/aligner/bowtie2.nf.test.snap | 4 ++-- workflows/tests/aligner/star.nf.test.snap | 12 +----------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/.nftignore b/tests/.nftignore index ba48e962..44cd1cea 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -15,6 +15,8 @@ multiqc/multiqc_plots/{pdf,png,svg}/*.{pdf,png,svg} pipeline_info/*.{html,json,txt,yml} */alignments/logs/*.txt +star/log/*.Log.{final.out,out,progress.out} +star/star/Log.out */deduplicated/logs/*.txt */{reports,summary}/*.{html,txt} **/*.command.log diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 65f2d4a2..58b4bc30 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -315,7 +315,7 @@ "cd4.peaks.txt:md5,66589ceaf2aabf1e4e7bad64b94b6fd8", "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", "jurkat.peaks.txt:md5,100cb761b6b7abad3901775e499a6aa1", - "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", + "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792" ] ], "meta": { @@ -324,4 +324,4 @@ }, "timestamp": "2024-12-18T07:25:45.87987" } -} \ No newline at end of file +} diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 92891148..60b80831 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -351,17 +351,8 @@ "jurkat.flagstat:md5,2e10f27f80137c7ca4d340f110aa8fcf", "jurkat.idxstats:md5,8e38ac91c083ef3c5cf77ba782b836a5", "jurkat.stats:md5,46d40815316f079c846963982c0f7d3d", - "cd4_REP1.Log.final.out:md5,e17966756179f743939a05e6e4d63e00", - "cd4_REP1.Log.out:md5,4233cd1dd8505ab9c8d0a1fed7c243db", - "cd4_REP1.Log.progress.out:md5,141a3c5768b0be41a9f601044a497d46", "cd4_REP1.SJ.out.tab:md5,991ac1fa28719c078a4827fcf66e90b0", - "cd4_REP2.Log.final.out:md5,998df17294b17662ac748d3632ab0fd9", - "cd4_REP2.Log.out:md5,ff8434154ed3ee2bcf96554242f982b2", - "cd4_REP2.Log.progress.out:md5,174a6db4862b84c9524d9a1363b42ce1", "cd4_REP2.SJ.out.tab:md5,5accd405e613d28731f111dfd070a3ba", - "jurkat.Log.final.out:md5,c470756754cad2cb0795b5cec5c08418", - "jurkat.Log.out:md5,32e0501862067b746ef645208a1cb972", - "jurkat.Log.progress.out:md5,c0dcce268773db73c93bcbd4635dbd21", "jurkat.SJ.out.tab:md5,8e5de2dc83e2478528528a86a2ffd456", "cd4_REP1.sorted.bam.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", "cd4_REP1.sorted.bam.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", @@ -373,7 +364,6 @@ "jurkat.sorted.bam.idxstats:md5,5e4a68fda75c954324d659af58d12c62", "jurkat.sorted.bam.stats:md5,0b7a4d6e0823d159ab2d9cdc1b2c8310", "Genome:md5,612664e3cfde5e1b73ad541d93752b31", - "Log.out:md5,b551a05446c3f8fc7add2e9002256271", "SA:md5,074ae54177bb7b9cb981382f043f36e5", "SAindex:md5,1c9cd646313f1abb1cfc205ccab73464", "chrLength.txt:md5,b0be0a56ddefa84552742c72d4859eac", @@ -498,4 +488,4 @@ }, "timestamp": "2024-11-25T21:02:16.63526" } -} \ No newline at end of file +} From 6f6af11eb287ed9d55d121b498a148d4408b0b68 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 19 Dec 2024 22:53:58 -0600 Subject: [PATCH 224/255] test: Maybe this was causing some deterministic issue --- tests/.nftignore | 89 +-------------------- workflows/tests/aligner/hisat2.nf.test.snap | 11 ++- 2 files changed, 11 insertions(+), 89 deletions(-) diff --git a/tests/.nftignore b/tests/.nftignore index 44cd1cea..af6c7828 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -17,6 +17,7 @@ pipeline_info/*.{html,json,txt,yml} */alignments/logs/*.txt star/log/*.Log.{final.out,out,progress.out} star/star/Log.out +hisat2/log/*.hisat2.summary.log */deduplicated/logs/*.txt */{reports,summary}/*.{html,txt} **/*.command.log @@ -34,91 +35,3 @@ transcript_identification/intersect/*_intersect.bed quality_control/bbsplit/*.stats.txt quality_control/** **/DupRate_plot.pdf - -hisat2/log/*.hisat2.summary.log -kallisto/*/abundance.{h5,tsv} -kallisto/*/kallisto_quant.log -kallisto/*/run_info.json -kallisto/kallisto.* -pipeline_info/*.{html,json,txt,yml} -sortmerna/*.sortmerna.log -star_rsem/*.stat/*.{cnt,model,theta} -star_rsem/*.{genes,isoforms}.results -star_rsem/log/*.log -star_salmon/log/*.Log.{final.out,out,progress.out} -trimgalore/*fastq.gz_trimming_report.txt -{hisat2,star_rsem,star_salmon}/*.{bam,bam.bai} -{hisat2,star_rsem,star_salmon}/bigwig/*.{forward,reverse}.bigWig -{hisat2,star_rsem,star_salmon}/dupradar/box_plot/*_duprateExpBoxplot.pdf -{hisat2,star_rsem,star_salmon}/dupradar/histogram/*_expressionHist.pdf -{hisat2,star_rsem,star_salmon}/dupradar/scatter_plot/*_duprateExpDens.pdf -{hisat2,star_rsem,star_salmon}/featurecounts/*.featureCounts.txt.summary -{hisat2,star_rsem,star_salmon}/picard_metrics/*.MarkDuplicates.metrics.txt -{hisat2,star_rsem,star_salmon}/qualimap/*/css/* -{hisat2,star_rsem,star_salmon}/qualimap/*/images_qualimapReport/* -{hisat2,star_rsem,star_salmon}/qualimap/*/qualimapReport.html -{hisat2,star_rsem,star_salmon}/qualimap/*/rnaseq_qc_results.txt -{hisat2,star_rsem,star_salmon}/rseqc/bam_stat/*.bam_stat.txt -{hisat2,star_rsem,star_salmon}/rseqc/read_distribution/*.read_distribution.txt -{hisat2,star_rsem,star_salmon}/rseqc/{inner_distance,junction_annotation,junction_saturation,read_duplication}/{bed,log,pdf,rscript,txt,xls}/* -{hisat2,star_rsem,star_salmon}/samtools_stats/*.bam.{flagstat,idxstats,stats} -{hisat2,star_rsem,star_salmon}/stringtie/*.ballgown/t_data.ctab -{hisat2,star_rsem,star_salmon}/stringtie/*.gene.abundance.txt -{hisat2,star_rsem,star_salmon}/stringtie/*.{coverage,transcripts}.gtf -{multiqc,multiqc/**}/multiqc_report.html -{multiqc,multiqc/**}/multiqc_report_data/fastqc_{raw,trimmed}_top_overrepresented_sequences_table.txt -{multiqc,multiqc/**}/multiqc_report_data/hisat2_pe_plot.txt -{multiqc,multiqc/**}/multiqc_report_data/hisat2_se_plot.txt -{multiqc,multiqc/**}/multiqc_report_data/junction_saturation_known.txt -{multiqc,multiqc/**}/multiqc_report_data/junction_saturation_novel.txt -{multiqc,multiqc/**}/multiqc_report_data/kallisto_alignment.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc.log -{multiqc,multiqc/**}/multiqc_report_data/multiqc_data.json -{multiqc,multiqc/**}/multiqc_report_data/multiqc_dupradar.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_fail_strand_check_table.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_general_stats.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_hisat2.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_kallisto.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_picard_dups.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_rsem.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_bam_stat.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_infer_experiment.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_junction_annotation.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_rseqc_read_distribution.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_salmon.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_sample-relationships*.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_samtools_{flagstat,stats}.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_software_versions.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_sortmerna.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_sources.txt -{multiqc,multiqc/**}/multiqc_report_data/multiqc_star.txt -{multiqc,multiqc/**}/multiqc_report_data/picard_deduplication.txt -{multiqc,multiqc/**}/multiqc_report_data/qualimap_genomic_origin.txt -{multiqc,multiqc/**}/multiqc_report_data/qualimap_rnaseq_genome_results.txt -{multiqc,multiqc/**}/multiqc_report_data/rsem_assignment_plot.txt -{multiqc,multiqc/**}/multiqc_report_data/rsem_multimapping_rates.txt -{multiqc,multiqc/**}/multiqc_report_data/rseqc_bam_stat.txt -{multiqc,multiqc/**}/multiqc_report_data/rseqc_inner_distance*.txt -{multiqc,multiqc/**}/multiqc_report_data/rseqc_junction_{annotation,saturation}_*.txt -{multiqc,multiqc/**}/multiqc_report_data/rseqc_read_*.txt -{multiqc,multiqc/**}/multiqc_report_data/salmon_plot.txt -{multiqc,multiqc/**}/multiqc_report_data/samtools-flagstat-dp_*.txt -{multiqc,multiqc/**}/multiqc_report_data/samtools-stats-dp.txt -{multiqc,multiqc/**}/multiqc_report_data/samtools_alignment_plot.txt -{multiqc,multiqc/**}/multiqc_report_data/sortmerna-detailed-plot.txt -{multiqc,multiqc/**}/multiqc_report_data/star_alignment_plot.txt -{multiqc,multiqc/**}/multiqc_report_data/star_summary_table.txt -{multiqc,multiqc/**}/multiqc_report_plots/{pdf,png,svg}/*.{pdf,png,svg} -{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.dds.RData -{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.pca.vals.txt -{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.plots.pdf -{salmon,star_rsem,star_salmon}/deseq2_qc/deseq2.sample.dists.txt -{salmon,star_rsem,star_salmon}/deseq2_qc/size_factors/*.txt -{salmon,star_rsem,star_salmon}/deseq2_qc/size_factors/deseq2.size_factors.RData -{salmon,star_salmon}/*/aux_info/fld.gz -{salmon,star_salmon}/*/aux_info/meta_info.json -{salmon,star_salmon}/*/libParams/flenDist.txt -{salmon,star_salmon}/*/logs/salmon_quant.log -{salmon,star_salmon}/*/quant.genes.sf -{salmon,star_salmon}/*/quant.sf -{salmon,star_salmon}/salmon.* diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index c7ba4cd7..7296f90b 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -329,6 +329,15 @@ "jurkat.minus.bigWig:md5,8a0ca6db6626d3fefb518f0d35dd1abc", "jurkat.plus.bedGraph:md5,835edbd98f6d5d69e56de05e1a837b7c", "jurkat.plus.bigWig:md5,66e82005e6c6730e970f7506bf93325c", + "cd4_REP1.sorted.bam.flagstat:md5,aa26d19a689b2fe97e254f125e1f7bcb", + "cd4_REP1.sorted.bam.idxstats:md5,d523e6e25ce8659871df4104dab503b0", + "cd4_REP1.sorted.bam.stats:md5,57b98494241870644c74edda7d503232", + "cd4_REP2.sorted.bam.flagstat:md5,6235482c2c1be02a23826261e2f8a033", + "cd4_REP2.sorted.bam.idxstats:md5,89de35c9f4f1eafa6944d5d574db1675", + "cd4_REP2.sorted.bam.stats:md5,aaa17a5a0018fa03cbadb1f5e354fa49", + "jurkat.sorted.bam.flagstat:md5,8e59ad91dd9df6003cb6c3070b0aa34c", + "jurkat.sorted.bam.idxstats:md5,56608a565532fc8ae2b93a3be28d5e8d", + "jurkat.sorted.bam.stats:md5,e100d7f3a79bb29ea3a99e610245e6c8", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", @@ -355,6 +364,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:36:18.855708" + "timestamp": "2024-12-20T06:18:38.954985" } } \ No newline at end of file From 6329b2cfaea98b6437acc0c95093827215e5f283 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 20 Dec 2024 20:46:10 -0600 Subject: [PATCH 225/255] test: Fix ignore samtools --- tests/.nftignore | 2 ++ workflows/tests/aligner/star.nf.test.snap | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/.nftignore b/tests/.nftignore index af6c7828..909d61c8 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -17,6 +17,8 @@ pipeline_info/*.{html,json,txt,yml} */alignments/logs/*.txt star/log/*.Log.{final.out,out,progress.out} star/star/Log.out +# FIXME idk why star outputs this +samtools/* hisat2/log/*.hisat2.summary.log */deduplicated/logs/*.txt */{reports,summary}/*.{html,txt} diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 60b80831..11bf7eda 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -348,9 +348,6 @@ "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", - "jurkat.flagstat:md5,2e10f27f80137c7ca4d340f110aa8fcf", - "jurkat.idxstats:md5,8e38ac91c083ef3c5cf77ba782b836a5", - "jurkat.stats:md5,46d40815316f079c846963982c0f7d3d", "cd4_REP1.SJ.out.tab:md5,991ac1fa28719c078a4827fcf66e90b0", "cd4_REP2.SJ.out.tab:md5,5accd405e613d28731f111dfd070a3ba", "jurkat.SJ.out.tab:md5,8e5de2dc83e2478528528a86a2ffd456", @@ -393,7 +390,7 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:38:33.228153" + "timestamp": "2024-12-20T20:36:26.671409" }, "gzip_software_versions": { "content": [ @@ -488,4 +485,4 @@ }, "timestamp": "2024-11-25T21:02:16.63526" } -} +} \ No newline at end of file From 3b9ee15a8d7653d8b607930c809aa4883790273f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 20 Dec 2024 21:19:22 -0600 Subject: [PATCH 226/255] test: That's why STAR is outputting samtools --- conf/modules.config | 23 +++++++++- tests/.nftignore | 2 - workflows/tests/aligner/star.nf.test.snap | 54 +++++++++++------------ 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 4e763048..705ca78d 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -176,7 +176,7 @@ process { // Alignment post-processing // /////////////////////////////// - withName: '.*:BAM_SORT_STATS_SAMTOOLS:.*|.*:BAM_SORT_STATS_SAMTOOLS_GENOME:.*' { + withName: '.*:BAM_SORT_STATS_SAMTOOLS:.*' { ext.prefix = { "${meta.id}.sorted.bam" } publishDir = [ path: { "${params.outdir}/${params.aligner}/samtools_stats" }, @@ -185,7 +185,7 @@ process { ] } - withName: '.*:BAM_SORT_STATS_SAMTOOLS:SAMTOOLS_.*|.*:BAM_SORT_STATS_SAMTOOLS_GENOME:SAMTOOLS_.*' { + withName: '.*:BAM_SORT_STATS_SAMTOOLS:SAMTOOLS_.*' { ext.prefix = { "${meta.id}.sorted" } publishDir = [ path: { "${params.outdir}/${params.aligner}" }, @@ -194,6 +194,25 @@ process { ] } + withName: ".*:FASTQ_ALIGN_STAR:BAM_SORT_STATS_SAMTOOLS_GENOME:.*" { + ext.prefix = {"${meta.id}_genome"} + publishDir = [ + path: { "${params.outdir}/${params.aligner}/samtools_stats" }, + mode: params.publish_dir_mode, + pattern: "*.{stats,flagstat,idxstats}" + ] + } + + withName: ".*:FASTQ_ALIGN_STAR:BAM_SORT_STATS_SAMTOOLS_TRANSCRIPTOME:.*" { + ext.prefix = {"${meta.id}_transcriptome"} + publishDir = [ + path: { "${params.outdir}/${params.aligner}/samtools_stats" }, + mode: params.publish_dir_mode, + pattern: "*.{stats,flagstat,idxstats}" + ] + } + + if(params.with_umi) { withName: '.*:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:UMITOOLS_DEDUP' { ext.args = { [ diff --git a/tests/.nftignore b/tests/.nftignore index 909d61c8..af6c7828 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -17,8 +17,6 @@ pipeline_info/*.{html,json,txt,yml} */alignments/logs/*.txt star/log/*.Log.{final.out,out,progress.out} star/star/Log.out -# FIXME idk why star outputs this -samtools/* hisat2/log/*.hisat2.summary.log */deduplicated/logs/*.txt */{reports,summary}/*.{html,txt} diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 11bf7eda..1eff98ff 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -234,17 +234,7 @@ "samtools", "samtools/cd4.bam", "samtools/jurkat.bam", - "samtools/jurkat.bam.bai", - "samtools/jurkat.flagstat", - "samtools/jurkat.idxstats", - "samtools/jurkat.stats", "star", - "star/cd4_REP1.sorted.bam", - "star/cd4_REP1.sorted.bam.bai", - "star/cd4_REP2.sorted.bam", - "star/cd4_REP2.sorted.bam.bai", - "star/jurkat.sorted.bam", - "star/jurkat.sorted.bam.bai", "star/log", "star/log/cd4_REP1.Log.final.out", "star/log/cd4_REP1.Log.out", @@ -259,15 +249,18 @@ "star/log/jurkat.Log.progress.out", "star/log/jurkat.SJ.out.tab", "star/samtools_stats", - "star/samtools_stats/cd4_REP1.sorted.bam.flagstat", - "star/samtools_stats/cd4_REP1.sorted.bam.idxstats", - "star/samtools_stats/cd4_REP1.sorted.bam.stats", - "star/samtools_stats/cd4_REP2.sorted.bam.flagstat", - "star/samtools_stats/cd4_REP2.sorted.bam.idxstats", - "star/samtools_stats/cd4_REP2.sorted.bam.stats", - "star/samtools_stats/jurkat.sorted.bam.flagstat", - "star/samtools_stats/jurkat.sorted.bam.idxstats", - "star/samtools_stats/jurkat.sorted.bam.stats", + "star/samtools_stats/cd4_REP1_genome.flagstat", + "star/samtools_stats/cd4_REP1_genome.idxstats", + "star/samtools_stats/cd4_REP1_genome.stats", + "star/samtools_stats/cd4_REP2_genome.flagstat", + "star/samtools_stats/cd4_REP2_genome.idxstats", + "star/samtools_stats/cd4_REP2_genome.stats", + "star/samtools_stats/jurkat_genome.flagstat", + "star/samtools_stats/jurkat_genome.idxstats", + "star/samtools_stats/jurkat_genome.stats", + "star/samtools_stats/jurkat_transcriptome.flagstat", + "star/samtools_stats/jurkat_transcriptome.idxstats", + "star/samtools_stats/jurkat_transcriptome.stats", "star/star", "star/star/Genome", "star/star/Log.out", @@ -351,15 +344,18 @@ "cd4_REP1.SJ.out.tab:md5,991ac1fa28719c078a4827fcf66e90b0", "cd4_REP2.SJ.out.tab:md5,5accd405e613d28731f111dfd070a3ba", "jurkat.SJ.out.tab:md5,8e5de2dc83e2478528528a86a2ffd456", - "cd4_REP1.sorted.bam.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", - "cd4_REP1.sorted.bam.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", - "cd4_REP1.sorted.bam.stats:md5,bec325c0cd30bafd9758c0535f99cf49", - "cd4_REP2.sorted.bam.flagstat:md5,ab83e3fbca17cf463fc5293a82e4bb3a", - "cd4_REP2.sorted.bam.idxstats:md5,9cdf3dd50a9862a02592c3768071fe32", - "cd4_REP2.sorted.bam.stats:md5,c7a92c340bb5735414d035da30b9b53f", - "jurkat.sorted.bam.flagstat:md5,b5f1d127de493e406882aced667210c9", - "jurkat.sorted.bam.idxstats:md5,5e4a68fda75c954324d659af58d12c62", - "jurkat.sorted.bam.stats:md5,0b7a4d6e0823d159ab2d9cdc1b2c8310", + "cd4_REP1_genome.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", + "cd4_REP1_genome.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", + "cd4_REP1_genome.stats:md5,49ea194b2d955cef24987a32dea3f6bb", + "cd4_REP2_genome.flagstat:md5,ab83e3fbca17cf463fc5293a82e4bb3a", + "cd4_REP2_genome.idxstats:md5,9cdf3dd50a9862a02592c3768071fe32", + "cd4_REP2_genome.stats:md5,f878081edfbda2977e38685d12434c43", + "jurkat_genome.flagstat:md5,b5f1d127de493e406882aced667210c9", + "jurkat_genome.idxstats:md5,5e4a68fda75c954324d659af58d12c62", + "jurkat_genome.stats:md5,5bf21e33fb56e0a38b53faf34b3be2ea", + "jurkat_transcriptome.flagstat:md5,2e10f27f80137c7ca4d340f110aa8fcf", + "jurkat_transcriptome.idxstats:md5,8e38ac91c083ef3c5cf77ba782b836a5", + "jurkat_transcriptome.stats:md5,322d7e620bcce35529aca042d0c8b3e8", "Genome:md5,612664e3cfde5e1b73ad541d93752b31", "SA:md5,074ae54177bb7b9cb981382f043f36e5", "SAindex:md5,1c9cd646313f1abb1cfc205ccab73464", @@ -390,7 +386,7 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-20T20:36:26.671409" + "timestamp": "2024-12-20T21:16:25.416797" }, "gzip_software_versions": { "content": [ From 5b21392e983deaf813240e2014b5569a11d83300 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 26 Nov 2024 11:09:25 -0600 Subject: [PATCH 227/255] test(#57): Add uniqmap test --- workflows/tests/inputs/uniqmap/main.nf.test | 54 +++++++++ .../tests/inputs/uniqmap/main.nf.test.snap | 109 ++++++++++++++++++ .../tests/inputs/uniqmap/nextflow.config | 5 + 3 files changed, 168 insertions(+) create mode 100644 workflows/tests/inputs/uniqmap/main.nf.test create mode 100644 workflows/tests/inputs/uniqmap/main.nf.test.snap create mode 100644 workflows/tests/inputs/uniqmap/nextflow.config diff --git a/workflows/tests/inputs/uniqmap/main.nf.test b/workflows/tests/inputs/uniqmap/main.nf.test new file mode 100644 index 00000000..04db908c --- /dev/null +++ b/workflows/tests/inputs/uniqmap/main.nf.test @@ -0,0 +1,54 @@ +nextflow_pipeline { + + name "HOMER Uniqmap" + script "../../../../main.nf" + tag "input" + tag "homer" + + test("Should run with an zipped uniqmap") { + + config "./nextflow.config" + + when { + params { + outdir = "$outputDir" + use_homer_uniqmap = true + homer_uniqmap = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/uniqmap.GRCh38_chr21.50nt.zip' + skip_grohmm = true + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + // Files should have -uniqmap in the header + { assert path("$outputDir/transcript_identification/homer/cd4.bed").readLines()[18].contains("uniqMapDirectory = uniqmap.GRCh38_chr21.50nt") }, + { assert path("$outputDir/transcript_identification/homer/cd4.bed").readLines()[20].contains("-uniqmap") }, + { assert path("$outputDir/transcript_identification/homer/jurkat.bed").readLines()[18].contains("uniqMapDirectory = uniqmap.GRCh38_chr21.50nt") }, + { assert path("$outputDir/transcript_identification/homer/jurkat.bed").readLines()[20].contains("-uniqmap") }, + // TODO Test for uniqmap unzip process + // { assert workflow.trace.tasks().find { it.process == "UNZIP" } }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/transcript_identification/homer/cd4.bed").readLines()[18], + path("$outputDir/transcript_identification/homer/cd4.bed").readLines()[20], + path("$outputDir/transcript_identification/homer/jurkat.bed").readLines()[18], + path("$outputDir/transcript_identification/homer/jurkat.bed").readLines()[20], + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + path("$outputDir/transcript_identification/homer/cd4-uniqmap.GRCh38_chr21.peaks.txt"), + path("$outputDir/transcript_identification/homer/jurkat-uniqmap.GRCh38_chr21.peaks.txt"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + ).match("output_files") + }, + ) + } + } + // TODO Check for running with unzipped uniqmap +} diff --git a/workflows/tests/inputs/uniqmap/main.nf.test.snap b/workflows/tests/inputs/uniqmap/main.nf.test.snap new file mode 100644 index 00000000..e194f434 --- /dev/null +++ b/workflows/tests/inputs/uniqmap/main.nf.test.snap @@ -0,0 +1,109 @@ +{ + "output_files": { + "content": [ + 78, + "# uniqMapDirectory = uniqmap.GRCh38_chr21.50nt", + "# cmd = findPeaks cd4_tagdir -style groseq -o cd4-uniqmap.GRCh38_chr21.peaks.txt -uniqmap uniqmap.GRCh38_chr21.50nt", + "# uniqMapDirectory = uniqmap.GRCh38_chr21.50nt", + "# cmd = findPeaks jurkat_tagdir -style groseq -o jurkat-uniqmap.GRCh38_chr21.peaks.txt -uniqmap uniqmap.GRCh38_chr21.50nt", + "cd4.bed:md5,bbe77431f7c1ac833d1f939012435962", + "jurkat.bed:md5,98dd0b5dde7b11c0604b35c391754c9d", + "cd4-uniqmap.GRCh38_chr21.peaks.txt:md5,bbe77431f7c1ac833d1f939012435962", + "jurkat-uniqmap.GRCh38_chr21.peaks.txt:md5,98dd0b5dde7b11c0604b35c391754c9d", + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_filtered.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + true + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.2" + }, + "timestamp": "2024-12-21T07:55:14.410658" + }, + "software_versions": { + "content": [ + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWA_INDEX": { + "bwa": "0.7.18-r1243-dirty" + }, + "BWA_MEM": { + "bwa": "0.7.18-r1243-dirty", + "samtools": 1.2 + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SAMTOOLS_MERGE": { + "samtools": 1.21 + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "UNZIP": { + "7za": 16.02 + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.2" + }, + "timestamp": "2024-12-21T08:17:33.996307" + } +} \ No newline at end of file diff --git a/workflows/tests/inputs/uniqmap/nextflow.config b/workflows/tests/inputs/uniqmap/nextflow.config new file mode 100644 index 00000000..a3d80f05 --- /dev/null +++ b/workflows/tests/inputs/uniqmap/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: PINTS_CALLER { + ext.when = false + } +} From 96a9f4d8fe49c8626eed973451d5016eac309f6a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 21 Dec 2024 07:34:16 -0600 Subject: [PATCH 228/255] chore: nf-core subworkflows update homer_groseq --- modules.json | 4 +- .../homer/findpeaks/tests/main.nf.test | 44 ++++++++++++++++++- .../homer/findpeaks/tests/main.nf.test.snap | 35 +++++++++++++++ .../nf-core/homer_groseq/tests/main.nf.test | 16 ++++--- .../homer_groseq/tests/main.nf.test.snap | 24 +++++----- 5 files changed, 102 insertions(+), 21 deletions(-) diff --git a/modules.json b/modules.json index fe81c8d6..046bb78f 100644 --- a/modules.json +++ b/modules.json @@ -125,7 +125,7 @@ }, "homer/findpeaks": { "branch": "master", - "git_sha": "b108745a1d59778e21577c217a963e17b8ba9bc2", + "git_sha": "cac282aeb4099300e04b60167a3a12d8c96c4978", "installed_by": ["homer_groseq"] }, "homer/maketagdirectory": { @@ -315,7 +315,7 @@ }, "homer_groseq": { "branch": "master", - "git_sha": "b108745a1d59778e21577c217a963e17b8ba9bc2", + "git_sha": "cac282aeb4099300e04b60167a3a12d8c96c4978", "installed_by": ["subworkflows"] }, "utils_nextflow_pipeline": { diff --git a/modules/nf-core/homer/findpeaks/tests/main.nf.test b/modules/nf-core/homer/findpeaks/tests/main.nf.test index a2263990..a72a0fa5 100644 --- a/modules/nf-core/homer/findpeaks/tests/main.nf.test +++ b/modules/nf-core/homer/findpeaks/tests/main.nf.test @@ -8,6 +8,7 @@ nextflow_process { tag "modules" tag "modules_nfcore" tag "homer" + tag "unzip" tag "homer/findpeaks" tag "homer/maketagdirectory" @@ -27,6 +28,20 @@ nextflow_process { """ } } + run("UNZIP") { + script "../../../unzip/main.nf" + process { + """ + url = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/uniqmap.GRCh38_chr21.50nt.zip' + + input[0] = [ + [:], + file(url, checkIfExists: true) + ] + """ + + } + } } test("sarscov2 - tagdir") { @@ -69,6 +84,31 @@ nextflow_process { ) } } - // TODO Test uniqmap. Might need to make a small uniqmap but that could take a day or two. - // See https://github.com/Functional-Genomics-Lab/homer-uniqmap-nf if you're feeling adventurous! + + test("sarscov2 - tagdir - uniqmap") { + + tag "uniqmap" + + when { + process { + """ + input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + input[1] = UNZIP.out.unzipped_archive.map { it[1] } + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot( + process.out, + // FIXME These are empty? + path(process.out.txt.get(0).get(1)).readLines()[31], + path(process.out.txt.get(0).get(1)).readLines()[33], + ).match() + } + ) + } + } } \ No newline at end of file diff --git a/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap b/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap index e2a44d5b..c658f18a 100644 --- a/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap +++ b/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap @@ -64,5 +64,40 @@ "nextflow": "24.03.0" }, "timestamp": "2024-05-17T13:56:22.119853182" + }, + "sarscov2 - tagdir - uniqmap": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test-uniqmap.GRCh38_chr21.peaks.txt:md5,d96e7bba4f4fe827a18acae200b422a4" + ] + ], + "1": [ + "versions.yml:md5,12c3e88a3eeb96208a1d352504ebebfa" + ], + "txt": [ + [ + { + "id": "test" + }, + "test-uniqmap.GRCh38_chr21.peaks.txt:md5,d96e7bba4f4fe827a18acae200b422a4" + ] + ], + "versions": [ + "versions.yml:md5,12c3e88a3eeb96208a1d352504ebebfa" + ] + }, + "# uniqMapDirectory = uniqmap.GRCh38_chr21.50nt", + "# cmd = findPeaks test_tagdir -style factor -o test-uniqmap.GRCh38_chr21.peaks.txt -uniqmap uniqmap.GRCh38_chr21.50nt" + ], + "meta": { + "nf-test": "0.9.2", + "nextflow": "24.10.2" + }, + "timestamp": "2024-12-07T18:32:39.16634" } } \ No newline at end of file diff --git a/subworkflows/nf-core/homer_groseq/tests/main.nf.test b/subworkflows/nf-core/homer_groseq/tests/main.nf.test index 3461de03..48e75981 100644 --- a/subworkflows/nf-core/homer_groseq/tests/main.nf.test +++ b/subworkflows/nf-core/homer_groseq/tests/main.nf.test @@ -72,7 +72,11 @@ nextflow_workflow { ) } } - test("Test files from tutorial") { + + test("Test files from GROseq tutorial with uniqmap") { + + tag "uniqmap" + config "./bed.config" when { @@ -80,11 +84,11 @@ nextflow_workflow { """ input[0] = [ [ id: 'test' ], - file('ftp://ftp.ncbi.nlm.nih.gov/geo/samples/GSM340nnn/GSM340901/suppl/GSM340901_lib1_aligned.bed.gz', checkIfExists: true), - file('ftp://ftp.ncbi.nlm.nih.gov/geo/samples/GSM340nnn/GSM340902/suppl/GSM340902_lib2_aligned.bed.gz', checkIfExists: true), + [file('ftp://ftp.ncbi.nlm.nih.gov/geo/samples/GSM340nnn/GSM340901/suppl/GSM340901_lib1_aligned.bed.gz', checkIfExists: true), + file('ftp://ftp.ncbi.nlm.nih.gov/geo/samples/GSM340nnn/GSM340902/suppl/GSM340902_lib2_aligned.bed.gz', checkIfExists: true)], ] input[1] = file('https://hgdownload.soe.ucsc.edu/goldenPath/hg18/chromosomes/chr14.fa.gz', checkIfExists: true) - input[2] = [] + input[2] = file('https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/uniqmap.GRCh38_chr21.50nt.zip', checkIfExists: true) """ } } @@ -97,14 +101,14 @@ nextflow_workflow { path(workflow.out.bed_graph.get(0).get(1)).linesGzip.size(), workflow.out.peaks, workflow.out.bed, + path(workflow.out.bed.get(0).get(1)).readLines()[30], + path(workflow.out.bed.get(0).get(1)).readLines()[32], path(workflow.out.versions.get(0)).yaml, ).match() }, ) } } - // TODO Test uniqmap - test("sarscov2 - stub") { options "-stub" diff --git a/subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap b/subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap index ecb37fde..61e8eb64 100644 --- a/subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap +++ b/subworkflows/nf-core/homer_groseq/tests/main.nf.test.snap @@ -75,15 +75,15 @@ }, "timestamp": "2024-11-23T20:47:40.376043" }, - "Test files from tutorial": { + "Should run HOMER_GROSEQ with BED input": { "content": [ - 7856998, + 6, [ [ { "id": "test" }, - "test.peaks.txt:md5,312199a96a41f67fe81b91289fefc6e1" + "test.peaks.txt:md5,0b0b174b135fd5404a9b462e27ab4ce1" ] ], [ @@ -91,7 +91,7 @@ { "id": "test" }, - "test.bed:md5,45b36116aa3f75ddd4f655f97ab8dfd6" + "test.bed:md5,0b0b174b135fd5404a9b462e27ab4ce1" ] ], { @@ -104,17 +104,17 @@ "nf-test": "0.9.2", "nextflow": "24.10.1" }, - "timestamp": "2024-11-24T15:36:33.428434" + "timestamp": "2024-11-23T20:47:47.733612" }, - "Should run HOMER_GROSEQ with BED input": { + "Test files from GROseq tutorial with uniqmap": { "content": [ - 6, + 15368354, [ [ { "id": "test" }, - "test.peaks.txt:md5,0b0b174b135fd5404a9b462e27ab4ce1" + "test-uniqmap.GRCh38_chr21.50nt.peaks.txt:md5,3220d07ce56785d77045282345ddf1cd" ] ], [ @@ -122,9 +122,11 @@ { "id": "test" }, - "test.bed:md5,0b0b174b135fd5404a9b462e27ab4ce1" + "test.bed:md5,49433f826697cd237dfdb740a0cb2c54" ] ], + "# uniqMapDirectory = uniqmap.GRCh38_chr21.50nt.zip", + "# cmd = findPeaks test_tagdir -o test-uniqmap.GRCh38_chr21.50nt.peaks.txt -uniqmap uniqmap.GRCh38_chr21.50nt.zip", { "HOMER_GROSEQ:HOMER_POS2BED": { "homer": 4.11 @@ -133,8 +135,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-23T20:47:47.733612" + "timestamp": "2024-12-07T17:59:14.024175" } } \ No newline at end of file From c0d2709310c27696aa745896dc67338e7a84b87f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 22 Oct 2024 11:18:40 -0500 Subject: [PATCH 229/255] chore: Fix config selectors --- CHANGELOG.md | 1 + conf/modules.config | 4 ++-- conf/test.config | 2 +- workflows/tests/aligner/bowtie2.nf.test.snap | 2 +- workflows/tests/aligner/bwa.nf.test.snap | 2 +- workflows/tests/aligner/star.nf.test.snap | 6 +++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f414a34c..11c585bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#171](https://github.com/nf-core/nascent/pull/171) - Clean up MultiQC report - [#170](https://github.com/nf-core/nascent/pull/170) - Remove "Access to undefined parameter forwardStranded" warnings +- [#173](https://github.com/nf-core/nascent/pull/173) - Fix config selectors ### Changed diff --git a/conf/modules.config b/conf/modules.config index 705ca78d..5a08d84b 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -106,7 +106,7 @@ process { ] } - withName: ".*:FASTQ_ALIGN_HISAT2:HISAT2_ALIGN" { + withName: "HISAT2_ALIGN" { ext.args = "--met-stderr --new-summary --dta" publishDir = [ [ @@ -275,7 +275,7 @@ process { ] } - withName: '.*:BAM_RSEQC:RSEQC_READDISTRIBUTION ' { + withName: '.*:BAM_RSEQC:RSEQC_READDISTRIBUTION' { publishDir = [ path: { "${params.outdir}/quality_control/rseqc/read_distribution" }, mode: params.publish_dir_mode, diff --git a/conf/test.config b/conf/test.config index a7a9d6f1..c7635451 100644 --- a/conf/test.config +++ b/conf/test.config @@ -42,7 +42,7 @@ params { } process { - withName: STAR_GENOMEGENERATE_IGENOMES { + withName: STAR_GENOMEGENERATE { ext.args = '--genomeSAindexNbases 9' } diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 58b4bc30..7ea4e747 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -324,4 +324,4 @@ }, "timestamp": "2024-12-18T07:25:45.87987" } -} +} \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index cd341d37..8f7e1743 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -462,4 +462,4 @@ }, "timestamp": "2024-12-18T07:07:22.737667" } -} +} \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 1eff98ff..7080275d 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -358,7 +358,7 @@ "jurkat_transcriptome.stats:md5,322d7e620bcce35529aca042d0c8b3e8", "Genome:md5,612664e3cfde5e1b73ad541d93752b31", "SA:md5,074ae54177bb7b9cb981382f043f36e5", - "SAindex:md5,1c9cd646313f1abb1cfc205ccab73464", + "SAindex:md5,c8cae2d81bec99f68eddc0afe570090b", "chrLength.txt:md5,b0be0a56ddefa84552742c72d4859eac", "chrName.txt:md5,e99d7d1051eee43ceab5563c2d09fcee", "chrNameLength.txt:md5,c985a141685e8431ec27c782816cb744", @@ -366,7 +366,7 @@ "exonGeTrInfo.tab:md5,ea42dd46e177f95a72a8f6a2925f7348", "exonInfo.tab:md5,42a3ce2024f396b2298c0a84b07fb6e4", "geneInfo.tab:md5,d0092fb1ea6fcdac270c4df788de70fb", - "genomeParameters.txt:md5,2fec04098057094f4b2e5a9ec4371a7d", + "genomeParameters.txt:md5,9e6f272d058d48c729d355ede94f8c87", "sjdbInfo.txt:md5,12fb05dc7cea89735a0c19e1c0df61cb", "sjdbList.fromGTF.out.tab:md5,5d9761b49920fb70a77d74e390d196b9", "sjdbList.out.tab:md5,766fbca932681f8666b3a9e5fb3640bd", @@ -386,7 +386,7 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-20T21:16:25.416797" + "timestamp": "2024-12-21T10:42:07.059182" }, "gzip_software_versions": { "content": [ From 723e87303369cf93cb79baff762b8da262f3c807 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 21 Dec 2024 11:26:28 -0600 Subject: [PATCH 230/255] fix: Remove Transcriptome quant from STAR --- CHANGELOG.md | 1 + conf/modules.config | 1 - workflows/tests/aligner/star.nf.test.snap | 16 +++++----------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11c585bf..4269a9b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#171](https://github.com/nf-core/nascent/pull/171) - Clean up MultiQC report - [#170](https://github.com/nf-core/nascent/pull/170) - Remove "Access to undefined parameter forwardStranded" warnings - [#173](https://github.com/nf-core/nascent/pull/173) - Fix config selectors +- [#173](https://github.com/nf-core/nascent/pull/173) - Remove STAR transcriptome run ### Changed diff --git a/conf/modules.config b/conf/modules.config index 5a08d84b..eea6cc70 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -129,7 +129,6 @@ process { // Initialize the map with preconfigured values def preset_args_map = argsToMap(""" - --quantMode TranscriptomeSAM --twopassMode Basic --outSAMtype BAM Unsorted --readFilesCommand zcat diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 7080275d..b1552de6 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -1,17 +1,17 @@ { "Should run with gzipped gtf": { "content": [ - 98 + 93 ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-11-25T21:02:16.647189" + "timestamp": "2024-12-21T11:57:47.575681" }, "Should run with defaults": { "content": [ - 97, + 92, { "BBMAP_PILEUP": { "bbmap": 39.01, @@ -258,9 +258,6 @@ "star/samtools_stats/jurkat_genome.flagstat", "star/samtools_stats/jurkat_genome.idxstats", "star/samtools_stats/jurkat_genome.stats", - "star/samtools_stats/jurkat_transcriptome.flagstat", - "star/samtools_stats/jurkat_transcriptome.idxstats", - "star/samtools_stats/jurkat_transcriptome.stats", "star/star", "star/star/Genome", "star/star/Log.out", @@ -353,9 +350,6 @@ "jurkat_genome.flagstat:md5,b5f1d127de493e406882aced667210c9", "jurkat_genome.idxstats:md5,5e4a68fda75c954324d659af58d12c62", "jurkat_genome.stats:md5,5bf21e33fb56e0a38b53faf34b3be2ea", - "jurkat_transcriptome.flagstat:md5,2e10f27f80137c7ca4d340f110aa8fcf", - "jurkat_transcriptome.idxstats:md5,8e38ac91c083ef3c5cf77ba782b836a5", - "jurkat_transcriptome.stats:md5,322d7e620bcce35529aca042d0c8b3e8", "Genome:md5,612664e3cfde5e1b73ad541d93752b31", "SA:md5,074ae54177bb7b9cb981382f043f36e5", "SAindex:md5,c8cae2d81bec99f68eddc0afe570090b", @@ -386,7 +380,7 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-21T10:42:07.059182" + "timestamp": "2024-12-21T11:55:35.046966" }, "gzip_software_versions": { "content": [ From bfcd97c00f0746dcf89c062e7b33bfc80238388d Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Thu, 12 Dec 2024 11:26:00 +0000 Subject: [PATCH 231/255] Template update for nf-core/tools version 3.1.0 --- .github/CONTRIBUTING.md | 12 +- .github/workflows/awsfulltest.yml | 21 +- .github/workflows/branch.yml | 18 +- .github/workflows/ci.yml | 2 +- .github/workflows/download_pipeline.yml | 8 +- .github/workflows/fix-linting.yml | 4 +- .github/workflows/linting.yml | 10 +- .github/workflows/linting_comment.yml | 2 +- .github/workflows/release-announcements.yml | 2 +- .../workflows/template_version_comment.yml | 2 +- .gitpod.yml | 11 +- .nf-core.yml | 6 +- .vscode/settings.json | 3 + conf/base.config | 2 +- conf/modules.config | 1 + docs/usage.md | 32 +- modules.json | 8 +- modules/nf-core/fastqc/main.nf | 2 +- modules/nf-core/fastqc/meta.yml | 1 + nextflow.config | 61 +++- nextflow_schema.json | 6 + ro-crate-metadata.json | 306 ++++++++++++++++++ .../utils_nfcore_nascent_pipeline/main.nf | 7 +- .../nf-core/utils_nextflow_pipeline/main.nf | 2 + .../tests/main.workflow.nf.test | 10 +- .../nf-core/utils_nfcore_pipeline/main.nf | 89 ++--- .../tests/main.function.nf.test | 46 ++- .../tests/main.function.nf.test.snap | 30 -- .../utils_nfschema_plugin/tests/main.nf.test | 4 +- workflows/nascent.nf | 2 +- 30 files changed, 492 insertions(+), 218 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 ro-crate-metadata.json diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7c6ec34e..2a281c08 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# nf-core/nascent: Contributing Guidelines +# `nf-core/nascent`: Contributing Guidelines Hi there! Many thanks for taking an interest in improving nf-core/nascent. @@ -55,9 +55,9 @@ These tests are run both with the latest available version of `Nextflow` and als :warning: Only in the unlikely and regretful event of a release happening with a bug. -- On your own fork, make a new branch `patch` based on `upstream/master`. +- On your own fork, make a new branch `patch` based on `upstream/main` or `upstream/master`. - Fix the bug, and bump version (X.Y.Z+1). -- A PR should be made on `master` from patch to directly this particular bug. +- Open a pull-request from `patch` to `main`/`master` with the changes. ## Getting help @@ -65,13 +65,13 @@ For further information/help, please consult the [nf-core/nascent documentation] ## Pipeline contribution conventions -To make the nf-core/nascent code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written. +To make the `nf-core/nascent` code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written. ### Adding a new step If you wish to contribute a new step, please use the following coding standards: -1. Define the corresponding input channel into your new process from the expected previous process channel +1. Define the corresponding input channel into your new process from the expected previous process channel. 2. Write the process block (see below). 3. Define the output channel if needed (see below). 4. Add any new parameters to `nextflow.config` with a default (see below). @@ -84,7 +84,7 @@ If you wish to contribute a new step, please use the following coding standards: ### Default values -Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope. +Parameters should be initialised / defined with default values within the `params` scope in `nextflow.config`. Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`. diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index 0980ae1d..40777fab 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -1,11 +1,12 @@ name: nf-core AWS full size tests -# This workflow is triggered on PRs opened against the master branch. +# This workflow is triggered on PRs opened against the main/master branch. # It can be additionally triggered manually with GitHub actions workflow dispatch button. # It runs the -profile 'test_full' on AWS batch on: pull_request: branches: + - main - master workflow_dispatch: pull_request_review: @@ -18,18 +19,30 @@ jobs: if: github.repository == 'nf-core/nascent' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - - uses: octokit/request-action@v2.x + - name: Get PR reviews + uses: octokit/request-action@v2.x + if: github.event_name != 'workflow_dispatch' id: check_approvals + continue-on-error: true with: - route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews + route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - id: test_variables + + - name: Check for approvals + if: ${{ failure() && github.event_name != 'workflow_dispatch' }} + run: | + echo "No review approvals found. At least 2 approvals are required to run this action automatically." + exit 1 + + - name: Check for enough approvals (>=2) + id: test_variables if: github.event_name != 'workflow_dispatch' run: | JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}' CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length') test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required + - name: Launch workflow via Seqera Platform uses: seqeralabs/action-tower-launch@v2 with: diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index fed61579..7467bd12 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -1,15 +1,17 @@ name: nf-core branch protection -# This workflow is triggered on PRs to master branch on the repository -# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev` +# This workflow is triggered on PRs to `main`/`master` branch on the repository +# It fails when someone tries to make a PR against the nf-core `main`/`master` branch instead of `dev` on: pull_request_target: - branches: [master] + branches: + - main + - master jobs: test: runs-on: ubuntu-latest steps: - # PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches + # PRs to the nf-core repo main/master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches - name: Check PRs if: github.repository == 'nf-core/nascent' run: | @@ -22,7 +24,7 @@ jobs: uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2 with: message: | - ## This PR is against the `master` branch :x: + ## This PR is against the `${{github.event.pull_request.base.ref}}` branch :x: * Do not close this PR * Click _Edit_ and change the `base` to `dev` @@ -32,9 +34,9 @@ jobs: Hi @${{ github.event.pull_request.user.login }}, - It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `master` branch. - The `master` branch on nf-core repositories should always contain code from the latest release. - Because of this, PRs to `master` are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch. + It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) ${{github.event.pull_request.base.ref}} branch. + The ${{github.event.pull_request.base.ref}} branch on nf-core repositories should always contain code from the latest release. + Because of this, PRs to ${{github.event.pull_request.base.ref}} are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch. You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page. Note that even after this, the test will continue to show as failing until you push a new commit. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57fceade..2c1e3f68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: shard: [1, 2, 3, 4] steps: - name: Check out pipeline code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: fetch-depth: 0 diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml index 713dc3e7..2576cc0c 100644 --- a/.github/workflows/download_pipeline.yml +++ b/.github/workflows/download_pipeline.yml @@ -2,7 +2,7 @@ name: Test successful pipeline download with 'nf-core pipelines download' # Run the workflow when: # - dispatched manually -# - when a PR is opened or reopened to master branch +# - when a PR is opened or reopened to main/master branch # - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev. on: workflow_dispatch: @@ -17,9 +17,11 @@ on: - edited - synchronize branches: + - main - master pull_request_target: branches: + - main - master env: @@ -35,7 +37,7 @@ jobs: - name: Disk space cleanup uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 - - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 + - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 with: python-version: "3.12" architecture: "x64" @@ -69,7 +71,7 @@ jobs: --outdir ./${{ env.REPOTITLE_LOWERCASE }} \ --compress "none" \ --container-system 'singularity' \ - --container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io" \ + --container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io/library/" \ --container-cache-utilisation 'amend' \ --download-configuration 'yes' diff --git a/.github/workflows/fix-linting.yml b/.github/workflows/fix-linting.yml index b6b81b22..7e31ee9b 100644 --- a/.github/workflows/fix-linting.yml +++ b/.github/workflows/fix-linting.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: # Use the @nf-core-bot token to check out so we can push later - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: token: ${{ secrets.nf_core_bot_auth_token }} @@ -32,7 +32,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }} # Install and run pre-commit - - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 + - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 with: python-version: "3.12" diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index a502573c..dbd52d5a 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -14,10 +14,10 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Set up Python 3.12 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 + uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 with: python-version: "3.12" @@ -31,12 +31,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out pipeline code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Install Nextflow uses: nf-core/setup-nextflow@v2 - - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 + - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 with: python-version: "3.12" architecture: "x64" @@ -74,7 +74,7 @@ jobs: - name: Upload linting log file artifact if: ${{ always() }} - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 with: name: linting-logs path: | diff --git a/.github/workflows/linting_comment.yml b/.github/workflows/linting_comment.yml index 42e519bf..0bed96d3 100644 --- a/.github/workflows/linting_comment.yml +++ b/.github/workflows/linting_comment.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download lint results - uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6 + uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7 with: workflow: linting.yml workflow_conclusion: completed diff --git a/.github/workflows/release-announcements.yml b/.github/workflows/release-announcements.yml index c6ba35df..450b1d5e 100644 --- a/.github/workflows/release-announcements.yml +++ b/.github/workflows/release-announcements.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5 + - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/template_version_comment.yml b/.github/workflows/template_version_comment.yml index e8aafe44..537529bc 100644 --- a/.github/workflows/template_version_comment.yml +++ b/.github/workflows/template_version_comment.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out pipeline code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.gitpod.yml b/.gitpod.yml index 46118637..83599f63 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -6,12 +6,5 @@ tasks: nextflow self-update vscode: - extensions: # based on nf-core.nf-core-extensionpack - #- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code - - EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files - - Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar - - mechatroner.rainbow-csv # Highlight columns in csv files in different colors - - nextflow.nextflow # Nextflow syntax highlighting - - oderwat.indent-rainbow # Highlight indentation level - - streetsidesoftware.code-spell-checker # Spelling checker for source code - - charliermarsh.ruff # Code linter Ruff + extensions: + - nf-core.nf-core-extensionpack # https://github.com/nf-core/vscode-extensionpack diff --git a/.nf-core.yml b/.nf-core.yml index e8445cf8..dad7f3fb 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -1,12 +1,10 @@ -bump_version: null lint: actions_ci: false files_unchanged: - .github/workflows/linting.yml - LICENSE - assets/email_template.html -nf_core_version: 3.0.2 -org_path: null +nf_core_version: 3.1.0 repository_type: pipeline template: author: Edmund Miller, Ignacio Tripodi, Margaret Gruca @@ -16,6 +14,4 @@ template: name: nascent org: nf-core outdir: . - skip_features: null version: 2.3.0dev -update: null diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..a33b527c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "markdown.styles": ["public/vscode_markdown.css"] +} diff --git a/conf/base.config b/conf/base.config index 6085da58..bd288142 100644 --- a/conf/base.config +++ b/conf/base.config @@ -20,7 +20,7 @@ process { maxErrors = '-1' // Process-specific resource requirements - // NOTE - Please try and re-use the labels below as much as possible. + // NOTE - Please try and reuse the labels below as much as possible. // These labels are used and recognised by default in DSL2 files hosted on nf-core/modules. // If possible, it would be nice to keep the same label naming convention when // adding in your local modules too. diff --git a/conf/modules.config b/conf/modules.config index eea6cc70..68b3cb9b 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -26,6 +26,7 @@ process { saveAs: { filename -> filename.equals('versions.yml') ? null : filename } ] } + withName: 'MULTIQC' { ext.args = { params.multiqc_title ? "--title \"$params.multiqc_title\"" : '' } publishDir = [ diff --git a/docs/usage.md b/docs/usage.md index 5713c091..8d4ee12b 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -188,9 +188,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 `. -:::warning -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). -::: +> [!WARNING] +> 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: @@ -219,23 +218,21 @@ nextflow pull nf-core/nascent ### Reproducibility -It is a good idea to specify a pipeline version when running the pipeline on your data. This ensures that a specific version of the pipeline code and software are used when you run your pipeline. If you keep using the same tag, you'll be running the same version of the pipeline, even if there have been changes to the code since. +It is a good idea to specify the pipeline version when running the pipeline on your data. This ensures that a specific version of the pipeline code and software are used when you run your pipeline. If you keep using the same tag, you'll be running the same version of the pipeline, even if there have been changes to the code since. First, go to the [nf-core/nascent releases page](https://github.com/nf-core/nascent/releases) and find the latest pipeline version - numeric only (eg. `1.3.1`). Then specify this when running the pipeline with `-r` (one hyphen) - eg. `-r 1.3.1`. Of course, you can switch to another version by changing the number after the `-r` flag. This version number will be logged in reports when you run the pipeline, so that you'll know what you used when you look back in the future. For example, at the bottom of the MultiQC reports. -To further assist in reproducbility, you can use share and re-use [parameter files](#running-the-pipeline) to repeat pipeline runs with the same settings without having to write out a command with every single parameter. +To further assist in reproducibility, you can use share and reuse [parameter files](#running-the-pipeline) to repeat pipeline runs with the same settings without having to write out a command with every single parameter. -:::tip -If you wish to share such profile (such as upload as supplementary material for academic publications), make sure to NOT include cluster specific paths to files, nor institutional specific profiles. -::: +> [!TIP] +> If you wish to share such profile (such as upload as supplementary material for academic publications), make sure to NOT include cluster specific paths to files, nor institutional specific profiles. ## Core Nextflow arguments -:::note -These options are part of Nextflow and use a _single_ hyphen (pipeline parameters use a double-hyphen). -::: +> [!NOTE] +> These options are part of Nextflow and use a _single_ hyphen (pipeline parameters use a double-hyphen) ### `-profile` @@ -243,16 +240,15 @@ Use this parameter to choose a configuration profile. Profiles can give configur Several generic profiles are bundled with the pipeline which instruct the pipeline to use software packaged using different methods (Docker, Singularity, Podman, Shifter, Charliecloud, Apptainer, Conda) - see below. -:::info -We highly recommend the use of Docker or Singularity containers for full pipeline reproducibility, however when this is not possible, Conda is also supported. -::: +> [!IMPORTANT] +> We highly recommend the use of Docker or Singularity containers for full pipeline reproducibility, however when this is not possible, Conda is also supported. -The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to see if your system is available in these configs please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation). +The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to check if your system is suported, please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation). Note that multiple profiles can be loaded, for example: `-profile test,docker` - the order of arguments is important! They are loaded in sequence, so later profiles can overwrite earlier profiles. -If `-profile` is not specified, the pipeline will run locally and expect all software to be installed and available on the `PATH`. This is _not_ recommended, since it can lead to different results on different machines dependent on the computer enviroment. +If `-profile` is not specified, the pipeline will run locally and expect all software to be installed and available on the `PATH`. This is _not_ recommended, since it can lead to different results on different machines dependent on the computer environment. - `test` - A profile with a complete configuration for automated testing @@ -288,13 +284,13 @@ Specify the path to a specific config file (this is a core Nextflow command). Se ### Resource requests -Whilst the default requirements set within the pipeline will hopefully work for most people and with most input data, you may find that you want to customise the compute resources that the pipeline requests. Each step in the pipeline has a default set of requirements for number of CPUs, memory and time. For most of the steps in the pipeline, if the job exits with any of the error codes specified [here](https://github.com/nf-core/rnaseq/blob/4c27ef5610c87db00c3c5a3eed10b1d161abf575/conf/base.config#L18) it will automatically be resubmitted with higher requests (2 x original, then 3 x original). If it still fails after the third attempt then the pipeline execution is stopped. +Whilst the default requirements set within the pipeline will hopefully work for most people and with most input data, you may find that you want to customise the compute resources that the pipeline requests. Each step in the pipeline has a default set of requirements for number of CPUs, memory and time. For most of the pipeline steps, if the job exits with any of the error codes specified [here](https://github.com/nf-core/rnaseq/blob/4c27ef5610c87db00c3c5a3eed10b1d161abf575/conf/base.config#L18) it will automatically be resubmitted with higher resources request (2 x original, then 3 x original). If it still fails after the third attempt then the pipeline execution is stopped. To change the resource requests, please see the [max resources](https://nf-co.re/docs/usage/configuration#max-resources) and [tuning workflow resources](https://nf-co.re/docs/usage/configuration#tuning-workflow-resources) section of the nf-core website. ### Custom Containers -In some cases you may wish to change which container or conda environment a step of the pipeline uses for a particular tool. By default nf-core pipelines use containers and software from the [biocontainers](https://biocontainers.pro/) or [bioconda](https://bioconda.github.io/) projects. However in some cases the pipeline specified version maybe out of date. +In some cases, you may wish to change the container or conda environment used by a pipeline steps for a particular tool. By default, nf-core pipelines use containers and software from the [biocontainers](https://biocontainers.pro/) or [bioconda](https://bioconda.github.io/) projects. However, in some cases the pipeline specified version maybe out of date. To use a different container from the default container or conda environment specified in a pipeline, please see the [updating tool versions](https://nf-co.re/docs/usage/configuration#updating-tool-versions) section of the nf-core website. diff --git a/modules.json b/modules.json index 046bb78f..cdce3c86 100644 --- a/modules.json +++ b/modules.json @@ -105,7 +105,7 @@ }, "fastqc": { "branch": "master", - "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", + "git_sha": "dc94b6ee04a05ddb9f7ae050712ff30a13149164", "installed_by": ["modules"] }, "gffread": { @@ -320,17 +320,17 @@ }, "utils_nextflow_pipeline": { "branch": "master", - "git_sha": "3aa0aec1d52d492fe241919f0c6100ebf0074082", + "git_sha": "c2b22d85f30a706a3073387f30380704fcae013b", "installed_by": ["subworkflows"] }, "utils_nfcore_pipeline": { "branch": "master", - "git_sha": "1b6b9a3338d011367137808b49b923515080e3ba", + "git_sha": "51ae5406a030d4da1e49e4dab49756844fdd6c7a", "installed_by": ["subworkflows"] }, "utils_nfschema_plugin": { "branch": "master", - "git_sha": "bbd5a41f4535a8defafe6080e00ea74c45f4f96c", + "git_sha": "2fd2cd6d0e7b273747f32e465fdc6bcc3ae0814e", "installed_by": ["subworkflows"] } } diff --git a/modules/nf-core/fastqc/main.nf b/modules/nf-core/fastqc/main.nf index d8989f48..752c3a10 100644 --- a/modules/nf-core/fastqc/main.nf +++ b/modules/nf-core/fastqc/main.nf @@ -24,7 +24,7 @@ process FASTQC { // Make list of old name and new name pairs to use for renaming in the bash while loop def old_new_pairs = reads instanceof Path || reads.size() == 1 ? [[ reads, "${prefix}.${reads.extension}" ]] : reads.withIndex().collect { entry, index -> [ entry, "${prefix}_${index + 1}.${entry.extension}" ] } def rename_to = old_new_pairs*.join(' ').join(' ') - def renamed_files = old_new_pairs.collect{ old_name, new_name -> new_name }.join(' ') + def renamed_files = old_new_pairs.collect{ _old_name, new_name -> new_name }.join(' ') // The total amount of allocated RAM by FastQC is equal to the number of threads defined (--threads) time the amount of RAM defined (--memory) // https://github.com/s-andrews/FastQC/blob/1faeea0412093224d7f6a07f777fad60a5650795/fastqc#L211-L222 diff --git a/modules/nf-core/fastqc/meta.yml b/modules/nf-core/fastqc/meta.yml index 4827da7a..2b2e62b8 100644 --- a/modules/nf-core/fastqc/meta.yml +++ b/modules/nf-core/fastqc/meta.yml @@ -11,6 +11,7 @@ tools: FastQC gives general quality metrics about your reads. It provides information about the quality score distribution across your reads, the per base sequence content (%A/C/G/T). + You get information about adapter contamination and other overrepresented sequences. homepage: https://www.bioinformatics.babraham.ac.uk/projects/fastqc/ diff --git a/nextflow.config b/nextflow.config index b9160d7b..17abc459 100644 --- a/nextflow.config +++ b/nextflow.config @@ -62,8 +62,7 @@ params { show_hidden = false version = false pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/' - - // Config options + trace_report_suffix = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss')// Config options config_profile_name = null config_profile_description = null @@ -177,6 +176,13 @@ profiles { executor.name = 'local' executor.cpus = 4 executor.memory = 8.GB + process { + resourceLimits = [ + memory: 8.GB, + cpus : 4, + time : 1.h + ] + } } test { includeConfig 'conf/test.config' } test_grocap { includeConfig 'conf/test_grocap.config' } @@ -227,30 +233,57 @@ set -C # No clobber - prevent output redirection from overwriting files. // Disable process selector warnings by default. Use debug profile to enable warnings. nextflow.enable.configProcessNamesValidation = false -def trace_timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss') timeline { enabled = true - file = "${params.outdir}/pipeline_info/execution_timeline_${trace_timestamp}.html" + file = "${params.outdir}/pipeline_info/execution_timeline_${params.trace_report_suffix}.html" } report { enabled = true - file = "${params.outdir}/pipeline_info/execution_report_${trace_timestamp}.html" + file = "${params.outdir}/pipeline_info/execution_report_${params.trace_report_suffix}.html" } trace { enabled = true - file = "${params.outdir}/pipeline_info/execution_trace_${trace_timestamp}.txt" + file = "${params.outdir}/pipeline_info/execution_trace_${params.trace_report_suffix}.txt" } dag { enabled = true - file = "${params.outdir}/pipeline_info/pipeline_dag_${trace_timestamp}.html" + file = "${params.outdir}/pipeline_info/pipeline_dag_${params.trace_report_suffix}.html" } manifest { name = 'nf-core/nascent' - author = """Edmund Miller, Ignacio Tripodi, Margaret Gruca""" + author = """Edmund Miller, Ignacio Tripodi, Margaret Gruca""" // The author field is deprecated from Nextflow version 24.10.0, use contributors instead + contributors = [ + // TODO nf-core: Update the field with the details of the contributors to your pipeline. New with Nextflow version 24.10.0 + [ + name: 'Edmund Miller', + affiliation: '', + email: '', + github: '', + contribution: [], // List of contribution types ('author', 'maintainer' or 'contributor') + orcid: '' + ], + [ + name: ' Ignacio Tripodi', + affiliation: '', + email: '', + github: '', + contribution: [], // List of contribution types ('author', 'maintainer' or 'contributor') + orcid: '' + ], + [ + name: ' Margaret Gruca', + affiliation: '', + email: '', + github: '', + contribution: [], // List of contribution types ('author', 'maintainer' or 'contributor') + orcid: '' + ], + ] homePage = 'https://github.com/nf-core/nascent' description = """Global Run-On sequencing analysis pipeline""" mainScript = 'main.nf' + defaultBranch = 'master' nextflowVersion = '!>=24.04.2' version = '2.3.0dev' doi = '10.5281/zenodo.7245273' @@ -263,9 +296,10 @@ plugins { validation { defaultIgnoreParams = ["genomes"] + monochromeLogs = params.monochrome_logs help { enabled = true - command = "nextflow run $manifest.name -profile --input samplesheet.csv --outdir " + command = "nextflow run nf-core/nascent -profile --input samplesheet.csv --outdir " fullParameter = "help_full" showHiddenParameter = "show_hidden" beforeText = """ @@ -275,15 +309,15 @@ validation { \033[0;34m |\\ | |__ __ / ` / \\ |__) |__ \033[0;33m} {\033[0m \033[0;34m | \\| | \\__, \\__/ | \\ |___ \033[0;32m\\`-._,-`-,\033[0m \033[0;32m`._,._,\'\033[0m -\033[0;35m ${manifest.name} ${manifest.version}\033[0m +\033[0;35m nf-core/nascent ${manifest.version}\033[0m -\033[2m----------------------------------------------------\033[0m- """ - afterText = """${manifest.doi ? "* The pipeline\n" : ""}${manifest.doi.tokenize(",").collect { " https://doi.org/${it.trim().replace('https://doi.org/','')}"}.join("\n")}${manifest.doi ? "\n" : ""} + afterText = """${manifest.doi ? "\n* The pipeline\n" : ""}${manifest.doi.tokenize(",").collect { " https://doi.org/${it.trim().replace('https://doi.org/','')}"}.join("\n")}${manifest.doi ? "\n" : ""} * The nf-core framework https://doi.org/10.1038/s41587-020-0439-x * Software dependencies - https://github.com/${manifest.name}/blob/master/CITATIONS.md + https://github.com/nf-core/nascent/blob/master/CITATIONS.md """ } summary { @@ -291,6 +325,3 @@ validation { afterText = validation.help.afterText } } - -// Load modules.config for DSL2 module specific options -includeConfig 'conf/modules.config' diff --git a/nextflow_schema.json b/nextflow_schema.json index 4e7d64d9..20145011 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -435,6 +435,12 @@ "description": "Base URL or local path to location of pipeline test dataset files", "default": "https://raw.githubusercontent.com/nf-core/test-datasets/", "hidden": true + }, + "trace_report_suffix": { + "type": "string", + "fa_icon": "far calendar", + "description": "Suffix to add to the trace report filename. Default is the date and time in the format yyyy-MM-dd_HH-mm-ss.", + "hidden": true } } } diff --git a/ro-crate-metadata.json b/ro-crate-metadata.json new file mode 100644 index 00000000..53ed7ada --- /dev/null +++ b/ro-crate-metadata.json @@ -0,0 +1,306 @@ +{ + "@context": [ + "https://w3id.org/ro/crate/1.1/context", + { + "GithubService": "https://w3id.org/ro/terms/test#GithubService", + "JenkinsService": "https://w3id.org/ro/terms/test#JenkinsService", + "PlanemoEngine": "https://w3id.org/ro/terms/test#PlanemoEngine", + "TestDefinition": "https://w3id.org/ro/terms/test#TestDefinition", + "TestInstance": "https://w3id.org/ro/terms/test#TestInstance", + "TestService": "https://w3id.org/ro/terms/test#TestService", + "TestSuite": "https://w3id.org/ro/terms/test#TestSuite", + "TravisService": "https://w3id.org/ro/terms/test#TravisService", + "definition": "https://w3id.org/ro/terms/test#definition", + "engineVersion": "https://w3id.org/ro/terms/test#engineVersion", + "instance": "https://w3id.org/ro/terms/test#instance", + "resource": "https://w3id.org/ro/terms/test#resource", + "runsOn": "https://w3id.org/ro/terms/test#runsOn" + } + ], + "@graph": [ + { + "@id": "./", + "@type": "Dataset", + "creativeWorkStatus": "InProgress", + "datePublished": "2024-12-12T11:25:43+00:00", + "description": "

    \n \n \n \"nf-core/nascent\"\n \n

    \n\n[![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/nascent** is a bioinformatics pipeline that ...\n\n\n\n\n\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))\n2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Edmund Miller, Ignacio Tripodi, Margaret Gruca.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n\n\n\n\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", + "hasPart": [ + { + "@id": "main.nf" + }, + { + "@id": "assets/" + }, + { + "@id": "conf/" + }, + { + "@id": "docs/" + }, + { + "@id": "docs/images/" + }, + { + "@id": "modules/" + }, + { + "@id": "modules/nf-core/" + }, + { + "@id": "workflows/" + }, + { + "@id": "subworkflows/" + }, + { + "@id": "nextflow.config" + }, + { + "@id": "README.md" + }, + { + "@id": "nextflow_schema.json" + }, + { + "@id": "CHANGELOG.md" + }, + { + "@id": "LICENSE" + }, + { + "@id": "CODE_OF_CONDUCT.md" + }, + { + "@id": "CITATIONS.md" + }, + { + "@id": "modules.json" + }, + { + "@id": "docs/usage.md" + }, + { + "@id": "docs/output.md" + }, + { + "@id": ".nf-core.yml" + }, + { + "@id": ".pre-commit-config.yaml" + }, + { + "@id": ".prettierignore" + } + ], + "isBasedOn": "https://github.com/nf-core/nascent", + "license": "MIT", + "mainEntity": { + "@id": "main.nf" + }, + "mentions": [ + { + "@id": "#617942a4-4cf7-49c9-85c7-e86489515162" + } + ], + "name": "nf-core/nascent" + }, + { + "@id": "ro-crate-metadata.json", + "@type": "CreativeWork", + "about": { + "@id": "./" + }, + "conformsTo": [ + { + "@id": "https://w3id.org/ro/crate/1.1" + }, + { + "@id": "https://w3id.org/workflowhub/workflow-ro-crate/1.0" + } + ] + }, + { + "@id": "main.nf", + "@type": ["File", "SoftwareSourceCode", "ComputationalWorkflow"], + "creator": [ + { + "@id": "https://orcid.org/0000-0002-6503-2180" + } + ], + "dateCreated": "", + "dateModified": "2024-12-12T11:25:43Z", + "dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/", + "keywords": ["nf-core", "nextflow", "gro-seq", "nascent", "pro-seq", "rna", "transcription", "tss"], + "license": ["MIT"], + "name": ["nf-core/nascent"], + "programmingLanguage": { + "@id": "https://w3id.org/workflowhub/workflow-ro-crate#nextflow" + }, + "sdPublisher": { + "@id": "https://nf-co.re/" + }, + "url": ["https://github.com/nf-core/nascent", "https://nf-co.re/nascent/dev/"], + "version": ["2.3.0dev"] + }, + { + "@id": "https://w3id.org/workflowhub/workflow-ro-crate#nextflow", + "@type": "ComputerLanguage", + "identifier": { + "@id": "https://www.nextflow.io/" + }, + "name": "Nextflow", + "url": { + "@id": "https://www.nextflow.io/" + }, + "version": "!>=24.04.2" + }, + { + "@id": "#617942a4-4cf7-49c9-85c7-e86489515162", + "@type": "TestSuite", + "instance": [ + { + "@id": "#8abfeb92-95c9-4b62-a918-cfb8177def5c" + } + ], + "mainEntity": { + "@id": "main.nf" + }, + "name": "Test suite for nf-core/nascent" + }, + { + "@id": "#8abfeb92-95c9-4b62-a918-cfb8177def5c", + "@type": "TestInstance", + "name": "GitHub Actions workflow for testing nf-core/nascent", + "resource": "repos/nf-core/nascent/actions/workflows/ci.yml", + "runsOn": { + "@id": "https://w3id.org/ro/terms/test#GithubService" + }, + "url": "https://api.github.com" + }, + { + "@id": "https://w3id.org/ro/terms/test#GithubService", + "@type": "TestService", + "name": "Github Actions", + "url": { + "@id": "https://github.com" + } + }, + { + "@id": "assets/", + "@type": "Dataset", + "description": "Additional files" + }, + { + "@id": "conf/", + "@type": "Dataset", + "description": "Configuration files" + }, + { + "@id": "docs/", + "@type": "Dataset", + "description": "Markdown files for documenting the pipeline" + }, + { + "@id": "docs/images/", + "@type": "Dataset", + "description": "Images for the documentation files" + }, + { + "@id": "modules/", + "@type": "Dataset", + "description": "Modules used by the pipeline" + }, + { + "@id": "modules/nf-core/", + "@type": "Dataset", + "description": "nf-core modules" + }, + { + "@id": "workflows/", + "@type": "Dataset", + "description": "Main pipeline workflows to be executed in main.nf" + }, + { + "@id": "subworkflows/", + "@type": "Dataset", + "description": "Smaller subworkflows" + }, + { + "@id": "nextflow.config", + "@type": "File", + "description": "Main Nextflow configuration file" + }, + { + "@id": "README.md", + "@type": "File", + "description": "Basic pipeline usage information" + }, + { + "@id": "nextflow_schema.json", + "@type": "File", + "description": "JSON schema for pipeline parameter specification" + }, + { + "@id": "CHANGELOG.md", + "@type": "File", + "description": "Information on changes made to the pipeline" + }, + { + "@id": "LICENSE", + "@type": "File", + "description": "The license - should be MIT" + }, + { + "@id": "CODE_OF_CONDUCT.md", + "@type": "File", + "description": "The nf-core code of conduct" + }, + { + "@id": "CITATIONS.md", + "@type": "File", + "description": "Citations needed when using the pipeline" + }, + { + "@id": "modules.json", + "@type": "File", + "description": "Version information for modules from nf-core/modules" + }, + { + "@id": "docs/usage.md", + "@type": "File", + "description": "Usage documentation" + }, + { + "@id": "docs/output.md", + "@type": "File", + "description": "Output documentation" + }, + { + "@id": ".nf-core.yml", + "@type": "File", + "description": "nf-core configuration file, configuring template features and linting rules" + }, + { + "@id": ".pre-commit-config.yaml", + "@type": "File", + "description": "Configuration file for pre-commit hooks" + }, + { + "@id": ".prettierignore", + "@type": "File", + "description": "Ignore file for prettier" + }, + { + "@id": "https://nf-co.re/", + "@type": "Organization", + "name": "nf-core", + "url": "https://nf-co.re/" + }, + { + "@id": "https://orcid.org/0000-0002-6503-2180", + "@type": "Person", + "email": "alex.peltzer@gmail.com", + "name": "Alexander Peltzer" + } + ] +} diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index f8e1f61b..be43b4d3 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -116,7 +116,8 @@ workflow PIPELINE_COMPLETION { main: summary_params = paramsSummaryMap(workflow, parameters_schema: "nextflow_schema.json") - + def multiqc_reports = multiqc_report.toList() + // // Completion email and summary // @@ -129,7 +130,7 @@ workflow PIPELINE_COMPLETION { plaintext_email, outdir, monochrome_logs, - multiqc_report.toList() + multiqc_reports.getVal(), ) } @@ -258,7 +259,7 @@ def toolBibliographyText() { } def methodsDescriptionText(mqc_methods_yaml) { - // Convert to a named map so can be used as with familar NXF ${workflow} variable syntax in the MultiQC YML file + // Convert to a named map so can be used as with familiar NXF ${workflow} variable syntax in the MultiQC YML file def meta = [:] meta.workflow = workflow.toMap() meta["manifest_map"] = workflow.manifest.toMap() diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf index 0fcbf7b3..d6e593e8 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nextflow_pipeline/main.nf @@ -92,10 +92,12 @@ def checkCondaChannels() { channels = config.channels } catch (NullPointerException e) { + log.debug(e) log.warn("Could not verify conda channel configuration.") return null } catch (IOException e) { + log.debug(e) log.warn("Could not verify conda channel configuration.") return null } diff --git a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test index ca964ce8..02dbf094 100644 --- a/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test +++ b/subworkflows/nf-core/utils_nextflow_pipeline/tests/main.workflow.nf.test @@ -52,10 +52,12 @@ nextflow_workflow { } then { - assertAll( - { assert workflow.success }, - { assert workflow.stdout.contains("nextflow_workflow v9.9.9") } - ) + expect { + with(workflow) { + assert success + assert "nextflow_workflow v9.9.9" in stdout + } + } } } diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf index 5cb7bafe..bfd25876 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/main.nf +++ b/subworkflows/nf-core/utils_nfcore_pipeline/main.nf @@ -56,21 +56,6 @@ def checkProfileProvided(nextflow_cli_args) { } } -// -// Citation string for pipeline -// -def workflowCitation() { - def temp_doi_ref = "" - def manifest_doi = workflow.manifest.doi.tokenize(",") - // Handling multiple DOIs - // Removing `https://doi.org/` to handle pipelines using DOIs vs DOI resolvers - // Removing ` ` since the manifest.doi is a string and not a proper list - manifest_doi.each { doi_ref -> - temp_doi_ref += " https://doi.org/${doi_ref.replace('https://doi.org/', '').replace(' ', '')}\n" - } - return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + "* The pipeline\n" + temp_doi_ref + "\n" + "* The nf-core framework\n" + " https://doi.org/10.1038/s41587-020-0439-x\n\n" + "* Software dependencies\n" + " https://github.com/${workflow.manifest.name}/blob/master/CITATIONS.md" -} - // // Generate workflow version string // @@ -150,33 +135,6 @@ def paramsSummaryMultiqc(summary_params) { return yaml_file_text } -// -// nf-core logo -// -def nfCoreLogo(monochrome_logs=true) { - def colors = logColours(monochrome_logs) as Map - String.format( - """\n - ${dashedLine(monochrome_logs)} - ${colors.green},--.${colors.black}/${colors.green},-.${colors.reset} - ${colors.blue} ___ __ __ __ ___ ${colors.green}/,-._.--~\'${colors.reset} - ${colors.blue} |\\ | |__ __ / ` / \\ |__) |__ ${colors.yellow}} {${colors.reset} - ${colors.blue} | \\| | \\__, \\__/ | \\ |___ ${colors.green}\\`-._,-`-,${colors.reset} - ${colors.green}`._,._,\'${colors.reset} - ${colors.purple} ${workflow.manifest.name} ${getWorkflowVersion()}${colors.reset} - ${dashedLine(monochrome_logs)} - """.stripIndent() - ) -} - -// -// Return dashed line -// -def dashedLine(monochrome_logs=true) { - def colors = logColours(monochrome_logs) as Map - return "-${colors.dim}----------------------------------------------------${colors.reset}-" -} - // // ANSII colours used for terminal logging // @@ -245,28 +203,24 @@ def logColours(monochrome_logs=true) { return colorcodes } -// -// Attach the multiqc report to email -// -def attachMultiqcReport(multiqc_report) { - def mqc_report = null - try { - if (workflow.success) { - mqc_report = multiqc_report.getVal() - if (mqc_report.getClass() == ArrayList && mqc_report.size() >= 1) { - if (mqc_report.size() > 1) { - log.warn("[${workflow.manifest.name}] Found multiple reports from process 'MULTIQC', will use only one") - } - mqc_report = mqc_report[0] - } +// Return a single report from an object that may be a Path or List +// +def getSingleReport(multiqc_reports) { + if (multiqc_reports instanceof Path) { + return multiqc_reports + } else if (multiqc_reports instanceof List) { + if (multiqc_reports.size() == 0) { + log.warn("[${workflow.manifest.name}] No reports found from process 'MULTIQC'") + return null + } else if (multiqc_reports.size() == 1) { + return multiqc_reports.first() + } else { + log.warn("[${workflow.manifest.name}] Found multiple reports from process 'MULTIQC', will use only one") + return multiqc_reports.first() } + } else { + return null } - catch (Exception all) { - if (multiqc_report) { - log.warn("[${workflow.manifest.name}] Could not attach MultiQC report to summary email") - } - } - return mqc_report } // @@ -320,7 +274,7 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi email_fields['summary'] = summary << misc_fields // On success try attach the multiqc report - def mqc_report = attachMultiqcReport(multiqc_report) + def mqc_report = getSingleReport(multiqc_report) // Check if we are only sending emails on failure def email_address = email @@ -340,7 +294,7 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi def email_html = html_template.toString() // Render the sendmail template - def max_multiqc_email_size = (params.containsKey('max_multiqc_email_size') ? params.max_multiqc_email_size : 0) as nextflow.util.MemoryUnit + def max_multiqc_email_size = (params.containsKey('max_multiqc_email_size') ? params.max_multiqc_email_size : 0) as MemoryUnit def smail_fields = [email: email_address, subject: subject, email_txt: email_txt, email_html: email_html, projectDir: "${workflow.projectDir}", mqcFile: mqc_report, mqcMaxSize: max_multiqc_email_size.toBytes()] def sf = new File("${workflow.projectDir}/assets/sendmail_template.txt") def sendmail_template = engine.createTemplate(sf).make(smail_fields) @@ -351,14 +305,17 @@ def completionEmail(summary_params, email, email_on_fail, plaintext_email, outdi if (email_address) { try { if (plaintext_email) { -new org.codehaus.groovy.GroovyException('Send plaintext e-mail, not HTML') } + new org.codehaus.groovy.GroovyException('Send plaintext e-mail, not HTML') + } // Try to send HTML e-mail using sendmail def sendmail_tf = new File(workflow.launchDir.toString(), ".sendmail_tmp.html") sendmail_tf.withWriter { w -> w << sendmail_html } ['sendmail', '-t'].execute() << sendmail_html log.info("-${colors.purple}[${workflow.manifest.name}]${colors.green} Sent summary e-mail to ${email_address} (sendmail)-") } - catch (Exception all) { + catch (Exception msg) { + log.debug(msg.toString()) + log.debug("Trying with mail instead of sendmail") // Catch failures and try with plaintext def mail_cmd = ['mail', '-s', subject, '--content-type=text/html', email_address] mail_cmd.execute() << email_html diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test index 1dc317f8..f117040c 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test @@ -41,26 +41,14 @@ nextflow_function { } } - test("Test Function workflowCitation") { - - function "workflowCitation" - - then { - assertAll( - { assert function.success }, - { assert snapshot(function.result).match() } - ) - } - } - - test("Test Function nfCoreLogo") { + test("Test Function without logColours") { - function "nfCoreLogo" + function "logColours" when { function { """ - input[0] = false + input[0] = true """ } } @@ -73,9 +61,8 @@ nextflow_function { } } - test("Test Function dashedLine") { - - function "dashedLine" + test("Test Function with logColours") { + function "logColours" when { function { @@ -93,14 +80,13 @@ nextflow_function { } } - test("Test Function without logColours") { - - function "logColours" + test("Test Function getSingleReport with a single file") { + function "getSingleReport" when { function { """ - input[0] = true + input[0] = file(params.modules_testdata_base_path + '/generic/tsv/test.tsv', checkIfExists: true) """ } } @@ -108,18 +94,22 @@ nextflow_function { then { assertAll( { assert function.success }, - { assert snapshot(function.result).match() } + { assert function.result.contains("test.tsv") } ) } } - test("Test Function with logColours") { - function "logColours" + test("Test Function getSingleReport with multiple files") { + function "getSingleReport" when { function { """ - input[0] = false + input[0] = [ + file(params.modules_testdata_base_path + '/generic/tsv/test.tsv', checkIfExists: true), + file(params.modules_testdata_base_path + '/generic/tsv/network.tsv', checkIfExists: true), + file(params.modules_testdata_base_path + '/generic/tsv/expression.tsv', checkIfExists: true) + ] """ } } @@ -127,7 +117,9 @@ nextflow_function { then { assertAll( { assert function.success }, - { assert snapshot(function.result).match() } + { assert function.result.contains("test.tsv") }, + { assert !function.result.contains("network.tsv") }, + { assert !function.result.contains("expression.tsv") } ) } } diff --git a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap index 1037232c..02c67014 100644 --- a/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap +++ b/subworkflows/nf-core/utils_nfcore_pipeline/tests/main.function.nf.test.snap @@ -17,26 +17,6 @@ }, "timestamp": "2024-02-28T12:02:59.729647" }, - "Test Function nfCoreLogo": { - "content": [ - "\n\n-\u001b[2m----------------------------------------------------\u001b[0m-\n \u001b[0;32m,--.\u001b[0;30m/\u001b[0;32m,-.\u001b[0m\n\u001b[0;34m ___ __ __ __ ___ \u001b[0;32m/,-._.--~'\u001b[0m\n\u001b[0;34m |\\ | |__ __ / ` / \\ |__) |__ \u001b[0;33m} {\u001b[0m\n\u001b[0;34m | \\| | \\__, \\__/ | \\ |___ \u001b[0;32m\\`-._,-`-,\u001b[0m\n \u001b[0;32m`._,._,'\u001b[0m\n\u001b[0;35m nextflow_workflow v9.9.9\u001b[0m\n-\u001b[2m----------------------------------------------------\u001b[0m-\n" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-02-28T12:03:10.562934" - }, - "Test Function workflowCitation": { - "content": [ - "If you use nextflow_workflow for your analysis please cite:\n\n* The pipeline\n https://doi.org/10.5281/zenodo.5070524\n\n* The nf-core framework\n https://doi.org/10.1038/s41587-020-0439-x\n\n* Software dependencies\n https://github.com/nextflow_workflow/blob/master/CITATIONS.md" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-02-28T12:03:07.019761" - }, "Test Function without logColours": { "content": [ { @@ -95,16 +75,6 @@ }, "timestamp": "2024-02-28T12:03:17.969323" }, - "Test Function dashedLine": { - "content": [ - "-\u001b[2m----------------------------------------------------\u001b[0m-" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-02-28T12:03:14.366181" - }, "Test Function with logColours": { "content": [ { diff --git a/subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test b/subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test index 842dc432..8fb30164 100644 --- a/subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test +++ b/subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test @@ -42,7 +42,7 @@ nextflow_workflow { params { test_data = '' - outdir = 1 + outdir = null } workflow { @@ -94,7 +94,7 @@ nextflow_workflow { params { test_data = '' - outdir = 1 + outdir = null } workflow { diff --git a/workflows/nascent.nf b/workflows/nascent.nf index af9b1996..bb1eb1b9 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -322,7 +322,7 @@ workflow NASCENT { softwareVersionsToYAML(ch_versions) .collectFile( storeDir: "${params.outdir}/pipeline_info", - name: 'nf_core_' + 'pipeline_software_' + 'mqc_' + 'versions.yml', + name: 'nf_core_' + 'nascent_software_' + 'mqc_' + 'versions.yml', sort: true, newLine: true ).set { ch_collated_versions } From 7a4e3560d691ce65d507ca9745843d77a16a6027 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Fri, 20 Dec 2024 13:12:11 +0000 Subject: [PATCH 232/255] Template update for nf-core/tools version 3.1.1 --- .editorconfig | 4 ++ .github/ISSUE_TEMPLATE/bug_report.yml | 1 - .github/workflows/download_pipeline.yml | 41 +++++++++------ .nf-core.yml | 2 +- .prettierignore | 1 + CITATIONS.md | 6 +-- LICENSE | 2 +- README.md | 2 +- docs/output.md | 4 +- docs/usage.md | 2 +- nextflow.config | 3 ++ ro-crate-metadata.json | 50 +++++++++++++------ .../utils_nfcore_nascent_pipeline/main.nf | 2 +- 13 files changed, 78 insertions(+), 42 deletions(-) diff --git a/.editorconfig b/.editorconfig index e957201e..0e269142 100644 --- a/.editorconfig +++ b/.editorconfig @@ -32,6 +32,10 @@ indent_size = unset [*.{py,md}] indent_style = unset +# ignore ro-crate metadata files +[**/ro-crate-metadata.json] +insert_final_newline = unset + # Follow tidyverse style for R [*.{R,Rmd}] indent_size = 2 diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index d004c11d..02dcdcfb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -9,7 +9,6 @@ body: - [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting) - [nf-core/nascent pipeline documentation](https://nf-co.re/nascent/usage) - - type: textarea id: description attributes: diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml index 2576cc0c..13b51e2c 100644 --- a/.github/workflows/download_pipeline.yml +++ b/.github/workflows/download_pipeline.yml @@ -28,8 +28,12 @@ env: NXF_ANSI_LOG: false jobs: - download: + configure: runs-on: ubuntu-latest + outputs: + REPO_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPO_LOWERCASE }} + REPOTITLE_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPOTITLE_LOWERCASE }} + REPO_BRANCH: ${{ steps.get_repo_properties.outputs.REPO_BRANCH }} steps: - name: Install Nextflow uses: nf-core/setup-nextflow@v2 @@ -53,22 +57,27 @@ jobs: pip install git+https://github.com/nf-core/tools.git@dev - name: Get the repository name and current branch set as environment variable + id: get_repo_properties run: | - echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV} - echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV} - echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV} + echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT" + echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> "$GITHUB_OUTPUT" + echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> "$GITHUB_OUTPUT" - name: Make a cache directory for the container images run: | mkdir -p ./singularity_container_images + download: + runs-on: ubuntu-latest + needs: configure + steps: - name: Download the pipeline env: NXF_SINGULARITY_CACHEDIR: ./singularity_container_images run: | - nf-core pipelines download ${{ env.REPO_LOWERCASE }} \ - --revision ${{ env.REPO_BRANCH }} \ - --outdir ./${{ env.REPOTITLE_LOWERCASE }} \ + nf-core pipelines download ${{ needs.configure.outputs.REPO_LOWERCASE }} \ + --revision ${{ needs.configure.outputs.REPO_BRANCH }} \ + --outdir ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }} \ --compress "none" \ --container-system 'singularity' \ --container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io/library/" \ @@ -76,14 +85,14 @@ jobs: --download-configuration 'yes' - name: Inspect download - run: tree ./${{ env.REPOTITLE_LOWERCASE }} + run: tree ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }} - name: Count the downloaded number of container images id: count_initial run: | image_count=$(ls -1 ./singularity_container_images | wc -l | xargs) echo "Initial container image count: $image_count" - echo "IMAGE_COUNT_INITIAL=$image_count" >> ${GITHUB_ENV} + echo "IMAGE_COUNT_INITIAL=$image_count" >> "$GITHUB_OUTPUT" - name: Run the downloaded pipeline (stub) id: stub_run_pipeline @@ -91,27 +100,27 @@ jobs: env: NXF_SINGULARITY_CACHEDIR: ./singularity_container_images NXF_SINGULARITY_HOME_MOUNT: true - run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results + run: nextflow run ./${{needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results - name: Run the downloaded pipeline (stub run not supported) id: run_pipeline - if: ${{ job.steps.stub_run_pipeline.status == failure() }} + if: ${{ steps.stub_run_pipeline.outcome == 'failure' }} env: NXF_SINGULARITY_CACHEDIR: ./singularity_container_images NXF_SINGULARITY_HOME_MOUNT: true - run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results + run: nextflow run ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -profile test,singularity --outdir ./results - name: Count the downloaded number of container images id: count_afterwards run: | image_count=$(ls -1 ./singularity_container_images | wc -l | xargs) echo "Post-pipeline run container image count: $image_count" - echo "IMAGE_COUNT_AFTER=$image_count" >> ${GITHUB_ENV} + echo "IMAGE_COUNT_AFTER=$image_count" >> "$GITHUB_OUTPUT" - name: Compare container image counts run: | - if [ "${{ env.IMAGE_COUNT_INITIAL }}" -ne "${{ env.IMAGE_COUNT_AFTER }}" ]; then - initial_count=${{ env.IMAGE_COUNT_INITIAL }} - final_count=${{ env.IMAGE_COUNT_AFTER }} + if [ "${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}" -ne "${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}" ]; then + initial_count=${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }} + final_count=${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }} difference=$((final_count - initial_count)) echo "$difference additional container images were \n downloaded at runtime . The pipeline has no support for offline runs!" tree ./singularity_container_images diff --git a/.nf-core.yml b/.nf-core.yml index dad7f3fb..47041fa7 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -4,7 +4,7 @@ lint: - .github/workflows/linting.yml - LICENSE - assets/email_template.html -nf_core_version: 3.1.0 +nf_core_version: 3.1.1 repository_type: pipeline template: author: Edmund Miller, Ignacio Tripodi, Margaret Gruca diff --git a/.prettierignore b/.prettierignore index 437d763d..edd29f01 100644 --- a/.prettierignore +++ b/.prettierignore @@ -10,3 +10,4 @@ testing/ testing* *.pyc bin/ +ro-crate-metadata.json diff --git a/CITATIONS.md b/CITATIONS.md index 14068893..6e4513b4 100644 --- a/CITATIONS.md +++ b/CITATIONS.md @@ -40,7 +40,7 @@ - [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/) -> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. + > Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. - [featureCounts](https://pubmed.ncbi.nlm.nih.gov/24227677/) @@ -56,11 +56,11 @@ - [HOMER](http://homer.ucsd.edu/homer/index.html) -> Heinz S, Benner C, Spann N, Bertolino E et al. Simple Combinations of Lineage-Determining Transcription Factors Prime cis-Regulatory Elements Required for Macrophage and B Cell Identities. Mol Cell 2010 May 28;38(4):576-589. PMID: 20513432 + > Heinz S, Benner C, Spann N, Bertolino E et al. Simple Combinations of Lineage-Determining Transcription Factors Prime cis-Regulatory Elements Required for Macrophage and B Cell Identities. Mol Cell 2010 May 28;38(4):576-589. PMID: 20513432 - [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/) -> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924. + > Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924. - [PINTS](https://pints.yulab.org/) diff --git a/LICENSE b/LICENSE index afec2257..15d7da24 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) Edmund Miller, Ignacio Tripodi, Margaret Gruca +Copyright (c) The nf-core/nascent team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 4b734d66..10826c34 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ On release, automated continuous integration tests run the pipeline on a full-si ## Usage > [!NOTE] -> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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. +> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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. \n\n\n\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))\n2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Edmund Miller, Ignacio Tripodi, Margaret Gruca.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n\n\n\n\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", + "datePublished": "2024-12-20T13:11:56+00:00", + "description": "

    \n \n \n \"nf-core/nascent\"\n \n

    [![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/nascent** is a bioinformatics pipeline that ...\n\n\n\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Edmund Miller, Ignacio Tripodi, Margaret Gruca.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n\n\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", "hasPart": [ { "@id": "main.nf" @@ -99,7 +99,7 @@ }, "mentions": [ { - "@id": "#617942a4-4cf7-49c9-85c7-e86489515162" + "@id": "#1dfd475c-0e99-4ced-8d46-c7b1667f8062" } ], "name": "nf-core/nascent" @@ -121,26 +121,48 @@ }, { "@id": "main.nf", - "@type": ["File", "SoftwareSourceCode", "ComputationalWorkflow"], + "@type": [ + "File", + "SoftwareSourceCode", + "ComputationalWorkflow" + ], "creator": [ { "@id": "https://orcid.org/0000-0002-6503-2180" } ], "dateCreated": "", - "dateModified": "2024-12-12T11:25:43Z", + "dateModified": "2024-12-20T13:11:56Z", "dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/", - "keywords": ["nf-core", "nextflow", "gro-seq", "nascent", "pro-seq", "rna", "transcription", "tss"], - "license": ["MIT"], - "name": ["nf-core/nascent"], + "keywords": [ + "nf-core", + "nextflow", + "gro-seq", + "nascent", + "pro-seq", + "rna", + "transcription", + "tss" + ], + "license": [ + "MIT" + ], + "name": [ + "nf-core/nascent" + ], "programmingLanguage": { "@id": "https://w3id.org/workflowhub/workflow-ro-crate#nextflow" }, "sdPublisher": { "@id": "https://nf-co.re/" }, - "url": ["https://github.com/nf-core/nascent", "https://nf-co.re/nascent/dev/"], - "version": ["2.3.0dev"] + "url": [ + "https://github.com/nf-core/nascent", + "https://nf-co.re/nascent/dev/" + ], + "version": [ + "2.3.0dev" + ] }, { "@id": "https://w3id.org/workflowhub/workflow-ro-crate#nextflow", @@ -155,11 +177,11 @@ "version": "!>=24.04.2" }, { - "@id": "#617942a4-4cf7-49c9-85c7-e86489515162", + "@id": "#1dfd475c-0e99-4ced-8d46-c7b1667f8062", "@type": "TestSuite", "instance": [ { - "@id": "#8abfeb92-95c9-4b62-a918-cfb8177def5c" + "@id": "#3d1dd031-9b67-4d83-bdc1-e9f4277163af" } ], "mainEntity": { @@ -168,7 +190,7 @@ "name": "Test suite for nf-core/nascent" }, { - "@id": "#8abfeb92-95c9-4b62-a918-cfb8177def5c", + "@id": "#3d1dd031-9b67-4d83-bdc1-e9f4277163af", "@type": "TestInstance", "name": "GitHub Actions workflow for testing nf-core/nascent", "resource": "repos/nf-core/nascent/actions/workflows/ci.yml", @@ -303,4 +325,4 @@ "name": "Alexander Peltzer" } ] -} +} \ No newline at end of file diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index be43b4d3..bf28cfc1 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -117,7 +117,7 @@ workflow PIPELINE_COMPLETION { main: summary_params = paramsSummaryMap(workflow, parameters_schema: "nextflow_schema.json") def multiqc_reports = multiqc_report.toList() - + // // Completion email and summary // From ba48eb2f64e7150141a2053e7faa6e3947e3afdd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 21 Dec 2024 15:26:54 -0600 Subject: [PATCH 233/255] chore: Fix pipeline => nascent --- workflows/tests/aligner/bowtie2.nf.test | 2 +- workflows/tests/aligner/bowtie2.nf.test.snap | 4 ++-- workflows/tests/aligner/bwa.nf.test | 2 +- workflows/tests/aligner/bwa.nf.test.snap | 4 ++-- workflows/tests/aligner/bwamem2.nf.test | 2 +- workflows/tests/aligner/bwamem2.nf.test.snap | 2 +- workflows/tests/aligner/hisat2.nf.test | 2 +- workflows/tests/aligner/hisat2.nf.test.snap | 2 +- workflows/tests/aligner/star.nf.test | 4 ++-- workflows/tests/aligner/star.nf.test.snap | 4 ++-- workflows/tests/inputs/gff/main.nf.test | 2 +- workflows/tests/inputs/gff/main.nf.test.snap | 2 +- workflows/tests/inputs/gzipped_gff/main.nf.test | 2 +- workflows/tests/inputs/gzipped_gff/main.nf.test.snap | 2 +- workflows/tests/inputs/only_gff/main.nf.test | 2 +- workflows/tests/inputs/only_gff/main.nf.test.snap | 2 +- workflows/tests/inputs/uniqmap/main.nf.test | 2 +- .../transcript_indentification/grohmm/only_gff/main.nf.test | 2 +- .../grohmm/only_gff/main.nf.test.snap | 4 ++-- .../transcript_indentification/grohmm/tuning/main.nf.test | 2 +- .../grohmm/tuning/main.nf.test.snap | 4 ++-- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index add662c6..4f91e553 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -27,7 +27,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 7ea4e747..804a5398 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -172,7 +172,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", @@ -324,4 +324,4 @@ }, "timestamp": "2024-12-18T07:25:45.87987" } -} \ No newline at end of file +} diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 0e1f6f66..ed8e201a 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -28,7 +28,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 8f7e1743..5bb2633d 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -221,7 +221,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", @@ -462,4 +462,4 @@ }, "timestamp": "2024-12-18T07:07:22.737667" } -} \ No newline at end of file +} diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test index ae80dd8d..2bebf8ff 100644 --- a/workflows/tests/aligner/bwamem2.nf.test +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -25,7 +25,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index be3f1f96..257d9d93 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -186,7 +186,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index fc030f6e..8deb6f2b 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -28,7 +28,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 7296f90b..815b8f9a 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -187,7 +187,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test index 34db1e0a..1fbcd996 100644 --- a/workflows/tests/aligner/star.nf.test +++ b/workflows/tests/aligner/star.nf.test @@ -27,7 +27,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents @@ -52,7 +52,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("gzip_software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml")).match("gzip_software_versions") }, { assert snapshot( workflow.trace.tasks().size(), ).match() diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index b1552de6..f19dd9c4 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -157,7 +157,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", @@ -475,4 +475,4 @@ }, "timestamp": "2024-11-25T21:02:16.63526" } -} \ No newline at end of file +} diff --git a/workflows/tests/inputs/gff/main.nf.test b/workflows/tests/inputs/gff/main.nf.test index 7bec5f64..258a30bf 100644 --- a/workflows/tests/inputs/gff/main.nf.test +++ b/workflows/tests/inputs/gff/main.nf.test @@ -27,7 +27,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 0ffc76f9..1b41f1b6 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -171,7 +171,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test b/workflows/tests/inputs/gzipped_gff/main.nf.test index 0bf35086..33bc949f 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test @@ -27,7 +27,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index 4660736c..f376150c 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -171,7 +171,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", diff --git a/workflows/tests/inputs/only_gff/main.nf.test b/workflows/tests/inputs/only_gff/main.nf.test index 74841c14..b9fd1389 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test +++ b/workflows/tests/inputs/only_gff/main.nf.test @@ -29,7 +29,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 77e4d408..c7fe6492 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -174,7 +174,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", diff --git a/workflows/tests/inputs/uniqmap/main.nf.test b/workflows/tests/inputs/uniqmap/main.nf.test index 04db908c..945b0929 100644 --- a/workflows/tests/inputs/uniqmap/main.nf.test +++ b/workflows/tests/inputs/uniqmap/main.nf.test @@ -21,7 +21,7 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, - { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot(removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml")).match("software_versions") }, // Files should have -uniqmap in the header { assert path("$outputDir/transcript_identification/homer/cd4.bed").readLines()[18].contains("uniqMapDirectory = uniqmap.GRCh38_chr21.50nt") }, { assert path("$outputDir/transcript_identification/homer/cd4.bed").readLines()[20].contains("-uniqmap") }, diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test index 57367003..638a7ba0 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test @@ -33,7 +33,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index 66d1544f..c394efd9 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -184,7 +184,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", @@ -383,4 +383,4 @@ }, "timestamp": "2024-12-18T08:07:15.190593" } -} \ No newline at end of file +} diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test index a300f206..847b907c 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test @@ -25,7 +25,7 @@ nextflow_pipeline { // Number of tasks workflow.trace.succeeded().size(), // pipeline versions.yml file for multiqc from which Nextflow version is removed because we tests pipelines on multiple Nextflow versions - removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml"), + removeNextflowVersion("$outputDir/pipeline_info/nf_core_nascent_software_mqc_versions.yml"), // All stable path name stable_name, // All files with stable contents diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 093d9bbe..877e3f4d 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -175,7 +175,7 @@ "multiqc/multiqc_data/samtools_alignment_plot.txt", "multiqc/multiqc_report.html", "pipeline_info", - "pipeline_info/nf_core_pipeline_software_mqc_versions.yml", + "pipeline_info/nf_core_nascent_software_mqc_versions.yml", "preprocessing", "preprocessing/fastp", "preprocessing/fastp/cd4_REP1.trimmed.fastp.html", @@ -374,4 +374,4 @@ }, "timestamp": "2024-12-18T08:25:02.333169" } -} \ No newline at end of file +} From e6b3ecd11b0053467ffc64072c9c1987f4a1719d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 4 Nov 2024 23:54:03 +0100 Subject: [PATCH 234/255] style: First pass with lsp --- conf/test.config | 20 +- conf/test_copro.config | 14 +- conf/test_full.config | 6 +- conf/test_grocap.config | 19 +- modules/local/bed2saf.nf | 10 +- modules/local/dreg_prep/main.nf | 20 +- modules/local/grohmm/parametertuning/main.nf | 20 +- .../local/grohmm/transcriptcalling/main.nf | 24 +- modules/local/gtf2bed.nf | 15 +- subworkflows/local/align_bwamem2/main.nf | 28 +- subworkflows/local/align_dragmap/main.nf | 28 +- subworkflows/local/coverage_graphs.nf | 34 +- subworkflows/local/dreg_prep/main.nf | 1 - subworkflows/local/prepare_genome.nf | 140 ++++---- subworkflows/local/quality_control.nf | 35 +- .../local/transcript_identification/main.nf | 6 +- .../utils_nfcore_nascent_pipeline/main.nf | 71 ++-- workflows/nascent.nf | 302 +++++++++--------- 18 files changed, 404 insertions(+), 389 deletions(-) diff --git a/conf/test.config b/conf/test.config index c7635451..3b306c17 100644 --- a/conf/test.config +++ b/conf/test.config @@ -24,21 +24,22 @@ params { // Input data // TODO params.pipelines_testdata_base_path + 'viralrecon/samplesheet/samplesheet_test_illumina_amplicon.csv' - input = "${projectDir}/assets/samplesheet.csv" + input = "${projectDir}/assets/samplesheet.csv" // Genome references - fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21.fa' - gtf = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gtf' - hisat2_index = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21_hisat2.tar.gz' + fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21.fa' + gtf = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gtf' + hisat2_index = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21_hisat2.tar.gz' - assay_type = "GROseq" - skip_grohmm = true // FIXME Fails due to higher memory requirements + assay_type = "GROseq" + // FIXME Fails due to higher memory requirements + skip_grohmm = true grohmm_min_uts = 5 grohmm_max_uts = 10 grohmm_min_ltprobb = -100 grohmm_max_ltprobb = -150 - filter_bed = "${projectDir}/tests/config/unwanted_region.bed" - intersect_bed = "${projectDir}/tests/config/wanted_region.bed" + filter_bed = "${projectDir}/tests/config/unwanted_region.bed" + intersect_bed = "${projectDir}/tests/config/wanted_region.bed" } process { @@ -46,8 +47,7 @@ process { ext.args = '--genomeSAindexNbases 9' } - withName: 'PINTS_CALLER' { - // HACK Tests fail after latest modules update + withName: PINTS_CALLER { ext.args = { "--disable-small" } } } diff --git a/conf/test_copro.config b/conf/test_copro.config index 27d33607..42c41cdd 100644 --- a/conf/test_copro.config +++ b/conf/test_copro.config @@ -15,17 +15,17 @@ params { config_profile_description = 'Test dataset to check PINTS pipeline function(https://pints.yulab.org/tre_calling#part-iv-case-2)' // Input data - input = "${projectDir}/tests/config/samplesheets/copro.csv" + input = "${projectDir}/tests/config/samplesheets/copro.csv" - genome = 'hg38' - assay_type = 'CoPRO' - filter_bed = "https://pints.yulab.org/ref/examples/promoters_1kb_tss_centered.bed.gz" - with_umi = true - umitools_dedup_stats = true + genome = 'hg38' + assay_type = 'CoPRO' + filter_bed = "https://pints.yulab.org/ref/examples/promoters_1kb_tss_centered.bed.gz" + with_umi = true + umitools_dedup_stats = true } process { - withName: NFCORE_NASCENT:NASCENT:FASTP { + withName: FASTP { ext.args = [ "--adapter_sequence TGGAATTCTCGGGTGCCAAGGAACTCCAGTCAC", "--adapter_sequence_r2 GATCGTCGGACTGTAGAACTCTGAAC", diff --git a/conf/test_full.config b/conf/test_full.config index f5f1c5e6..5b464fe2 100644 --- a/conf/test_full.config +++ b/conf/test_full.config @@ -16,9 +16,9 @@ params { // Input data for full size test // TODO params.pipelines_testdata_base_path + 'viralrecon/samplesheet/samplesheet_full_illumina_amplicon.csv' - input = "${projectDir}/assets/samplesheet_full.csv" + input = "${projectDir}/assets/samplesheet_full.csv" // Genome references - genome = 'hg38' - assay_type = 'GROseq' + genome = 'hg38' + assay_type = 'GROseq' } diff --git a/conf/test_grocap.config b/conf/test_grocap.config index 53916d5f..55a1823b 100644 --- a/conf/test_grocap.config +++ b/conf/test_grocap.config @@ -15,21 +15,22 @@ params { config_profile_description = 'Test dataset to check PINTS pipeline function(https://pints.yulab.org/tre_calling#part-iii-case-1)' // Input data - input = "${projectDir}/tests/config/samplesheets/grocap.csv" + input = "${projectDir}/tests/config/samplesheets/grocap.csv" - genome = 'hg38' - assay_type = 'GROcap' - filter_bed = "https://pints.yulab.org/ref/examples/promoters_1kb_tss_centered.bed.gz" + genome = 'hg38' + assay_type = 'GROcap' + filter_bed = "https://pints.yulab.org/ref/examples/promoters_1kb_tss_centered.bed.gz" } process { - withName: NFCORE_NASCENT:NASCENT:FASTP { + // only keep reads longer than 14nts after trimming + // This library was polyadenylated, + // so we are trimming the last 20nts per reads (with --trim_tail1). + // For more recent single-end PRO/GRO-cap libraries, this may not be necessary. + withName: 'NFCORE_NASCENT:NASCENT:FASTP' { ext.args = [ "--adapter_sequence TGGAATTCTCGGGTGCCAAGG", - "-l 14", // only keep reads longer than 14nts after trimming - // This library was polyadenylated, - // so we are trimming the last 20nts per reads (with --trim_tail1). - // For more recent single-end PRO/GRO-cap libraries, this may not be necessary. + "-l 14", "--trim_tail1 20", "--low_complexity_filter", "-w 8" diff --git a/modules/local/bed2saf.nf b/modules/local/bed2saf.nf index f23b7750..bcc23c3e 100644 --- a/modules/local/bed2saf.nf +++ b/modules/local/bed2saf.nf @@ -1,11 +1,11 @@ process BED2SAF { - tag "$meta.id" + tag "${meta.id}" label 'process_single' conda "conda-forge::gawk=5.1.0" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/ubuntu:20.04' : - 'nf-core/ubuntu:20.04' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://depot.galaxyproject.org/singularity/ubuntu:20.04' + : 'nf-core/ubuntu:20.04'}" input: tuple val(meta), path(bed) @@ -20,7 +20,7 @@ process BED2SAF { script: """ awk 'OFS="\\t" {print \$1"."\$2"."\$3, \$1, \$2, \$3, "."}' \\ - $bed \\ + ${bed} \\ > ${bed.baseName}.saf cat <<-END_VERSIONS > versions.yml diff --git a/modules/local/dreg_prep/main.nf b/modules/local/dreg_prep/main.nf index 7c640cf4..403bdfdb 100644 --- a/modules/local/dreg_prep/main.nf +++ b/modules/local/dreg_prep/main.nf @@ -1,16 +1,16 @@ process DREG_PREP { - tag "$meta.id" + tag "${meta.id}" label 'process_low' conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-f01e242bdea19948f0576fdca94777242fe4c2cb:4238fb992d2a93e648108c86e3a9f51348e834a9-0' : - 'biocontainers/mulled-v2-f01e242bdea19948f0576fdca94777242fe4c2cb:4238fb992d2a93e648108c86e3a9f51348e834a9-0' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://depot.galaxyproject.org/singularity/mulled-v2-f01e242bdea19948f0576fdca94777242fe4c2cb:4238fb992d2a93e648108c86e3a9f51348e834a9-0' + : 'biocontainers/mulled-v2-f01e242bdea19948f0576fdca94777242fe4c2cb:4238fb992d2a93e648108c86e3a9f51348e834a9-0'}" input: tuple val(meta), path(bam_file), val(index) - path sizes + path sizes val assay_type output: @@ -78,10 +78,11 @@ process DREG_PREP { echo "bedGraph to bigwig done" """ - } else { + } + else { if (forwardStranded) { """ - samtools view -@ $task.cpus -bf 0x2 ${bam_file} | samtools sort -n -@ $task.cpus \\ + samtools view -@ ${task.cpus} -bf 0x2 ${bam_file} | samtools sort -n -@ ${task.cpus} \\ > ${prefix}.dreg.bam bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \\ @@ -118,9 +119,10 @@ process DREG_PREP { ${prefix}.unsorted.bedGraph \\ > ${prefix}.bedGraph """ - } else { + } + else { """ - samtools view -@ $task.cpus -bf 0x2 ${bam_file} | samtools sort -n -@ $task.cpus \\ + samtools view -@ ${task.cpus} -bf 0x2 ${bam_file} | samtools sort -n -@ ${task.cpus} \\ > ${prefix}.dreg.bam bedtools bamtobed -bedpe -mate1 -i ${prefix}.dreg.bam \\ diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index ac56402f..b19810ce 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,12 +1,12 @@ process GROHMM_PARAMETERTUNING { - tag "$meta.id|$UTS|$LtProbB" + tag "${meta.id}|${UTS}|${LtProbB}" label 'process_high' // array 10 conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/b9/b929af5662486ba6ce2d27eb501e5c7ec71ca7dd8e333fe5d3dcf2803d87cf67/data' : - 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/b9/b929af5662486ba6ce2d27eb501e5c7ec71ca7dd8e333fe5d3dcf2803d87cf67/data' + : 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac'}" input: tuple val(meta), path(bams), path(bais), val(UTS), val(LtProbB) @@ -15,7 +15,7 @@ process GROHMM_PARAMETERTUNING { output: tuple val(meta), path("*.tuning.csv"), emit: tuning tuple val(meta), path("*.tuning.consensus.bed"), emit: bed - path "versions.yml", emit: versions + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when @@ -27,12 +27,12 @@ process GROHMM_PARAMETERTUNING { grohmm_parametertuning.R \\ --bam_file ${bams} \\ --outprefix ${prefix} \\ - --gxf $gxf \\ - --uts $UTS \\ - --ltprobb $LtProbB \\ + --gxf ${gxf} \\ + --uts ${UTS} \\ + --ltprobb ${LtProbB} \\ --outdir ./ \\ - --cores $task.cpus \\ - $args + --cores ${task.cpus} \\ + ${args} cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/local/grohmm/transcriptcalling/main.nf b/modules/local/grohmm/transcriptcalling/main.nf index 984d1800..95dca60c 100644 --- a/modules/local/grohmm/transcriptcalling/main.nf +++ b/modules/local/grohmm/transcriptcalling/main.nf @@ -1,12 +1,12 @@ process GROHMM_TRANSCRIPTCALLING { - tag "$meta.id" + tag "${meta.id}" label 'process_high' label 'process_long' conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/b9/b929af5662486ba6ce2d27eb501e5c7ec71ca7dd8e333fe5d3dcf2803d87cf67/data' : - 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/b9/b929af5662486ba6ce2d27eb501e5c7ec71ca7dd8e333fe5d3dcf2803d87cf67/data' + : 'community.wave.seqera.io/library/grohmm:833aa94cad4202ac'}" input: tuple val(meta), path(bams), path(bais), path(tuning_file) @@ -14,12 +14,12 @@ process GROHMM_TRANSCRIPTCALLING { output: tuple val(meta), path("*.transcripts.txt"), emit: transcripts - tuple val(meta), path("*.eval.txt") , emit: eval + tuple val(meta), path("*.eval.txt"), emit: eval tuple val(meta), path("*.transcripts.bed"), emit: transcripts_bed - tuple val(meta), path("*.tdFinal.txt") , emit: td - tuple val(meta), path("*.tdplot_mqc.png") , emit: td_plot - tuple val(meta), path("*.tdFinal_mqc.csv") , emit: mqc_csv - path "versions.yml" , emit: versions + tuple val(meta), path("*.tdFinal.txt"), emit: td + tuple val(meta), path("*.tdplot_mqc.png"), emit: td_plot + tuple val(meta), path("*.tdFinal_mqc.csv"), emit: mqc_csv + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when @@ -32,11 +32,11 @@ process GROHMM_TRANSCRIPTCALLING { --bam_file ${bams} \\ --tuning_file ${tuning_file} \\ --outprefix ${prefix} \\ - --gxf $gxf \\ + --gxf ${gxf} \\ --outdir ./ \\ - --cores $task.cpus \\ + --cores ${task.cpus} \\ --memory ${task.memory.toMega()} \\ - $args + ${args} cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/local/gtf2bed.nf b/modules/local/gtf2bed.nf index 07df95fb..7b34be8b 100644 --- a/modules/local/gtf2bed.nf +++ b/modules/local/gtf2bed.nf @@ -1,26 +1,27 @@ process GTF2BED { - tag "$gtf" + tag "${gtf}" label 'process_low' conda "conda-forge::perl=5.26.2" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/perl:5.26.2' : - 'biocontainers/perl:5.26.2' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://depot.galaxyproject.org/singularity/perl:5.26.2' + : 'biocontainers/perl:5.26.2'}" input: path gtf output: - path '*.bed' , emit: bed + path '*.bed', emit: bed path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when - script: // This script is bundled with the pipeline, in nf-core/nascent/bin/ + script: + // This script is bundled with the pipeline, in nf-core/nascent/bin/ """ gtf2bed \\ - $gtf \\ + ${gtf} \\ > ${gtf.baseName}.bed cat <<-END_VERSIONS > versions.yml diff --git a/subworkflows/local/align_bwamem2/main.nf b/subworkflows/local/align_bwamem2/main.nf index beb6d863..f1ffb959 100644 --- a/subworkflows/local/align_bwamem2/main.nf +++ b/subworkflows/local/align_bwamem2/main.nf @@ -2,15 +2,15 @@ // Alignment with BWAMEM2 // -include { BWAMEM2_MEM } from '../../../modules/nf-core/bwamem2/mem/main' +include { BWAMEM2_MEM } from '../../../modules/nf-core/bwamem2/mem/main' include { BAM_SORT_STATS_SAMTOOLS } from '../../nf-core/bam_sort_stats_samtools/main' workflow ALIGN_BWAMEM2 { take: - ch_reads // channel (mandatory): [ val(meta), [ path(reads) ] ] - ch_index // channel (mandatory): [ val(meta2), path(index) ] - val_sort_bam // boolean (mandatory): true or false - ch_fasta // channel (optional) : [ val(meta3), path(fasta) ] + ch_reads // channel (mandatory): [ val(meta), [ path(reads) ] ] + ch_index // channel (mandatory): [ val(meta2), path(index) ] + val_sort_bam // boolean (mandatory): true or false + ch_fasta // channel (optional) : [ val(meta3), path(fasta) ] main: ch_versions = Channel.empty() @@ -19,25 +19,23 @@ workflow ALIGN_BWAMEM2 { // Map reads with BWA // - BWAMEM2_MEM ( ch_reads, ch_index, ch_fasta, val_sort_bam ) + BWAMEM2_MEM(ch_reads, ch_index, ch_fasta, val_sort_bam) ch_versions = ch_versions.mix(BWAMEM2_MEM.out.versions.first()) // // Sort, index BAM file and run samtools stats, flagstat and idxstats // - BAM_SORT_STATS_SAMTOOLS ( BWAMEM2_MEM.out.bam, ch_fasta ) + BAM_SORT_STATS_SAMTOOLS(BWAMEM2_MEM.out.bam, ch_fasta) ch_versions = ch_versions.mix(BAM_SORT_STATS_SAMTOOLS.out.versions) emit: - bam_orig = BWAMEM2_MEM.out.bam // channel: [ val(meta), path(bam) ] - - bam = BAM_SORT_STATS_SAMTOOLS.out.bam // channel: [ val(meta), path(bam) ] - bai = BAM_SORT_STATS_SAMTOOLS.out.bai // channel: [ val(meta), path(bai) ] - csi = BAM_SORT_STATS_SAMTOOLS.out.csi // channel: [ val(meta), path(csi) ] - stats = BAM_SORT_STATS_SAMTOOLS.out.stats // channel: [ val(meta), path(stats) ] + bam_orig = BWAMEM2_MEM.out.bam // channel: [ val(meta), path(bam) ] + bam = BAM_SORT_STATS_SAMTOOLS.out.bam // channel: [ val(meta), path(bam) ] + bai = BAM_SORT_STATS_SAMTOOLS.out.bai // channel: [ val(meta), path(bai) ] + csi = BAM_SORT_STATS_SAMTOOLS.out.csi // channel: [ val(meta), path(csi) ] + stats = BAM_SORT_STATS_SAMTOOLS.out.stats // channel: [ val(meta), path(stats) ] flagstat = BAM_SORT_STATS_SAMTOOLS.out.flagstat // channel: [ val(meta), path(flagstat) ] idxstats = BAM_SORT_STATS_SAMTOOLS.out.idxstats // channel: [ val(meta), path(idxstats) ] - - versions = ch_versions // channel: [ path(versions.yml) ] + versions = ch_versions // channel: [ path(versions.yml) ] } diff --git a/subworkflows/local/align_dragmap/main.nf b/subworkflows/local/align_dragmap/main.nf index 17a74ec6..73a181b8 100644 --- a/subworkflows/local/align_dragmap/main.nf +++ b/subworkflows/local/align_dragmap/main.nf @@ -2,15 +2,15 @@ // Alignment with dragmap // -include { DRAGMAP_ALIGN } from '../../../modules/nf-core/dragmap/align/main' +include { DRAGMAP_ALIGN } from '../../../modules/nf-core/dragmap/align/main' include { BAM_SORT_STATS_SAMTOOLS } from '../../nf-core/bam_sort_stats_samtools/main' workflow ALIGN_DRAGMAP { take: - ch_reads // channel (mandatory): [ val(meta), [ path(reads) ] ] - ch_index // channel (mandatory): [ val(meta2), path(index) ] - val_sort_bam // boolean (mandatory): true or false - ch_fasta // channel (optional) : [ val(meta3), path(fasta) ] + ch_reads // channel (mandatory): [ val(meta), [ path(reads) ] ] + ch_index // channel (mandatory): [ val(meta2), path(index) ] + val_sort_bam // boolean (mandatory): true or false + ch_fasta // channel (optional) : [ val(meta3), path(fasta) ] main: ch_versions = Channel.empty() @@ -19,25 +19,23 @@ workflow ALIGN_DRAGMAP { // Map reads with dragmap // - DRAGMAP_ALIGN ( ch_reads, ch_index, ch_fasta, val_sort_bam ) + DRAGMAP_ALIGN(ch_reads, ch_index, ch_fasta, val_sort_bam) ch_versions = ch_versions.mix(DRAGMAP_ALIGN.out.versions.first()) // // Sort, index BAM file and run samtools stats, flagstat and idxstats // - BAM_SORT_STATS_SAMTOOLS ( DRAGMAP_ALIGN.out.bam, ch_fasta ) + BAM_SORT_STATS_SAMTOOLS(DRAGMAP_ALIGN.out.bam, ch_fasta) ch_versions = ch_versions.mix(BAM_SORT_STATS_SAMTOOLS.out.versions) emit: - bam_orig = DRAGMAP_ALIGN.out.bam // channel: [ val(meta), path(bam) ] - - bam = BAM_SORT_STATS_SAMTOOLS.out.bam // channel: [ val(meta), path(bam) ] - bai = BAM_SORT_STATS_SAMTOOLS.out.bai // channel: [ val(meta), path(bai) ] - csi = BAM_SORT_STATS_SAMTOOLS.out.csi // channel: [ val(meta), path(csi) ] - stats = BAM_SORT_STATS_SAMTOOLS.out.stats // channel: [ val(meta), path(stats) ] + bam_orig = DRAGMAP_ALIGN.out.bam // channel: [ val(meta), path(bam) ] + bam = BAM_SORT_STATS_SAMTOOLS.out.bam // channel: [ val(meta), path(bam) ] + bai = BAM_SORT_STATS_SAMTOOLS.out.bai // channel: [ val(meta), path(bai) ] + csi = BAM_SORT_STATS_SAMTOOLS.out.csi // channel: [ val(meta), path(csi) ] + stats = BAM_SORT_STATS_SAMTOOLS.out.stats // channel: [ val(meta), path(stats) ] flagstat = BAM_SORT_STATS_SAMTOOLS.out.flagstat // channel: [ val(meta), path(flagstat) ] idxstats = BAM_SORT_STATS_SAMTOOLS.out.idxstats // channel: [ val(meta), path(idxstats) ] - - versions = ch_versions // channel: [ path(versions.yml) ] + versions = ch_versions // channel: [ path(versions.yml) ] } diff --git a/subworkflows/local/coverage_graphs.nf b/subworkflows/local/coverage_graphs.nf index a1628c16..ac8c46db 100644 --- a/subworkflows/local/coverage_graphs.nf +++ b/subworkflows/local/coverage_graphs.nf @@ -2,15 +2,13 @@ * Create bigWig and bedGraph files */ -include { - BEDTOOLS_GENOMECOV as BEDTOOLS_GENOMECOV_PLUS - BEDTOOLS_GENOMECOV as BEDTOOLS_GENOMECOV_MINUS } from '../../modules/nf-core/bedtools/genomecov/main' +include { BEDTOOLS_GENOMECOV as BEDTOOLS_GENOMECOV_PLUS } from '../../modules/nf-core/bedtools/genomecov/main' +include { BEDTOOLS_GENOMECOV as BEDTOOLS_GENOMECOV_MINUS } from '../../modules/nf-core/bedtools/genomecov/main' -include { - DEEPTOOLS_BAMCOVERAGE as DEEPTOOLS_BAMCOVERAGE_PLUS - DEEPTOOLS_BAMCOVERAGE as DEEPTOOLS_BAMCOVERAGE_MINUS } from '../../modules/nf-core/deeptools/bamcoverage/main' +include { DEEPTOOLS_BAMCOVERAGE as DEEPTOOLS_BAMCOVERAGE_PLUS } from '../../modules/nf-core/deeptools/bamcoverage/main' +include { DEEPTOOLS_BAMCOVERAGE as DEEPTOOLS_BAMCOVERAGE_MINUS } from '../../modules/nf-core/deeptools/bamcoverage/main' -include { DREG_PREP } from '../../modules/local/dreg_prep/main' +include { DREG_PREP } from '../../modules/local/dreg_prep/main' workflow COVERAGE_GRAPHS { take: @@ -21,13 +19,13 @@ workflow COVERAGE_GRAPHS { main: - bam = bam_bai.map{ [ it[0], it[1] ] } + bam = bam_bai.map { [it[0], it[1]] } ch_versions = Channel.empty() ch_genomecov_bam = bam.combine(Channel.from(1)) - BEDTOOLS_GENOMECOV_PLUS ( + BEDTOOLS_GENOMECOV_PLUS( ch_genomecov_bam, sizes, 'bedGraph', @@ -35,7 +33,7 @@ workflow COVERAGE_GRAPHS { ) ch_versions = ch_versions.mix(BEDTOOLS_GENOMECOV_PLUS.out.versions.first()) - BEDTOOLS_GENOMECOV_MINUS ( + BEDTOOLS_GENOMECOV_MINUS( ch_genomecov_bam, sizes, 'bedGraph', @@ -43,14 +41,14 @@ workflow COVERAGE_GRAPHS { ) ch_versions = ch_versions.mix(BEDTOOLS_GENOMECOV_MINUS.out.versions.first()) - DEEPTOOLS_BAMCOVERAGE_PLUS ( + DEEPTOOLS_BAMCOVERAGE_PLUS( bam_bai, fasta, fai ) ch_versions = ch_versions.mix(DEEPTOOLS_BAMCOVERAGE_PLUS.out.versions.first()) - DEEPTOOLS_BAMCOVERAGE_MINUS ( + DEEPTOOLS_BAMCOVERAGE_MINUS( bam_bai, fasta, fai @@ -59,17 +57,15 @@ workflow COVERAGE_GRAPHS { ch_plus_minus = DEEPTOOLS_BAMCOVERAGE_PLUS.out.bigwig.join(DEEPTOOLS_BAMCOVERAGE_MINUS.out.bigwig) - DREG_PREP ( + DREG_PREP( bam_bai, sizes, - params.assay_type, + params.assay_type ) emit: - plus_bedGraph = BEDTOOLS_GENOMECOV_PLUS.out.genomecov + plus_bedGraph = BEDTOOLS_GENOMECOV_PLUS.out.genomecov minus_bedGraph = BEDTOOLS_GENOMECOV_MINUS.out.genomecov - - plus_minus = ch_plus_minus - - versions = ch_versions + plus_minus = ch_plus_minus + versions = ch_versions } diff --git a/subworkflows/local/dreg_prep/main.nf b/subworkflows/local/dreg_prep/main.nf index 54c0bff8..942d97ec 100644 --- a/subworkflows/local/dreg_prep/main.nf +++ b/subworkflows/local/dreg_prep/main.nf @@ -10,5 +10,4 @@ workflow DREG_PREP { BEDTOOLS_BAMTOBED( bam ) - } diff --git a/subworkflows/local/prepare_genome.nf b/subworkflows/local/prepare_genome.nf index cc5bab21..1e802c27 100644 --- a/subworkflows/local/prepare_genome.nf +++ b/subworkflows/local/prepare_genome.nf @@ -2,22 +2,24 @@ // Uncompress and prepare reference genome files // -include { GTF2BED } from '../../modules/local/gtf2bed' +include { GTF2BED } from '../../modules/local/gtf2bed' include { - GUNZIP as GUNZIP_FASTA - GUNZIP as GUNZIP_GTF - GUNZIP as GUNZIP_GFF - GUNZIP as GUNZIP_GENE_BED } from '../../modules/nf-core/gunzip/main' + GUNZIP as GUNZIP_FASTA ; + GUNZIP as GUNZIP_GTF ; + GUNZIP as GUNZIP_GFF ; + GUNZIP as GUNZIP_GENE_BED +} from '../../modules/nf-core/gunzip/main' include { - UNTAR as UNTAR_BWA_INDEX - UNTAR as UNTAR_DRAGMAP } from '../../modules/nf-core/untar/main' -include { GFFREAD } from '../../modules/nf-core/gffread/main' -include { BWA_INDEX } from '../../modules/nf-core/bwa/index/main' -include { BWAMEM2_INDEX } from '../../modules/nf-core/bwamem2/index/main' -include { DRAGMAP_HASHTABLE } from '../../modules/nf-core/dragmap/hashtable/main' -include { BOWTIE2_BUILD } from '../../modules/nf-core/bowtie2/build/main' -include { CUSTOM_GETCHROMSIZES } from '../../modules/nf-core/custom/getchromsizes/main' + UNTAR as UNTAR_BWA_INDEX ; + UNTAR as UNTAR_DRAGMAP +} from '../../modules/nf-core/untar/main' +include { GFFREAD } from '../../modules/nf-core/gffread/main' +include { BWA_INDEX } from '../../modules/nf-core/bwa/index/main' +include { BWAMEM2_INDEX } from '../../modules/nf-core/bwamem2/index/main' +include { DRAGMAP_HASHTABLE } from '../../modules/nf-core/dragmap/hashtable/main' +include { BOWTIE2_BUILD } from '../../modules/nf-core/bowtie2/build/main' +include { CUSTOM_GETCHROMSIZES } from '../../modules/nf-core/custom/getchromsizes/main' workflow PREPARE_GENOME { take: @@ -40,9 +42,10 @@ workflow PREPARE_GENOME { // Uncompress genome fasta file if required // if (fasta.endsWith('.gz')) { - ch_fasta = GUNZIP_FASTA ( [ [:], fasta ] ).gunzip.map { it[1] } + ch_fasta = GUNZIP_FASTA([[:], fasta]).gunzip.map { it[1] } ch_versions = ch_versions.mix(GUNZIP_FASTA.out.versions) - } else { + } + else { ch_fasta = Channel.value(file(fasta)) } @@ -52,19 +55,22 @@ workflow PREPARE_GENOME { if (gtf || gff) { if (gtf) { if (gtf.endsWith('.gz')) { - ch_gtf = GUNZIP_GTF ( [ [:], gtf ] ).gunzip.map { it[1] } + ch_gtf = GUNZIP_GTF([[:], gtf]).gunzip.map { it[1] } ch_versions = ch_versions.mix(GUNZIP_GTF.out.versions) - } else { + } + else { ch_gtf = Channel.value(file(gtf)) } - } else if (gff) { + } + else if (gff) { if (gff.endsWith('.gz')) { - ch_gff = GUNZIP_GFF ( [ [:], gff ] ).gunzip + ch_gff = GUNZIP_GFF([[:], gff]).gunzip ch_versions = ch_versions.mix(GUNZIP_GFF.out.versions) - } else { - ch_gff = [ [:], file(gff)] } - ch_gtf = GFFREAD ( ch_gff, ch_fasta ).gtf.map { it[1] } + else { + ch_gff = [[:], file(gff)] + } + ch_gtf = GFFREAD(ch_gff, ch_fasta).gtf.map { it[1] } ch_versions = ch_versions.mix(GFFREAD.out.versions) } } @@ -74,23 +80,25 @@ workflow PREPARE_GENOME { // if (gene_bed) { if (gene_bed.endsWith('.gz')) { - ch_gene_bed = GUNZIP_GENE_BED ( [ [:], gene_bed ] ).gunzip.map { it[1] } + ch_gene_bed = GUNZIP_GENE_BED([[:], gene_bed]).gunzip.map { it[1] } ch_versions = ch_versions.mix(GUNZIP_GENE_BED.out.versions) - } else { + } + else { ch_gene_bed = file(gene_bed) } - } else { - ch_gene_bed = GTF2BED ( ch_gtf ).bed + } + else { + ch_gene_bed = GTF2BED(ch_gtf).bed ch_versions = ch_versions.mix(GTF2BED.out.versions) } // // Create chromosome sizes file // - CUSTOM_GETCHROMSIZES ( ch_fasta.map { [ [:], it ] } ) - ch_fai = CUSTOM_GETCHROMSIZES.out.fai.map { it[1] } + CUSTOM_GETCHROMSIZES(ch_fasta.map { [[:], it] }) + ch_fai = CUSTOM_GETCHROMSIZES.out.fai.map { it[1] } ch_chrom_sizes = CUSTOM_GETCHROMSIZES.out.sizes.map { it[1] } - ch_versions = ch_versions.mix(CUSTOM_GETCHROMSIZES.out.versions) + ch_versions = ch_versions.mix(CUSTOM_GETCHROMSIZES.out.versions) // // Uncompress BWA index or generate from scratch if required @@ -102,66 +110,76 @@ workflow PREPARE_GENOME { if ('bwa' in prepare_tool_indices) { if (bwa_index) { if (bwa_index.endsWith('.tar.gz')) { - ch_bwa_index = UNTAR_BWA_INDEX ( [ [:], bwa_index ] ).untar + ch_bwa_index = UNTAR_BWA_INDEX([[:], bwa_index]).untar ch_versions = ch_versions.mix(UNTAR_BWA_INDEX.out.versions) - } else { + } + else { // TODO Give the meta from basename or genome? - ch_bwa_index = [ [meta: "Genome"], file(bwa_index) ] + ch_bwa_index = [[meta: "Genome"], file(bwa_index)] } - } else { - ch_bwa_index = BWA_INDEX ( ch_fasta.map { [ [:], it ] } ).index + } + else { + ch_bwa_index = BWA_INDEX(ch_fasta.map { [[:], it] }).index ch_versions = ch_versions.mix(BWA_INDEX.out.versions) } - } else if ('bwamem2' in prepare_tool_indices) { + } + else if ('bwamem2' in prepare_tool_indices) { if (bwamem2_index) { if (bwamem2_index.endsWith('.tar.gz') || bwamem2_index.endsWith('.tgz')) { - ch_bwa_index = UNTAR_BWA_INDEX ( [ [:], bwamem2_index ] ).untar + ch_bwa_index = UNTAR_BWA_INDEX([[:], bwamem2_index]).untar ch_versions = ch_versions.mix(UNTAR_BWA_INDEX.out.versions) - } else { + } + else { // TODO Give the meta from basename or genome? - ch_bwa_index = [ [meta: "Genome"], file(bwamem2_index) ] + ch_bwa_index = [[meta: "Genome"], file(bwamem2_index)] } - } else { - ch_bwa_index = BWAMEM2_INDEX ( ch_fasta.map { [ [:], it ] } ).index + } + else { + ch_bwa_index = BWAMEM2_INDEX(ch_fasta.map { [[:], it] }).index ch_versions = ch_versions.mix(BWAMEM2_INDEX.out.versions) } - } else if ('dragmap' in prepare_tool_indices) { + } + else if ('dragmap' in prepare_tool_indices) { if (dragmap) { if (dragmap.endsWith('.tar.gz')) { - ch_dragmap = UNTAR_DRAGMAP_INDEX ( dragmap ).untar + ch_dragmap = UNTAR_DRAGMAP_INDEX(dragmap).untar ch_versions = ch_versions.mix(UNTAR_DRAGMAP_INDEX.out.versions) - } else { + } + else { // TODO Give the meta from basename or genome? - ch_dragmap = [ [meta: "Genome"], file(dragmap) ] + ch_dragmap = [[meta: "Genome"], file(dragmap)] } - } else { - ch_dragmap = DRAGMAP_HASHTABLE( ch_fasta.map { [ [:], it ] } ).hashmap + } + else { + ch_dragmap = DRAGMAP_HASHTABLE(ch_fasta.map { [[:], it] }).hashmap ch_versions = ch_versions.mix(DRAGMAP_HASHTABLE.out.versions) } - } else if ('bowtie2' in prepare_tool_indices) { + } + else if ('bowtie2' in prepare_tool_indices) { if (bowtie2_index) { if (bowtie2_index.endsWith('.tar.gz')) { - ch_bowtie2_index = UNTAR_BOWTIE2_INDEX ( bowtie2_index ).untar + ch_bowtie2_index = UNTAR_BOWTIE2_INDEX(bowtie2_index).untar ch_versions = ch_versions.mix(UNTAR_BOWTIE2_INDEX.out.versions) - } else { + } + else { // TODO Give the meta from basename or genome? - ch_bowtie2_index = [ [meta: "Genome"], file(bowtie2_index) ] + ch_bowtie2_index = [[meta: "Genome"], file(bowtie2_index)] } - } else { - ch_bowtie2_index = BOWTIE2_BUILD ( ch_fasta.map { [ [:], it ] } ).index + } + else { + ch_bowtie2_index = BOWTIE2_BUILD(ch_fasta.map { [[:], it] }).index ch_versions = ch_versions.mix(BOWTIE2_BUILD.out.versions) } } emit: - fasta = ch_fasta - fai = ch_fai - gtf = ch_gtf - gene_bed = ch_gene_bed - chrom_sizes = ch_chrom_sizes - bwa_index = ch_bwa_index - dragmap = ch_dragmap + fasta = ch_fasta + fai = ch_fai + gtf = ch_gtf + gene_bed = ch_gene_bed + chrom_sizes = ch_chrom_sizes + bwa_index = ch_bwa_index + dragmap = ch_dragmap bowtie2_index = ch_bowtie2_index - - versions = ch_versions.ifEmpty(null) + versions = ch_versions.ifEmpty(null) } diff --git a/subworkflows/local/quality_control.nf b/subworkflows/local/quality_control.nf index ad24c7d9..9169d4cd 100644 --- a/subworkflows/local/quality_control.nf +++ b/subworkflows/local/quality_control.nf @@ -1,8 +1,8 @@ -include { PRESEQ_CCURVE } from '../../modules/nf-core/preseq/ccurve/main' +include { PRESEQ_CCURVE } from '../../modules/nf-core/preseq/ccurve/main' include { PRESEQ_LCEXTRAP } from '../../modules/nf-core/preseq/lcextrap/main' -include { BBMAP_PILEUP } from '../../modules/nf-core/bbmap/pileup/main' +include { BBMAP_PILEUP } from '../../modules/nf-core/bbmap/pileup/main' -include { BAM_RSEQC } from '../../subworkflows/nf-core/bam_rseqc' +include { BAM_RSEQC } from '../../subworkflows/nf-core/bam_rseqc' workflow QUALITY_CONTROL { take: @@ -11,37 +11,34 @@ workflow QUALITY_CONTROL { main: - bam = bam_bai.map{ [ it[0], it[1] ] } + bam = bam_bai.map { [it[0], it[1]] } ch_versions = Channel.empty() - PRESEQ_CCURVE ( bam ) + PRESEQ_CCURVE(bam) ch_versions = ch_versions.mix(PRESEQ_CCURVE.out.versions.first()) - PRESEQ_LCEXTRAP ( bam ) + PRESEQ_LCEXTRAP(bam) ch_versions = ch_versions.mix(PRESEQ_LCEXTRAP.out.versions.first()) // TODO Set this in a param? rseqc_modules = ['read_duplication', 'read_distribution', 'infer_experiment'] - BAM_RSEQC ( bam_bai, bed, rseqc_modules ) + BAM_RSEQC(bam_bai, bed, rseqc_modules) ch_versions = ch_versions.mix(BAM_RSEQC.out.versions) - BBMAP_PILEUP ( bam ) + BBMAP_PILEUP(bam) ch_versions = ch_versions.mix(BBMAP_PILEUP.out.versions.first()) emit: - preseq_ccurve = PRESEQ_CCURVE.out.c_curve - preseq_lcextrap = PRESEQ_LCEXTRAP.out.lc_extrap - - inferexperiment_txt = BAM_RSEQC.out.inferexperiment_txt - readdistribution_txt = BAM_RSEQC.out.readdistribution_txt + preseq_ccurve = PRESEQ_CCURVE.out.c_curve + preseq_lcextrap = PRESEQ_LCEXTRAP.out.lc_extrap + inferexperiment_txt = BAM_RSEQC.out.inferexperiment_txt + readdistribution_txt = BAM_RSEQC.out.readdistribution_txt readduplication_seq_xls = BAM_RSEQC.out.readduplication_seq_xls readduplication_pos_xls = BAM_RSEQC.out.readduplication_pos_xls - readduplication_pdf = BAM_RSEQC.out.readduplication_pdf + readduplication_pdf = BAM_RSEQC.out.readduplication_pdf readduplication_rscript = BAM_RSEQC.out.readduplication_rscript - - pileup_stats = BBMAP_PILEUP.out.covstats - pileup_hist = BBMAP_PILEUP.out.hist - - versions = ch_versions + pileup_stats = BBMAP_PILEUP.out.covstats + pileup_hist = BBMAP_PILEUP.out.hist + versions = ch_versions } diff --git a/subworkflows/local/transcript_identification/main.nf b/subworkflows/local/transcript_identification/main.nf index 890f5579..537c8552 100644 --- a/subworkflows/local/transcript_identification/main.nf +++ b/subworkflows/local/transcript_identification/main.nf @@ -37,7 +37,7 @@ workflow TRANSCRIPT_INDENTIFICATION { homer_peaks = Channel.empty() homer_tagdir = Channel.empty() if (params.assay_type == "GROseq") { - group_bam = group_bam_bai.map { meta, bam, bai -> [meta, bam] } + group_bam = group_bam_bai.map { meta, bam, _bai -> [meta, bam] } HOMER_GROSEQ(group_bam, fasta, uniqmap) ch_identification_bed = ch_identification_bed.mix(HOMER_GROSEQ.out.bed) homer_peaks = HOMER_GROSEQ.out.peaks @@ -78,7 +78,7 @@ workflow TRANSCRIPT_INDENTIFICATION { // TODO Tests don't seem to hit this because there's no bidirectional_TREs // Need to collect all of the beds for each chromosome/sample and concatenate them // Nextflow makes this super easy - def ch_bidirectional_tres = PINTS_CALLER.out.unidirectional_TREs.groupTuple(by: [0]).map { meta, beds -> + ch_bidirectional_tres = PINTS_CALLER.out.unidirectional_TREs.groupTuple(by: [0]).map { meta, beds -> [meta, beds.flatten()] } @@ -106,7 +106,7 @@ workflow TRANSCRIPT_INDENTIFICATION { } ch_identification_bed - .filter { meta, bed -> bed.size() > 0 } + .filter { _meta, bed -> bed.size() > 0 } .set { ch_identification_bed_clean } emit: diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index bf28cfc1..9a421fa5 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -8,14 +8,14 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -include { UTILS_NFSCHEMA_PLUGIN } from '../../nf-core/utils_nfschema_plugin' -include { paramsSummaryMap } from 'plugin/nf-schema' -include { samplesheetToList } from 'plugin/nf-schema' -include { completionEmail } from '../../nf-core/utils_nfcore_pipeline' -include { completionSummary } from '../../nf-core/utils_nfcore_pipeline' -include { imNotification } from '../../nf-core/utils_nfcore_pipeline' -include { UTILS_NFCORE_PIPELINE } from '../../nf-core/utils_nfcore_pipeline' -include { UTILS_NEXTFLOW_PIPELINE } from '../../nf-core/utils_nextflow_pipeline' +include { UTILS_NFSCHEMA_PLUGIN } from '../../nf-core/utils_nfschema_plugin' +include { paramsSummaryMap } from 'plugin/nf-schema' +include { samplesheetToList } from 'plugin/nf-schema' +include { completionEmail } from '../../nf-core/utils_nfcore_pipeline' +include { completionSummary } from '../../nf-core/utils_nfcore_pipeline' +include { imNotification } from '../../nf-core/utils_nfcore_pipeline' +include { UTILS_NFCORE_PIPELINE } from '../../nf-core/utils_nfcore_pipeline' +include { UTILS_NEXTFLOW_PIPELINE } from '../../nf-core/utils_nextflow_pipeline' /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -24,7 +24,6 @@ include { UTILS_NEXTFLOW_PIPELINE } from '../../nf-core/utils_nextflow_pipelin */ workflow PIPELINE_INITIALISATION { - take: version // boolean: Display version and exit validate_params // boolean: Boolean whether to validate parameters against the schema at runtime @@ -40,7 +39,7 @@ workflow PIPELINE_INITIALISATION { // // Print version and exit if required and dump pipeline parameters to JSON file // - UTILS_NEXTFLOW_PIPELINE ( + UTILS_NEXTFLOW_PIPELINE( version, true, outdir, @@ -50,7 +49,7 @@ workflow PIPELINE_INITIALISATION { // // Validate parameters and generate parameter summary to stdout // - UTILS_NFSCHEMA_PLUGIN ( + UTILS_NFSCHEMA_PLUGIN( workflow, validate_params, null @@ -59,7 +58,7 @@ workflow PIPELINE_INITIALISATION { // // Check config provided to the pipeline // - UTILS_NFCORE_PIPELINE ( + UTILS_NFCORE_PIPELINE( nextflow_cli_args ) @@ -74,21 +73,20 @@ workflow PIPELINE_INITIALISATION { Channel .fromList(samplesheetToList(params.input, "${projectDir}/assets/schema_input.json")) - .map { - meta, fastq_1, fastq_2 -> - if (!fastq_2) { - return [ meta.id, meta + [ single_end:true ], [ fastq_1 ] ] - } else { - return [ meta.id, meta + [ single_end:false ], [ fastq_1, fastq_2 ] ] - } + .map { meta, fastq_1, fastq_2 -> + if (!fastq_2) { + return [meta.id, meta + [single_end: true], [fastq_1]] + } + else { + return [meta.id, meta + [single_end: false], [fastq_1, fastq_2]] + } } .groupTuple() .map { samplesheet -> validateInputSamplesheet(samplesheet) } - .map { - meta, fastqs -> - return [ meta, fastqs.flatten() ] + .map { meta, fastqs -> + return [meta, fastqs.flatten()] } .set { ch_samplesheet } @@ -104,7 +102,6 @@ workflow PIPELINE_INITIALISATION { */ workflow PIPELINE_COMPLETION { - take: email // string: email address email_on_fail // string: email address sent on pipeline failure @@ -130,7 +127,7 @@ workflow PIPELINE_COMPLETION { plaintext_email, outdir, monochrome_logs, - multiqc_reports.getVal(), + multiqc_reports.getVal() ) } @@ -141,7 +138,7 @@ workflow PIPELINE_COMPLETION { } workflow.onError { - log.error "Pipeline failed. Please refer to troubleshooting docs: https://nf-co.re/docs/usage/troubleshooting" + log.error("Pipeline failed. Please refer to troubleshooting docs: https://nf-co.re/docs/usage/troubleshooting") } } @@ -164,20 +161,20 @@ def validateInputSamplesheet(input) { def (metas, fastqs) = input[1..2] // Check that multiple runs of the same sample are of the same datatype i.e. single-end / paired-end - def endedness_ok = metas.collect{ meta -> meta.single_end }.unique().size == 1 + def endedness_ok = metas.collect { meta -> meta.single_end }.unique().size == 1 if (!endedness_ok) { error("Please check input samplesheet -> Multiple runs of a sample must be of the same datatype i.e. single-end or paired-end: ${metas[0].id}") } - return [ metas[0], fastqs ] + return [metas[0], fastqs] } // // Get attribute from genome config file e.g. fasta // def getGenomeAttribute(attribute) { if (params.genomes && params.genome && params.genomes.containsKey(params.genome)) { - if (params.genomes[ params.genome ].containsKey(attribute)) { - return params.genomes[ params.genome ][ attribute ] + if (params.genomes[params.genome].containsKey(attribute)) { + return params.genomes[params.genome][attribute] } } return null @@ -188,11 +185,7 @@ def getGenomeAttribute(attribute) { // def genomeExistsError() { if (params.genomes && params.genome && !params.genomes.containsKey(params.genome)) { - def error_string = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + - " Genome '${params.genome}' not found in any config files provided to the pipeline.\n" + - " Currently, the available genome keys are:\n" + - " ${params.genomes.keySet().join(", ")}\n" + - "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + def error_string = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + " Genome '${params.genome}' not found in any config files provided to the pipeline.\n" + " Currently, the available genome keys are:\n" + " ${params.genomes.keySet().join(", ")}\n" + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" error(error_string) } } @@ -272,10 +265,13 @@ def methodsDescriptionText(mqc_methods_yaml) { def temp_doi_ref = "" def manifest_doi = meta.manifest_map.doi.tokenize(",") manifest_doi.each { doi_ref -> - temp_doi_ref += "(doi: ${doi_ref.replace("https://doi.org/", "").replace(" ", "")}), " + temp_doi_ref += "(doi: ${doi_ref.replace("https://doi.org/", "").replace(" ", "")}), " } meta["doi_text"] = temp_doi_ref.substring(0, temp_doi_ref.length() - 2) - } else meta["doi_text"] = "" + } + else { + meta["doi_text"] = "" + } 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 @@ -288,9 +284,8 @@ def methodsDescriptionText(mqc_methods_yaml) { def methods_text = mqc_methods_yaml.text - def engine = new groovy.text.SimpleTemplateEngine() + def engine = new groovy.text.SimpleTemplateEngine() def description_html = engine.createTemplate(methods_text).make(meta) return description_html.toString() } - diff --git a/workflows/nascent.nf b/workflows/nascent.nf index bb1eb1b9..724bf1bb 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -4,40 +4,38 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -include { BED2SAF } from '../modules/local/bed2saf' - -include { PREPARE_GENOME } from '../subworkflows/local/prepare_genome' -include { ALIGN_BWAMEM2 } from '../subworkflows/local/align_bwamem2/main' -include { ALIGN_DRAGMAP } from '../subworkflows/local/align_dragmap/main' -include { QUALITY_CONTROL } from '../subworkflows/local/quality_control.nf' -include { COVERAGE_GRAPHS } from '../subworkflows/local/coverage_graphs.nf' -include { TRANSCRIPT_INDENTIFICATION } from '../subworkflows/local/transcript_identification' - -include { FASTP } from '../modules/nf-core/fastp/main' -include { - UNTAR as UNTAR_HISAT2_INDEX - UNTAR as UNTAR_STAR_INDEX -} from '../modules/nf-core/untar/main' -include { STAR_GENOMEGENERATE } from '../modules/nf-core/star/genomegenerate/main' -include { - SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_GENE - SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_PREDICTED } from '../modules/nf-core/subread/featurecounts/main' - -include { FASTQC } from '../modules/nf-core/fastqc/main' -include { MULTIQC } from '../modules/nf-core/multiqc/main' -include { paramsSummaryMap } from 'plugin/nf-schema' -include { paramsSummaryMultiqc } from '../subworkflows/nf-core/utils_nfcore_pipeline' -include { softwareVersionsToYAML } from '../subworkflows/nf-core/utils_nfcore_pipeline' -include { methodsDescriptionText } from '../subworkflows/local/utils_nfcore_nascent_pipeline' +include { BED2SAF } from '../modules/local/bed2saf' + +include { PREPARE_GENOME } from '../subworkflows/local/prepare_genome' +include { ALIGN_BWAMEM2 } from '../subworkflows/local/align_bwamem2/main' +include { ALIGN_DRAGMAP } from '../subworkflows/local/align_dragmap/main' +include { QUALITY_CONTROL } from '../subworkflows/local/quality_control.nf' +include { COVERAGE_GRAPHS } from '../subworkflows/local/coverage_graphs.nf' +include { TRANSCRIPT_INDENTIFICATION } from '../subworkflows/local/transcript_identification' + +include { FASTP } from '../modules/nf-core/fastp/main' +include { UNTAR as UNTAR_HISAT2_INDEX } from '../modules/nf-core/untar/main' +include { UNTAR as UNTAR_STAR_INDEX } from '../modules/nf-core/untar/main' +include { STAR_GENOMEGENERATE } from '../modules/nf-core/star/genomegenerate/main' +include { SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_GENE } from '../modules/nf-core/subread/featurecounts/main' +include { SUBREAD_FEATURECOUNTS as SUBREAD_FEATURECOUNTS_PREDICTED } from '../modules/nf-core/subread/featurecounts/main' + + +include { FASTQC } from '../modules/nf-core/fastqc/main' +include { MULTIQC } from '../modules/nf-core/multiqc/main' +include { paramsSummaryMap } from 'plugin/nf-schema' +include { paramsSummaryMultiqc } from '../subworkflows/nf-core/utils_nfcore_pipeline' +include { softwareVersionsToYAML } from '../subworkflows/nf-core/utils_nfcore_pipeline' +include { methodsDescriptionText } from '../subworkflows/local/utils_nfcore_nascent_pipeline' // // SUBWORKFLOW: Consisting entirely of nf-core/modules // -include { FASTQ_ALIGN_BWA } from '../subworkflows/nf-core/fastq_align_bwa/main' -include { FASTQ_ALIGN_BOWTIE2 } from '../subworkflows/nf-core/fastq_align_bowtie2/main' -include { FASTQ_ALIGN_HISAT2 } from '../subworkflows/nf-core/fastq_align_hisat2/main' -include { FASTQ_ALIGN_STAR } from '../subworkflows/nf-core/fastq_align_star/main' -include { BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS } from '../subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main' +include { FASTQ_ALIGN_BWA } from '../subworkflows/nf-core/fastq_align_bwa/main' +include { FASTQ_ALIGN_BOWTIE2 } from '../subworkflows/nf-core/fastq_align_bowtie2/main' +include { FASTQ_ALIGN_HISAT2 } from '../subworkflows/nf-core/fastq_align_hisat2/main' +include { FASTQ_ALIGN_STAR } from '../subworkflows/nf-core/fastq_align_star/main' +include { BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS } from '../subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main' /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -46,9 +44,8 @@ include { BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS } from '../subworkflows/nf-core/bam_ */ workflow NASCENT { - take: - ch_samplesheet // channel: samplesheet read in from --input + ch_samplesheet // channel: samplesheet read in from --input ch_fasta ch_gtf ch_gff @@ -61,7 +58,6 @@ workflow NASCENT { ch_star_index ch_uniqmap - main: ch_versions = Channel.empty() @@ -72,8 +68,10 @@ workflow NASCENT { // HACK Rework this because of nf-validation def prepareToolIndices = [] - if (!params.skip_alignment) { prepareToolIndices << params.aligner } - PREPARE_GENOME ( + if (!params.skip_alignment) { + prepareToolIndices << params.aligner + } + PREPARE_GENOME( prepareToolIndices, ch_fasta, ch_gtf, @@ -83,26 +81,27 @@ workflow NASCENT { ch_bwamem2_index, ch_dragmap, ch_bowtie2_index, - ch_hisat2_index, + ch_hisat2_index ) ch_versions = ch_versions.mix(PREPARE_GENOME.out.versions) - ch_fasta = PREPARE_GENOME.out.fasta.map{ fasta -> [ [ id:fasta.baseName ], fasta ] } + ch_fasta = PREPARE_GENOME.out.fasta.map { fasta -> [[id: fasta.baseName], fasta] } // // MODULE: Run FastQC // - FASTQC ( + FASTQC( ch_samplesheet ) - ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip.collect{it[1]}) + ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip.collect { it[1] }) ch_versions = ch_versions.mix(FASTQC.out.versions.first()) ch_reads = Channel.empty() - if(!params.skip_trimming) { - FASTP ( ch_samplesheet, [], false, false, false ) + if (!params.skip_trimming) { + FASTP(ch_samplesheet, [], false, false, false) ch_reads = FASTP.out.reads ch_versions = ch_versions.mix(FASTP.out.versions.first()) - } else { + } + else { ch_reads = ch_samplesheet } @@ -119,11 +118,11 @@ workflow NASCENT { ch_aligner_clustering_multiqc = Channel.empty() ch_bowtie2_multiqc = Channel.empty() if (!params.skip_alignment && params.aligner == 'bwa') { - FASTQ_ALIGN_BWA ( + FASTQ_ALIGN_BWA( ch_reads, PREPARE_GENOME.out.bwa_index, false, - ch_fasta, + ch_fasta ) ch_genome_bam = FASTQ_ALIGN_BWA.out.bam ch_genome_bai = FASTQ_ALIGN_BWA.out.bai @@ -132,12 +131,13 @@ workflow NASCENT { ch_samtools_idxstats = FASTQ_ALIGN_BWA.out.idxstats ch_versions = ch_versions.mix(FASTQ_ALIGN_BWA.out.versions.first()) - } else if (!params.skip_alignment && params.aligner == 'bwamem2') { - ALIGN_BWAMEM2 ( + } + else if (!params.skip_alignment && params.aligner == 'bwamem2') { + ALIGN_BWAMEM2( ch_reads, PREPARE_GENOME.out.bwa_index, false, - ch_fasta, + ch_fasta ) ch_genome_bam = ALIGN_BWAMEM2.out.bam ch_genome_bai = ALIGN_BWAMEM2.out.bai @@ -146,12 +146,13 @@ workflow NASCENT { ch_samtools_idxstats = ALIGN_BWAMEM2.out.idxstats ch_versions = ch_versions.mix(ALIGN_BWAMEM2.out.versions) - } else if (!params.skip_alignment && params.aligner == 'dragmap') { - ALIGN_DRAGMAP ( + } + else if (!params.skip_alignment && params.aligner == 'dragmap') { + ALIGN_DRAGMAP( ch_reads, PREPARE_GENOME.out.dragmap, false, - ch_fasta, + ch_fasta ) ch_genome_bam = ALIGN_DRAGMAP.out.bam ch_genome_bai = ALIGN_DRAGMAP.out.bai @@ -160,13 +161,14 @@ workflow NASCENT { ch_samtools_idxstats = ALIGN_DRAGMAP.out.idxstats ch_versions = ch_versions.mix(ALIGN_DRAGMAP.out.versions) - } else if (!params.skip_alignment && params.aligner == 'bowtie2') { - FASTQ_ALIGN_BOWTIE2 ( + } + else if (!params.skip_alignment && params.aligner == 'bowtie2') { + FASTQ_ALIGN_BOWTIE2( ch_reads, PREPARE_GENOME.out.bowtie2_index, false, false, - ch_fasta, + ch_fasta ) ch_genome_bam = FASTQ_ALIGN_BOWTIE2.out.bam ch_genome_bai = FASTQ_ALIGN_BOWTIE2.out.bai @@ -176,20 +178,22 @@ workflow NASCENT { ch_bowtie2_multiqc = FASTQ_ALIGN_BOWTIE2.out.log_out ch_versions = ch_versions.mix(FASTQ_ALIGN_BOWTIE2.out.versions) - } else if (!params.skip_alignment && params.aligner == 'hisat2') { + } + else if (!params.skip_alignment && params.aligner == 'hisat2') { if (ch_hisat2_index.endsWith('.tar.gz')) { - ch_hisat2_index = UNTAR_HISAT2_INDEX ( [ [:], ch_hisat2_index ] ).untar + ch_hisat2_index = UNTAR_HISAT2_INDEX([[:], ch_hisat2_index]).untar ch_versions = ch_versions.mix(UNTAR_HISAT2_INDEX.out.versions) - } else { + } + else { // TODO Give the meta from basename or genome? - ch_hisat2_index = [ [meta: "Genome"], file(ch_hisat2_index) ] + ch_hisat2_index = [[meta: "Genome"], file(ch_hisat2_index)] } - FASTQ_ALIGN_HISAT2 ( + FASTQ_ALIGN_HISAT2( ch_reads, ch_hisat2_index, - [[:],[]], - ch_fasta, + [[:], []], + ch_fasta ) ch_genome_bam = FASTQ_ALIGN_HISAT2.out.bam ch_genome_bai = FASTQ_ALIGN_HISAT2.out.bai @@ -199,42 +203,45 @@ workflow NASCENT { ch_HISAT2_multiqc = FASTQ_ALIGN_HISAT2.out.summary ch_versions = ch_versions.mix(FASTQ_ALIGN_HISAT2.out.versions) - } else if (!params.skip_alignment && params.aligner == 'star') { - if(!ch_star_index) { - ch_star_index = STAR_GENOMEGENERATE ( + } + else if (!params.skip_alignment && params.aligner == 'star') { + if (!ch_star_index) { + ch_star_index = STAR_GENOMEGENERATE( ch_fasta, PREPARE_GENOME.out.gtf.map { [[:], it] } ).index - } else if (ch_star_index.endsWith('.tar.gz')) { - ch_star_index = UNTAR_STAR_INDEX ( [ [:], ch_star_index ] ).untar + } + else if (ch_star_index.endsWith('.tar.gz')) { + ch_star_index = UNTAR_STAR_INDEX([[:], ch_star_index]).untar ch_versions = ch_versions.mix(UNTAR_STAR_INDEX.out.versions) - } else { + } + else { // TODO Give the meta from basename or genome? - ch_star_index = [ [meta: "Genome"], file(ch_star_index) ] + ch_star_index = [[meta: "Genome"], file(ch_star_index)] } - FASTQ_ALIGN_STAR ( + FASTQ_ALIGN_STAR( ch_reads, ch_star_index, - PREPARE_GENOME.out.gtf.map { [ [:], it ] }, + PREPARE_GENOME.out.gtf.map { [[:], it] }, false, '', - '', // TODO params.seq_center ?: + '', ch_fasta, - Channel.of([[:], []]), + Channel.of([[:], []]) ) - ch_genome_bam = FASTQ_ALIGN_STAR.out.bam - ch_genome_bai = FASTQ_ALIGN_STAR.out.bai + ch_genome_bam = FASTQ_ALIGN_STAR.out.bam + ch_genome_bai = FASTQ_ALIGN_STAR.out.bai ch_transcriptome_bam = FASTQ_ALIGN_STAR.out.bam_transcript - ch_star_log = FASTQ_ALIGN_STAR.out.log_final - ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.stats.collect{it[1]}) - ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.flagstat.collect{it[1]}) - ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.idxstats.collect{it[1]}) - ch_multiqc_files = ch_multiqc_files.mix(ch_star_log.collect{it[1]}) + ch_star_log = FASTQ_ALIGN_STAR.out.log_final + ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.stats.collect { it[1] }) + ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.flagstat.collect { it[1] }) + ch_multiqc_files = ch_multiqc_files.mix(FASTQ_ALIGN_STAR.out.idxstats.collect { it[1] }) + ch_multiqc_files = ch_multiqc_files.mix(ch_star_log.collect { it[1] }) } - if(params.with_umi) { - BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS ( + if (params.with_umi) { + BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS( ch_genome_bam.join(ch_genome_bai, by: [0]), params.umitools_dedup_stats ) @@ -249,13 +256,13 @@ workflow NASCENT { ch_genome_bam_bai = ch_genome_bam.join(ch_genome_bai, by: [0], remainder: true) - QUALITY_CONTROL ( + QUALITY_CONTROL( ch_genome_bam_bai, PREPARE_GENOME.out.gene_bed ) ch_versions = ch_versions.mix(QUALITY_CONTROL.out.versions) - COVERAGE_GRAPHS ( + COVERAGE_GRAPHS( ch_genome_bam_bai, PREPARE_GENOME.out.chrom_sizes, PREPARE_GENOME.out.fasta, @@ -266,31 +273,33 @@ workflow NASCENT { // // SUBWORKFLOW: Transcript indetification // - ch_genome_bam.map { - meta, bam -> - fmeta = meta.findAll { it.key != 'read_group' } - // Split and take the first element - fmeta.id = fmeta.id.split('_')[0] - [ fmeta, bam ] } + ch_genome_bam + .map { meta, bam -> + fmeta = meta.findAll { it.key != 'read_group' } + // Split and take the first element + fmeta.id = fmeta.id.split('_')[0] + [fmeta, bam] + } .groupTuple(by: [0]) - .map { it -> [ it[0], it[1].flatten() ] } + .map { it -> [it[0], it[1].flatten()] } .set { ch_group_bam } // Group the index files with bams - ch_genome_bai.map { - meta, bai -> - fmeta = meta.findAll { it.key != 'read_group' } - // Split and take the first element - fmeta.id = fmeta.id.split('_')[0] - [ fmeta, bai ] } + ch_genome_bai + .map { meta, bai -> + fmeta = meta.findAll { it.key != 'read_group' } + // Split and take the first element + fmeta.id = fmeta.id.split('_')[0] + [fmeta, bai] + } .groupTuple(by: [0]) - .map { it -> [ it[0], it[1].flatten() ] } + .map { it -> [it[0], it[1].flatten()] } .set { ch_group_bai } ch_group_bam_bai = ch_group_bam.join(ch_group_bai, by: [0]) ch_gxf = ch_gff ? ch_gff : PREPARE_GENOME.out.gtf - TRANSCRIPT_INDENTIFICATION ( + TRANSCRIPT_INDENTIFICATION( ch_group_bam_bai, ch_gxf, PREPARE_GENOME.out.fasta, @@ -302,16 +311,16 @@ workflow NASCENT { ch_homer_multiqc = ch_homer_multiqc.mix(TRANSCRIPT_INDENTIFICATION.out.homer_tagdir) ch_versions = ch_versions.mix(TRANSCRIPT_INDENTIFICATION.out.versions) - SUBREAD_FEATURECOUNTS_PREDICTED ( + SUBREAD_FEATURECOUNTS_PREDICTED( ch_group_bam.combine( - BED2SAF ( + BED2SAF( TRANSCRIPT_INDENTIFICATION.out.transcript_beds ).saf.map { it[1] } ) ) ch_versions = ch_versions.mix(SUBREAD_FEATURECOUNTS_PREDICTED.out.versions.first()) - SUBREAD_FEATURECOUNTS_GENE ( + SUBREAD_FEATURECOUNTS_GENE( ch_group_bam.combine(PREPARE_GENOME.out.gtf) ) ch_versions = ch_versions.mix(SUBREAD_FEATURECOUNTS_GENE.out.versions.first()) @@ -322,34 +331,41 @@ workflow NASCENT { softwareVersionsToYAML(ch_versions) .collectFile( storeDir: "${params.outdir}/pipeline_info", - name: 'nf_core_' + 'nascent_software_' + 'mqc_' + 'versions.yml', + name: 'nf_core_' + 'nascent_software_' + 'mqc_' + 'versions.yml', sort: true, newLine: true - ).set { ch_collated_versions } + ) + .set { ch_collated_versions } // // MODULE: MultiQC // - ch_multiqc_config = Channel.fromPath( - "$projectDir/assets/multiqc_config.yml", checkIfExists: true) - ch_multiqc_custom_config = params.multiqc_config ? - Channel.fromPath(params.multiqc_config, checkIfExists: true) : - Channel.empty() - ch_multiqc_logo = params.multiqc_logo ? - Channel.fromPath(params.multiqc_logo, checkIfExists: true) : - Channel.empty() - - summary_params = paramsSummaryMap( - workflow, parameters_schema: "nextflow_schema.json") + ch_multiqc_config = Channel.fromPath( + "${projectDir}/assets/multiqc_config.yml", + checkIfExists: true + ) + ch_multiqc_custom_config = params.multiqc_config + ? Channel.fromPath(params.multiqc_config, checkIfExists: true) + : Channel.empty() + ch_multiqc_logo = params.multiqc_logo + ? Channel.fromPath(params.multiqc_logo, checkIfExists: true) + : Channel.empty() + + summary_params = paramsSummaryMap( + workflow, + parameters_schema: "nextflow_schema.json" + ) ch_workflow_summary = Channel.value(paramsSummaryMultiqc(summary_params)) ch_multiqc_files = ch_multiqc_files.mix( - ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml')) - ch_multiqc_custom_methods_description = params.multiqc_methods_description ? - file(params.multiqc_methods_description, checkIfExists: true) : - file("$projectDir/assets/methods_description_template.yml", checkIfExists: true) - ch_methods_description = Channel.value( - methodsDescriptionText(ch_multiqc_custom_methods_description)) + ch_workflow_summary.collectFile(name: 'workflow_summary_mqc.yaml') + ) + ch_multiqc_custom_methods_description = params.multiqc_methods_description + ? file(params.multiqc_methods_description, checkIfExists: true) + : file("${projectDir}/assets/methods_description_template.yml", checkIfExists: true) + ch_methods_description = Channel.value( + methodsDescriptionText(ch_multiqc_custom_methods_description) + ) ch_multiqc_files = ch_multiqc_files.mix(ch_collated_versions) ch_multiqc_files = ch_multiqc_files.mix( @@ -359,38 +375,32 @@ workflow NASCENT { ) ) - ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(ch_bowtie2_multiqc.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_stats.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_flagstat.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_idxstats.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.preseq_ccurve.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.preseq_lcextrap.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readdistribution_txt.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readduplication_seq_xls.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readduplication_pos_xls.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.inferexperiment_txt.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(ch_grohmm_multiqc.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(ch_homer_multiqc.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(SUBREAD_FEATURECOUNTS_PREDICTED.out.summary.collect{it[1]}.ifEmpty([])) - ch_multiqc_files = ch_multiqc_files.mix(SUBREAD_FEATURECOUNTS_GENE.out.summary.collect{it[1]}.ifEmpty([])) - - MULTIQC ( + ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_bowtie2_multiqc.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_stats.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_flagstat.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_samtools_idxstats.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.preseq_ccurve.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.preseq_lcextrap.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readdistribution_txt.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readduplication_seq_xls.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.readduplication_pos_xls.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(QUALITY_CONTROL.out.inferexperiment_txt.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_grohmm_multiqc.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(ch_homer_multiqc.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(SUBREAD_FEATURECOUNTS_PREDICTED.out.summary.collect { it[1] }.ifEmpty([])) + ch_multiqc_files = ch_multiqc_files.mix(SUBREAD_FEATURECOUNTS_GENE.out.summary.collect { it[1] }.ifEmpty([])) + + MULTIQC( ch_multiqc_files.collect(), ch_multiqc_config.toList(), ch_multiqc_custom_config.toList(), ch_multiqc_logo.toList(), [], - [], + [] ) - emit:multiqc_report = MULTIQC.out.report.toList() // channel: /path/to/multiqc_report.html - versions = ch_versions // channel: [ path(versions.yml) ] - + emit: + multiqc_report = MULTIQC.out.report.toList() // channel: /path/to/multiqc_report.html + versions = ch_versions // channel: [ path(versions.yml) ] } - -/* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - THE END -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -*/ From 1bda499454a655fffdd78eafac3c2a256bc83313 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 22 Dec 2024 12:17:14 -0600 Subject: [PATCH 235/255] chore: Add new contributors section --- README.md | 2 +- nextflow.config | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 10826c34..b1952d7b 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ For more details about the output files and reports, please refer to the nf-core/nascent was originally written by Ignacio Tripodi ([@ignaciot](https://github.com/ignaciot)) and Margaret Gruca ([@magruca](https://github.com/magruca)). -The pipeline was re-written in Nextflow DSL2 by Edmund Miller ([@Emiller88](https://github.com/emiller88)) and Sruthi Suresh ([@sruthipsuresh](https://github.com/sruthipsuresh)) from [The Functional Genomics Laboratory](https://taehoonkim.org/) at [The Univeristy of Texas at Dallas](https://www.utdallas.edu/) +The pipeline was re-written in Nextflow DSL2 by Edmund Miller ([@edmundmiller](https://github.com/edmundmiller)) and Sruthi Suresh ([@sruthipsuresh](https://github.com/sruthipsuresh)) from [The Functional Genomics Laboratory](https://taehoonkim.org/) at [The Univeristy of Texas at Dallas](https://www.utdallas.edu/) We thank the following people for their extensive assistance in the development of this pipeline: diff --git a/nextflow.config b/nextflow.config index 9a4c1790..f3d36215 100644 --- a/nextflow.config +++ b/nextflow.config @@ -254,29 +254,36 @@ manifest { name = 'nf-core/nascent' author = """Edmund Miller, Ignacio Tripodi, Margaret Gruca""" // The author field is deprecated from Nextflow version 24.10.0, use contributors instead contributors = [ - // TODO nf-core: Update the field with the details of the contributors to your pipeline. New with Nextflow version 24.10.0 [ name: 'Edmund Miller', - affiliation: '', + affiliation: 'The Univeristy of Texas at Dallas', + email: 'nf-core@edmundmiller.dev', + github: 'edmundmiller', + contribution: ['author', 'maintainer'], // List of contribution types ('author', 'maintainer' or 'contributor') + orcid: 'https://orcid.org/0000-0002-2398-0334' + ], + [ + name: 'Sruthi Suresh', + affiliation: 'The Univeristy of Texas at Dallas', email: '', - github: '', - contribution: [], // List of contribution types ('author', 'maintainer' or 'contributor') + github: 'sruthipsuresh', + contribution: ['author'], // List of contribution types ('author', 'maintainer' or 'contributor') orcid: '' ], [ - name: ' Ignacio Tripodi', + name: 'Ignacio Tripodi', affiliation: '', email: '', - github: '', - contribution: [], // List of contribution types ('author', 'maintainer' or 'contributor') + github: 'ignaciot', + contribution: ['author'], // List of contribution types ('author', 'maintainer' or 'contributor') orcid: '' ], [ - name: ' Margaret Gruca', + name: 'Margaret Gruca', affiliation: '', email: '', - github: '', - contribution: [], // List of contribution types ('author', 'maintainer' or 'contributor') + github: 'magruca', + contribution: ['author'], // List of contribution types ('author', 'maintainer' or 'contributor') orcid: '' ], ] From 0cb46013315d901a39b9b8c51c527d60e31cd300 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 22 Dec 2024 12:24:01 -0600 Subject: [PATCH 236/255] chore: Capture Template updates --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4269a9b3..53afff75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#142](https://github.com/nf-core/nascent/pull/142) - Add STAR aligner - [#149](https://github.com/nf-core/nascent/pull/149) - Add Software citations to MultiQC - [#175](https://github.com/nf-core/nascent/pull/175) - Add HOMER uniqmap support +- [a3bc907](https://github.com/nf-core/nascent/commit/a3bc907e9afd9dd2a9572798fa16fbc781c3dcb0) - Update pipeline template to [nf-core/tools 2.13.1](https://github.com/nf-core/tools/releases/tag/2.13.1) +- [14fdbb8](https://github.com/nf-core/nascent/commit/14fdbb83fe944fc4d8d77e804f0332510d82fea4) - Update pipeline template to [nf-core/tools 3.0.0](https://github.com/nf-core/tools/releases/tag/3.0.0) +- [b4ac8c5](https://github.com/nf-core/nascent/commit/b4ac8c5) - Update pipeline template to [nf-core/tools 3.0.1](https://github.com/nf-core/tools/releases/tag/3.0.1) +- [a9ae47a](https://github.com/nf-core/nascent/commit/a9ae47a) - Update pipeline template to [nf-core/tools 3.0.1](https://github.com/nf-core/tools/releases/tag/3.0.2) +- [bfcd97c](https://github.com/nf-core/nascent/commit/bfcd97c) - Update pipeline template to [nf-core/tools 3.1.0](https://github.com/nf-core/tools/releases/tag/3.1.0) +- [7a4e356](https://github.com/nf-core/nascent/commit/7a4e356) - Update pipeline template to [nf-core/tools 3.1.1](https://github.com/nf-core/tools/releases/tag/3.1.1) ### Fixed From d20685addb994e904d944c76f19622fcf2142604 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 22 Dec 2024 12:24:18 -0600 Subject: [PATCH 237/255] chore: Bump version to 2.3.0 --- .nf-core.yml | 2 +- CHANGELOG.md | 2 +- assets/multiqc_config.yml | 7 +-- nextflow.config | 2 +- ro-crate-metadata.json | 52 +++++++++++++++---- workflows/tests/aligner/bowtie2.nf.test.snap | 2 +- workflows/tests/aligner/bwa.nf.test.snap | 2 +- workflows/tests/aligner/bwamem2.nf.test.snap | 2 +- workflows/tests/aligner/hisat2.nf.test.snap | 2 +- workflows/tests/aligner/star.nf.test.snap | 4 +- workflows/tests/inputs/gff/main.nf.test.snap | 2 +- .../inputs/gzipped_gff/main.nf.test.snap | 2 +- .../tests/inputs/only_gff/main.nf.test.snap | 2 +- .../tests/inputs/uniqmap/main.nf.test.snap | 2 +- .../grohmm/only_gff/main.nf.test.snap | 2 +- .../grohmm/tuning/main.nf.test.snap | 2 +- 16 files changed, 60 insertions(+), 29 deletions(-) diff --git a/.nf-core.yml b/.nf-core.yml index 47041fa7..243dcc37 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -14,4 +14,4 @@ template: name: nascent org: nf-core outdir: . - version: 2.3.0dev + version: 2.3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 53afff75..ef22efa2 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.3.0dev - [date] +## v2.3.0 - 2024-12-23 ### Added diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml index 60f73877..1ed81747 100644 --- a/assets/multiqc_config.yml +++ b/assets/multiqc_config.yml @@ -1,7 +1,8 @@ report_comment: > - This report has been generated by the nf-core/nascent - analysis pipeline. For information about how to interpret these results, please see the - documentation. + This report has been generated by the nf-core/nascent analysis pipeline. For information about how + to interpret these results, please see the documentation. report_section_order: fastqc: order: 4004 diff --git a/nextflow.config b/nextflow.config index f3d36215..651fcd84 100644 --- a/nextflow.config +++ b/nextflow.config @@ -292,7 +292,7 @@ manifest { mainScript = 'main.nf' defaultBranch = 'master' nextflowVersion = '!>=24.04.2' - version = '2.3.0dev' + version = '2.3.0' doi = '10.5281/zenodo.7245273' } diff --git a/ro-crate-metadata.json b/ro-crate-metadata.json index 18932138..4851cb33 100644 --- a/ro-crate-metadata.json +++ b/ro-crate-metadata.json @@ -21,9 +21,9 @@ { "@id": "./", "@type": "Dataset", - "creativeWorkStatus": "InProgress", - "datePublished": "2024-12-20T13:11:56+00:00", - "description": "

    \n \n \n \"nf-core/nascent\"\n \n

    [![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/nascent** is a bioinformatics pipeline that ...\n\n\n\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Edmund Miller, Ignacio Tripodi, Margaret Gruca.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n\n\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", + "creativeWorkStatus": "Stable", + "datePublished": "2024-12-22T18:18:10+00:00", + "description": "

    \n \n \n \"nf-core/nascent\"\n \n

    \n\n[![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.7245273-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.7245273)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/nascent** is a bioinformatics best-practice analysis pipeline for nascent transcript (NT) and Transcriptional Start Site (TSS) assays.\n\nThe pipeline is built using [Nextflow](https://www.nextflow.io), a workflow tool to run tasks across multiple compute infrastructures in a very portable manner. It uses Docker/Singularity containers making installation trivial and results highly reproducible. The [Nextflow DSL2](https://www.nextflow.io/docs/latest/dsl2.html) implementation of this pipeline uses one container per process which makes it much easier to maintain and update software dependencies. Where possible, these processes have been submitted to and installed from [nf-core/modules](https://github.com/nf-core/modules) in order to make them available to all nf-core pipelines, and to everyone within the Nextflow community!\n\nOn release, automated continuous integration tests run the pipeline on a full-sized dataset on the AWS cloud infrastructure. This ensures that the pipeline runs on AWS, has sensible resource allocation defaults set to run on real-world datasets, and permits the persistent storage of results to benchmark between pipeline releases and other analysis sources.The results obtained from the full-sized test can be viewed on the [nf-core website](https://nf-co.re/nascent/results).\n\n## Pipeline summary\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))\n2. Adapter and quality trimming ([`fastp`](https://github.com/OpenGene/fastp))\n3. Alignment\n 1. [`bwa`](https://bio-bwa.sourceforge.net/)\n 2. [`bwamem2`](https://github.com/bwa-mem2/bwa-mem2)\n 3. [`DRAGMAP`](https://github.com/Illumina/DRAGMAP)\n4. Sort and index alignments ([`SAMtools`](https://sourceforge.net/projects/samtools/files/samtools/))\n5. UMI-based deduplication ([`UMI-tools`](https://github.com/CGATOxford/UMI-tools))\n6. Duplicate read marking ([`picard MarkDuplicates`](https://broadinstitute.github.io/picard/))\n7. Quality Control\n 1. [`RSeQC`](https://rseqc.sourceforge.net/index.html) - Various RNA-seq QC metrics\n 2. [`Preseq`](http://smithlabresearch.org/software/preseq/) - Estimation of library complexity\n 3. [`BBMap`](https://sourceforge.net/projects/bbmap/) - Analyzes the sequencing coverage\n8. Coverage Graphs\n 1. Create bedGraph coverage files ([`BEDTools`](https://github.com/arq5x/bedtools2/)\n 2. Create bigWig coverage files ([`deeptools`](https://deeptools.readthedocs.io/en/develop/))\n9. Transcript identification\n 1. [`HOMER`](http://homer.ucsd.edu/)\n 2. [`GroHMM`](https://bioconductor.org/packages/release/bioc/html/groHMM.html)\n 3. [`PINTS`](https://pints.yulab.org/)\n10. Quantification of Genes and Nascent Transcripts ([`featureCounts`](https://subread.sourceforge.net/featureCounts.html))\n11. Aggregate report describing results and QC from the whole pipeline ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Ignacio Tripodi ([@ignaciot](https://github.com/ignaciot)) and Margaret Gruca ([@magruca](https://github.com/magruca)).\n\nThe pipeline was re-written in Nextflow DSL2 by Edmund Miller ([@edmundmiller](https://github.com/edmundmiller)) and Sruthi Suresh ([@sruthipsuresh](https://github.com/sruthipsuresh)) from [The Functional Genomics Laboratory](https://taehoonkim.org/) at [The Univeristy of Texas at Dallas](https://www.utdallas.edu/)\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n- [@apeltzer](https://github.com/apeltzer)\n- [@ewels](https://github.com/ewels)\n- [@drpatelh](https://github.com/drpatelh)\n- [@pditommaso](https://github.com/pditommaso)\n- [@FriederikeHanssen](https://github.com/FriederikeHanssen)\n- [Tae Hoon Kim](https://github.com/taehoonkim-phd)\n- [@easterwoods](https://github.com/easterwoods)\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\nIf you use nf-core/nascent for your analysis, please cite it using the following doi: [10.5281/zenodo.7245273](https://doi.org/10.5281/zenodo.7245273)\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", "hasPart": [ { "@id": "main.nf" @@ -31,6 +31,9 @@ { "@id": "assets/" }, + { + "@id": "bin/" + }, { "@id": "conf/" }, @@ -43,6 +46,9 @@ { "@id": "modules/" }, + { + "@id": "modules/local/" + }, { "@id": "modules/nf-core/" }, @@ -99,7 +105,7 @@ }, "mentions": [ { - "@id": "#1dfd475c-0e99-4ced-8d46-c7b1667f8062" + "@id": "#daaf6fca-5723-48f3-8e28-467003b1ba8b" } ], "name": "nf-core/nascent" @@ -129,10 +135,13 @@ "creator": [ { "@id": "https://orcid.org/0000-0002-6503-2180" + }, + { + "@id": "#git@edmundmiller.dev" } ], "dateCreated": "", - "dateModified": "2024-12-20T13:11:56Z", + "dateModified": "2024-12-22T12:18:10Z", "dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/", "keywords": [ "nf-core", @@ -147,6 +156,11 @@ "license": [ "MIT" ], + "maintainer": [ + { + "@id": "#git@edmundmiller.dev" + } + ], "name": [ "nf-core/nascent" ], @@ -158,10 +172,10 @@ }, "url": [ "https://github.com/nf-core/nascent", - "https://nf-co.re/nascent/dev/" + "https://nf-co.re/nascent/2.3.0/" ], "version": [ - "2.3.0dev" + "2.3.0" ] }, { @@ -177,11 +191,11 @@ "version": "!>=24.04.2" }, { - "@id": "#1dfd475c-0e99-4ced-8d46-c7b1667f8062", + "@id": "#daaf6fca-5723-48f3-8e28-467003b1ba8b", "@type": "TestSuite", "instance": [ { - "@id": "#3d1dd031-9b67-4d83-bdc1-e9f4277163af" + "@id": "#c8ba6d45-39ba-478f-a2d2-2ec121776d34" } ], "mainEntity": { @@ -190,7 +204,7 @@ "name": "Test suite for nf-core/nascent" }, { - "@id": "#3d1dd031-9b67-4d83-bdc1-e9f4277163af", + "@id": "#c8ba6d45-39ba-478f-a2d2-2ec121776d34", "@type": "TestInstance", "name": "GitHub Actions workflow for testing nf-core/nascent", "resource": "repos/nf-core/nascent/actions/workflows/ci.yml", @@ -212,6 +226,11 @@ "@type": "Dataset", "description": "Additional files" }, + { + "@id": "bin/", + "@type": "Dataset", + "description": "Scripts that must be callable from a pipeline process" + }, { "@id": "conf/", "@type": "Dataset", @@ -232,6 +251,11 @@ "@type": "Dataset", "description": "Modules used by the pipeline" }, + { + "@id": "modules/local/", + "@type": "Dataset", + "description": "Pipeline-specific modules" + }, { "@id": "modules/nf-core/", "@type": "Dataset", @@ -323,6 +347,12 @@ "@type": "Person", "email": "alex.peltzer@gmail.com", "name": "Alexander Peltzer" + }, + { + "@id": "https://orcid.org/0000-0002-6503-2180", + "@type": "Person", + "email": "nf-core@edmundmiller.dev", + "name": "Edmund Miller" } ] -} \ No newline at end of file +} diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 804a5398..632e62eb 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -87,7 +87,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 5bb2633d..7c3c7359 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -107,7 +107,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 257d9d93..bf3689a9 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -102,7 +102,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 815b8f9a..a4b9d13c 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -99,7 +99,7 @@ "untar": 1.34 }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index f19dd9c4..6b169b91 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -90,7 +90,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ @@ -465,7 +465,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } } ], diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 1b41f1b6..1ebece28 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -87,7 +87,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index f376150c..b18120b9 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -87,7 +87,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index c7fe6492..2e8f0e9f 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -90,7 +90,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/inputs/uniqmap/main.nf.test.snap b/workflows/tests/inputs/uniqmap/main.nf.test.snap index e194f434..c6833f9e 100644 --- a/workflows/tests/inputs/uniqmap/main.nf.test.snap +++ b/workflows/tests/inputs/uniqmap/main.nf.test.snap @@ -96,7 +96,7 @@ "7za": 16.02 }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } } ], diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index c394efd9..d2d0c511 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -100,7 +100,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 877e3f4d..b147f03e 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -91,7 +91,7 @@ "subread": "2.0.1" }, "Workflow": { - "nf-core/nascent": "v2.3.0dev" + "nf-core/nascent": "v2.3.0" } }, [ From 9fe1db20787c86d648a3281de477209b31bf09dd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 23 Dec 2024 10:20:15 -0600 Subject: [PATCH 238/255] chore: Bump deeptools/bamcoverage --- conf/modules.config | 4 +- modules.json | 2 +- .../deeptools/bamcoverage/environment.yml | 6 +- modules/nf-core/deeptools/bamcoverage/main.nf | 25 ++-- .../nf-core/deeptools/bamcoverage/meta.yml | 92 ++++++++------ .../deeptools/bamcoverage/tests/main.nf.test | 118 ++++++++++++++++++ .../bamcoverage/tests/main.nf.test.snap | 94 ++++++++++++++ .../deeptools/bamcoverage/tests/tags.yml | 2 + workflows/tests/aligner/bowtie2.nf.test.snap | 4 +- workflows/tests/aligner/bwa.nf.test.snap | 4 +- workflows/tests/aligner/bwamem2.nf.test.snap | 4 +- workflows/tests/aligner/hisat2.nf.test.snap | 4 +- workflows/tests/aligner/star.nf.test.snap | 8 +- workflows/tests/inputs/gff/main.nf.test.snap | 4 +- .../inputs/gzipped_gff/main.nf.test.snap | 4 +- .../tests/inputs/only_gff/main.nf.test.snap | 4 +- .../tests/inputs/uniqmap/main.nf.test.snap | 4 +- .../grohmm/only_gff/main.nf.test.snap | 4 +- .../grohmm/tuning/main.nf.test.snap | 4 +- 19 files changed, 314 insertions(+), 77 deletions(-) create mode 100644 modules/nf-core/deeptools/bamcoverage/tests/main.nf.test create mode 100644 modules/nf-core/deeptools/bamcoverage/tests/main.nf.test.snap create mode 100644 modules/nf-core/deeptools/bamcoverage/tests/tags.yml diff --git a/conf/modules.config b/conf/modules.config index 68b3cb9b..512f9670 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -336,12 +336,12 @@ process { withName: DEEPTOOLS_BAMCOVERAGE_PLUS { ext.args = "--filterRNAstrand forward" - ext.prefix = { "${meta.id}.plus.bigWig" } + ext.prefix = { "${meta.id}.plus" } } withName: DEEPTOOLS_BAMCOVERAGE_MINUS { ext.args = "--filterRNAstrand reverse" - ext.prefix = { "${meta.id}.minus.bigWig" } + ext.prefix = { "${meta.id}.minus" } } withName:DREG_PREP { diff --git a/modules.json b/modules.json index cdce3c86..ba0fdf37 100644 --- a/modules.json +++ b/modules.json @@ -84,7 +84,7 @@ }, "deeptools/bamcoverage": { "branch": "master", - "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5", + "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", "installed_by": ["modules"] }, "dragmap/align": { diff --git a/modules/nf-core/deeptools/bamcoverage/environment.yml b/modules/nf-core/deeptools/bamcoverage/environment.yml index 345ac703..d8e208ca 100644 --- a/modules/nf-core/deeptools/bamcoverage/environment.yml +++ b/modules/nf-core/deeptools/bamcoverage/environment.yml @@ -1,8 +1,6 @@ -name: deeptools_bamcoverage channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::deeptools=3.5.1 - - bioconda::samtools=1.16.1 + - bioconda::deeptools=3.5.5 + - bioconda::samtools=1.20 diff --git a/modules/nf-core/deeptools/bamcoverage/main.nf b/modules/nf-core/deeptools/bamcoverage/main.nf index 8aff5d6d..92041634 100644 --- a/modules/nf-core/deeptools/bamcoverage/main.nf +++ b/modules/nf-core/deeptools/bamcoverage/main.nf @@ -4,8 +4,8 @@ process DEEPTOOLS_BAMCOVERAGE { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-eb9e7907c7a753917c1e4d7a64384c047429618a:62d1ebe2d3a2a9d1a7ad31e0b902983fa7c25fa7-0': - 'biocontainers/mulled-v2-eb9e7907c7a753917c1e4d7a64384c047429618a:62d1ebe2d3a2a9d1a7ad31e0b902983fa7c25fa7-0' }" + 'https://depot.galaxyproject.org/singularity/mulled-v2-eb9e7907c7a753917c1e4d7a64384c047429618a:41defd13a6f2ce014549fcc05d0b051f655777f9-0': + 'biocontainers/mulled-v2-eb9e7907c7a753917c1e4d7a64384c047429618a:41defd13a6f2ce014549fcc05d0b051f655777f9-0' }" input: tuple val(meta), path(input), path(input_index) @@ -21,8 +21,9 @@ process DEEPTOOLS_BAMCOVERAGE { task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}.bigWig" + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def extension = args.contains("--outFileFormat bedgraph") || args.contains("-of bedgraph") ? "bedgraph" : "bigWig" // cram_input is currently not working with deeptools // therefore it's required to convert cram to bam first @@ -39,7 +40,7 @@ process DEEPTOOLS_BAMCOVERAGE { --bam $input_out \\ $args \\ --numberOfProcessors ${task.cpus} \\ - --outFileName ${prefix} + --outFileName ${prefix}.${extension} cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -47,7 +48,6 @@ process DEEPTOOLS_BAMCOVERAGE { deeptools: \$(bamCoverage --version | sed -e "s/bamCoverage //g") END_VERSIONS """ - } else { """ @@ -55,7 +55,7 @@ process DEEPTOOLS_BAMCOVERAGE { --bam $input_out \\ $args \\ --numberOfProcessors ${task.cpus} \\ - --outFileName ${prefix} + --outFileName ${prefix}.${extension} cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -64,4 +64,15 @@ process DEEPTOOLS_BAMCOVERAGE { """ } + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + def extension = args.contains("--outFileFormat bedgraph") || args.contains("-of bedgraph") ? ".bedgraph" : ".bigWig" + """ + touch ${prefix} + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + deeptools: \$(bamCoverage --version | sed -e "s/bamCoverage //g") + END_VERSIONS + """ } diff --git a/modules/nf-core/deeptools/bamcoverage/meta.yml b/modules/nf-core/deeptools/bamcoverage/meta.yml index e8043e99..c349bfb9 100644 --- a/modules/nf-core/deeptools/bamcoverage/meta.yml +++ b/modules/nf-core/deeptools/bamcoverage/meta.yml @@ -1,60 +1,74 @@ name: deeptools_bamcoverage -description: This tool takes an alignment of reads or fragments as input (BAM file) and generates a coverage track (bigWig or bedGraph) as output. +description: This tool takes an alignment of reads or fragments as input (BAM file) + and generates a coverage track (bigWig or bedGraph) as output. keywords: - coverage - depth - track tools: - deeptools: - description: A set of user-friendly tools for normalization and visualzation of deep-sequencing data + description: A set of user-friendly tools for normalization and visualzation of + deep-sequencing data homepage: https://deeptools.readthedocs.io/en/develop/content/tools/bamCoverage.html documentation: https://deeptools.readthedocs.io/en/develop/content/tools/bamCoverage.html tool_dev_url: https://github.com/deeptools/deepTools/ doi: "10.1093/nar/gkw257" licence: ["GPL v3"] + identifier: biotools:deeptools input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - input: - type: file - description: BAM/CRAM file - pattern: "*.{bam,cram}" - - input_index: - type: file - description: BAM/CRAM index file - pattern: "*.{bai,crai}" - - fasta: - type: file - description: Reference file the CRAM file was created with (required with CRAM input) - pattern: "*.{fasta,fa}" - - fasta_fai: - type: file - description: Index of the reference file (optional, but recommended) - pattern: "*.{fai}" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - input: + type: file + description: BAM/CRAM file + pattern: "*.{bam,cram}" + - input_index: + type: file + description: BAM/CRAM index file + pattern: "*.{bai,crai}" + - - fasta: + type: file + description: Reference file the CRAM file was created with (required with CRAM + input) + pattern: "*.{fasta,fa}" + - - fasta_fai: + type: file + description: Index of the reference file (optional, but recommended) + pattern: "*.{fai}" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - versions: - type: file - description: File containing software versions - pattern: "versions.yml" - - bigWig: - type: file - description: BigWig file - pattern: "*.bigWig" + - bigwig: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.bigWig": + type: file + description: BigWig file + pattern: "*.bigWig" - bedgraph: - type: file - description: Bedgraph file - pattern: "*.bedgraph" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.bedgraph": + type: file + description: Bedgraph file + pattern: "*.bedgraph" + - versions: + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@FriederikeHanssen" - "@SusiJo" + - "@JoseEspinosa" maintainers: - "@FriederikeHanssen" - "@SusiJo" + - "@JoseEspinosa" diff --git a/modules/nf-core/deeptools/bamcoverage/tests/main.nf.test b/modules/nf-core/deeptools/bamcoverage/tests/main.nf.test new file mode 100644 index 00000000..5d697803 --- /dev/null +++ b/modules/nf-core/deeptools/bamcoverage/tests/main.nf.test @@ -0,0 +1,118 @@ +nextflow_process { + + name "Test Process DEEPTOOLS_BAMCOVERAGE" + script "../main.nf" + process "DEEPTOOLS_BAMCOVERAGE" + + tag "modules" + tag "modules_nfcore" + tag "deeptools" + tag "deeptools/bamcoverage" + + test("homo_sampiens - bam") { + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ] + input[1] = [] + input[2] = [] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.bigwig, + process.out.versions) + .match() + } + ) + } + } + + test("homo_sampiens - cram - fasta - fai ") { + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + '/genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram', checkIfExists: true), + file(params.modules_testdata_base_path + '/genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram.crai', checkIfExists: true) + ] + input[1] = [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + input[2] = [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta.fai', checkIfExists: true) ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.bigwig, + process.out.versions) + .match() + } + ) + } + } + + test("homo_sampiens - cram - fasta") { + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + '/genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram', checkIfExists: true), + file(params.modules_testdata_base_path + '/genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram.crai', checkIfExists: true) + ] + input[1] = [ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ] + input[2] = [] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.bigwig, + process.out.versions) + .match() + } + ) + } + } + + test("homo_sampiens - bam - stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ] + input[1] = [] + input[2] = [] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } +} diff --git a/modules/nf-core/deeptools/bamcoverage/tests/main.nf.test.snap b/modules/nf-core/deeptools/bamcoverage/tests/main.nf.test.snap new file mode 100644 index 00000000..62c75123 --- /dev/null +++ b/modules/nf-core/deeptools/bamcoverage/tests/main.nf.test.snap @@ -0,0 +1,94 @@ +{ + "homo_sampiens - bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.bigWig:md5,95fe9383a9e6c02aea6b785cf074274f" + ] + ], + [ + "versions.yml:md5,241ec68695b08434d2db71ad878ed162" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-08-06T10:07:55.827011705" + }, + "homo_sampiens - cram - fasta - fai ": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.bigWig:md5,95fe9383a9e6c02aea6b785cf074274f" + ] + ], + [ + "versions.yml:md5,e51ed2fa03466eba8e61cb5319a21ebc" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-08-06T10:08:01.46254825" + }, + "homo_sampiens - bam - stub": { + "content": [ + { + "0": [ + + ], + "1": [ + + ], + "2": [ + "versions.yml:md5,241ec68695b08434d2db71ad878ed162" + ], + "bedgraph": [ + + ], + "bigwig": [ + + ], + "versions": [ + "versions.yml:md5,241ec68695b08434d2db71ad878ed162" + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-08-06T10:08:11.983872422" + }, + "homo_sampiens - cram - fasta": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.bigWig:md5,95fe9383a9e6c02aea6b785cf074274f" + ] + ], + [ + "versions.yml:md5,e51ed2fa03466eba8e61cb5319a21ebc" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-08-06T10:08:06.894864638" + } +} \ No newline at end of file diff --git a/modules/nf-core/deeptools/bamcoverage/tests/tags.yml b/modules/nf-core/deeptools/bamcoverage/tests/tags.yml new file mode 100644 index 00000000..372cefc9 --- /dev/null +++ b/modules/nf-core/deeptools/bamcoverage/tests/tags.yml @@ -0,0 +1,2 @@ +deeptools/bamcoverage: + - "modules/nf-core/deeptools/bamcoverage/**" diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 632e62eb..ec8cef75 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -32,10 +32,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 7c3c7359..341a9ac5 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -60,10 +60,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index bf3689a9..6b2aa18d 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -40,10 +40,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index a4b9d13c..92066a28 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -33,10 +33,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 6b169b91..16ea4371 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -43,10 +43,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" @@ -415,10 +415,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 1ebece28..175bff41 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -40,10 +40,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index b18120b9..838ca32b 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -40,10 +40,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 2e8f0e9f..c7093faf 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -40,10 +40,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/inputs/uniqmap/main.nf.test.snap b/workflows/tests/inputs/uniqmap/main.nf.test.snap index c6833f9e..465bd58a 100644 --- a/workflows/tests/inputs/uniqmap/main.nf.test.snap +++ b/workflows/tests/inputs/uniqmap/main.nf.test.snap @@ -57,10 +57,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index d2d0c511..a3fc8046 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -40,10 +40,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index b147f03e..6504c2ee 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -40,10 +40,10 @@ "getchromsizes": 1.2 }, "DEEPTOOLS_BAMCOVERAGE_MINUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "DEEPTOOLS_BAMCOVERAGE_PLUS": { - "deeptools": "3.5.1" + "deeptools": "3.5.5" }, "FASTP": { "fastp": "0.23.4" From a9b12ce480c76d0424e864f5f166c1a99f6ace7e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 23 Dec 2024 10:42:39 -0600 Subject: [PATCH 239/255] style: Load pipeline-specific nf-core configs --- nextflow.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nextflow.config b/nextflow.config index 651fcd84..1acacebb 100644 --- a/nextflow.config +++ b/nextflow.config @@ -194,8 +194,7 @@ profiles { includeConfig !System.getenv('NXF_OFFLINE') && params.custom_config_base ? "${params.custom_config_base}/nfcore_custom.config" : "/dev/null" // Load nf-core/nascent custom profiles from different institutions. -// TODO nf-core: Optionally, you can add a pipeline-specific nf-core config at https://github.com/nf-core/configs -// includeConfig !System.getenv('NXF_OFFLINE') && params.custom_config_base ? "${params.custom_config_base}/pipeline/nascent.config" : "/dev/null" +includeConfig !System.getenv('NXF_OFFLINE') && params.custom_config_base ? "${params.custom_config_base}/pipeline/nascent.config" : "/dev/null" // Set default registry for Apptainer, Docker, Podman, Charliecloud and Singularity independent of -profile // Will not be used unless Apptainer / Docker / Podman / Charliecloud / Singularity are enabled From 83c2c8a0148ee82035a9a17d725dc0aa3522a9d8 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 23 Dec 2024 11:09:43 -0600 Subject: [PATCH 240/255] build: Lock down python version in PINTS --- modules/nf-core/pints/caller/environment.yml | 1 + modules/nf-core/pints/caller/pints-caller.diff | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/nf-core/pints/caller/environment.yml b/modules/nf-core/pints/caller/environment.yml index 1c29653c..cd1e610d 100644 --- a/modules/nf-core/pints/caller/environment.yml +++ b/modules/nf-core/pints/caller/environment.yml @@ -5,6 +5,7 @@ dependencies: - pybedtools - bedtools - htslib + - python=3.12.6 - pip - pip: # FIXME https://github.com/nf-core/modules/issues/5814 # NOTE PINTS isn't adding conda builds and is a few versions behind. diff --git a/modules/nf-core/pints/caller/pints-caller.diff b/modules/nf-core/pints/caller/pints-caller.diff index 021ca528..75c181e9 100644 --- a/modules/nf-core/pints/caller/pints-caller.diff +++ b/modules/nf-core/pints/caller/pints-caller.diff @@ -1,5 +1,16 @@ -Changes in module 'nf-core/pints/caller' -'modules/nf-core/pints/caller/environment.yml' is unchanged +Changes in component 'nf-core/pints/caller' +Changes in 'pints/caller/environment.yml': +--- modules/nf-core/pints/caller/environment.yml ++++ modules/nf-core/pints/caller/environment.yml +@@ -5,6 +5,7 @@ + - pybedtools + - bedtools + - htslib ++ - python=3.12.6 + - pip + - pip: # FIXME https://github.com/nf-core/modules/issues/5814 + # NOTE PINTS isn't adding conda builds and is a few versions behind. + 'modules/nf-core/pints/caller/meta.yml' is unchanged Changes in 'pints/caller/main.nf': --- modules/nf-core/pints/caller/main.nf From d6afd86db5466cca596195f62595e4c0b5c6438e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 23 Dec 2024 12:39:17 -0600 Subject: [PATCH 241/255] test: Ignore grohmm output --- tests/.nftignore | 3 +++ .../grohmm/only_gff/main.nf.test.snap | 6 ------ .../grohmm/tuning/main.nf.test.snap | 6 ------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/.nftignore b/tests/.nftignore index af6c7828..60cbdcea 100644 --- a/tests/.nftignore +++ b/tests/.nftignore @@ -31,6 +31,9 @@ hisat2/log/*.hisat2.summary.log transcript_identification/homer/*_tagdir/* transcript_identification/filtered/*_filtered.bed transcript_identification/intersect/*_intersect.bed +transcript_identification/grohmm/*.tdFinal.txt +transcript_identification/grohmm/*.tdFinal_mqc.csv +transcript_identification/grohmm/*.tdplot_mqc.png quality_control/bbsplit/*.stats.txt quality_control/** diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index a3fc8046..0db3e81b 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -355,16 +355,10 @@ "cd4.SE.tuning.csv:md5,9d76e9a83079d587459fda16af8c4da8", "cd4.eval.txt:md5,de1f790f721a67dfd1e1bf1592a7971a", "cd4.final.transcripts.bed:md5,3707df9ae8e7a95b6b5bfc336cfb1c8a", - "cd4.tdFinal.txt:md5,f8db76ddb3212459405e0d780c1dc807", - "cd4.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", - "cd4.tdplot_mqc.png:md5,159224ca8b99bdf67f3f7d328bd741dd", "cd4.transcripts.txt:md5,48d15103e5f67abc30b4da71a595243b", "jurkat.SE.tuning.csv:md5,d339a8072a8789896d4df6b78eeef6a2", "jurkat.eval.txt:md5,f8f6402c871cd55d6cfb9c2be04627b6", "jurkat.final.transcripts.bed:md5,cd3ce78611dcad5a1893a6da3d70a39f", - "jurkat.tdFinal.txt:md5,4bb6a220a6ba29941d4ab28696816afd", - "jurkat.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", - "jurkat.tdplot_mqc.png:md5,91825f59df971e9e79256058da010f3f", "jurkat.transcripts.txt:md5,901825bc4b6b93e718f7082fb4c2c579", "cd4.bed:md5,202652821e59d0357c699b217d02f755", "cd4.peaks.txt:md5,84b08e639d17d480cbc90b465ecfff73", diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 6504c2ee..995a9191 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -346,16 +346,10 @@ "cd4.SE.tuning.csv:md5,00e1c530e2ce3b09fd413b8f87eef5d0", "cd4.eval.txt:md5,6f688621a2acb60f2e48163f132d390c", "cd4.final.transcripts.bed:md5,5eb7209e5bb45744ae03f89010a162aa", - "cd4.tdFinal.txt:md5,83f65b2db4f2f584992a1d036fd8859d", - "cd4.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", - "cd4.tdplot_mqc.png:md5,ed0b167598cd9abf90954b00a5a28015", "cd4.transcripts.txt:md5,4b339fcbf7ca955c12ca1198b2c0db36", "jurkat.SE.tuning.csv:md5,6d6551f5ded9a49e05ffdbd233ae82b8", "jurkat.eval.txt:md5,dac8d86b680c5a9d59558b62a3fc896b", "jurkat.final.transcripts.bed:md5,d7149560c228316a2de2af10b48361ec", - "jurkat.tdFinal.txt:md5,e21a5b8112deb8b747a17630f21eb723", - "jurkat.tdFinal_mqc.csv:md5,a227d42afbcc590b4e949075cde4a5b6", - "jurkat.tdplot_mqc.png:md5,f88d76f5630a8ab4233682a616af6ca8", "jurkat.transcripts.txt:md5,ad6c62cf26bcb7f56d073d5404bc8674", "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "cd4.peaks.txt:md5,bdcd2ec3a56a8a4a01ed19e17da003f2", From 7d9ce8a3cb304874fdd8fb5c612b09c0c64d723c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 23 Dec 2024 14:27:36 -0600 Subject: [PATCH 242/255] chore: Bump fastq_align_hisat2 --- modules.json | 22 +-- modules/nf-core/hisat2/align/environment.yml | 2 - modules/nf-core/hisat2/align/main.nf | 9 +- modules/nf-core/hisat2/align/meta.yml | 107 +++++++++------ .../nf-core/samtools/flagstat/environment.yml | 8 +- modules/nf-core/samtools/flagstat/main.nf | 5 +- modules/nf-core/samtools/flagstat/meta.yml | 54 ++++---- .../samtools/flagstat/tests/main.nf.test | 28 +++- .../samtools/flagstat/tests/main.nf.test.snap | 78 ++++++++--- .../nf-core/samtools/idxstats/environment.yml | 8 +- modules/nf-core/samtools/idxstats/main.nf | 5 +- modules/nf-core/samtools/idxstats/meta.yml | 51 +++---- .../samtools/idxstats/tests/main.nf.test | 29 +++- .../samtools/idxstats/tests/main.nf.test.snap | 78 ++++++++--- .../nf-core/samtools/index/environment.yml | 8 +- modules/nf-core/samtools/index/main.nf | 4 +- modules/nf-core/samtools/index/meta.yml | 68 ++++++---- .../samtools/index/tests/main.nf.test.snap | 46 +++---- modules/nf-core/samtools/sort/environment.yml | 8 +- modules/nf-core/samtools/sort/main.nf | 15 +-- modules/nf-core/samtools/sort/meta.yml | 99 ++++++++------ .../nf-core/samtools/sort/tests/main.nf.test | 64 +++++++++ .../samtools/sort/tests/main.nf.test.snap | 125 +++++++++++++++--- .../nf-core/samtools/stats/environment.yml | 8 +- modules/nf-core/samtools/stats/main.nf | 5 +- modules/nf-core/samtools/stats/meta.yml | 69 +++++----- .../nf-core/samtools/stats/tests/main.nf.test | 60 ++++++++- .../samtools/stats/tests/main.nf.test.snap | 98 ++++++++++++-- .../nf-core/umitools/dedup/environment.yml | 2 - modules/nf-core/umitools/dedup/meta.yml | 118 +++++++++++------ .../nf-core/umitools/dedup/tests/main.nf.test | 28 ++-- .../umitools/dedup/tests/main.nf.test.snap | 40 ++---- .../tests/main.nf.test | 9 +- .../tests/main.nf.test.snap | 45 ++++--- .../tests/main.nf.test.snap | 80 +++++------ .../tests/main.nf.test.snap | 96 +++++++------- .../tests/main.nf.test.snap | 84 ++++++------ workflows/tests/aligner/bowtie2.nf.test.snap | 20 +-- workflows/tests/aligner/bwa.nf.test.snap | 16 +-- workflows/tests/aligner/bwamem2.nf.test.snap | 18 +-- workflows/tests/aligner/hisat2.nf.test.snap | 20 +-- workflows/tests/aligner/star.nf.test.snap | 10 +- workflows/tests/inputs/gff/main.nf.test.snap | 8 +- .../inputs/gzipped_gff/main.nf.test.snap | 8 +- .../tests/inputs/only_gff/main.nf.test.snap | 8 +- .../grohmm/only_gff/main.nf.test.snap | 10 +- .../grohmm/tuning/main.nf.test.snap | 10 +- 47 files changed, 1128 insertions(+), 663 deletions(-) diff --git a/modules.json b/modules.json index ba0fdf37..af566b53 100644 --- a/modules.json +++ b/modules.json @@ -120,7 +120,7 @@ }, "hisat2/align": { "branch": "master", - "git_sha": "2c6b1144ed58b6184ad58fc4e6b6a90219b4bf4f", + "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", "installed_by": ["fastq_align_hisat2"] }, "homer/findpeaks": { @@ -206,17 +206,17 @@ }, "samtools/flagstat": { "branch": "master", - "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", + "git_sha": "2d20463181b1c38981a02e90d3084b5f9fa8d540", "installed_by": ["bam_stats_samtools"] }, "samtools/idxstats": { "branch": "master", - "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", + "git_sha": "2d20463181b1c38981a02e90d3084b5f9fa8d540", "installed_by": ["bam_stats_samtools"] }, "samtools/index": { "branch": "master", - "git_sha": "46eca555142d6e597729fcb682adcc791796f514", + "git_sha": "b13f07be4c508d6ff6312d354d09f2493243e208", "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools"] }, "samtools/merge": { @@ -226,12 +226,12 @@ }, "samtools/sort": { "branch": "master", - "git_sha": "46eca555142d6e597729fcb682adcc791796f514", + "git_sha": "b7800db9b069ed505db3f9d91b8c72faea9be17b", "installed_by": ["bam_sort_stats_samtools"] }, "samtools/stats": { "branch": "master", - "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", + "git_sha": "2d20463181b1c38981a02e90d3084b5f9fa8d540", "installed_by": ["bam_stats_samtools"] }, "star/align": { @@ -251,7 +251,7 @@ }, "umitools/dedup": { "branch": "master", - "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", + "git_sha": "0b27602842d3d79fd0e8db79f4afa764967fc3d1", "installed_by": ["bam_dedup_stats_samtools_umitools"] }, "untar": { @@ -270,7 +270,7 @@ "nf-core": { "bam_dedup_stats_samtools_umitools": { "branch": "master", - "git_sha": "46eca555142d6e597729fcb682adcc791796f514", + "git_sha": "0b27602842d3d79fd0e8db79f4afa764967fc3d1", "installed_by": ["subworkflows"] }, "bam_rseqc": { @@ -280,7 +280,7 @@ }, "bam_sort_stats_samtools": { "branch": "master", - "git_sha": "46eca555142d6e597729fcb682adcc791796f514", + "git_sha": "763d4b5c05ffda3ac1ac969dc67f7458cfb2eb1d", "installed_by": [ "fastq_align_bowtie2", "fastq_align_bwa", @@ -290,7 +290,7 @@ }, "bam_stats_samtools": { "branch": "master", - "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", + "git_sha": "763d4b5c05ffda3ac1ac969dc67f7458cfb2eb1d", "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools"] }, "fastq_align_bowtie2": { @@ -305,7 +305,7 @@ }, "fastq_align_hisat2": { "branch": "master", - "git_sha": "c789476080a150f87066ca3ed42a622339a26c0b", + "git_sha": "763d4b5c05ffda3ac1ac969dc67f7458cfb2eb1d", "installed_by": ["subworkflows"] }, "fastq_align_star": { diff --git a/modules/nf-core/hisat2/align/environment.yml b/modules/nf-core/hisat2/align/environment.yml index 0c1415f9..26c62a3b 100644 --- a/modules/nf-core/hisat2/align/environment.yml +++ b/modules/nf-core/hisat2/align/environment.yml @@ -1,8 +1,6 @@ -name: hisat2_align channels: - conda-forge - bioconda - - defaults dependencies: - bioconda::hisat2=2.2.1 - bioconda::samtools=1.16.1 diff --git a/modules/nf-core/hisat2/align/main.nf b/modules/nf-core/hisat2/align/main.nf index ea186f62..f45f9bcc 100644 --- a/modules/nf-core/hisat2/align/main.nf +++ b/modules/nf-core/hisat2/align/main.nf @@ -2,7 +2,6 @@ process HISAT2_ALIGN { tag "$meta.id" label 'process_high' - // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions. conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://depot.galaxyproject.org/singularity/mulled-v2-a97e90b3b802d1da3d6958e0867610c718cb5eb1:2cdf6bf1e92acbeb9b2834b1c58754167173a410-0' : @@ -25,7 +24,6 @@ process HISAT2_ALIGN { script: def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" - def VERSION = '2.2.1' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. def strandedness = '' if (meta.strandedness == 'forward') { @@ -53,7 +51,7 @@ process HISAT2_ALIGN { cat <<-END_VERSIONS > versions.yml "${task.process}": - hisat2: $VERSION + hisat2: \$(hisat2 --version | grep -o 'version [^ ]*' | cut -d ' ' -f 2) samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') END_VERSIONS """ @@ -85,7 +83,7 @@ process HISAT2_ALIGN { cat <<-END_VERSIONS > versions.yml "${task.process}": - hisat2: $VERSION + hisat2: \$(hisat2 --version | grep -o 'version [^ ]*' | cut -d ' ' -f 2) samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') END_VERSIONS """ @@ -94,7 +92,6 @@ process HISAT2_ALIGN { stub: def prefix = task.ext.prefix ?: "${meta.id}" def unaligned = params.save_unaligned ? "echo '' | gzip > ${prefix}.unmapped_1.fastq.gz \n echo '' | gzip > ${prefix}.unmapped_2.fastq.gz" : '' - def VERSION = '2.2.1' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. """ ${unaligned} @@ -103,7 +100,7 @@ process HISAT2_ALIGN { cat <<-END_VERSIONS > versions.yml "${task.process}": - hisat2: $VERSION + hisat2: \$(hisat2 --version | grep -o 'version [^ ]*' | cut -d ' ' -f 2) samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') END_VERSIONS """ diff --git a/modules/nf-core/hisat2/align/meta.yml b/modules/nf-core/hisat2/align/meta.yml index b23eab75..d869c5d5 100644 --- a/modules/nf-core/hisat2/align/meta.yml +++ b/modules/nf-core/hisat2/align/meta.yml @@ -7,58 +7,79 @@ keywords: - reference tools: - hisat2: - description: HISAT2 is a fast and sensitive alignment program for mapping next-generation sequencing reads (both DNA and RNA) to a population of human genomes as well as to a single reference genome. + description: HISAT2 is a fast and sensitive alignment program for mapping next-generation + sequencing reads (both DNA and RNA) to a population of human genomes as well + as to a single reference genome. homepage: https://daehwankimlab.github.io/hisat2/ documentation: https://daehwankimlab.github.io/hisat2/manual/ doi: "10.1038/s41587-019-0201-4" licence: ["MIT"] + identifier: biotools:hisat2 input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - reads: - type: file - description: | - List of input FastQ files of size 1 and 2 for single-end and paired-end data, - respectively. - - meta2: - type: map - description: | - Groovy Map containing reference information - e.g. [ id:'genome' ] - - index: - type: file - description: HISAT2 genome index file - pattern: "*.ht2" - - meta3: - type: map - description: | - Groovy Map containing reference information - e.g. [ id:'genome' ] - - splicesites: - type: file - description: Splices sites in gtf file - pattern: "*.{txt}" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - reads: + type: file + description: | + List of input FastQ files of size 1 and 2 for single-end and paired-end data, + respectively. + - - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - index: + type: file + description: HISAT2 genome index file + pattern: "*.ht2" + - - meta3: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - splicesites: + type: file + description: Splices sites in gtf file + pattern: "*.{txt}" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - bam: - type: file - description: Output BAM file containing read alignments - pattern: "*.{bam}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.bam": + type: file + description: Output BAM file containing read alignments + pattern: "*.{bam}" - summary: - type: file - description: Aligment log - pattern: "*.log" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.log": + type: file + description: Aligment log + pattern: "*.log" + - fastq: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*fastq.gz": + type: file + description: Output FastQ file + pattern: "*fastq.gz" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@ntoda03" - "@ramprasadn" diff --git a/modules/nf-core/samtools/flagstat/environment.yml b/modules/nf-core/samtools/flagstat/environment.yml index 68b81558..62054fc9 100644 --- a/modules/nf-core/samtools/flagstat/environment.yml +++ b/modules/nf-core/samtools/flagstat/environment.yml @@ -1,8 +1,8 @@ -name: samtools_flagstat +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::samtools=1.20 - - bioconda::htslib=1.20 + - bioconda::htslib=1.21 + - bioconda::samtools=1.21 diff --git a/modules/nf-core/samtools/flagstat/main.nf b/modules/nf-core/samtools/flagstat/main.nf index 754d84b7..c23f3a5c 100644 --- a/modules/nf-core/samtools/flagstat/main.nf +++ b/modules/nf-core/samtools/flagstat/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_FLAGSTAT { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : - 'biocontainers/samtools:1.20--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.21--h50ea8bc_0' : + 'biocontainers/samtools:1.21--h50ea8bc_0' }" input: tuple val(meta), path(bam), path(bai) @@ -18,7 +18,6 @@ process SAMTOOLS_FLAGSTAT { task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" """ samtools \\ diff --git a/modules/nf-core/samtools/flagstat/meta.yml b/modules/nf-core/samtools/flagstat/meta.yml index 97991358..cdc4c254 100644 --- a/modules/nf-core/samtools/flagstat/meta.yml +++ b/modules/nf-core/samtools/flagstat/meta.yml @@ -1,5 +1,6 @@ name: samtools_flagstat -description: Counts the number of alignments in a BAM/CRAM/SAM file for each FLAG type +description: Counts the number of alignments in a BAM/CRAM/SAM file for each FLAG + type keywords: - stats - mapping @@ -17,34 +18,37 @@ tools: documentation: http://www.htslib.org/doc/samtools.html doi: 10.1093/bioinformatics/btp352 licence: ["MIT"] + identifier: biotools: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}" - - bai: - type: file - description: Index for BAM/CRAM/SAM file - pattern: "*.{bai,crai,sai}" + - - 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}" + - bai: + type: file + description: Index for BAM/CRAM/SAM file + pattern: "*.{bai,crai,sai}" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - flagstat: - type: file - description: File containing samtools flagstat output - pattern: "*.{flagstat}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.flagstat": + type: file + description: File containing samtools flagstat output + pattern: "*.{flagstat}" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" maintainers: diff --git a/modules/nf-core/samtools/flagstat/tests/main.nf.test b/modules/nf-core/samtools/flagstat/tests/main.nf.test index 24c3c04b..3b648a37 100644 --- a/modules/nf-core/samtools/flagstat/tests/main.nf.test +++ b/modules/nf-core/samtools/flagstat/tests/main.nf.test @@ -11,9 +11,30 @@ nextflow_process { test("BAM") { when { - params { - outdir = "$outputDir" + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + """ } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("BAM - stub") { + + options "-stub" + + when { process { """ input[0] = Channel.of([ @@ -28,8 +49,7 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out.flagstat).match("flagstat") }, - { assert snapshot(process.out.versions).match("versions") } + { assert snapshot(process.out).match() } ) } } diff --git a/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap b/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap index e9f85efa..04c3852b 100644 --- a/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap @@ -1,32 +1,72 @@ { - "flagstat": { + "BAM - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": false - }, - "test.flagstat:md5,4f7ffd1e6a5e85524d443209ac97d783" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,108a155f2d4a99f50bf3176904208d27" + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,108a155f2d4a99f50bf3176904208d27" ] - ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.04.3" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-02-12T18:31:37.783927" + "timestamp": "2024-09-16T08:02:58.866491759" }, - "versions": { + "BAM": { "content": [ - [ - "versions.yml:md5,f606681ef971cbb548a4d9e3fbabdbc2" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,4f7ffd1e6a5e85524d443209ac97d783" + ] + ], + "1": [ + "versions.yml:md5,108a155f2d4a99f50bf3176904208d27" + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,4f7ffd1e6a5e85524d443209ac97d783" + ] + ], + "versions": [ + "versions.yml:md5,108a155f2d4a99f50bf3176904208d27" + ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-05-28T15:41:52.516253882" + "timestamp": "2024-09-16T08:02:47.383332837" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/idxstats/environment.yml b/modules/nf-core/samtools/idxstats/environment.yml index eb6c8809..62054fc9 100644 --- a/modules/nf-core/samtools/idxstats/environment.yml +++ b/modules/nf-core/samtools/idxstats/environment.yml @@ -1,8 +1,8 @@ -name: samtools_idxstats +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::samtools=1.20 - - bioconda::htslib=1.20 + - bioconda::htslib=1.21 + - bioconda::samtools=1.21 diff --git a/modules/nf-core/samtools/idxstats/main.nf b/modules/nf-core/samtools/idxstats/main.nf index 2ea2a5cc..e2bb6b20 100644 --- a/modules/nf-core/samtools/idxstats/main.nf +++ b/modules/nf-core/samtools/idxstats/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_IDXSTATS { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : - 'biocontainers/samtools:1.20--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.21--h50ea8bc_0' : + 'biocontainers/samtools:1.21--h50ea8bc_0' }" input: tuple val(meta), path(bam), path(bai) @@ -18,7 +18,6 @@ process SAMTOOLS_IDXSTATS { task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" """ diff --git a/modules/nf-core/samtools/idxstats/meta.yml b/modules/nf-core/samtools/idxstats/meta.yml index 344e92a3..f0a6bcb2 100644 --- a/modules/nf-core/samtools/idxstats/meta.yml +++ b/modules/nf-core/samtools/idxstats/meta.yml @@ -18,34 +18,37 @@ tools: documentation: http://www.htslib.org/doc/samtools.html doi: 10.1093/bioinformatics/btp352 licence: ["MIT"] + identifier: biotools: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}" - - bai: - type: file - description: Index for BAM/CRAM/SAM file - pattern: "*.{bai,crai,sai}" + - - 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}" + - bai: + type: file + description: Index for BAM/CRAM/SAM file + pattern: "*.{bai,crai,sai}" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - idxstats: - type: file - description: File containing samtools idxstats output - pattern: "*.{idxstats}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.idxstats": + type: file + description: File containing samtools idxstats output + pattern: "*.{idxstats}" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" maintainers: diff --git a/modules/nf-core/samtools/idxstats/tests/main.nf.test b/modules/nf-core/samtools/idxstats/tests/main.nf.test index a2dcb27c..5fd1fc78 100644 --- a/modules/nf-core/samtools/idxstats/tests/main.nf.test +++ b/modules/nf-core/samtools/idxstats/tests/main.nf.test @@ -11,9 +11,6 @@ nextflow_process { test("bam") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -28,9 +25,29 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out.idxstats).match("idxstats") }, - { assert snapshot(process.out.versions).match("versions") } + { assert snapshot(process.out).match() } ) } } -} + + test("bam - stub") { + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + }} diff --git a/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap b/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap index 4eacdb90..2cc89a3b 100644 --- a/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap @@ -1,32 +1,72 @@ { - "versions": { + "bam - stub": { "content": [ - [ - "versions.yml:md5,7acbcb2a8ec6436ba7b2916d3ff13351" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,c8d7394830c3c1e5be150589571534fb" + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,c8d7394830c3c1e5be150589571534fb" + ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-05-28T15:46:46.617989517" + "timestamp": "2024-09-16T08:11:56.466856235" }, - "idxstats": { + "bam": { "content": [ - [ - [ - { - "id": "test", - "single_end": false - }, - "test.idxstats:md5,df60a8c8d6621100d05178c93fb053a2" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,df60a8c8d6621100d05178c93fb053a2" + ] + ], + "1": [ + "versions.yml:md5,c8d7394830c3c1e5be150589571534fb" + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,df60a8c8d6621100d05178c93fb053a2" + ] + ], + "versions": [ + "versions.yml:md5,c8d7394830c3c1e5be150589571534fb" ] - ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.04.3" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-02-12T18:36:41.561026" + "timestamp": "2024-09-16T08:11:46.311550359" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/index/environment.yml b/modules/nf-core/samtools/index/environment.yml index 260d516b..62054fc9 100644 --- a/modules/nf-core/samtools/index/environment.yml +++ b/modules/nf-core/samtools/index/environment.yml @@ -1,8 +1,8 @@ -name: samtools_index +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::samtools=1.20 - - bioconda::htslib=1.20 + - bioconda::htslib=1.21 + - bioconda::samtools=1.21 diff --git a/modules/nf-core/samtools/index/main.nf b/modules/nf-core/samtools/index/main.nf index e002585b..31175610 100644 --- a/modules/nf-core/samtools/index/main.nf +++ b/modules/nf-core/samtools/index/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_INDEX { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : - 'biocontainers/samtools:1.20--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.21--h50ea8bc_0' : + 'biocontainers/samtools:1.21--h50ea8bc_0' }" input: tuple val(meta), path(input) diff --git a/modules/nf-core/samtools/index/meta.yml b/modules/nf-core/samtools/index/meta.yml index 01a4ee03..db8df0d5 100644 --- a/modules/nf-core/samtools/index/meta.yml +++ b/modules/nf-core/samtools/index/meta.yml @@ -15,38 +15,52 @@ tools: documentation: http://www.htslib.org/doc/samtools.html doi: 10.1093/bioinformatics/btp352 licence: ["MIT"] + identifier: biotools: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}" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - input: + type: file + description: input file output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - 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}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.bai": + type: file + description: BAM/CRAM/SAM index file + pattern: "*.{bai,crai,sai}" - csi: - type: file - description: CSI index file - pattern: "*.{csi}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.csi": + type: file + description: CSI index file + pattern: "*.{csi}" + - crai: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.crai": + type: file + description: BAM/CRAM/SAM index file + pattern: "*.{bai,crai,sai}" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" - "@ewels" diff --git a/modules/nf-core/samtools/index/tests/main.nf.test.snap b/modules/nf-core/samtools/index/tests/main.nf.test.snap index 799d199c..72d65e81 100644 --- a/modules/nf-core/samtools/index/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/index/tests/main.nf.test.snap @@ -18,7 +18,7 @@ ], "3": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ], "bai": [ @@ -36,15 +36,15 @@ ] ], "versions": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T16:51:53.9057" + "timestamp": "2024-09-16T08:21:25.261127166" }, "crai - stub": { "content": [ @@ -65,7 +65,7 @@ ] ], "3": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ], "bai": [ @@ -83,15 +83,15 @@ ], "versions": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T16:51:45.931558" + "timestamp": "2024-09-16T08:21:12.653194876" }, "bai - stub": { "content": [ @@ -112,7 +112,7 @@ ], "3": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ], "bai": [ [ @@ -130,28 +130,28 @@ ], "versions": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T16:51:34.807525" + "timestamp": "2024-09-16T08:21:01.854932651" }, "csi": { "content": [ "test.paired_end.sorted.bam.csi", [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ] ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T16:52:55.688799" + "timestamp": "2024-09-16T08:20:51.485364222" }, "crai": { "content": [ @@ -172,7 +172,7 @@ ] ], "3": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ], "bai": [ @@ -190,15 +190,15 @@ ], "versions": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T16:51:17.609533" + "timestamp": "2024-09-16T08:20:40.518873972" }, "bai": { "content": [ @@ -219,7 +219,7 @@ ], "3": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ], "bai": [ [ @@ -237,14 +237,14 @@ ], "versions": [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + "versions.yml:md5,5e09a6fdf76de396728f877193d72315" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T16:51:04.16585" + "timestamp": "2024-09-16T08:20:21.184050361" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/sort/environment.yml b/modules/nf-core/samtools/sort/environment.yml index 36a12eab..62054fc9 100644 --- a/modules/nf-core/samtools/sort/environment.yml +++ b/modules/nf-core/samtools/sort/environment.yml @@ -1,8 +1,8 @@ -name: samtools_sort +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::samtools=1.20 - - bioconda::htslib=1.20 + - bioconda::htslib=1.21 + - bioconda::samtools=1.21 diff --git a/modules/nf-core/samtools/sort/main.nf b/modules/nf-core/samtools/sort/main.nf index 8e019099..caf3c61a 100644 --- a/modules/nf-core/samtools/sort/main.nf +++ b/modules/nf-core/samtools/sort/main.nf @@ -4,19 +4,19 @@ process SAMTOOLS_SORT { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : - 'biocontainers/samtools:1.20--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.21--h50ea8bc_0' : + 'biocontainers/samtools:1.21--h50ea8bc_0' }" input: tuple val(meta) , path(bam) tuple val(meta2), path(fasta) output: - tuple val(meta), path("*.bam"), emit: bam, optional: true - tuple val(meta), path("*.cram"), emit: cram, optional: true - tuple val(meta), path("*.crai"), emit: crai, optional: true - tuple val(meta), path("*.csi"), emit: csi, optional: true - path "versions.yml" , emit: versions + tuple val(meta), path("*.bam"), emit: bam, optional: true + tuple val(meta), path("*.cram"), emit: cram, optional: true + tuple val(meta), path("*.crai"), emit: crai, optional: true + tuple val(meta), path("*.csi"), emit: csi, optional: true + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when @@ -32,7 +32,6 @@ process SAMTOOLS_SORT { """ samtools cat \\ - --threads $task.cpus \\ ${bam} \\ | \\ samtools sort \\ diff --git a/modules/nf-core/samtools/sort/meta.yml b/modules/nf-core/samtools/sort/meta.yml index 341a7d0e..a9dbec5a 100644 --- a/modules/nf-core/samtools/sort/meta.yml +++ b/modules/nf-core/samtools/sort/meta.yml @@ -15,52 +15,73 @@ tools: documentation: http://www.htslib.org/doc/samtools.html doi: 10.1093/bioinformatics/btp352 licence: ["MIT"] + identifier: biotools: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(s) - pattern: "*.{bam,cram,sam}" - - meta2: - type: map - description: | - Groovy Map containing reference information - e.g. [ id:'genome' ] - - fasta: - type: file - description: Reference genome FASTA file - pattern: "*.{fa,fasta,fna}" - optional: true + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: BAM/CRAM/SAM file(s) + pattern: "*.{bam,cram,sam}" + - - meta2: + type: map + description: | + Groovy Map containing reference information + e.g. [ id:'genome' ] + - fasta: + type: file + description: Reference genome FASTA file + pattern: "*.{fa,fasta,fna}" + optional: true output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - bam: - type: file - description: Sorted BAM file - pattern: "*.{bam}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.bam": + type: file + description: Sorted BAM file + pattern: "*.{bam}" - cram: - type: file - description: Sorted CRAM file - pattern: "*.{cram}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.cram": + type: file + description: Sorted CRAM file + pattern: "*.{cram}" - crai: - type: file - description: CRAM index file (optional) - pattern: "*.crai" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.crai": + type: file + description: CRAM index file (optional) + pattern: "*.crai" - csi: - type: file - description: BAM index file (optional) - pattern: "*.csi" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.csi": + type: file + description: BAM index file (optional) + pattern: "*.csi" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" - "@ewels" diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test b/modules/nf-core/samtools/sort/tests/main.nf.test index c2ea9c72..b05e6691 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test +++ b/modules/nf-core/samtools/sort/tests/main.nf.test @@ -39,6 +39,40 @@ nextflow_process { } } + test("multiple bam") { + + config "./nextflow.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.sorted.bam', checkIfExists: true) + ] + ]) + input[1] = Channel.of([ + [ id:'fasta' ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot( + process.out.bam, + process.out.csi.collect { it.collect { it instanceof Map ? it : file(it).name } }, + process.out.versions + ).match()} + ) + } + } + test("cram") { config "./nextflow_cram.config" @@ -98,6 +132,36 @@ nextflow_process { } } + test("multiple bam - stub") { + + config "./nextflow.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test2.paired_end.sorted.bam', checkIfExists: true) + ] + ]) + input[1] = Channel.of([ + [ id:'fasta' ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + test("cram - stub") { options "-stub" diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test.snap b/modules/nf-core/samtools/sort/tests/main.nf.test.snap index da38d5d1..469891fe 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/sort/tests/main.nf.test.snap @@ -20,14 +20,14 @@ ] ], [ - "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + "versions.yml:md5,2659b187d681241451539d4c53500b9f" ] ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T17:19:37.196205" + "timestamp": "2024-09-16T08:49:58.207549273" }, "bam - stub": { "content": [ @@ -57,7 +57,7 @@ ] ], "4": [ - "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + "versions.yml:md5,2659b187d681241451539d4c53500b9f" ], "bam": [ [ @@ -84,15 +84,15 @@ ] ], "versions": [ - "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + "versions.yml:md5,2659b187d681241451539d4c53500b9f" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T15:54:46.580756" + "timestamp": "2024-09-16T08:50:08.630951018" }, "cram - stub": { "content": [ @@ -122,7 +122,7 @@ ], "4": [ - "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + "versions.yml:md5,2659b187d681241451539d4c53500b9f" ], "bam": [ @@ -149,15 +149,110 @@ ], "versions": [ - "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + "versions.yml:md5,2659b187d681241451539d4c53500b9f" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T15:57:30.505698" + "timestamp": "2024-09-16T08:50:19.061912443" + }, + "multiple bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,8a16ba90c7d294cbb4c33ac0f7127a12" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi" + ] + ], + [ + "versions.yml:md5,2659b187d681241451539d4c53500b9f" + ] + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.09.0" + }, + "timestamp": "2024-10-08T11:59:55.479443" + }, + "multiple bam - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,8a16ba90c7d294cbb4c33ac0f7127a12" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,d185916eaff9afeb4d0aeab3310371f9" + ] + ], + "4": [ + "versions.yml:md5,2659b187d681241451539d4c53500b9f" + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,8a16ba90c7d294cbb4c33ac0f7127a12" + ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,d185916eaff9afeb4d0aeab3310371f9" + ] + ], + "versions": [ + "versions.yml:md5,2659b187d681241451539d4c53500b9f" + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.09.0" + }, + "timestamp": "2024-10-08T11:36:13.781404" }, "bam": { "content": [ @@ -167,7 +262,7 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,21c992d59615936b99f2ad008aa54400" + "test.sorted.bam:md5,34aa85e86abefe637f7a4a9887f016fc" ] ], [ @@ -180,13 +275,13 @@ ] ], [ - "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + "versions.yml:md5,2659b187d681241451539d4c53500b9f" ] ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.09.0" }, - "timestamp": "2024-07-22T15:54:25.872954" + "timestamp": "2024-10-08T11:59:46.372244" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/stats/environment.yml b/modules/nf-core/samtools/stats/environment.yml index 1cc83bd9..62054fc9 100644 --- a/modules/nf-core/samtools/stats/environment.yml +++ b/modules/nf-core/samtools/stats/environment.yml @@ -1,8 +1,8 @@ -name: samtools_stats +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::samtools=1.20 - - bioconda::htslib=1.20 + - bioconda::htslib=1.21 + - bioconda::samtools=1.21 diff --git a/modules/nf-core/samtools/stats/main.nf b/modules/nf-core/samtools/stats/main.nf index 982bc28e..4443948b 100644 --- a/modules/nf-core/samtools/stats/main.nf +++ b/modules/nf-core/samtools/stats/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_STATS { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : - 'biocontainers/samtools:1.20--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.21--h50ea8bc_0' : + 'biocontainers/samtools:1.21--h50ea8bc_0' }" input: tuple val(meta), path(input), path(input_index) @@ -19,7 +19,6 @@ process SAMTOOLS_STATS { task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" def reference = fasta ? "--reference ${fasta}" : "" """ diff --git a/modules/nf-core/samtools/stats/meta.yml b/modules/nf-core/samtools/stats/meta.yml index 735ff812..77b020f7 100644 --- a/modules/nf-core/samtools/stats/meta.yml +++ b/modules/nf-core/samtools/stats/meta.yml @@ -16,43 +16,46 @@ tools: documentation: http://www.htslib.org/doc/samtools.html doi: 10.1093/bioinformatics/btp352 licence: ["MIT"] + identifier: biotools:samtools input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - input: - type: file - description: BAM/CRAM file from alignment - pattern: "*.{bam,cram}" - - input_index: - 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: file - description: Reference file the CRAM was created with (optional) - pattern: "*.{fasta,fa}" + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - input: + type: file + description: BAM/CRAM file from alignment + pattern: "*.{bam,cram}" + - input_index: + 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: file + description: Reference file the CRAM was created with (optional) + pattern: "*.{fasta,fa}" output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - stats: - type: file - description: File containing samtools stats output - pattern: "*.{stats}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.stats": + type: file + description: File containing samtools stats output + pattern: "*.{stats}" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" - "@FriederikeHanssen" diff --git a/modules/nf-core/samtools/stats/tests/main.nf.test b/modules/nf-core/samtools/stats/tests/main.nf.test index e3d5cb14..5bc89309 100644 --- a/modules/nf-core/samtools/stats/tests/main.nf.test +++ b/modules/nf-core/samtools/stats/tests/main.nf.test @@ -3,6 +3,7 @@ nextflow_process { name "Test Process SAMTOOLS_STATS" script "../main.nf" process "SAMTOOLS_STATS" + tag "modules" tag "modules_nfcore" tag "samtools" @@ -11,9 +12,6 @@ nextflow_process { test("bam") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -37,9 +35,59 @@ nextflow_process { test("cram") { when { - params { - outdir = "$outputDir" + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.recalibrated.sorted.cram', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.recalibrated.sorted.cram.crai', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'genome' ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) + ]) + """ } + } + + then { + assertAll( + {assert process.success}, + {assert snapshot(process.out).match()} + ) + } + } + + test("bam - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = [[],[]] + """ + } + } + + then { + assertAll( + {assert process.success}, + {assert snapshot(process.out).match()} + ) + } + } + + test("cram - stub") { + + options "-stub" + + when { process { """ input[0] = Channel.of([ @@ -49,7 +97,7 @@ nextflow_process { ]) input[1] = Channel.of([ [ id:'genome' ], // meta map - file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true) ]) """ } diff --git a/modules/nf-core/samtools/stats/tests/main.nf.test.snap b/modules/nf-core/samtools/stats/tests/main.nf.test.snap index 2747fd6c..df507be7 100644 --- a/modules/nf-core/samtools/stats/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/stats/tests/main.nf.test.snap @@ -8,11 +8,11 @@ "id": "test", "single_end": false }, - "test.stats:md5,c9d39b38c22de2057fc2f89949090975" + "test.stats:md5,a27fe55e49a341f92379bb20a65c6a06" ] ], "1": [ - "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" ], "stats": [ [ @@ -20,19 +20,89 @@ "id": "test", "single_end": false }, - "test.stats:md5,c9d39b38c22de2057fc2f89949090975" + "test.stats:md5,a27fe55e49a341f92379bb20a65c6a06" ] ], "versions": [ - "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-05-28T15:45:24.403941966" + "timestamp": "2024-09-16T09:29:16.767396182" + }, + "bam - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" + ], + "stats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-16T09:29:29.721580274" + }, + "cram - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" + ], + "stats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-09-16T09:29:53.567964304" }, "bam": { "content": [ @@ -43,11 +113,11 @@ "id": "test", "single_end": false }, - "test.stats:md5,d522a1fa016b259d6a55620ae53dcd63" + "test.stats:md5,d53a2584376d78942839e9933a34d11b" ] ], "1": [ - "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" ], "stats": [ [ @@ -55,18 +125,18 @@ "id": "test", "single_end": false }, - "test.stats:md5,d522a1fa016b259d6a55620ae53dcd63" + "test.stats:md5,d53a2584376d78942839e9933a34d11b" ] ], "versions": [ - "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" + "versions.yml:md5,15b91d8c0e0440332e0fe4df80957043" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-05-28T15:45:06.711251947" + "timestamp": "2024-09-16T09:28:50.73610604" } } \ No newline at end of file diff --git a/modules/nf-core/umitools/dedup/environment.yml b/modules/nf-core/umitools/dedup/environment.yml index bc497824..9f9e03c4 100644 --- a/modules/nf-core/umitools/dedup/environment.yml +++ b/modules/nf-core/umitools/dedup/environment.yml @@ -1,7 +1,5 @@ -name: umitools_dedup channels: - conda-forge - bioconda - - defaults dependencies: - bioconda::umi_tools=1.1.5 diff --git a/modules/nf-core/umitools/dedup/meta.yml b/modules/nf-core/umitools/dedup/meta.yml index 38d3fd46..6cbd8411 100644 --- a/modules/nf-core/umitools/dedup/meta.yml +++ b/modules/nf-core/umitools/dedup/meta.yml @@ -1,5 +1,6 @@ name: umitools_dedup -description: Deduplicate reads based on the mapping co-ordinate and the UMI attached to the read. +description: Deduplicate reads based on the mapping co-ordinate and the UMI attached + to the read. keywords: - umitools - deduplication @@ -7,60 +8,89 @@ keywords: tools: - umi_tools: description: > - UMI-tools contains tools for dealing with Unique Molecular Identifiers (UMIs)/Random Molecular Tags (RMTs) and single cell RNA-Seq cell barcodes + UMI-tools contains tools for dealing with Unique Molecular Identifiers (UMIs)/Random + Molecular Tags (RMTs) and single cell RNA-Seq cell barcodes documentation: https://umi-tools.readthedocs.io/en/latest/ license: ["MIT"] + identifier: "" input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - bam: - type: file - description: | - BAM file containing reads to be deduplicated via UMIs. - pattern: "*.{bam}" - - bai: - type: file - description: | - BAM index files corresponding to the input BAM file. - pattern: "*.{bai}" - - get_output_stats: - type: boolean - description: | - Whether or not to generate output stats. + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: | + BAM file containing reads to be deduplicated via UMIs. + pattern: "*.{bam}" + - bai: + type: file + description: | + BAM index files corresponding to the input BAM file. + pattern: "*.{bai}" + - - get_output_stats: + type: boolean + description: | + Whether or not to generate output stats. output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - bam: - type: file - description: BAM file with deduplicated UMIs. - pattern: "*.{bam}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - ${prefix}.bam: + type: file + description: BAM file with deduplicated UMIs. + pattern: "*.{bam}" - log: - type: file - description: File with logging information - pattern: "*.{log}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.log": + type: file + description: File with logging information + pattern: "*.{log}" - tsv_edit_distance: - type: file - description: Reports the (binned) average edit distance between the UMIs at each position. - pattern: "*edit_distance.tsv" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*edit_distance.tsv": + type: file + description: Reports the (binned) average edit distance between the UMIs at + each position. + pattern: "*edit_distance.tsv" - tsv_per_umi: - type: file - description: UMI-level summary statistics. - pattern: "*per_umi.tsv" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*per_umi.tsv": + type: file + description: UMI-level summary statistics. + pattern: "*per_umi.tsv" - tsv_umi_per_position: - type: file - description: Tabulates the counts for unique combinations of UMI and position. - pattern: "*per_position.tsv" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*per_position.tsv": + type: file + description: Tabulates the counts for unique combinations of UMI and position. + pattern: "*per_position.tsv" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" - "@grst" diff --git a/modules/nf-core/umitools/dedup/tests/main.nf.test b/modules/nf-core/umitools/dedup/tests/main.nf.test index ab445536..f00a8cbe 100644 --- a/modules/nf-core/umitools/dedup/tests/main.nf.test +++ b/modules/nf-core/umitools/dedup/tests/main.nf.test @@ -19,8 +19,8 @@ nextflow_process { input[0] = [ [ id:'test', single_end:true ], // meta map - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam", checkIfExists: true), - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam.bai", checkIfExists: true) + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.umi.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.umi.sorted.bam.bai", checkIfExists: true) ] input[1] = get_output_stats """ @@ -48,8 +48,8 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam.bai", checkIfExists: true) ] input[1] = get_output_stats """ @@ -61,7 +61,7 @@ nextflow_process { { assert process.success }, { assert path("${process.out.log[0][1]}").exists() }, { assert snapshot( - process.out.bam, + bam(process.out.bam[0][1]).getSamLinesMD5(), process.out.versions).match() } ) } @@ -77,8 +77,8 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam.bai", checkIfExists: true) ] input[1] = get_output_stats """ @@ -90,7 +90,7 @@ nextflow_process { { assert process.success }, { assert path("${process.out.log[0][1]}").exists() }, { assert snapshot( - process.out.bam, + bam(process.out.bam[0][1]).getSamLinesMD5(), process.out.tsv_edit_distance, process.out.tsv_per_umi, process.out.tsv_umi_per_position, @@ -112,8 +112,8 @@ nextflow_process { input[0] = [ [ id:'test', single_end:true ], // meta map - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam", checkIfExists: true), - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam.bai", checkIfExists: true) + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.umi.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.umi.sorted.bam.bai", checkIfExists: true) ] input[1] = get_output_stats """ @@ -141,8 +141,8 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam.bai", checkIfExists: true) ] input[1] = get_output_stats """ @@ -170,8 +170,8 @@ nextflow_process { input[0] = [ [ id:'test', single_end:false ], // meta map - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), - file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam.bai", checkIfExists: true) ] input[1] = get_output_stats """ diff --git a/modules/nf-core/umitools/dedup/tests/main.nf.test.snap b/modules/nf-core/umitools/dedup/tests/main.nf.test.snap index f7f4e94f..04b81692 100644 --- a/modules/nf-core/umitools/dedup/tests/main.nf.test.snap +++ b/modules/nf-core/umitools/dedup/tests/main.nf.test.snap @@ -37,13 +37,14 @@ }, "pe - with stats": { "content": [ + "b7be15ac7aae194b04bdbb56f3534495", [ [ { "id": "test", "single_end": false }, - "test.dedup.bam:md5,350e942a0d45e8356fa24bc8c47dc1ed" + "test.dedup_edit_distance.tsv:md5,c247a49b58768e6e2e86a6c08483e612" ] ], [ @@ -52,7 +53,7 @@ "id": "test", "single_end": false }, - "test.dedup_edit_distance.tsv:md5,65186b0964e2f8d970cc04d736d8b119" + "test.dedup_per_umi.tsv:md5,ced75f7bdbf38bf78f3137d5325a8773" ] ], [ @@ -61,16 +62,7 @@ "id": "test", "single_end": false }, - "test.dedup_per_umi.tsv:md5,8e6783a4a79437b095f095f2aefe7c01" - ] - ], - [ - [ - { - "id": "test", - "single_end": false - }, - "test.dedup_per_umi_per_position.tsv:md5,9386db4a104b8e4e32f3ca4a84efa4ac" + "test.dedup_per_umi_per_position.tsv:md5,2e1a12e6f720510880068deddeefe063" ] ], [ @@ -79,9 +71,9 @@ ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nextflow": "24.10.1" }, - "timestamp": "2024-07-03T11:27:24.231325" + "timestamp": "2024-11-25T17:25:28.939957" }, "se - no stats - stub": { "content": [ @@ -103,36 +95,28 @@ }, "se - no stats": { "content": [ - "a114abd9fccce6fe2869852b5cd18964", + "9158ea6e7a0e54819e25cbac5fbc5cc0", [ "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nextflow": "24.10.1" }, - "timestamp": "2024-07-03T13:45:48.553561" + "timestamp": "2024-11-23T09:06:54.373171" }, "pe - no stats": { "content": [ - [ - [ - { - "id": "test", - "single_end": false - }, - "test.dedup.bam:md5,350e942a0d45e8356fa24bc8c47dc1ed" - ] - ], + "b7be15ac7aae194b04bdbb56f3534495", [ "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nextflow": "24.10.1" }, - "timestamp": "2024-07-03T11:27:06.957467" + "timestamp": "2024-11-25T17:24:51.423637" } } \ No newline at end of file diff --git a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test index 9d38022b..93e62485 100644 --- a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test +++ b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test @@ -26,8 +26,8 @@ nextflow_workflow { input[0] = Channel.of([ [ id:'test'], // meta map - file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), - file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam.bai', checkIfExists: true) ]) input[1] = val_get_dedup_stats """ @@ -41,6 +41,7 @@ nextflow_workflow { { assert workflow.out.bam.get(0).get(1) ==~ ".*.bam"}, { assert workflow.out.bai.get(0).get(1) ==~ ".*.bai"}, { assert snapshot( + bam(workflow.out.bam[0][1]).getSamLinesMD5(), workflow.out.stats, workflow.out.flagstat, workflow.out.idxstats, @@ -61,8 +62,8 @@ nextflow_workflow { input[0] = Channel.of([ [ id:'test'], // meta map - file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), - file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.umi.sorted.bam.bai', checkIfExists: true) ]) input[1] = val_get_dedup_stats """ diff --git a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap index 4fd70b5f..3b361357 100644 --- a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap @@ -1,12 +1,13 @@ { "sarscov2_bam_bai": { "content": [ + "b7be15ac7aae194b04bdbb56f3534495", [ [ { "id": "test" }, - "test.stats:md5,09d1bd8f10e000921202f7ea1cd0679e" + "test.stats:md5,41ba57a9b90b54587e7d154e5405ea5e" ] ], [ @@ -14,7 +15,7 @@ { "id": "test" }, - "test.flagstat:md5,0bb716e40fae381b97484b58e0b16efe" + "test.flagstat:md5,18d602435a02a4d721b78d1812622159" ] ], [ @@ -22,22 +23,22 @@ { "id": "test" }, - "test.idxstats:md5,1adb27b52d4d64b826f48b59d61dcd4d" + "test.idxstats:md5,85d20a901eef23ca50c323638a2eb602" ] ], [ - "versions.yml:md5,32b4a349a563fb5b01cf0688ae3ca860", - "versions.yml:md5,803d3f4d3992a7a597a09cf330bd46a4", - "versions.yml:md5,9b7824114bf90d4b60110ddaf149f1db", - "versions.yml:md5,f0864f64f8ebb81826a1cf5c14b77e69", + "versions.yml:md5,2bf4310f1d49429016f5633f965e9ed0", + "versions.yml:md5,306b85f2109aeac87f1bf0eed94e6940", + "versions.yml:md5,db76f947845712952426efae5356018f", + "versions.yml:md5,eb35d8fd0745ef0ebacb9e26d4124e1d", "versions.yml:md5,f4935d4e563646266cc6bb4d75d0fb7d" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nextflow": "24.10.1" }, - "timestamp": "2024-07-03T11:53:11.53709" + "timestamp": "2024-11-25T17:23:13.841219" }, "sarscov2_bam_bai - stub": { "content": [ @@ -67,7 +68,7 @@ ] ], "3": [ - + ], "4": [ [ @@ -94,10 +95,10 @@ ] ], "7": [ - "versions.yml:md5,32b4a349a563fb5b01cf0688ae3ca860", - "versions.yml:md5,803d3f4d3992a7a597a09cf330bd46a4", - "versions.yml:md5,9b7824114bf90d4b60110ddaf149f1db", - "versions.yml:md5,f0864f64f8ebb81826a1cf5c14b77e69", + "versions.yml:md5,2bf4310f1d49429016f5633f965e9ed0", + "versions.yml:md5,306b85f2109aeac87f1bf0eed94e6940", + "versions.yml:md5,db76f947845712952426efae5356018f", + "versions.yml:md5,eb35d8fd0745ef0ebacb9e26d4124e1d", "versions.yml:md5,f4935d4e563646266cc6bb4d75d0fb7d" ], "bai": [ @@ -117,7 +118,7 @@ ] ], "csi": [ - + ], "deduplog": [ [ @@ -152,18 +153,18 @@ ] ], "versions": [ - "versions.yml:md5,32b4a349a563fb5b01cf0688ae3ca860", - "versions.yml:md5,803d3f4d3992a7a597a09cf330bd46a4", - "versions.yml:md5,9b7824114bf90d4b60110ddaf149f1db", - "versions.yml:md5,f0864f64f8ebb81826a1cf5c14b77e69", + "versions.yml:md5,2bf4310f1d49429016f5633f965e9ed0", + "versions.yml:md5,306b85f2109aeac87f1bf0eed94e6940", + "versions.yml:md5,db76f947845712952426efae5356018f", + "versions.yml:md5,eb35d8fd0745ef0ebacb9e26d4124e1d", "versions.yml:md5,f4935d4e563646266cc6bb4d75d0fb7d" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T16:34:35.959581" + "timestamp": "2024-09-16T08:04:43.790052381" } -} +} \ No newline at end of file diff --git a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap index b7f4da17..c3c9a049 100644 --- a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap @@ -25,22 +25,22 @@ "id": "test", "single_end": false }, - "test.stats:md5,d32de3b3716a11039cef2367c3c1a56e" + "test.stats:md5,2fe0f3a7a1f07906061c1dadb62e0d05" ] ], [ - "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", - "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", - "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", - "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", - "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + "versions.yml:md5,032c89015461d597fcc5a5331b619d0a", + "versions.yml:md5,416c5e4a374c61167db999b0e400e3cf", + "versions.yml:md5,721391fd94c417808516480c9451c6fd", + "versions.yml:md5,9e12386b91a2977d23292754e3bcb522", + "versions.yml:md5,c294c162aeb09862cc5e55b602647452" ] ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T17:02:44.34964" + "timestamp": "2024-09-16T08:26:24.36986488" }, "test_bam_sort_stats_samtools_paired_end": { "content": [ @@ -68,22 +68,22 @@ "id": "test", "single_end": false }, - "test.stats:md5,cca83e4fc9406fc3875b5e60055d6574" + "test.stats:md5,ba007b13981dad548358c7c957d41e12" ] ], [ - "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", - "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", - "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", - "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", - "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + "versions.yml:md5,032c89015461d597fcc5a5331b619d0a", + "versions.yml:md5,416c5e4a374c61167db999b0e400e3cf", + "versions.yml:md5,721391fd94c417808516480c9451c6fd", + "versions.yml:md5,9e12386b91a2977d23292754e3bcb522", + "versions.yml:md5,c294c162aeb09862cc5e55b602647452" ] ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T17:03:02.583095" + "timestamp": "2024-09-16T08:26:38.683996037" }, "test_bam_sort_stats_samtools_single_end - stub": { "content": [ @@ -137,11 +137,11 @@ ] ], "6": [ - "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", - "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", - "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", - "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", - "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + "versions.yml:md5,032c89015461d597fcc5a5331b619d0a", + "versions.yml:md5,416c5e4a374c61167db999b0e400e3cf", + "versions.yml:md5,721391fd94c417808516480c9451c6fd", + "versions.yml:md5,9e12386b91a2977d23292754e3bcb522", + "versions.yml:md5,c294c162aeb09862cc5e55b602647452" ], "bai": [ [ @@ -192,19 +192,19 @@ ] ], "versions": [ - "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", - "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", - "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", - "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", - "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + "versions.yml:md5,032c89015461d597fcc5a5331b619d0a", + "versions.yml:md5,416c5e4a374c61167db999b0e400e3cf", + "versions.yml:md5,721391fd94c417808516480c9451c6fd", + "versions.yml:md5,9e12386b91a2977d23292754e3bcb522", + "versions.yml:md5,c294c162aeb09862cc5e55b602647452" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T17:03:22.328703" + "timestamp": "2024-09-16T08:07:18.896460047" }, "test_bam_sort_stats_samtools_paired_end - stub": { "content": [ @@ -258,11 +258,11 @@ ] ], "6": [ - "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", - "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", - "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", - "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", - "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + "versions.yml:md5,032c89015461d597fcc5a5331b619d0a", + "versions.yml:md5,416c5e4a374c61167db999b0e400e3cf", + "versions.yml:md5,721391fd94c417808516480c9451c6fd", + "versions.yml:md5,9e12386b91a2977d23292754e3bcb522", + "versions.yml:md5,c294c162aeb09862cc5e55b602647452" ], "bai": [ [ @@ -313,18 +313,18 @@ ] ], "versions": [ - "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", - "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", - "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", - "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", - "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + "versions.yml:md5,032c89015461d597fcc5a5331b619d0a", + "versions.yml:md5,416c5e4a374c61167db999b0e400e3cf", + "versions.yml:md5,721391fd94c417808516480c9451c6fd", + "versions.yml:md5,9e12386b91a2977d23292754e3bcb522", + "versions.yml:md5,c294c162aeb09862cc5e55b602647452" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T17:03:38.833662" + "timestamp": "2024-09-16T08:07:39.028688324" } } \ No newline at end of file diff --git a/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap index a3ddcc5c..8ca22526 100644 --- a/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap @@ -30,9 +30,9 @@ ] ], "3": [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ], "flagstat": [ [ @@ -62,17 +62,17 @@ ] ], "versions": [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:20:06.699297" + "timestamp": "2024-09-16T08:08:35.660286921" }, "test_bam_stats_samtools_single_end - stub": { "content": [ @@ -105,9 +105,9 @@ ] ], "3": [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ], "flagstat": [ [ @@ -137,17 +137,17 @@ ] ], "versions": [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:19:57.708621" + "timestamp": "2024-09-16T08:08:24.220305512" }, "test_bam_stats_samtools_paired_end_cram - stub": { "content": [ @@ -180,9 +180,9 @@ ] ], "3": [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ], "flagstat": [ [ @@ -212,17 +212,17 @@ ] ], "versions": [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:20:17.051493" + "timestamp": "2024-09-16T08:08:54.206770141" }, "test_bam_stats_samtools_single_end": { "content": [ @@ -250,20 +250,20 @@ "id": "test", "single_end": true }, - "test.stats:md5,4a0c429c661d6aa0b60acb9309da642d" + "test.stats:md5,291bb2393ec947140d12d42c2795b222" ] ], [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:19:25.801394" + "timestamp": "2024-09-16T08:07:49.731645858" }, "test_bam_stats_samtools_paired_end": { "content": [ @@ -291,20 +291,20 @@ "id": "test", "single_end": true }, - "test.stats:md5,7afd486ad6abb9a2a3dac90c99e1d87b" + "test.stats:md5,8140d69cdedd77570ca1d7618a744e16" ] ], [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:19:36.158768" + "timestamp": "2024-09-16T08:08:01.421996172" }, "test_bam_stats_samtools_paired_end_cram": { "content": [ @@ -332,19 +332,19 @@ "id": "test", "single_end": false }, - "test.stats:md5,16b59a1f2c99d9fe30f711adc3ebe32d" + "test.stats:md5,1622856127bafd6cdbadee9cd64ec9b7" ] ], [ - "versions.yml:md5,3c485730f712b115bcdc235e7294133b", - "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", - "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + "versions.yml:md5,73c55059ed478cd2f9cd93dd3185da3a", + "versions.yml:md5,80d8653e01575b3c381d87073f672fb5", + "versions.yml:md5,cb889532237a2f3d813978ac14a12d51" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:19:46.625907" + "timestamp": "2024-09-16T08:08:12.640915756" } } \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap index 408dabff..f5a87298 100644 --- a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap @@ -34,7 +34,7 @@ "id": "test", "single_end": true }, - "test.stats:md5,845655ccfd1fd701b9f692f8db9508af" + "test.stats:md5,0ebab7bf6149e6378b263997d7073067" ] ], [ @@ -47,19 +47,19 @@ ] ], [ - "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", - "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", - "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", - "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,60b3d72afae0af5e6ba9d522ed2a865d", + "versions.yml:md5,6d9f7a6b7da221197ec81a78012dd306", + "versions.yml:md5,9bb4be2b6931086977d43355fd7c9edb", "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", - "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + "versions.yml:md5,e5ba15fd38b21e5c3050edc8cf2ab665", + "versions.yml:md5,e65b217d1cb47f1c163fdc37023c0909" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:36:06.813423" + "timestamp": "2024-09-16T08:27:35.808393107" }, "sarscov2 - bam - single_end - stub": { "content": [ @@ -134,12 +134,12 @@ ] ], "9": [ - "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", - "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", - "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", - "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,60b3d72afae0af5e6ba9d522ed2a865d", + "versions.yml:md5,6d9f7a6b7da221197ec81a78012dd306", + "versions.yml:md5,9bb4be2b6931086977d43355fd7c9edb", "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", - "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + "versions.yml:md5,e5ba15fd38b21e5c3050edc8cf2ab665", + "versions.yml:md5,e65b217d1cb47f1c163fdc37023c0909" ], "bai": [ [ @@ -211,20 +211,20 @@ ] ], "versions": [ - "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", - "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", - "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", - "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,60b3d72afae0af5e6ba9d522ed2a865d", + "versions.yml:md5,6d9f7a6b7da221197ec81a78012dd306", + "versions.yml:md5,9bb4be2b6931086977d43355fd7c9edb", "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", - "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + "versions.yml:md5,e5ba15fd38b21e5c3050edc8cf2ab665", + "versions.yml:md5,e65b217d1cb47f1c163fdc37023c0909" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T19:36:23.861012" + "timestamp": "2024-09-16T08:10:09.451605417" }, "sarscov2 - bam - paired_end": { "content": [ @@ -261,7 +261,7 @@ "id": "test", "single_end": false }, - "test.stats:md5,603fa8c9e0e9eb3769498fc989a29250" + "test.stats:md5,74b78cbd41df459e1037735f714cda4f" ] ], [ @@ -274,19 +274,19 @@ ] ], [ - "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", - "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", - "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", - "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,60b3d72afae0af5e6ba9d522ed2a865d", + "versions.yml:md5,6d9f7a6b7da221197ec81a78012dd306", + "versions.yml:md5,9bb4be2b6931086977d43355fd7c9edb", "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", - "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + "versions.yml:md5,e5ba15fd38b21e5c3050edc8cf2ab665", + "versions.yml:md5,e65b217d1cb47f1c163fdc37023c0909" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.4" }, - "timestamp": "2024-07-03T12:36:25.071168" + "timestamp": "2024-09-16T08:28:01.671969576" }, "sarscov2 - bam - paired_end - stub": { "content": [ @@ -361,12 +361,12 @@ ] ], "9": [ - "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", - "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", - "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", - "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,60b3d72afae0af5e6ba9d522ed2a865d", + "versions.yml:md5,6d9f7a6b7da221197ec81a78012dd306", + "versions.yml:md5,9bb4be2b6931086977d43355fd7c9edb", "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", - "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + "versions.yml:md5,e5ba15fd38b21e5c3050edc8cf2ab665", + "versions.yml:md5,e65b217d1cb47f1c163fdc37023c0909" ], "bai": [ [ @@ -438,19 +438,19 @@ ] ], "versions": [ - "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", - "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", - "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", - "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,60b3d72afae0af5e6ba9d522ed2a865d", + "versions.yml:md5,6d9f7a6b7da221197ec81a78012dd306", + "versions.yml:md5,9bb4be2b6931086977d43355fd7c9edb", "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", - "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + "versions.yml:md5,e5ba15fd38b21e5c3050edc8cf2ab665", + "versions.yml:md5,e65b217d1cb47f1c163fdc37023c0909" ] } ], "meta": { "nf-test": "0.9.0", - "nextflow": "24.04.3" + "nextflow": "24.04.4" }, - "timestamp": "2024-07-22T19:36:44.894976" + "timestamp": "2024-09-16T08:10:28.136547114" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index ec8cef75..4a26bb95 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -66,22 +66,22 @@ "rseqc": "5.0.2" }, "SAMTOOLS_FLAGSTAT": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_IDXSTATS": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_INDEX": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_MERGE": { "samtools": 1.21 }, "SAMTOOLS_SORT": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_STATS": { - "samtools": 1.2 + "samtools": 1.21 }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" @@ -286,13 +286,13 @@ "jurkat.bowtie2.log:md5,24031e901f4ce11cfb227c7d30d1373a", "cd4_REP1.sorted.bam.flagstat:md5,14e684e73cb41155ab1168a0a99a97e6", "cd4_REP1.sorted.bam.idxstats:md5,e32ac3215ba948bb7dd1559dab6c3c36", - "cd4_REP1.sorted.bam.stats:md5,490f84b5520b83daa95653671ce43921", + "cd4_REP1.sorted.bam.stats:md5,9dcac9f6f5e9afbb3b2880aaf3256603", "cd4_REP2.sorted.bam.flagstat:md5,e00d036bcbea6f944d45fb5cb7c34516", "cd4_REP2.sorted.bam.idxstats:md5,0803f2dce4b972ccc14943e22145c3e8", - "cd4_REP2.sorted.bam.stats:md5,f8872ba7ef4b4e66b16a4ca3d63c1a65", + "cd4_REP2.sorted.bam.stats:md5,c7882ce1e3e7ae5cf9889479f897307d", "jurkat.sorted.bam.flagstat:md5,1b24ceabc8cecf34d745d06cf9d43cd0", "jurkat.sorted.bam.idxstats:md5,15e67d4d9d71c6cc6c37d5ce5414ede0", - "jurkat.sorted.bam.stats:md5,ff1a4b8f6456a539943a14c8daeb75d3", + "jurkat.sorted.bam.stats:md5,396021be96da9e3a14e07849c1e1abc8", "cd4_REP1.dreg.bedGraph:md5,f48ab66b1ddaf0d1b4867183aedb670a", "cd4_REP1.minus.bedGraph:md5,6930097f008d44b850d8bb5c681e0d1d", "cd4_REP1.minus.bigWig:md5,a28d277b360522476ceead81b28adc7f", @@ -322,6 +322,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:25:45.87987" + "timestamp": "2024-12-28T21:38:27.737347" } -} +} \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 341a9ac5..0035dabc 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -391,22 +391,22 @@ [ "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP1.sorted.bam.stats:md5,70b7cd3040a9b7ca70e919afb4dc7fea", "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP2.sorted.bam.stats:md5,c0e8d8d265fce71dcd43e43c93d29ef3", "cd4_REP3.sorted.bam.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", "cd4_REP3.sorted.bam.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", + "cd4_REP3.sorted.bam.stats:md5,b262fbc5a0cb83b5be1cbb71e921e4da", "cd4_REP4.sorted.bam.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", "cd4_REP4.sorted.bam.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam.stats:md5,edc57478278aa35b7376cee9afd634a7", + "cd4_REP4.sorted.bam.stats:md5,e912817bed2ca2321455010e5a95df94", "jurkat_REP1.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat_REP1.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", + "jurkat_REP1.sorted.bam.stats:md5,da19804248dcde941b4a1eb860583830", "jurkat_REP2.sorted.bam.flagstat:md5,86ed47bd41a745ab59de473082c7742d", "jurkat_REP2.sorted.bam.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam.stats:md5,026c558e8c36136ef19bfbef6b12ce2b", + "jurkat_REP2.sorted.bam.stats:md5,141032fd40420e3aa80d37c7bf7ed2b1", "cd4.bed:md5,76ee3b56d3e518f88a34b42039ec719c", "jurkat.bed:md5,862a5e81119acc691845f3b426847401", "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", @@ -460,6 +460,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:07:22.737667" + "timestamp": "2024-12-28T21:40:27.445964" } -} +} \ No newline at end of file diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 6b2aa18d..6db4b3d8 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -78,22 +78,22 @@ "rseqc": "5.0.2" }, "SAMTOOLS_FLAGSTAT": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_IDXSTATS": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_INDEX": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_MERGE": { "samtools": 1.21 }, "SAMTOOLS_SORT": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_STATS": { - "samtools": 1.2 + "samtools": 1.21 }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" @@ -308,13 +308,13 @@ [ "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP1.sorted.bam.stats:md5,70b7cd3040a9b7ca70e919afb4dc7fea", "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP2.sorted.bam.stats:md5,c0e8d8d265fce71dcd43e43c93d29ef3", "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "jurkat.sorted.bam.stats:md5,c9a6ec83d8fb1a14f53351c76cfcd24b", "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", @@ -350,6 +350,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:35:03.935996" + "timestamp": "2024-12-28T21:43:08.022898" } } \ No newline at end of file diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 92066a28..eb4693e2 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -75,22 +75,22 @@ "rseqc": "5.0.2" }, "SAMTOOLS_FLAGSTAT": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_IDXSTATS": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_INDEX": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_MERGE": { "samtools": 1.21 }, "SAMTOOLS_SORT": { - "samtools": 1.2 + "samtools": 1.21 }, "SAMTOOLS_STATS": { - "samtools": 1.2 + "samtools": 1.21 }, "SUBREAD_FEATURECOUNTS_GENE": { "subread": "2.0.1" @@ -331,13 +331,13 @@ "jurkat.plus.bigWig:md5,66e82005e6c6730e970f7506bf93325c", "cd4_REP1.sorted.bam.flagstat:md5,aa26d19a689b2fe97e254f125e1f7bcb", "cd4_REP1.sorted.bam.idxstats:md5,d523e6e25ce8659871df4104dab503b0", - "cd4_REP1.sorted.bam.stats:md5,57b98494241870644c74edda7d503232", + "cd4_REP1.sorted.bam.stats:md5,244977b276c63d2d348976d15d0cdc1c", "cd4_REP2.sorted.bam.flagstat:md5,6235482c2c1be02a23826261e2f8a033", "cd4_REP2.sorted.bam.idxstats:md5,89de35c9f4f1eafa6944d5d574db1675", - "cd4_REP2.sorted.bam.stats:md5,aaa17a5a0018fa03cbadb1f5e354fa49", + "cd4_REP2.sorted.bam.stats:md5,733cb9aeb26c7093ed936702bd7a8ba8", "jurkat.sorted.bam.flagstat:md5,8e59ad91dd9df6003cb6c3070b0aa34c", "jurkat.sorted.bam.idxstats:md5,56608a565532fc8ae2b93a3be28d5e8d", - "jurkat.sorted.bam.stats:md5,e100d7f3a79bb29ea3a99e610245e6c8", + "jurkat.sorted.bam.stats:md5,18f79cf0b37c7052d4a5d602987a8e64", "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2", @@ -362,8 +362,8 @@ ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.2" + "nextflow": "24.10.3" }, - "timestamp": "2024-12-20T06:18:38.954985" + "timestamp": "2024-12-23T14:30:09.535125" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 16ea4371..5e3ecb27 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -343,13 +343,13 @@ "jurkat.SJ.out.tab:md5,8e5de2dc83e2478528528a86a2ffd456", "cd4_REP1_genome.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", "cd4_REP1_genome.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", - "cd4_REP1_genome.stats:md5,49ea194b2d955cef24987a32dea3f6bb", + "cd4_REP1_genome.stats:md5,98b8edc46f4553462af6a395fa36ccb1", "cd4_REP2_genome.flagstat:md5,ab83e3fbca17cf463fc5293a82e4bb3a", "cd4_REP2_genome.idxstats:md5,9cdf3dd50a9862a02592c3768071fe32", - "cd4_REP2_genome.stats:md5,f878081edfbda2977e38685d12434c43", + "cd4_REP2_genome.stats:md5,5b0f411f23fce70ed0c509f1e5a2aa01", "jurkat_genome.flagstat:md5,b5f1d127de493e406882aced667210c9", "jurkat_genome.idxstats:md5,5e4a68fda75c954324d659af58d12c62", - "jurkat_genome.stats:md5,5bf21e33fb56e0a38b53faf34b3be2ea", + "jurkat_genome.stats:md5,e69e49feae0a1840403894aea26c4a33", "Genome:md5,612664e3cfde5e1b73ad541d93752b31", "SA:md5,074ae54177bb7b9cb981382f043f36e5", "SAindex:md5,c8cae2d81bec99f68eddc0afe570090b", @@ -380,7 +380,7 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-21T11:55:35.046966" + "timestamp": "2024-12-28T21:46:42.36263" }, "gzip_software_versions": { "content": [ @@ -475,4 +475,4 @@ }, "timestamp": "2024-11-25T21:02:16.63526" } -} +} \ No newline at end of file diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index 175bff41..ce95984f 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -293,13 +293,13 @@ [ "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP1.sorted.bam.stats:md5,70b7cd3040a9b7ca70e919afb4dc7fea", "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP2.sorted.bam.stats:md5,c0e8d8d265fce71dcd43e43c93d29ef3", "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "jurkat.sorted.bam.stats:md5,c9a6ec83d8fb1a14f53351c76cfcd24b", "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", @@ -335,6 +335,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:45:33.920337" + "timestamp": "2024-12-28T21:50:29.316626" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index 838ca32b..e68bfc2c 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -293,13 +293,13 @@ [ "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP1.sorted.bam.stats:md5,70b7cd3040a9b7ca70e919afb4dc7fea", "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP2.sorted.bam.stats:md5,c0e8d8d265fce71dcd43e43c93d29ef3", "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "jurkat.sorted.bam.stats:md5,c9a6ec83d8fb1a14f53351c76cfcd24b", "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", @@ -335,6 +335,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:53:43.251101" + "timestamp": "2024-12-28T21:51:56.754194" } } \ No newline at end of file diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index c7093faf..683a1fe9 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -296,13 +296,13 @@ [ "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP1.sorted.bam.stats:md5,70b7cd3040a9b7ca70e919afb4dc7fea", "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP2.sorted.bam.stats:md5,c0e8d8d265fce71dcd43e43c93d29ef3", "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "jurkat.sorted.bam.stats:md5,c9a6ec83d8fb1a14f53351c76cfcd24b", "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", @@ -338,6 +338,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T07:55:07.095505" + "timestamp": "2024-12-28T21:53:21.62668" } } \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index 0db3e81b..7a124e34 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -325,13 +325,13 @@ [ "cd4_REP1.sorted.bam.flagstat:md5,98ee509d07c1db03ccce634ccf410d07", "cd4_REP1.sorted.bam.idxstats:md5,3f30696c4c8628b47029f63d9521f0e7", - "cd4_REP1.sorted.bam.stats:md5,4902e9a7e501f6150549e195b7dc44c0", + "cd4_REP1.sorted.bam.stats:md5,a778d8eaf5f819ab4cdfca253c55f96a", "cd4_REP2.sorted.bam.flagstat:md5,235f511666cc191d1ba0d0e7334eb6ad", "cd4_REP2.sorted.bam.idxstats:md5,5eb0e894286a602d8c34b18ae226863e", - "cd4_REP2.sorted.bam.stats:md5,77abd3727f54071ce24ac389a91934ed", + "cd4_REP2.sorted.bam.stats:md5,2eb00b3b786faf06a62b79309070c514", "jurkat.sorted.bam.flagstat:md5,a1eec107305fe681a02771574de5c5fb", "jurkat.sorted.bam.idxstats:md5,02590cdcaec907c42cf6507d62844a4c", - "jurkat.sorted.bam.stats:md5,824ca1525abba55d54e9df2c319be932", + "jurkat.sorted.bam.stats:md5,1feee32d0fcf66f2042aba5627fdc019", "cd4.bed:md5,60e0da7e5691e55d86eb9df9f6ea0c46", "jurkat.bed:md5,3584ff1a08cdecc92b6fcf6b2db8dc90", "cd4_REP1.dreg.bedGraph:md5,35eb3dce09cf8a32e71fe459e0f4a0a5", @@ -375,6 +375,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T08:07:15.190593" + "timestamp": "2024-12-28T22:00:45.272491" } -} +} \ No newline at end of file diff --git a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap index 995a9191..8b61a072 100644 --- a/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/tuning/main.nf.test.snap @@ -316,13 +316,13 @@ [ "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP1.sorted.bam.stats:md5,70b7cd3040a9b7ca70e919afb4dc7fea", "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP2.sorted.bam.stats:md5,c0e8d8d265fce71dcd43e43c93d29ef3", "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d", + "jurkat.sorted.bam.stats:md5,c9a6ec83d8fb1a14f53351c76cfcd24b", "cd4.bed:md5,0193e58943726af89bfd00e9da2536d8", "jurkat.bed:md5,cb6932229eea2e09f61d48d7dd397ae1", "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", @@ -366,6 +366,6 @@ "nf-test": "0.9.2", "nextflow": "24.10.2" }, - "timestamp": "2024-12-18T08:25:02.333169" + "timestamp": "2024-12-28T22:06:41.107934" } -} +} \ No newline at end of file From a012bf3e047a6f01d0c5287b1463a2ea9f5f1e06 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 22 Apr 2025 20:56:06 -0500 Subject: [PATCH 243/255] fix: Add changes from code-review Co-authored-by: sateeshperi Co-authored-by: vagkaratzas --- CHANGELOG.md | 2 +- conf/base.config | 1 - docs/output.md | 13 ++++++++----- docs/usage.md | 4 +++- modules/local/dreg_prep/environment.yml | 1 - 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef22efa2..6b551b84 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.3.0 - 2024-12-23 +## v2.3.0 - 2025-04-23 ### Added diff --git a/conf/base.config b/conf/base.config index bd288142..f4bcc3c8 100644 --- a/conf/base.config +++ b/conf/base.config @@ -10,7 +10,6 @@ process { - // TODO nf-core: Check the defaults for all processes cpus = { 1 * task.attempt } memory = { 6.GB * task.attempt } time = { 4.h * task.attempt } diff --git a/docs/output.md b/docs/output.md index 50e10356..55e76c9c 100644 --- a/docs/output.md +++ b/docs/output.md @@ -230,6 +230,7 @@ The majority of RSeQC scripts generate output files which can be plotted and sum - `quality_control/preseq/` - `*.lc_extrap.txt`: Preseq expected future yield file. + - `*.c_curve.txt`: Preseq cumulative coverage curve file. - `quality_control/preseq/log/` - `*.command.log`: Standard error output from command. @@ -262,6 +263,7 @@ The [Preseq](http://smithlabresearch.org/software/preseq/) package is aimed at p - `coverage_graphs/` - `*.minus.bedGraph`: Sample coverage file (negative strand only) in bedGraph format - `*.plus.bedGraph`: Sample coverage file (positive strand only) in bedGraph format + - `*.dreg.bedGraph`: Sample coverage file (dreg) in bedGraph format prepared using proseq2.0 pipeline @@ -307,8 +309,8 @@ The pipeline will pool the reads if they are in the same group. See [#153](https Output files - `transcript_identification/pints/` - - `*_bidirectional_peaks.bed`: Bidirectional TREs (divergent + convergent) - - `*_divergent_peaks.bed`: Divergent TREs + - `*_bidirectional_peaks.bed`: Bidirectional TREs (divergent + convergent) **optional** + - `*_divergent_peaks.bed`: Divergent TREs **optional** - `*_unidirectional_peaks.bed`: Unidirectional TREs, maybe lncRNAs transcribed from enhancers (e-lncRNAs) @@ -372,9 +374,10 @@ They've also created some bed files that might be useful for analysis. Output files - `quantification/featurecounts/` - - `*.featureCounts.txt`: featureCounts biotype-level quantification results for each sample. - - `*.featureCounts.txt.summary`: featureCounts summary file containing overall statistics about the counts. - - `*_mqc.tsv`: MultiQC custom content files used to plot biotypes in report. + - `gene/*.featureCounts.txt`: featureCounts biotype-level quantification results for each sample. + - `gene/*.featureCounts.txt.summary`: featureCounts summary file containing overall statistics about the counts. + - `nascent/*.featureCounts.txt`: featureCounts of nascent transcripts quantification results for each sample. + - `nascent/*.featureCounts.txt.summary`: featureCounts summary file of the nascent transcripts containing overall statistics about the counts. diff --git a/docs/usage.md b/docs/usage.md index 168da41d..2fe6469a 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -91,7 +91,7 @@ groHMM is split into two steps: parameter tuning and transcript identification. When running the pipeline with groHMM as a transcript identification method, the pipeline will automatically perform a parameter tuning process. This process is unique to the groHMM transcript identification method and is designed to select the optimal hold-out parameters for the groHMM algorithm. See [this issue](https://github.com/dankoc/groHMM/issues/4) for more information. -In the groHMM vignette, the code is ran using a single mclapply call, which is a scatter gather approach. This is not ideal for large datasets, because it ends up being bottlenecked by the memory available on your local machine. To improve this, we have written a Nextflow script that runs the pipeline with a scatter gather approach. This is done by running the pipeline with a single hold-out parameter, and then the next parameter, and so on. This is more memory efficient and scales better to larger datasets. The results are then combined then combined in the end as intended and used in the transcript identification process. +In the groHMM vignette, the code is ran using a single mclapply call, which is a scatter gather approach. This is not ideal for large datasets, because it ends up being bottle-necked by the memory available on your local machine. To improve this, we have written a Nextflow script that runs the pipeline with a scatter gather approach. This is done by running the pipeline with a single hold-out parameter, and then the next parameter, and so on. This is more memory efficient and scales better to larger datasets. The results are then combined in the end as intended and used in the transcript identification process. #### groHMM Parameters @@ -138,7 +138,9 @@ HOMER uses uniquely mappable regions to improve transcript detection in repetiti - Mouse: mm10 - Fly: dm6 +:::info **This setting is off by default** +::: To find the full list of uniqmaps supplied by the author check http://homer.ucsd.edu/homer/data/uniqmap/. To build a uniqmap for a genome that isn't supported, check out [homer-uniqmap-nf](https://github.com/Functional-Genomics-Lab/homer-uniqmap-nf). diff --git a/modules/local/dreg_prep/environment.yml b/modules/local/dreg_prep/environment.yml index 906c65f1..1f219964 100644 --- a/modules/local/dreg_prep/environment.yml +++ b/modules/local/dreg_prep/environment.yml @@ -2,7 +2,6 @@ name: dreg_prep channels: - conda-forge - bioconda - - defaults dependencies: - bioconda::bedtools=2.31.1 - bioconda::ucsc-bedgraphtobigwig=445 From 31f35f7365d055488fd04544290768afb19668f6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 23 Apr 2025 22:48:41 -0500 Subject: [PATCH 244/255] chore: Update nf-test.config triggers and remove unused UTILS class Co-authored-by: maxulysse --- modules/local/grohmm/parametertuning/main.nf | 1 + nf-test.config | 2 +- tests/lib/UTILS.groovy | 34 -------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 tests/lib/UTILS.groovy diff --git a/modules/local/grohmm/parametertuning/main.nf b/modules/local/grohmm/parametertuning/main.nf index b19810ce..7761778a 100644 --- a/modules/local/grohmm/parametertuning/main.nf +++ b/modules/local/grohmm/parametertuning/main.nf @@ -1,6 +1,7 @@ process GROHMM_PARAMETERTUNING { tag "${meta.id}|${UTS}|${LtProbB}" label 'process_high' + // TODO: Use array's? Or should this be set at the nf-core/configs level? // array 10 conda "${moduleDir}/environment.yml" diff --git a/nf-test.config b/nf-test.config index b282ac78..2d22099f 100644 --- a/nf-test.config +++ b/nf-test.config @@ -8,6 +8,6 @@ config { load "nft-bam@0.5.0" load "nft-utils@0.0.3" } - triggers "nextflow.config", "nf-test.config", "conf/modules.config", "conf/test.config", "tests/nextflow.config" + triggers "nextflow.config", "nf-test.config", "conf/modules.config", "conf/test.config", "tests/nextflow.config", "nextflow_schema.json", "modules.json", "assets/schema_input.json" } diff --git a/tests/lib/UTILS.groovy b/tests/lib/UTILS.groovy deleted file mode 100644 index a5c780ee..00000000 --- a/tests/lib/UTILS.groovy +++ /dev/null @@ -1,34 +0,0 @@ -class UTILS { - // Recursively list all files in a directory and its sub-directories, matching a given suffix - // TODO: use regex pattern instead of suffix? - public static getAllFilesFromDir(dir, suffix) { - def output = [] - new File(dir).eachFileRecurse() { - if (it.name.toString().endsWith(suffix)) { - output.add(it) - } - } - return output.sort() - } - // Recursively list all files names in a directory and its sub-directories, matching a given suffix, return file names - public static getAllFileNamesFromDir(dir, suffix) { - def output = [] - new File(dir).eachFileRecurse() { - if (it.name.toString().endsWith(suffix)) { - output.add(it.toString().split("/")[-1]) - } - } - return output.sort() - } - - // Recursively list all files names in a directory and its sub-directories, matching a given suffix, return if check if given string is in file - public static checkAllFilesNamesFromDirForString(dir, suffix, string) { - def output = [] - new File(dir).eachFileRecurse() { - if (it.name.toString().endsWith(suffix)) { - output.add(it.text.contains(string)) - } - } - return output.sort() - } -} From 84977cc9981f160e4d62a8a8c97ceebeac0c8c91 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Mon, 20 Jan 2025 14:35:04 +0000 Subject: [PATCH 245/255] Template update for nf-core/tools version 3.1.2 --- .github/workflows/download_pipeline.yml | 28 ++++++++++++++----------- .nf-core.yml | 2 +- CHANGELOG.md | 3 ++- CITATIONS.md | 4 +++- README.md | 2 +- assets/multiqc_config.yml | 7 +++---- nextflow.config | 2 +- ro-crate-metadata.json | 19 +++++++---------- 8 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml index 13b51e2c..ab06316e 100644 --- a/.github/workflows/download_pipeline.yml +++ b/.github/workflows/download_pipeline.yml @@ -34,6 +34,17 @@ jobs: REPO_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPO_LOWERCASE }} REPOTITLE_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPOTITLE_LOWERCASE }} REPO_BRANCH: ${{ steps.get_repo_properties.outputs.REPO_BRANCH }} + steps: + - name: Get the repository name and current branch + id: get_repo_properties + run: | + echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT" + echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> "$GITHUB_OUTPUT" + echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> "$GITHUB_OUTPUT" + + download: + runs-on: ubuntu-latest + needs: configure steps: - name: Install Nextflow uses: nf-core/setup-nextflow@v2 @@ -56,21 +67,10 @@ jobs: python -m pip install --upgrade pip pip install git+https://github.com/nf-core/tools.git@dev - - name: Get the repository name and current branch set as environment variable - id: get_repo_properties - run: | - echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT" - echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> "$GITHUB_OUTPUT" - echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> "$GITHUB_OUTPUT" - - name: Make a cache directory for the container images run: | mkdir -p ./singularity_container_images - download: - runs-on: ubuntu-latest - needs: configure - steps: - name: Download the pipeline env: NXF_SINGULARITY_CACHEDIR: ./singularity_container_images @@ -87,6 +87,9 @@ jobs: - name: Inspect download run: tree ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }} + - name: Inspect container images + run: tree ./singularity_container_images | tee ./container_initial + - name: Count the downloaded number of container images id: count_initial run: | @@ -123,7 +126,8 @@ jobs: final_count=${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }} difference=$((final_count - initial_count)) echo "$difference additional container images were \n downloaded at runtime . The pipeline has no support for offline runs!" - tree ./singularity_container_images + tree ./singularity_container_images > ./container_afterwards + diff ./container_initial ./container_afterwards exit 1 else echo "The pipeline can be downloaded successfully!" diff --git a/.nf-core.yml b/.nf-core.yml index 243dcc37..3f7c6ae1 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -4,7 +4,7 @@ lint: - .github/workflows/linting.yml - LICENSE - assets/email_template.html -nf_core_version: 3.1.1 +nf_core_version: 3.1.2 repository_type: pipeline template: author: Edmund Miller, Ignacio Tripodi, Margaret Gruca diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b551b84..ef68c948 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.3.0 - 2025-04-23 +## v2.3.0 - [date] ### Added @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [a9ae47a](https://github.com/nf-core/nascent/commit/a9ae47a) - Update pipeline template to [nf-core/tools 3.0.1](https://github.com/nf-core/tools/releases/tag/3.0.2) - [bfcd97c](https://github.com/nf-core/nascent/commit/bfcd97c) - Update pipeline template to [nf-core/tools 3.1.0](https://github.com/nf-core/tools/releases/tag/3.1.0) - [7a4e356](https://github.com/nf-core/nascent/commit/7a4e356) - Update pipeline template to [nf-core/tools 3.1.1](https://github.com/nf-core/tools/releases/tag/3.1.1) +- [7a4e356](https://github.com/nf-core/nascent/commit/debe6a9) - Update pipeline template to [nf-core/tools 3.1.2](https://github.com/nf-core/tools/releases/tag/3.1.2) ### Fixed diff --git a/CITATIONS.md b/CITATIONS.md index 6e4513b4..0ffcc2e2 100644 --- a/CITATIONS.md +++ b/CITATIONS.md @@ -40,7 +40,9 @@ - [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/) - > Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. +> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. + +- [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/) - [featureCounts](https://pubmed.ncbi.nlm.nih.gov/24227677/) diff --git a/README.md b/README.md index b1952d7b..0541ef85 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ On release, automated continuous integration tests run the pipeline on a full-si ## Usage > [!NOTE] -> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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. +> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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. \n\nNow, you can run the pipeline using:\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Ignacio Tripodi ([@ignaciot](https://github.com/ignaciot)) and Margaret Gruca ([@magruca](https://github.com/magruca)).\n\nThe pipeline was re-written in Nextflow DSL2 by Edmund Miller ([@edmundmiller](https://github.com/edmundmiller)) and Sruthi Suresh ([@sruthipsuresh](https://github.com/sruthipsuresh)) from [The Functional Genomics Laboratory](https://taehoonkim.org/) at [The Univeristy of Texas at Dallas](https://www.utdallas.edu/)\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n- [@apeltzer](https://github.com/apeltzer)\n- [@ewels](https://github.com/ewels)\n- [@drpatelh](https://github.com/drpatelh)\n- [@pditommaso](https://github.com/pditommaso)\n- [@FriederikeHanssen](https://github.com/FriederikeHanssen)\n- [Tae Hoon Kim](https://github.com/taehoonkim-phd)\n- [@easterwoods](https://github.com/easterwoods)\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\nIf you use nf-core/nascent for your analysis, please cite it using the following doi: [10.5281/zenodo.7245273](https://doi.org/10.5281/zenodo.7245273)\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", + "datePublished": "2025-01-20T14:35:00+00:00", + "description": "

    \n \n \n \"nf-core/nascent\"\n \n

    \n\n[![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/nascent** is a bioinformatics pipeline that ...\n\n\n\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Edmund Miller, Ignacio Tripodi, Margaret Gruca.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n\n\n\n\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", "hasPart": [ { "@id": "main.nf" @@ -105,7 +105,7 @@ }, "mentions": [ { - "@id": "#daaf6fca-5723-48f3-8e28-467003b1ba8b" + "@id": "#28b4d750-0a8d-45b5-bc30-f8ca2692a05e" } ], "name": "nf-core/nascent" @@ -141,7 +141,7 @@ } ], "dateCreated": "", - "dateModified": "2024-12-22T12:18:10Z", + "dateModified": "2025-01-20T14:35:00Z", "dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/", "keywords": [ "nf-core", @@ -156,11 +156,6 @@ "license": [ "MIT" ], - "maintainer": [ - { - "@id": "#git@edmundmiller.dev" - } - ], "name": [ "nf-core/nascent" ], @@ -191,11 +186,11 @@ "version": "!>=24.04.2" }, { - "@id": "#daaf6fca-5723-48f3-8e28-467003b1ba8b", + "@id": "#28b4d750-0a8d-45b5-bc30-f8ca2692a05e", "@type": "TestSuite", "instance": [ { - "@id": "#c8ba6d45-39ba-478f-a2d2-2ec121776d34" + "@id": "#bd576001-77be-4861-9853-57f97ce28cb4" } ], "mainEntity": { @@ -204,7 +199,7 @@ "name": "Test suite for nf-core/nascent" }, { - "@id": "#c8ba6d45-39ba-478f-a2d2-2ec121776d34", + "@id": "#bd576001-77be-4861-9853-57f97ce28cb4", "@type": "TestInstance", "name": "GitHub Actions workflow for testing nf-core/nascent", "resource": "repos/nf-core/nascent/actions/workflows/ci.yml", From 63c1dbce7cc46b38a0111acb1019f8eb8d85b7b7 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Mon, 27 Jan 2025 14:47:53 +0000 Subject: [PATCH 246/255] Template update for nf-core/tools version 3.2.0 --- .github/workflows/linting_comment.yml | 2 +- .github/workflows/release-announcements.yml | 33 ------------------- .nf-core.yml | 2 +- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 1 + docs/output.md | 4 ++- modules.json | 4 +-- modules/nf-core/fastqc/main.nf | 20 +++++------ modules/nf-core/fastqc/tests/tags.yml | 2 -- modules/nf-core/multiqc/environment.yml | 2 +- modules/nf-core/multiqc/main.nf | 4 +-- .../nf-core/multiqc/tests/main.nf.test.snap | 24 +++++++------- nextflow.config | 16 ++++----- ro-crate-metadata.json | 12 +++---- 14 files changed, 48 insertions(+), 80 deletions(-) delete mode 100644 modules/nf-core/fastqc/tests/tags.yml diff --git a/.github/workflows/linting_comment.yml b/.github/workflows/linting_comment.yml index 0bed96d3..95b6b6af 100644 --- a/.github/workflows/linting_comment.yml +++ b/.github/workflows/linting_comment.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download lint results - uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7 + uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8 with: workflow: linting.yml workflow_conclusion: completed diff --git a/.github/workflows/release-announcements.yml b/.github/workflows/release-announcements.yml index 450b1d5e..76a9e67e 100644 --- a/.github/workflows/release-announcements.yml +++ b/.github/workflows/release-announcements.yml @@ -27,39 +27,6 @@ jobs: ${{ steps.get_topics.outputs.topics }} #nfcore #openscience #nextflow #bioinformatics - send-tweet: - runs-on: ubuntu-latest - - steps: - - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 - with: - python-version: "3.10" - - name: Install dependencies - run: pip install tweepy==4.14.0 - - name: Send tweet - shell: python - run: | - import os - import tweepy - - client = tweepy.Client( - access_token=os.getenv("TWITTER_ACCESS_TOKEN"), - access_token_secret=os.getenv("TWITTER_ACCESS_TOKEN_SECRET"), - consumer_key=os.getenv("TWITTER_CONSUMER_KEY"), - consumer_secret=os.getenv("TWITTER_CONSUMER_SECRET"), - ) - tweet = os.getenv("TWEET") - client.create_tweet(text=tweet) - env: - TWEET: | - Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}! - - Please see the changelog: ${{ github.event.release.html_url }} - TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }} - TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }} - TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }} - TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} - bsky-post: runs-on: ubuntu-latest steps: diff --git a/.nf-core.yml b/.nf-core.yml index 3f7c6ae1..eb9b47b4 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -4,7 +4,7 @@ lint: - .github/workflows/linting.yml - LICENSE - assets/email_template.html -nf_core_version: 3.1.2 +nf_core_version: 3.2.0 repository_type: pipeline template: author: Edmund Miller, Ignacio Tripodi, Margaret Gruca diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e9f0e1c..1dec8650 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: - prettier@3.2.5 - repo: https://github.com/editorconfig-checker/editorconfig-checker.python - rev: "3.0.3" + rev: "3.1.2" hooks: - id: editorconfig-checker alias: ec diff --git a/CHANGELOG.md b/CHANGELOG.md index ef68c948..4184b7e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [bfcd97c](https://github.com/nf-core/nascent/commit/bfcd97c) - Update pipeline template to [nf-core/tools 3.1.0](https://github.com/nf-core/tools/releases/tag/3.1.0) - [7a4e356](https://github.com/nf-core/nascent/commit/7a4e356) - Update pipeline template to [nf-core/tools 3.1.1](https://github.com/nf-core/tools/releases/tag/3.1.1) - [7a4e356](https://github.com/nf-core/nascent/commit/debe6a9) - Update pipeline template to [nf-core/tools 3.1.2](https://github.com/nf-core/tools/releases/tag/3.1.2) +- [7a4e356](https://github.com/nf-core/nascent/commit/f60a3cb) - Update pipeline template to [nf-core/tools 3.2.0](https://github.com/nf-core/tools/releases/tag/3.2.0) ### Fixed diff --git a/docs/output.md b/docs/output.md index 55e76c9c..e14423c3 100644 --- a/docs/output.md +++ b/docs/output.md @@ -417,7 +417,9 @@ A number of genome-specific files are generated by the pipeline because they are [MultiQC](http://multiqc.info) is a visualization tool that generates a single HTML report summarising all samples in your project. Most of the pipeline QC results are visualised in the report and further statistics are available in the report data directory. -Results generated by MultiQC collate pipeline QC from supported tools e.g. FastQC. The pipeline has special steps which also allow the software versions to be reported in the MultiQC output for future traceability. For more information about how to use MultiQC reports, see .### Pipeline information +Results generated by MultiQC collate pipeline QC from supported tools e.g. FastQC. The pipeline has special steps which also allow the software versions to be reported in the MultiQC output for future traceability. For more information about how to use MultiQC reports, see . + +### Pipeline information
    Output files diff --git a/modules.json b/modules.json index af566b53..5eede723 100644 --- a/modules.json +++ b/modules.json @@ -105,7 +105,7 @@ }, "fastqc": { "branch": "master", - "git_sha": "dc94b6ee04a05ddb9f7ae050712ff30a13149164", + "git_sha": "08108058ea36a63f141c25c4e75f9f872a5b2296", "installed_by": ["modules"] }, "gffread": { @@ -145,7 +145,7 @@ }, "multiqc": { "branch": "master", - "git_sha": "cf17ca47590cc578dfb47db1c2a44ef86f89976d", + "git_sha": "f0719ae309075ae4a291533883847c3f7c441dad", "installed_by": ["modules"] }, "pints/caller": { diff --git a/modules/nf-core/fastqc/main.nf b/modules/nf-core/fastqc/main.nf index 752c3a10..033f4154 100644 --- a/modules/nf-core/fastqc/main.nf +++ b/modules/nf-core/fastqc/main.nf @@ -1,5 +1,5 @@ process FASTQC { - tag "$meta.id" + tag "${meta.id}" label 'process_medium' conda "${moduleDir}/environment.yml" @@ -19,30 +19,30 @@ process FASTQC { task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${meta.id}" + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" // Make list of old name and new name pairs to use for renaming in the bash while loop def old_new_pairs = reads instanceof Path || reads.size() == 1 ? [[ reads, "${prefix}.${reads.extension}" ]] : reads.withIndex().collect { entry, index -> [ entry, "${prefix}_${index + 1}.${entry.extension}" ] } - def rename_to = old_new_pairs*.join(' ').join(' ') + def rename_to = old_new_pairs*.join(' ').join(' ') def renamed_files = old_new_pairs.collect{ _old_name, new_name -> new_name }.join(' ') // The total amount of allocated RAM by FastQC is equal to the number of threads defined (--threads) time the amount of RAM defined (--memory) // https://github.com/s-andrews/FastQC/blob/1faeea0412093224d7f6a07f777fad60a5650795/fastqc#L211-L222 // Dividing the task.memory by task.cpu allows to stick to requested amount of RAM in the label - def memory_in_mb = MemoryUnit.of("${task.memory}").toUnit('MB') / task.cpus + def memory_in_mb = task.memory ? task.memory.toUnit('MB').toFloat() / task.cpus : null // FastQC memory value allowed range (100 - 10000) def fastqc_memory = memory_in_mb > 10000 ? 10000 : (memory_in_mb < 100 ? 100 : memory_in_mb) """ - printf "%s %s\\n" $rename_to | while read old_name new_name; do + 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 \\ - --memory $fastqc_memory \\ - $renamed_files + ${args} \\ + --threads ${task.cpus} \\ + --memory ${fastqc_memory} \\ + ${renamed_files} cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/fastqc/tests/tags.yml b/modules/nf-core/fastqc/tests/tags.yml deleted file mode 100644 index 7834294b..00000000 --- a/modules/nf-core/fastqc/tests/tags.yml +++ /dev/null @@ -1,2 +0,0 @@ -fastqc: - - modules/nf-core/fastqc/** diff --git a/modules/nf-core/multiqc/environment.yml b/modules/nf-core/multiqc/environment.yml index 6f5b867b..a27122ce 100644 --- a/modules/nf-core/multiqc/environment.yml +++ b/modules/nf-core/multiqc/environment.yml @@ -2,4 +2,4 @@ channels: - conda-forge - bioconda dependencies: - - bioconda::multiqc=1.25.1 + - bioconda::multiqc=1.27 diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf index cc0643e1..58d9313c 100644 --- a/modules/nf-core/multiqc/main.nf +++ b/modules/nf-core/multiqc/main.nf @@ -3,8 +3,8 @@ process MULTIQC { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.25.1--pyhdfd78af_0' : - 'biocontainers/multiqc:1.25.1--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/multiqc:1.27--pyhdfd78af_0' : + 'biocontainers/multiqc:1.27--pyhdfd78af_0' }" input: path multiqc_files, stageAs: "?/*" diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap index 2fcbb5ff..7b7c1322 100644 --- a/modules/nf-core/multiqc/tests/main.nf.test.snap +++ b/modules/nf-core/multiqc/tests/main.nf.test.snap @@ -2,14 +2,14 @@ "multiqc_versions_single": { "content": [ [ - "versions.yml:md5,41f391dcedce7f93ca188f3a3ffa0916" + "versions.yml:md5,8f3b8c1cec5388cf2708be948c9fa42f" ] ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.4" }, - "timestamp": "2024-10-02T17:51:46.317523" + "timestamp": "2025-01-27T09:29:57.631982377" }, "multiqc_stub": { "content": [ @@ -17,25 +17,25 @@ "multiqc_report.html", "multiqc_data", "multiqc_plots", - "versions.yml:md5,41f391dcedce7f93ca188f3a3ffa0916" + "versions.yml:md5,8f3b8c1cec5388cf2708be948c9fa42f" ] ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.4" }, - "timestamp": "2024-10-02T17:52:20.680978" + "timestamp": "2025-01-27T09:30:34.743726958" }, "multiqc_versions_config": { "content": [ [ - "versions.yml:md5,41f391dcedce7f93ca188f3a3ffa0916" + "versions.yml:md5,8f3b8c1cec5388cf2708be948c9fa42f" ] ], "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.4" + "nf-test": "0.9.2", + "nextflow": "24.10.4" }, - "timestamp": "2024-10-02T17:52:09.185842" + "timestamp": "2025-01-27T09:30:21.44383553" } } \ No newline at end of file diff --git a/nextflow.config b/nextflow.config index dd2e5c24..b28d47aa 100644 --- a/nextflow.config +++ b/nextflow.config @@ -220,14 +220,14 @@ env { } // Set bash options -process.shell = """\ -bash - -set -e # Exit if a tool returns a non-zero status/exit code -set -u # Treat unset variables and parameters as an error -set -o pipefail # Returns the status of the last command to exit with a non-zero status or zero if all successfully execute -set -C # No clobber - prevent output redirection from overwriting files. -""" +process.shell = [ + "bash", + "-C", // No clobber - prevent output redirection from overwriting files. + "-e", // Exit if a tool returns a non-zero status/exit code + "-u", // Treat unset variables and parameters as an error + "-o", // Returns the status of the last command to exit.. + "pipefail" // ..with a non-zero status or zero if all successfully execute +] // Disable process selector warnings by default. Use debug profile to enable warnings. nextflow.enable.configProcessNamesValidation = false diff --git a/ro-crate-metadata.json b/ro-crate-metadata.json index bc67f7ca..5dc1b8ea 100644 --- a/ro-crate-metadata.json +++ b/ro-crate-metadata.json @@ -22,7 +22,7 @@ "@id": "./", "@type": "Dataset", "creativeWorkStatus": "Stable", - "datePublished": "2025-01-20T14:35:00+00:00", + "datePublished": "2025-01-27T14:47:39+00:00", "description": "

    \n \n \n \"nf-core/nascent\"\n \n

    \n\n[![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/nascent** is a bioinformatics pipeline that ...\n\n\n\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Edmund Miller, Ignacio Tripodi, Margaret Gruca.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n\n\n\n\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", "hasPart": [ { @@ -105,7 +105,7 @@ }, "mentions": [ { - "@id": "#28b4d750-0a8d-45b5-bc30-f8ca2692a05e" + "@id": "#0ad9fe72-3d3a-4c6c-a89b-005216f84dc2" } ], "name": "nf-core/nascent" @@ -141,7 +141,7 @@ } ], "dateCreated": "", - "dateModified": "2025-01-20T14:35:00Z", + "dateModified": "2025-01-27T14:47:39Z", "dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/", "keywords": [ "nf-core", @@ -186,11 +186,11 @@ "version": "!>=24.04.2" }, { - "@id": "#28b4d750-0a8d-45b5-bc30-f8ca2692a05e", + "@id": "#0ad9fe72-3d3a-4c6c-a89b-005216f84dc2", "@type": "TestSuite", "instance": [ { - "@id": "#bd576001-77be-4861-9853-57f97ce28cb4" + "@id": "#8926e24d-6fce-49a6-ac62-50b84f5fab52" } ], "mainEntity": { @@ -199,7 +199,7 @@ "name": "Test suite for nf-core/nascent" }, { - "@id": "#bd576001-77be-4861-9853-57f97ce28cb4", + "@id": "#8926e24d-6fce-49a6-ac62-50b84f5fab52", "@type": "TestInstance", "name": "GitHub Actions workflow for testing nf-core/nascent", "resource": "repos/nf-core/nascent/actions/workflows/ci.yml", From 1cd72901cf684c53265ba0fc9b93b33b64d48a57 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 29 Apr 2025 19:21:37 -0500 Subject: [PATCH 247/255] chore: Bump gunzip version That's really fishy... --- workflows/tests/aligner/star.nf.test.snap | 2 +- .../grohmm/only_gff/main.nf.test.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 5e3ecb27..efb6bc43 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -430,7 +430,7 @@ "perl": "5.26.2" }, "GUNZIP_GTF": { - "gunzip": 1.1 + "gunzip": 1.12 }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index 7a124e34..371c9f54 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -62,10 +62,10 @@ "perl": "5.26.2" }, "GUNZIP_FASTA": { - "gunzip": 1.1 + "gunzip": 1.12 }, "GUNZIP_GFF": { - "gunzip": 1.1 + "gunzip": 1.12 }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, From a76d25bd83d32870be8dd1394123c05573b74c55 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 29 Apr 2025 22:01:15 -0500 Subject: [PATCH 248/255] chore: nf-core modules update gunzip --- modules.json | 2 +- modules/nf-core/gunzip/environment.yml | 7 +++- modules/nf-core/gunzip/main.nf | 40 +++++++++---------- modules/nf-core/gunzip/meta.yml | 37 ++++++++++------- .../nf-core/gunzip/tests/main.nf.test.snap | 40 +++++++++---------- modules/nf-core/gunzip/tests/tags.yml | 2 - workflows/tests/aligner/star.nf.test.snap | 2 +- .../grohmm/only_gff/main.nf.test.snap | 4 +- 8 files changed, 71 insertions(+), 63 deletions(-) delete mode 100644 modules/nf-core/gunzip/tests/tags.yml diff --git a/modules.json b/modules.json index 5eede723..1d6d320a 100644 --- a/modules.json +++ b/modules.json @@ -115,7 +115,7 @@ }, "gunzip": { "branch": "master", - "git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d", + "git_sha": "05954dab2ff481bcb999f24455da29a5828af08d", "installed_by": ["modules"] }, "hisat2/align": { diff --git a/modules/nf-core/gunzip/environment.yml b/modules/nf-core/gunzip/environment.yml index dfc02a7b..9b926b1f 100644 --- a/modules/nf-core/gunzip/environment.yml +++ b/modules/nf-core/gunzip/environment.yml @@ -1,9 +1,12 @@ -name: gunzip +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json channels: - conda-forge - bioconda - - defaults dependencies: + - conda-forge::coreutils=9.5 - conda-forge::grep=3.11 + - conda-forge::gzip=1.13 + - conda-forge::lbzip2=2.5 - conda-forge::sed=4.8 - conda-forge::tar=1.34 diff --git a/modules/nf-core/gunzip/main.nf b/modules/nf-core/gunzip/main.nf index 5e67e3b9..3ffc8e92 100644 --- a/modules/nf-core/gunzip/main.nf +++ b/modules/nf-core/gunzip/main.nf @@ -1,37 +1,37 @@ process GUNZIP { - tag "$archive" + tag "${archive}" label 'process_single' conda "${moduleDir}/environment.yml" - container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/ubuntu:22.04' : - 'nf-core/ubuntu:22.04' }" + container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container + ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/52/52ccce28d2ab928ab862e25aae26314d69c8e38bd41ca9431c67ef05221348aa/data' + : 'community.wave.seqera.io/library/coreutils_grep_gzip_lbzip2_pruned:838ba80435a629f8'}" input: tuple val(meta), path(archive) output: - tuple val(meta), path("$gunzip"), emit: gunzip - path "versions.yml" , emit: versions + tuple val(meta), path("${gunzip}"), emit: gunzip + path "versions.yml", emit: versions when: task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' - def extension = ( archive.toString() - '.gz' ).tokenize('.')[-1] - def name = archive.toString() - '.gz' - ".$extension" - def prefix = task.ext.prefix ?: name - gunzip = prefix + ".$extension" + def args = task.ext.args ?: '' + def extension = (archive.toString() - '.gz').tokenize('.')[-1] + def name = archive.toString() - '.gz' - ".${extension}" + def prefix = task.ext.prefix ?: name + gunzip = prefix + ".${extension}" """ # Not calling gunzip itself because it creates files # with the original group ownership rather than the # default one for that user / the work directory gzip \\ -cd \\ - $args \\ - $archive \\ - > $gunzip + ${args} \\ + ${archive} \\ + > ${gunzip} cat <<-END_VERSIONS > versions.yml "${task.process}": @@ -40,13 +40,13 @@ process GUNZIP { """ stub: - def args = task.ext.args ?: '' - def extension = ( archive.toString() - '.gz' ).tokenize('.')[-1] - def name = archive.toString() - '.gz' - ".$extension" - def prefix = task.ext.prefix ?: name - gunzip = prefix + ".$extension" + def args = task.ext.args ?: '' + def extension = (archive.toString() - '.gz').tokenize('.')[-1] + def name = archive.toString() - '.gz' - ".${extension}" + def prefix = task.ext.prefix ?: name + gunzip = prefix + ".${extension}" """ - touch $gunzip + touch ${gunzip} cat <<-END_VERSIONS > versions.yml "${task.process}": gunzip: \$(echo \$(gunzip --version 2>&1) | sed 's/^.*(gzip) //; s/ Copyright.*\$//') diff --git a/modules/nf-core/gunzip/meta.yml b/modules/nf-core/gunzip/meta.yml index f32973a0..69d31024 100644 --- a/modules/nf-core/gunzip/meta.yml +++ b/modules/nf-core/gunzip/meta.yml @@ -10,25 +10,32 @@ tools: gzip is a file format and a software application used for file compression and decompression. documentation: https://www.gnu.org/software/gzip/manual/gzip.html licence: ["GPL-3.0-or-later"] + identifier: "" input: - - meta: - type: map - description: | - Optional groovy Map containing meta information - e.g. [ id:'test', single_end:false ] - - archive: - type: file - description: File to be compressed/uncompressed - pattern: "*.*" + - - meta: + type: map + description: | + Optional groovy Map containing meta information + e.g. [ id:'test', single_end:false ] + - archive: + type: file + description: File to be compressed/uncompressed + pattern: "*.*" output: - gunzip: - type: file - description: Compressed/uncompressed file - pattern: "*.*" + - meta: + type: file + description: Compressed/uncompressed file + pattern: "*.*" + - ${gunzip}: + type: file + description: Compressed/uncompressed file + pattern: "*.*" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@joseespinosa" - "@drpatelh" diff --git a/modules/nf-core/gunzip/tests/main.nf.test.snap b/modules/nf-core/gunzip/tests/main.nf.test.snap index 069967e7..a0f0e67e 100644 --- a/modules/nf-core/gunzip/tests/main.nf.test.snap +++ b/modules/nf-core/gunzip/tests/main.nf.test.snap @@ -11,7 +11,7 @@ ] ], "1": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ], "gunzip": [ [ @@ -22,15 +22,15 @@ ] ], "versions": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.2", + "nextflow": "24.10.2" }, - "timestamp": "2024-06-25T11:35:10.861293" + "timestamp": "2024-12-13T11:48:22.080222697" }, "Should run without failures - stub": { "content": [ @@ -44,7 +44,7 @@ ] ], "1": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ], "gunzip": [ [ @@ -55,15 +55,15 @@ ] ], "versions": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.2", + "nextflow": "24.10.2" }, - "timestamp": "2024-06-25T11:35:05.857145" + "timestamp": "2024-12-13T11:48:14.593020264" }, "Should run without failures": { "content": [ @@ -77,7 +77,7 @@ ] ], "1": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ], "gunzip": [ [ @@ -88,15 +88,15 @@ ] ], "versions": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.2", + "nextflow": "24.10.2" }, - "timestamp": "2023-10-17T15:35:37.690477896" + "timestamp": "2024-12-13T11:48:01.295397925" }, "Should run without failures - prefix": { "content": [ @@ -110,7 +110,7 @@ ] ], "1": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ], "gunzip": [ [ @@ -121,14 +121,14 @@ ] ], "versions": [ - "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + "versions.yml:md5,d327e4a19a6d5c5e974136cef8999d8c" ] } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.2", + "nextflow": "24.10.2" }, - "timestamp": "2024-06-25T11:33:32.921739" + "timestamp": "2024-12-13T11:48:07.414271387" } } \ No newline at end of file diff --git a/modules/nf-core/gunzip/tests/tags.yml b/modules/nf-core/gunzip/tests/tags.yml deleted file mode 100644 index fd3f6915..00000000 --- a/modules/nf-core/gunzip/tests/tags.yml +++ /dev/null @@ -1,2 +0,0 @@ -gunzip: - - modules/nf-core/gunzip/** diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index efb6bc43..085b5afa 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -430,7 +430,7 @@ "perl": "5.26.2" }, "GUNZIP_GTF": { - "gunzip": 1.12 + "gunzip": 1.13 }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, diff --git a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap index 371c9f54..90dc633e 100644 --- a/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap +++ b/workflows/tests/transcript_indentification/grohmm/only_gff/main.nf.test.snap @@ -62,10 +62,10 @@ "perl": "5.26.2" }, "GUNZIP_FASTA": { - "gunzip": 1.12 + "gunzip": 1.13 }, "GUNZIP_GFF": { - "gunzip": 1.12 + "gunzip": 1.13 }, "HOMER_MAKETAGDIRECTORY": { "homer": 4.11, From 691211f0f09bc632a1dc91e50bb81f6446449b7e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 30 Apr 2025 20:36:07 -0500 Subject: [PATCH 249/255] ci: Fix naming --- .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 2c1e3f68..ebc7d8fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ concurrency: jobs: test: - name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})" + name: "${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}" # Only run on push if this is the nf-core dev branch (merged PRs) if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/nascent') }}" runs-on: ubuntu-latest From 4bba323e831885176c68c7cc7b27a5213cadad80 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 30 Apr 2025 20:37:31 -0500 Subject: [PATCH 250/255] ci: Remove latest-everything on non-master --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebc7d8fb..c9b132c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,8 @@ jobs: profile: "conda" - isMaster: false profile: "singularity" + - isMaster: false + NXF_VER: "latest-everything" shard: [1, 2, 3, 4] steps: - name: Check out pipeline code From 1a0514f49753950f4a0bc6ff2320091c6726fba8 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 30 Apr 2025 20:44:39 -0500 Subject: [PATCH 251/255] ci: Switch to runs-on and use 5 shards --- .github/workflows/ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9b132c6..62b4f544 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,10 +24,14 @@ concurrency: jobs: test: + name: "${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}" # Only run on push if this is the nf-core dev branch (merged PRs) if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/nascent') }}" - runs-on: ubuntu-latest + runs-on: + - runs-on=${{ github.run_id }} + - runner=4cpu-linux-x64 + - image=ubuntu22-full-x64 strategy: fail-fast: false matrix: @@ -50,7 +54,7 @@ jobs: profile: "singularity" - isMaster: false NXF_VER: "latest-everything" - shard: [1, 2, 3, 4] + shard: [1, 2, 3, 4, 5] steps: - name: Check out pipeline code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 @@ -103,12 +107,12 @@ jobs: - name: Clean up Disk space uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 - - name: Run Tests (Shard ${{ matrix.shard }}/4) + - name: Run Tests (Shard ${{ matrix.shard }}/5) run: | NFT_WORKDIR=~ \ nf-test test \ --ci \ - --shard ${{ matrix.shard }}/4 \ + --shard ${{ matrix.shard }}/5 \ --changed-since HEAD^ \ --profile "+${{ matrix.profile }}" \ --verbose \ From 852b5f04fb3a8774265e39deba52a5db934393bf Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Wed, 30 Apr 2025 12:28:03 +0000 Subject: [PATCH 252/255] Template update for nf-core/tools version 3.2.1 --- .github/workflows/awsfulltest.yml | 41 ++++++++----------------------- .github/workflows/ci.yml | 4 +-- .nf-core.yml | 2 +- CITATIONS.md | 2 ++ nextflow.config | 2 +- ro-crate-metadata.json | 12 ++++----- 6 files changed, 22 insertions(+), 41 deletions(-) diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index 40777fab..c8d9a777 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -4,44 +4,23 @@ name: nf-core AWS full size tests # It runs the -profile 'test_full' on AWS batch on: - pull_request: - branches: - - main - - master workflow_dispatch: pull_request_review: types: [submitted] + release: + types: [published] jobs: run-platform: name: Run AWS full tests - # run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered - if: github.repository == 'nf-core/nascent' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch' + # run only if the PR is approved by at least 2 reviewers and against the master/main branch or manually triggered + if: github.repository == 'nf-core/nascent' && github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - - name: Get PR reviews - uses: octokit/request-action@v2.x - if: github.event_name != 'workflow_dispatch' - id: check_approvals - continue-on-error: true - with: - route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Check for approvals - if: ${{ failure() && github.event_name != 'workflow_dispatch' }} - run: | - echo "No review approvals found. At least 2 approvals are required to run this action automatically." - exit 1 - - - name: Check for enough approvals (>=2) - id: test_variables - if: github.event_name != 'workflow_dispatch' + - name: Set revision variable + id: revision run: | - JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}' - CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length') - test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required + echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT" - name: Launch workflow via Seqera Platform uses: seqeralabs/action-tower-launch@v2 @@ -49,12 +28,12 @@ jobs: 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/nascent/work-${{ github.sha }} + revision: ${{ steps.revision.outputs.revision }} + workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/nascent/work-${{ steps.revision.outputs.revision }} parameters: | { "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}", - "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/nascent/results-${{ github.sha }}" + "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/nascent/results-${{ steps.revision.outputs.revision }}" } profiles: test_full diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62b4f544..d6799fa8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,6 @@ concurrency: jobs: test: - name: "${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}" # Only run on push if this is the nf-core dev branch (merged PRs) if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/nascent') }}" @@ -107,7 +106,8 @@ jobs: - name: Clean up Disk space uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 - - name: Run Tests (Shard ${{ matrix.shard }}/5) + - name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}" + continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }} run: | NFT_WORKDIR=~ \ nf-test test \ diff --git a/.nf-core.yml b/.nf-core.yml index eb9b47b4..e41f39d8 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -4,7 +4,7 @@ lint: - .github/workflows/linting.yml - LICENSE - assets/email_template.html -nf_core_version: 3.2.0 +nf_core_version: 3.2.1 repository_type: pipeline template: author: Edmund Miller, Ignacio Tripodi, Margaret Gruca diff --git a/CITATIONS.md b/CITATIONS.md index 0ffcc2e2..cf2e52ca 100644 --- a/CITATIONS.md +++ b/CITATIONS.md @@ -44,6 +44,8 @@ - [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/) +> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924. + - [featureCounts](https://pubmed.ncbi.nlm.nih.gov/24227677/) > Liao Y, Smyth GK, Shi W. featureCounts: an efficient general purpose program for assigning sequence reads to genomic features. Bioinformatics. 2014 Apr 1;30(7):923-30. doi: 10.1093/bioinformatics/btt656. Epub 2013 Nov 13. PubMed PMID: 24227677. diff --git a/nextflow.config b/nextflow.config index b28d47aa..295fcc75 100644 --- a/nextflow.config +++ b/nextflow.config @@ -297,7 +297,7 @@ manifest { // Nextflow plugins plugins { - id 'nf-schema@2.3.0' // Validation of pipeline parameters and creation of an input channel from a sample sheet + id 'nf-schema@2.2.0' // Validation of pipeline parameters and creation of an input channel from a sample sheet } validation { diff --git a/ro-crate-metadata.json b/ro-crate-metadata.json index 5dc1b8ea..4d25301d 100644 --- a/ro-crate-metadata.json +++ b/ro-crate-metadata.json @@ -22,7 +22,7 @@ "@id": "./", "@type": "Dataset", "creativeWorkStatus": "Stable", - "datePublished": "2025-01-27T14:47:39+00:00", + "datePublished": "2025-04-30T12:27:28+00:00", "description": "

    \n \n \n \"nf-core/nascent\"\n \n

    \n\n[![GitHub Actions CI Status](https://github.com/nf-core/nascent/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/nascent)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23nascent-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/nascent)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/nascent** is a bioinformatics pipeline that ...\n\n\n\n\n1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how 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.\n\n\n\nNow, you can run the pipeline using:\n\n\n\n```bash\nnextflow run nf-core/nascent \\\n -profile \\\n --input samplesheet.csv \\\n --outdir \n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/nascent/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/nascent/output).\n\n## Credits\n\nnf-core/nascent was originally written by Edmund Miller, Ignacio Tripodi, Margaret Gruca.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#nascent` channel](https://nfcore.slack.com/channels/nascent) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n\n\n\n\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n", "hasPart": [ { @@ -105,7 +105,7 @@ }, "mentions": [ { - "@id": "#0ad9fe72-3d3a-4c6c-a89b-005216f84dc2" + "@id": "#230bee17-200a-48b1-b68d-0c34b732fc6c" } ], "name": "nf-core/nascent" @@ -141,7 +141,7 @@ } ], "dateCreated": "", - "dateModified": "2025-01-27T14:47:39Z", + "dateModified": "2025-04-30T12:27:28Z", "dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/", "keywords": [ "nf-core", @@ -186,11 +186,11 @@ "version": "!>=24.04.2" }, { - "@id": "#0ad9fe72-3d3a-4c6c-a89b-005216f84dc2", + "@id": "#230bee17-200a-48b1-b68d-0c34b732fc6c", "@type": "TestSuite", "instance": [ { - "@id": "#8926e24d-6fce-49a6-ac62-50b84f5fab52" + "@id": "#b5cc8a3b-ee2b-42a1-aecc-da0cc6592625" } ], "mainEntity": { @@ -199,7 +199,7 @@ "name": "Test suite for nf-core/nascent" }, { - "@id": "#8926e24d-6fce-49a6-ac62-50b84f5fab52", + "@id": "#b5cc8a3b-ee2b-42a1-aecc-da0cc6592625", "@type": "TestInstance", "name": "GitHub Actions workflow for testing nf-core/nascent", "resource": "repos/nf-core/nascent/actions/workflows/ci.yml", From 5a32319fbaaf2b9907bf2867a30a945eda37efe7 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 1 May 2025 19:22:54 -0500 Subject: [PATCH 253/255] chore: Bump a hash --- CHANGELOG.md | 1 + workflows/tests/aligner/bwa.nf.test.snap | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4184b7e0..98daa63f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [7a4e356](https://github.com/nf-core/nascent/commit/7a4e356) - Update pipeline template to [nf-core/tools 3.1.1](https://github.com/nf-core/tools/releases/tag/3.1.1) - [7a4e356](https://github.com/nf-core/nascent/commit/debe6a9) - Update pipeline template to [nf-core/tools 3.1.2](https://github.com/nf-core/tools/releases/tag/3.1.2) - [7a4e356](https://github.com/nf-core/nascent/commit/f60a3cb) - Update pipeline template to [nf-core/tools 3.2.0](https://github.com/nf-core/tools/releases/tag/3.2.0) +- [852b5f0](https://github.com/nf-core/nascent/commit/852b5f0) - Update pipeline template to [nf-core/tools 3.2.1](https://github.com/nf-core/tools/releases/tag/3.2.1) ### Fixed diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 0035dabc..b43e8b17 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -407,7 +407,7 @@ "jurkat_REP2.sorted.bam.flagstat:md5,86ed47bd41a745ab59de473082c7742d", "jurkat_REP2.sorted.bam.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", "jurkat_REP2.sorted.bam.stats:md5,141032fd40420e3aa80d37c7bf7ed2b1", - "cd4.bed:md5,76ee3b56d3e518f88a34b42039ec719c", + "cd4.bed:md5,864532d867843d8ad1545b90d5dcd762", "jurkat.bed:md5,862a5e81119acc691845f3b426847401", "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", @@ -452,7 +452,7 @@ "versions.yml:md5,7c0dcd0a18b3c753def73b96cb825792", "cd4_merged.bed:md5,4d8f9dc54f886f379b95609908a08662", "jurkat_merged.bed:md5,cae11a1bfb707ea2df5fe612ae7268c8", - "cd4_chr21_1_unidirectional_peaks.bed:md5,76ee3b56d3e518f88a34b42039ec719c", + "cd4_chr21_1_unidirectional_peaks.bed:md5,864532d867843d8ad1545b90d5dcd762", "jurkat_chr21_1_unidirectional_peaks.bed:md5,862a5e81119acc691845f3b426847401" ] ], @@ -462,4 +462,4 @@ }, "timestamp": "2024-12-28T21:40:27.445964" } -} \ No newline at end of file +} From e90fbd179f911ff7eff4161594daf60f544ff75c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 1 May 2025 19:23:06 -0500 Subject: [PATCH 254/255] ci: Try to fixes runs on error with AWS iGenomes In Should work with BWA Index --- workflows/tests/skip_pints.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflows/tests/skip_pints.config b/workflows/tests/skip_pints.config index 1b3dad74..2f5de50d 100644 --- a/workflows/tests/skip_pints.config +++ b/workflows/tests/skip_pints.config @@ -1,3 +1,6 @@ +// Fixes runs-on error +aws.client.anonymous = true + process { withName: '.*:TRANSCRIPT_INDENTIFICATION:.*' { ext.when = false From 414bf0f71c0a8755b149c3f5db4279261d1873b9 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 May 2025 20:16:18 -0500 Subject: [PATCH 255/255] chore: Update release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98daa63f..430fbb40 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.3.0 - [date] +## v2.3.0 - 2025-05-06 ### Added
    Process Name \\", - " \\ Software Version
    CUSTOM_DUMPSOFTWAREVERSIONSpython3.11.7
    yaml5.4.1
    TOOL1tool10.11.9
    TOOL2tool21.9
    WorkflowNextflow12.922000 K (92.984097%)", - "single end (151 cycles)" ] - def log_text = [ "Q20 bases: 12922(92.9841%)", - "reads passed filter: 99" ] - def read_lines = ["@ERR5069949.2151832 NS500628:121:HK3MMAFX2:2:21208:10793:15304/1", - "TCATAAACCAAAGCACTCACAGTGTCAACAATTTCAGCAGGACAACGCCGACAAGTTCCGAGGAACATGTCTGGACCTATAGTTTTCATAAGTCTACACACTGAATTGAAATATTCTGGTTCTAGTGTGCCCTTAGTTAGCAATGTGCGT", - "AAAAAAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEE - { assert path(process.out.reads.get(0).get(1)).linesGzip.contains(read_line) } - } - }, - { html_text.each { html_part -> - { assert path(process.out.html.get(0).get(1)).getText().contains(html_part) } - } - }, - { assert snapshot(process.out.json).match("test_fastp_single_end_json") }, - { log_text.each { log_part -> - { assert path(process.out.log.get(0).get(1)).getText().contains(log_part) } - } - }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { file(it[1]).getName() } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_single_end-_match") - }, - { assert snapshot(process.out.versions).match("versions_single_end") } + { assert path(process.out.html.get(0).get(1)).getText().contains("single end (151 cycles)") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("reads passed filter: 99") }, + { assert snapshot( + process.out.json, + process.out.reads, + process.out.reads_fail, + process.out.reads_merged, + process.out.versions).match() } ) } } - test("test_fastp_single_end-stub") { - - options '-stub' + test("test_fastp_paired_end") { when { - params { - outdir = "$outputDir" - } + process { """ adapter_fasta = [] + save_trimmed_pass = true save_trimmed_fail = false save_merged = false input[0] = Channel.of([ - [ id:'test', single_end:true ], - [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = false + input[4] = false """ } } then { + assertAll( + { assert process.success }, + { assert path(process.out.html.get(0).get(1)).getText().contains("The input has little adapter percentage (~0.000000%), probably it's trimmed before.") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("Q30 bases: 12281(88.3716%)") }, + { assert snapshot( + process.out.json, + process.out.reads, + process.out.reads_fail, + process.out.reads_merged, + process.out.versions).match() } + ) + } + } + test("fastp test_fastp_interleaved") { + + config './nextflow.interleaved.config' + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_interleaved.fastq.gz', checkIfExists: true) ] + ]) + input[1] = [] + input[2] = false + input[3] = false + input[4] = false + """ + } + } + + then { assertAll( { assert process.success }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { file(it[1]).getName() } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_single_end-for_stub_match") - }, - { assert snapshot(process.out.versions).match("versions_single_end_stub") } + { assert path(process.out.html.get(0).get(1)).getText().contains("paired end (151 cycles + 151 cycles)") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("reads passed filter: 162") }, + { assert process.out.reads_fail == [] }, + { assert process.out.reads_merged == [] }, + { assert snapshot( + process.out.reads, + process.out.json, + process.out.versions).match() } ) } } - test("test_fastp_paired_end") { + test("test_fastp_single_end_trim_fail") { when { - params { - outdir = "$outputDir" + + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = [] + input[2] = false + input[3] = true + input[4] = false + """ } + } + + then { + assertAll( + { assert process.success }, + { assert path(process.out.html.get(0).get(1)).getText().contains("single end (151 cycles)") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("reads passed filter: 99") }, + { assert snapshot( + process.out.json, + process.out.reads, + process.out.reads_fail, + process.out.reads_merged, + process.out.versions).match() } + ) + } + } + + test("test_fastp_paired_end_trim_fail") { + + config './nextflow.save_failed.config' + when { process { """ - adapter_fasta = [] - save_trimmed_fail = false - save_merged = false + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true)] + ]) + input[1] = [] + input[2] = false + input[3] = true + input[4] = false + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert path(process.out.html.get(0).get(1)).getText().contains("The input has little adapter percentage (~0.000000%), probably it's trimmed before.") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("reads passed filter: 162") }, + { assert snapshot( + process.out.reads, + process.out.reads_fail, + process.out.reads_merged, + process.out.json, + process.out.versions).match() } + ) + } + } + + test("test_fastp_paired_end_merged") { + when { + process { + """ input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = false + input[4] = true """ } } then { - def html_text = [ "Q20 bases:25.719000 K (93.033098%)", - "The input has little adapter percentage (~0.000000%), probably it's trimmed before."] - def log_text = [ "No adapter detected for read1", - "Q30 bases: 12281(88.3716%)"] - def json_text = ['"passed_filter_reads": 198'] - def read1_lines = ["@ERR5069949.2151832 NS500628:121:HK3MMAFX2:2:21208:10793:15304/1", - "TCATAAACCAAAGCACTCACAGTGTCAACAATTTCAGCAGGACAACGCCGACAAGTTCCGAGGAACATGTCTGGACCTATAGTTTTCATAAGTCTACACACTGAATTGAAATATTCTGGTTCTAGTGTGCCCTTAGTTAGCAATGTGCGT", - "AAAAAAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEE - { assert path(process.out.reads.get(0).get(1).get(0)).linesGzip.contains(read1_line) } - } - }, - { read2_lines.each { read2_line -> - { assert path(process.out.reads.get(0).get(1).get(1)).linesGzip.contains(read2_line) } - } - }, - { html_text.each { html_part -> - { assert path(process.out.html.get(0).get(1)).getText().contains(html_part) } - } - }, - { json_text.each { json_part -> - { assert path(process.out.json.get(0).get(1)).getText().contains(json_part) } - } - }, - { log_text.each { log_part -> - { assert path(process.out.log.get(0).get(1)).getText().contains(log_part) } - } - }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { it[1].collect { item -> file(item).getName() } } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_paired_end_match") - }, - { assert snapshot(process.out.versions).match("versions_paired_end") } + { assert path(process.out.html.get(0).get(1)).getText().contains("The input has little adapter percentage (~0.000000%), probably it's trimmed before.") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("total reads: 75") }, + { assert snapshot( + process.out.json, + process.out.reads, + process.out.reads_fail, + process.out.reads_merged, + process.out.versions).match() }, ) } } - test("test_fastp_paired_end-stub") { - - options '-stub' + test("test_fastp_paired_end_merged_adapterlist") { when { - params { - outdir = "$outputDir" + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] + ]) + input[1] = Channel.of([ file(params.modules_testdata_base_path + 'delete_me/fastp/adapters.fasta', checkIfExists: true) ]) + input[2] = false + input[3] = false + input[4] = true + """ } + } + + then { + assertAll( + { assert process.success }, + { assert path(process.out.html.get(0).get(1)).getText().contains("
    ") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("total bases: 13683") }, + { assert snapshot( + process.out.json, + process.out.reads, + process.out.reads_fail, + process.out.reads_merged, + process.out.versions).match() } + ) + } + } + + test("test_fastp_single_end_qc_only") { + + when { process { """ - adapter_fasta = [] - save_trimmed_fail = false - save_merged = false + input[0] = Channel.of([ + [ id:'test', single_end:true ], + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = [] + input[2] = true + input[3] = false + input[4] = false + """ + } + } + then { + assertAll( + { assert process.success }, + { assert path(process.out.html.get(0).get(1)).getText().contains("single end (151 cycles)") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("reads passed filter: 99") }, + { assert snapshot( + process.out.json, + process.out.reads, + process.out.reads, + process.out.reads_fail, + process.out.reads_fail, + process.out.reads_merged, + process.out.reads_merged, + process.out.versions).match() } + ) + } + } + + test("test_fastp_paired_end_qc_only") { + + when { + process { + """ input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = true + input[3] = false + input[4] = false """ } } @@ -232,113 +301,99 @@ nextflow_process { then { assertAll( { assert process.success }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { it[1].collect { item -> file(item).getName() } } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_paired_end-for_stub_match") - }, - { assert snapshot(process.out.versions).match("versions_paired_end-stub") } + { assert path(process.out.html.get(0).get(1)).getText().contains("The input has little adapter percentage (~0.000000%), probably it's trimmed before.") }, + { assert path(process.out.log.get(0).get(1)).getText().contains("Q30 bases: 12281(88.3716%)") }, + { assert snapshot( + process.out.json, + process.out.reads, + process.out.reads, + process.out.reads_fail, + process.out.reads_fail, + process.out.reads_merged, + process.out.reads_merged, + process.out.versions).match() } ) } } - test("fastp test_fastp_interleaved") { - config './nextflow.config' + test("test_fastp_single_end - stub") { + + options "-stub" + when { - params { - outdir = "$outputDir" + + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = [] + input[2] = false + input[3] = false + input[4] = false + """ } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("test_fastp_paired_end - stub") { + + options "-stub" + + when { + process { """ adapter_fasta = [] + save_trimmed_pass = true save_trimmed_fail = false save_merged = false input[0] = Channel.of([ - [ id:'test', single_end:true ], // meta map - [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_interleaved.fastq.gz', checkIfExists: true) ] + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = false + input[4] = false """ } } then { - def html_text = [ "Q20 bases:
    		25.719000 K (93.033098%)", - "paired end (151 cycles + 151 cycles)"] - def log_text = [ "Q20 bases: 12922(92.9841%)", - "reads passed filter: 198"] - def read_lines = [ "@ERR5069949.2151832 NS500628:121:HK3MMAFX2:2:21208:10793:15304/1", - "TCATAAACCAAAGCACTCACAGTGTCAACAATTTCAGCAGGACAACGCCGACAAGTTCCGAGGAACATGTCTGGACCTATAGTTTTCATAAGTCTACACACTGAATTGAAATATTCTGGTTCTAGTGTGCCCTTAGTTAGCAATGTGCGT", - "AAAAAAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEE - { assert path(process.out.reads.get(0).get(1)).linesGzip.contains(read_line) } - } - }, - { html_text.each { html_part -> - { assert path(process.out.html.get(0).get(1)).getText().contains(html_part) } - } - }, - { assert snapshot(process.out.json).match("fastp test_fastp_interleaved_json") }, - { log_text.each { log_part -> - { assert path(process.out.log.get(0).get(1)).getText().contains(log_part) } - } - }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { file(it[1]).getName() } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_interleaved-_match") - }, - { assert snapshot(process.out.versions).match("versions_interleaved") } + { assert snapshot(process.out).match() } ) } } - test("fastp test_fastp_interleaved-stub") { + test("fastp - stub test_fastp_interleaved") { - options '-stub' + options "-stub" - config './nextflow.config' + config './nextflow.interleaved.config' when { - params { - outdir = "$outputDir" - } process { """ - adapter_fasta = [] - save_trimmed_fail = false - save_merged = false - input[0] = Channel.of([ [ id:'test', single_end:true ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_interleaved.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = false + input[4] = false """ } } @@ -346,276 +401,112 @@ nextflow_process { then { assertAll( { assert process.success }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { file(it[1]).getName() } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_interleaved-for_stub_match") - }, - { assert snapshot(process.out.versions).match("versions_interleaved-stub") } + { assert snapshot(process.out).match() } ) } } - test("test_fastp_single_end_trim_fail") { + test("test_fastp_single_end_trim_fail - stub") { + + options "-stub" when { - params { - outdir = "$outputDir" - } + process { """ - adapter_fasta = [] - save_trimmed_fail = true - save_merged = false - input[0] = Channel.of([ [ id:'test', single_end:true ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = true + input[4] = false """ } } then { - def html_text = [ "Q20 bases:12.922000 K (92.984097%)", - "single end (151 cycles)"] - def log_text = [ "Q20 bases: 12922(92.9841%)", - "reads passed filter: 99" ] - def read_lines = [ "@ERR5069949.2151832 NS500628:121:HK3MMAFX2:2:21208:10793:15304/1", - "TCATAAACCAAAGCACTCACAGTGTCAACAATTTCAGCAGGACAACGCCGACAAGTTCCGAGGAACATGTCTGGACCTATAGTTTTCATAAGTCTACACACTGAATTGAAATATTCTGGTTCTAGTGTGCCCTTAGTTAGCAATGTGCGT", - "AAAAAAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEE - { assert path(process.out.reads.get(0).get(1)).linesGzip.contains(read_line) } - } - }, - { failed_read_lines.each { failed_read_line -> - { assert path(process.out.reads_fail.get(0).get(1)).linesGzip.contains(failed_read_line) } - } - }, - { html_text.each { html_part -> - { assert path(process.out.html.get(0).get(1)).getText().contains(html_part) } - } - }, - { assert snapshot(process.out.json).match("test_fastp_single_end_trim_fail_json") }, - { log_text.each { log_part -> - { assert path(process.out.log.get(0).get(1)).getText().contains(log_part) } - } - }, - { assert snapshot(process.out.versions).match("versions_single_end_trim_fail") } + { assert snapshot(process.out).match() } ) } } - test("test_fastp_paired_end_trim_fail") { + test("test_fastp_paired_end_trim_fail - stub") { + + options "-stub" + config './nextflow.save_failed.config' when { - params { - outdir = "$outputDir" - } process { """ - adapter_fasta = [] - save_trimmed_fail = true - save_merged = false - input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true)] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = true + input[4] = false """ } } then { - def html_text = [ "Q20 bases:25.719000 K (93.033098%)", - "The input has little adapter percentage (~0.000000%), probably it's trimmed before."] - def log_text = [ "No adapter detected for read1", - "Q30 bases: 12281(88.3716%)"] - def json_text = ['"passed_filter_reads": 198'] - def read1_lines = ["@ERR5069949.2151832 NS500628:121:HK3MMAFX2:2:21208:10793:15304/1", - "TCATAAACCAAAGCACTCACAGTGTCAACAATTTCAGCAGGACAACGCCGACAAGTTCCGAGGAACATGTCTGGACCTATAGTTTTCATAAGTCTACACACTGAATTGAAATATTCTGGTTCTAGTGTGCCCTTAGTTAGCAATGTGCGT", - "AAAAAAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEAAEEEEE - { assert path(process.out.reads.get(0).get(1).get(0)).linesGzip.contains(read1_line) } - } - }, - { read2_lines.each { read2_line -> - { assert path(process.out.reads.get(0).get(1).get(1)).linesGzip.contains(read2_line) } - } - }, - { failed_read2_lines.each { failed_read2_line -> - { assert path(process.out.reads_fail.get(0).get(1).get(1)).linesGzip.contains(failed_read2_line) } - } - }, - { html_text.each { html_part -> - { assert path(process.out.html.get(0).get(1)).getText().contains(html_part) } - } - }, - { json_text.each { json_part -> - { assert path(process.out.json.get(0).get(1)).getText().contains(json_part) } - } - }, - { log_text.each { log_part -> - { assert path(process.out.log.get(0).get(1)).getText().contains(log_part) } - } - }, - { assert snapshot(process.out.versions).match("versions_paired_end_trim_fail") } + { assert snapshot(process.out).match() } ) } } - test("test_fastp_paired_end_merged") { + test("test_fastp_paired_end_merged - stub") { + + options "-stub" when { - params { - outdir = "$outputDir" - } process { """ - adapter_fasta = [] - save_trimmed_fail = false - save_merged = true input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = false + input[3] = false + input[4] = true """ } } then { - def html_text = [ "
    "] - def log_text = [ "Merged and filtered:", - "total reads: 75", - "total bases: 13683"] - def json_text = ['"merged_and_filtered": {', '"total_reads": 75', '"total_bases": 13683'] - def read1_lines = [ "@ERR5069949.1066259 NS500628:121:HK3MMAFX2:1:11312:18369:8333/1", - "CCTTATGACAGCAAGAACTGTGTATGATGATGGTGCTAGGAGAGTGTGGACACTTATGAATGTCTTGACACTCGTTTATAAAGTTTATTATGGTAATGCTTTAGATCAAGCCATTTCCATGTGGGCTCTTATAATCTCTGTTACTTC", - "AAAAAEAEEAEEEEEEEEEEEEEEEEAEEEEAEEEEEEEEAEEEEEEEEEEEEEEEEE/EAEEEEEE/6EEEEEEEEEEAEEAEEE/EE/AEEAEEEEEAEEEA/EEAAEAE - { assert path(process.out.reads.get(0).get(1).get(0)).linesGzip.contains(read1_line) } - } - }, - { read2_lines.each { read2_line -> - { assert path(process.out.reads.get(0).get(1).get(1)).linesGzip.contains(read2_line) } - } - }, - { read_merged_lines.each { read_merged_line -> - { assert path(process.out.reads_merged.get(0).get(1)).linesGzip.contains(read_merged_line) } - } - }, - { html_text.each { html_part -> - { assert path(process.out.html.get(0).get(1)).getText().contains(html_part) } - } - }, - { json_text.each { json_part -> - { assert path(process.out.json.get(0).get(1)).getText().contains(json_part) } - } - }, - { log_text.each { log_part -> - { assert path(process.out.log.get(0).get(1)).getText().contains(log_part) } - } - }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { it[1].collect { item -> file(item).getName() } } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_paired_end_merged_match") - }, - { assert snapshot(process.out.versions).match("versions_paired_end_merged") } + { assert snapshot(process.out).match() } ) } } - test("test_fastp_paired_end_merged-stub") { + test("test_fastp_paired_end_merged_adapterlist - stub") { - options '-stub' + options "-stub" when { - params { - outdir = "$outputDir" - } process { """ - adapter_fasta = [] - save_trimmed_fail = false - save_merged = true - input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = Channel.of([ file(params.modules_testdata_base_path + 'delete_me/fastp/adapters.fasta', checkIfExists: true) ]) + input[2] = false + input[3] = false + input[4] = true """ } } @@ -623,101 +514,63 @@ nextflow_process { then { assertAll( { assert process.success }, - { - assert snapshot( - ( - [process.out.reads[0][0].toString()] + // meta - process.out.reads.collect { it[1].collect { item -> file(item).getName() } } + - process.out.json.collect { file(it[1]).getName() } + - process.out.html.collect { file(it[1]).getName() } + - process.out.log.collect { file(it[1]).getName() } + - process.out.reads_fail.collect { file(it[1]).getName() } + - process.out.reads_merged.collect { file(it[1]).getName() } - ).sort() - ).match("test_fastp_paired_end_merged-for_stub_match") - }, - { assert snapshot(process.out.versions).match("versions_paired_end_merged_stub") } + { assert snapshot(process.out).match() } ) } } - test("test_fastp_paired_end_merged_adapterlist") { + test("test_fastp_single_end_qc_only - stub") { + + options "-stub" when { - params { - outdir = "$outputDir" - } process { """ - adapter_fasta = Channel.of([ file(params.modules_testdata_base_path + 'delete_me/fastp/adapters.fasta', checkIfExists: true) ]) - save_trimmed_fail = false - save_merged = true + input[0] = Channel.of([ + [ id:'test', single_end:true ], + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = [] + input[2] = true + input[3] = false + input[4] = false + """ + } + } + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("test_fastp_paired_end_qc_only - stub") { + + options "-stub" + + when { + process { + """ input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] ]) - input[1] = adapter_fasta - input[2] = save_trimmed_fail - input[3] = save_merged + input[1] = [] + input[2] = true + input[3] = false + input[4] = false """ } } then { - def html_text = [ "
    "] - def log_text = [ "Merged and filtered:", - "total reads: 75", - "total bases: 13683"] - def json_text = ['"merged_and_filtered": {', '"total_reads": 75', '"total_bases": 13683',"--adapter_fasta"] - def read1_lines = ["@ERR5069949.1066259 NS500628:121:HK3MMAFX2:1:11312:18369:8333/1", - "CCTTATGACAGCAAGAACTGTGTATGATGATGGTGCTAGGAGAGTGTGGACACTTATGAATGTCTTGACACTCGTTTATAAAGTTTATTATGGTAATGCTTTAGATCAAGCCATTTCCATGTGGGCTCTTATAATCTCTGTTACTTC", - "AAAAAEAEEAEEEEEEEEEEEEEEEEAEEEEAEEEEEEEEAEEEEEEEEEEEEEEEEE/EAEEEEEE/6EEEEEEEEEEAEEAEEE/EE/AEEAEEEEEAEEEA/EEAAEAE - { assert path(process.out.reads.get(0).get(1).get(0)).linesGzip.contains(read1_line) } - } - }, - { read2_lines.each { read2_line -> - { assert path(process.out.reads.get(0).get(1).get(1)).linesGzip.contains(read2_line) } - } - }, - { read_merged_lines.each { read_merged_line -> - { assert path(process.out.reads_merged.get(0).get(1)).linesGzip.contains(read_merged_line) } - } - }, - { html_text.each { html_part -> - { assert path(process.out.html.get(0).get(1)).getText().contains(html_part) } - } - }, - { json_text.each { json_part -> - { assert path(process.out.json.get(0).get(1)).getText().contains(json_part) } - } - }, - { log_text.each { log_part -> - { assert path(process.out.log.get(0).get(1)).getText().contains(log_part) } - } - }, - { assert snapshot(process.out.versions).match("versions_paired_end_merged_adapterlist") } + { assert snapshot(process.out).match() } ) } } -} +} \ No newline at end of file diff --git a/modules/nf-core/fastp/tests/main.nf.test.snap b/modules/nf-core/fastp/tests/main.nf.test.snap index b4c0e1dd..54be7e45 100644 --- a/modules/nf-core/fastp/tests/main.nf.test.snap +++ b/modules/nf-core/fastp/tests/main.nf.test.snap @@ -1,55 +1,178 @@ { - "fastp test_fastp_interleaved_json": { + "test_fastp_single_end_qc_only - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": true - }, - "test.fastp.json:md5,168f516f7bd4b7b6c32da7cba87299a4" + { + "0": [ + + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + + ], + "5": [ + + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + + ], + "reads_fail": [ + + ], + "reads_merged": [ + + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] - ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-01-17T18:08:06.123035" + "timestamp": "2024-07-05T14:31:10.841098" }, - "test_fastp_paired_end_merged-for_stub_match": { + "test_fastp_paired_end": { "content": [ [ [ - "test_1.fastp.fastq.gz", - "test_2.fastp.fastq.gz" - ], - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "test.merged.fastq.gz", - "{id=test, single_end=false}" + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,1e0f8e27e71728e2b63fc64086be95cd" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,67b2bbae47f073e05a97a9c2edce23c7", + "test_2.fastp.fastq.gz:md5,25cbdca08e2083dbd4f0502de6b62f39" + ] + ] + ], + [ + + ], + [ + + ], + [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-01-17T18:10:13.467574" + "timestamp": "2024-07-05T13:43:28.665779" }, - "versions_interleaved": { + "test_fastp_paired_end_merged_adapterlist": { "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,5914ca3f21ce162123a824e33e8564f6" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,54b726a55e992a869fd3fa778afe1672", + "test_2.fastp.fastq.gz:md5,29d3b33b869f7b63417b8ff07bb128ba" + ] + ] + ], + [ + + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.merged.fastq.gz:md5,c873bb1ab3fa859dcc47306465e749d5" + ] + ], [ "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:56:24.615634793" + "timestamp": "2024-07-05T13:44:18.210375" }, - "test_fastp_single_end_json": { + "test_fastp_single_end_qc_only": { "content": [ [ [ @@ -57,274 +180,1152 @@ "id": "test", "single_end": true }, - "test.fastp.json:md5,c852d7a6dba5819e4ac8d9673bedcacc" + "test.fastp.json:md5,5cc5f01e449309e0e689ed6f51a2294a" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-01-17T18:06:00.223817" - }, - "versions_paired_end": { - "content": [ + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], [ "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:55:42.333545689" + "timestamp": "2024-07-05T13:44:27.380974" }, - "test_fastp_paired_end_match": { + "test_fastp_paired_end_trim_fail": { "content": [ [ [ - "test_1.fastp.fastq.gz", - "test_2.fastp.fastq.gz" - ], - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "{id=test, single_end=false}" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-02-01T12:03:06.431833729" - }, - "test_fastp_interleaved-_match": { - "content": [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,6ff32a64c5188b9a9192be1398c262c7", + "test_2.fastp.fastq.gz:md5,db0cb7c9977e94ac2b4b446ebd017a8a" + ] + ] + ], [ - "test.fastp.fastq.gz", - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "{id=test, single_end=true}" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-02-01T12:03:37.827323085" - }, - "test_fastp_paired_end_merged_match": { - "content": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test.paired.fail.fastq.gz:md5,409b687c734cedd7a1fec14d316e1366", + "test_1.fail.fastq.gz:md5,4f273cf3159c13f79e8ffae12f5661f6", + "test_2.fail.fastq.gz:md5,f97b9edefb5649aab661fbc9e71fc995" + ] + ] + ], + [ + + ], [ [ - "test_1.fastp.fastq.gz", - "test_2.fastp.fastq.gz" - ], - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "test.merged.fastq.gz", - "{id=test, single_end=false}" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-02-01T12:08:44.496251446" - }, - "versions_single_end_stub": { - "content": [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,4c3268ddb50ea5b33125984776aa3519" + ] + ], [ "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:55:27.354051299" + "timestamp": "2024-07-05T13:43:58.749589" }, - "versions_interleaved-stub": { + "fastp - stub test_fastp_interleaved": { "content": [ - [ - "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + + ], + "5": [ + + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "reads_fail": [ + + ], + "reads_merged": [ + + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:56:46.535528418" + "timestamp": "2024-07-05T13:50:00.270029" }, - "versions_single_end_trim_fail": { + "test_fastp_single_end - stub": { "content": [ - [ - "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + + ], + "5": [ + + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "reads_fail": [ + + ], + "reads_merged": [ + + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:59:03.724591407" + "timestamp": "2024-07-05T13:49:42.502789" }, - "test_fastp_paired_end-for_stub_match": { + "test_fastp_paired_end_merged_adapterlist - stub": { "content": [ - [ - [ - "test_1.fastp.fastq.gz", - "test_2.fastp.fastq.gz" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] ], - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "{id=test, single_end=false}" - ] + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + + ], + "5": [ + [ + { + "id": "test", + "single_end": false + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "reads_fail": [ + + ], + "reads_merged": [ + [ + { + "id": "test", + "single_end": false + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-01-17T18:07:15.398827" + "timestamp": "2024-07-05T13:54:53.458252" }, - "versions_paired_end-stub": { + "test_fastp_paired_end_merged - stub": { "content": [ - [ - "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + + ], + "5": [ + [ + { + "id": "test", + "single_end": false + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "reads_fail": [ + + ], + "reads_merged": [ + [ + { + "id": "test", + "single_end": false + }, + "test.merged.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:56:06.50017282" + "timestamp": "2024-07-05T13:50:27.689379" }, - "versions_single_end": { + "test_fastp_paired_end_merged": { "content": [ [ - "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-02-01T11:55:07.67921647" - }, - "versions_paired_end_merged_stub": { - "content": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,b712fd68ed0322f4bec49ff2a5237fcc" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,54b726a55e992a869fd3fa778afe1672", + "test_2.fastp.fastq.gz:md5,29d3b33b869f7b63417b8ff07bb128ba" + ] + ] + ], + [ + + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.merged.fastq.gz:md5,c873bb1ab3fa859dcc47306465e749d5" + ] + ], [ "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:59:47.350653154" + "timestamp": "2024-07-05T13:44:08.68476" }, - "test_fastp_interleaved-for_stub_match": { + "test_fastp_paired_end - stub": { "content": [ - [ - "test.fastp.fastq.gz", - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "{id=test, single_end=true}" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + + ], + "5": [ + + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "reads_fail": [ + + ], + "reads_merged": [ + + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-01-17T18:08:06.127974" + "timestamp": "2024-07-05T13:49:51.679221" }, - "versions_paired_end_trim_fail": { + "test_fastp_single_end": { "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,c852d7a6dba5819e4ac8d9673bedcacc" + ] + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,67b2bbae47f073e05a97a9c2edce23c7" + ] + ], + [ + + ], + [ + + ], [ "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:59:18.140484878" + "timestamp": "2024-07-05T13:43:18.834322" }, - "test_fastp_single_end-for_stub_match": { + "test_fastp_single_end_trim_fail - stub": { "content": [ - [ - "test.fastp.fastq.gz", - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "{id=test, single_end=true}" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "5": [ + + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "reads_fail": [ + [ + { + "id": "test", + "single_end": true + }, + "test.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ], + "reads_merged": [ + + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-01-17T18:06:00.244202" + "timestamp": "2024-07-05T14:05:36.898142" }, - "test_fastp_single_end-_match": { + "test_fastp_paired_end_trim_fail - stub": { "content": [ - [ - "test.fastp.fastq.gz", - "test.fastp.html", - "test.fastp.json", - "test.fastp.log", - "{id=test, single_end=true}" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test.paired.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_1.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "5": [ + + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test_1.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fastp.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "reads_fail": [ + [ + { + "id": "test", + "single_end": false + }, + [ + "test.paired.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_1.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940", + "test_2.fail.fastq.gz:md5,68b329da9893e34099c7d8ad5cb9c940" + ] + ] + ], + "reads_merged": [ + + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:57:30.791982648" + "timestamp": "2024-07-05T14:05:49.212847" }, - "versions_paired_end_merged_adapterlist": { + "fastp test_fastp_interleaved": { "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,217d62dc13a23e92513a1bd8e1bcea39" + ] + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,b24e0624df5cc0b11cd5ba21b726fb22" + ] + ], [ "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T12:05:37.845370554" + "timestamp": "2024-07-05T13:43:38.910832" }, - "versions_paired_end_merged": { + "test_fastp_single_end_trim_fail": { "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.json:md5,9a7ee180f000e8d00c7fb67f06293eb5" + ] + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.fastp.fastq.gz:md5,67b2bbae47f073e05a97a9c2edce23c7" + ] + ], + [ + [ + { + "id": "test", + "single_end": true + }, + "test.fail.fastq.gz:md5,3e4aaadb66a5b8fc9b881bf39c227abd" + ] + ], + [ + + ], [ "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-01T11:59:32.860543858" + "timestamp": "2024-07-05T13:43:48.22378" }, - "test_fastp_single_end_trim_fail_json": { + "test_fastp_paired_end_qc_only": { "content": [ [ [ { "id": "test", - "single_end": true + "single_end": false }, - "test.fastp.json:md5,9a7ee180f000e8d00c7fb67f06293eb5" + "test.fastp.json:md5,623064a45912dac6f2b64e3f2e9901df" ] + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + + ], + [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-05T13:44:36.334938" + }, + "test_fastp_paired_end_qc_only - stub": { + "content": [ + { + "0": [ + + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + + ], + "5": [ + + ], + "6": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ], + "html": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.html:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "json": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.json:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": false + }, + "test.fastp.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "reads": [ + + ], + "reads_fail": [ + + ], + "reads_merged": [ + + ], + "versions": [ + "versions.yml:md5,48ffc994212fb1fc9f83a74fa69c9f02" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" }, - "timestamp": "2024-01-17T18:08:41.942317" + "timestamp": "2024-07-05T14:31:27.096468" } } \ No newline at end of file diff --git a/modules/nf-core/fastp/tests/nextflow.interleaved.config b/modules/nf-core/fastp/tests/nextflow.interleaved.config new file mode 100644 index 00000000..4be8dbd2 --- /dev/null +++ b/modules/nf-core/fastp/tests/nextflow.interleaved.config @@ -0,0 +1,5 @@ +process { + withName: FASTP { + ext.args = "--interleaved_in -e 30" + } +} diff --git a/modules/nf-core/fastp/tests/nextflow.config b/modules/nf-core/fastp/tests/nextflow.save_failed.config similarity index 50% rename from modules/nf-core/fastp/tests/nextflow.config rename to modules/nf-core/fastp/tests/nextflow.save_failed.config index 0f7849ad..53b61b0c 100644 --- a/modules/nf-core/fastp/tests/nextflow.config +++ b/modules/nf-core/fastp/tests/nextflow.save_failed.config @@ -1,6 +1,5 @@ process { - withName: FASTP { - ext.args = "--interleaved_in" + ext.args = "-e 30" } } diff --git a/modules/nf-core/gffread/environment.yml b/modules/nf-core/gffread/environment.yml index 5398f71c..c6df58ad 100644 --- a/modules/nf-core/gffread/environment.yml +++ b/modules/nf-core/gffread/environment.yml @@ -4,4 +4,4 @@ channels: - bioconda - defaults dependencies: - - bioconda::gffread=0.12.1 + - bioconda::gffread=0.12.7 diff --git a/modules/nf-core/gffread/main.nf b/modules/nf-core/gffread/main.nf index d8a473e0..da55cbab 100644 --- a/modules/nf-core/gffread/main.nf +++ b/modules/nf-core/gffread/main.nf @@ -1,32 +1,57 @@ process GFFREAD { - tag "$gff" + tag "$meta.id" label 'process_low' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/gffread:0.12.1--h8b12597_0' : - 'biocontainers/gffread:0.12.1--h8b12597_0' }" + 'https://depot.galaxyproject.org/singularity/gffread:0.12.7--hdcf5f25_4' : + 'biocontainers/gffread:0.12.7--hdcf5f25_4' }" input: - path gff + tuple val(meta), path(gff) + path fasta output: - path "*.gtf" , emit: gtf , optional: true - path "*.gff3" , emit: gffread_gff , optional: true - path "versions.yml" , emit: versions + tuple val(meta), path("*.gtf") , emit: gtf , optional: true + tuple val(meta), path("*.gff3") , emit: gffread_gff , optional: true + tuple val(meta), path("*.fasta"), emit: gffread_fasta , optional: true + path "versions.yml" , emit: versions when: task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' - def prefix = task.ext.prefix ?: "${gff.baseName}" - def extension = args.contains("-T") ? 'gtf' : 'gffread.gff3' + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def extension = args.contains("-T") ? 'gtf' : ( ( ['-w', '-x', '-y' ].any { args.contains(it) } ) ? 'fasta' : 'gff3' ) + def fasta_arg = fasta ? "-g $fasta" : '' + def output_name = "${prefix}.${extension}" + def output = extension == "fasta" ? "$output_name" : "-o $output_name" + def args_sorted = args.replaceAll(/(.*)(-[wxy])(.*)/) { all, pre, param, post -> "$pre $post $param" }.trim() + // args_sorted = Move '-w', '-x', and '-y' to the end of the args string as gffread expects the file name after these parameters + if ( "$output_name" in [ "$gff", "$fasta" ] ) error "Input and output names are the same, use \"task.ext.prefix\" to disambiguate!" """ gffread \\ $gff \\ - $args \\ - -o ${prefix}.${extension} + $fasta_arg \\ + $args_sorted \\ + $output + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + gffread: \$(gffread --version 2>&1) + END_VERSIONS + """ + + stub: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + def extension = args.contains("-T") ? 'gtf' : ( ( ['-w', '-x', '-y' ].any { args.contains(it) } ) ? 'fasta' : 'gff3' ) + def output_name = "${prefix}.${extension}" + if ( "$output_name" in [ "$gff", "$fasta" ] ) error "Input and output names are the same, use \"task.ext.prefix\" to disambiguate!" + """ + touch $output_name + cat <<-END_VERSIONS > versions.yml "${task.process}": gffread: \$(gffread --version 2>&1) diff --git a/modules/nf-core/gffread/meta.yml b/modules/nf-core/gffread/meta.yml index d38cbcda..c0602820 100644 --- a/modules/nf-core/gffread/meta.yml +++ b/modules/nf-core/gffread/meta.yml @@ -13,11 +13,25 @@ tools: doi: 10.12688/f1000research.23297.1 licence: ["MIT"] input: + - meta: + type: map + description: | + Groovy Map containing meta data + e.g. [ id:'test' ] - gff: type: file description: A reference file in either the GFF3, GFF2 or GTF format. pattern: "*.{gff, gtf}" + - fasta: + type: file + description: A multi-fasta file with the genomic sequences + pattern: "*.{fasta,fa,faa,fas,fsa}" output: + - meta: + type: map + description: | + Groovy Map containing meta data + e.g. [ id:'test' ] - gtf: type: file description: GTF file resulting from the conversion of the GFF input file if '-T' argument is present @@ -25,7 +39,11 @@ output: - gffread_gff: type: file description: GFF3 file resulting from the conversion of the GFF input file if '-T' argument is absent - pattern: "*.{gff3}" + pattern: "*.gff3" + - gffread_fasta: + type: file + description: Fasta file produced when either of '-w', '-x', '-y' parameters is present + pattern: "*.fasta" - versions: type: file description: File containing software versions @@ -34,3 +52,4 @@ authors: - "@edmundmiller" maintainers: - "@edmundmiller" + - "@gallvp" diff --git a/modules/nf-core/gffread/tests/main.nf.test b/modules/nf-core/gffread/tests/main.nf.test index bdbc96ae..4cd13dcd 100644 --- a/modules/nf-core/gffread/tests/main.nf.test +++ b/modules/nf-core/gffread/tests/main.nf.test @@ -18,7 +18,11 @@ nextflow_process { } process { """ - input[0] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + ] + input[1] = [] """ } } @@ -26,11 +30,40 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot( - process.out.gtf, - process.out.versions - ).match() }, - { assert process.out.gffread_gff == [] } + { assert snapshot(process.out).match() }, + { assert process.out.gffread_gff == [] }, + { assert process.out.gffread_fasta == [] } + ) + } + + } + + test("sarscov2-gff3-gtf-stub") { + + options '-stub' + config "./nextflow.config" + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + ] + input[1] = [] + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() }, + { assert process.out.gffread_gff == [] }, + { assert process.out.gffread_fasta == [] } ) } @@ -38,13 +71,50 @@ nextflow_process { test("sarscov2-gff3-gff3") { + config "./nextflow-gff3.config" + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + ] + input[1] = [] + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() }, + { assert process.out.gtf == [] }, + { assert process.out.gffread_fasta == [] } + ) + } + + } + + test("sarscov2-gff3-gff3-stub") { + + options '-stub' + config "./nextflow-gff3.config" + when { params { outdir = "$outputDir" } process { """ - input[0] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + ] + input[1] = [] """ } } @@ -52,11 +122,99 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot( - process.out.gffread_gff, - process.out.versions - ).match() }, + { assert snapshot(process.out).match() }, { assert process.out.gtf == [] }, + { assert process.out.gffread_fasta == [] } + ) + } + + } + + test("sarscov2-gff3-fasta") { + + config "./nextflow-fasta.config" + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + ] + input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() }, + { assert process.out.gtf == [] }, + { assert process.out.gffread_gff == [] } + ) + } + + } + + test("sarscov2-gff3-fasta-stub") { + + options '-stub' + config "./nextflow-fasta.config" + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + ] + input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() }, + { assert process.out.gtf == [] }, + { assert process.out.gffread_gff == [] } + ) + } + + } + + test("sarscov2-gff3-fasta-fail-catch") { + + options '-stub' + config "./nextflow-fasta.config" + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = [ + [id: 'genome'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gff3", checkIfExists: true) + ] + input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + """ + } + } + + then { + assertAll ( + { assert ! process.success }, + { assert process.stdout.toString().contains("Input and output names are the same") } ) } diff --git a/modules/nf-core/gffread/tests/main.nf.test.snap b/modules/nf-core/gffread/tests/main.nf.test.snap index 00a11a40..15262320 100644 --- a/modules/nf-core/gffread/tests/main.nf.test.snap +++ b/modules/nf-core/gffread/tests/main.nf.test.snap @@ -1,24 +1,272 @@ { "sarscov2-gff3-gtf": { "content": [ - [ - "genome.gtf:md5,2394072d7d31530dfd590c4a117bf6e3" - ], - [ - "versions.yml:md5,a71b6cdfa528dd206a238ec64bae13d6" - ] + { + "0": [ + [ + { + "id": "test" + }, + "test.gtf:md5,1ea0ae98d3388e0576407dc4a24ef428" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ], + "gffread_fasta": [ + + ], + "gffread_gff": [ + + ], + "gtf": [ + [ + { + "id": "test" + }, + "test.gtf:md5,1ea0ae98d3388e0576407dc4a24ef428" + ] + ], + "versions": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ] + } ], - "timestamp": "2024-01-23T20:00:32.688779117" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-04-09T10:48:56.496187" }, "sarscov2-gff3-gff3": { "content": [ - [ - "genome.gffread.gff3:md5,a7d40d99dcddac23ac673c473279ea2d" - ], - [ - "versions.yml:md5,a71b6cdfa528dd206a238ec64bae13d6" - ] + { + "0": [ + + ], + "1": [ + [ + { + "id": "test" + }, + "test.gff3:md5,c4e5da6267c6bee5899a2c204ae1ad91" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ], + "gffread_fasta": [ + + ], + "gffread_gff": [ + [ + { + "id": "test" + }, + "test.gff3:md5,c4e5da6267c6bee5899a2c204ae1ad91" + ] + ], + "gtf": [ + + ], + "versions": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ] + } ], - "timestamp": "2024-01-23T20:07:11.457356625" + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-04-09T10:49:00.892782" + }, + "sarscov2-gff3-gtf-stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.gtf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ], + "gffread_fasta": [ + + ], + "gffread_gff": [ + + ], + "gtf": [ + [ + { + "id": "test" + }, + "test.gtf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-04-09T11:11:26.975666" + }, + "sarscov2-gff3-fasta-stub": { + "content": [ + { + "0": [ + + ], + "1": [ + + ], + "2": [ + [ + { + "id": "test" + }, + "test.fasta:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ], + "gffread_fasta": [ + [ + { + "id": "test" + }, + "test.fasta:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "gffread_gff": [ + + ], + "gtf": [ + + ], + "versions": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-04-09T11:11:44.34792" + }, + "sarscov2-gff3-gff3-stub": { + "content": [ + { + "0": [ + + ], + "1": [ + [ + { + "id": "test" + }, + "test.gff3:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ], + "gffread_fasta": [ + + ], + "gffread_gff": [ + [ + { + "id": "test" + }, + "test.gff3:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "gtf": [ + + ], + "versions": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-04-09T11:11:35.221671" + }, + "sarscov2-gff3-fasta": { + "content": [ + { + "0": [ + + ], + "1": [ + + ], + "2": [ + [ + { + "id": "test" + }, + "test.fasta:md5,5f8108fb51739a0588ccf0a251de919a" + ] + ], + "3": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ], + "gffread_fasta": [ + [ + { + "id": "test" + }, + "test.fasta:md5,5f8108fb51739a0588ccf0a251de919a" + ] + ], + "gffread_gff": [ + + ], + "gtf": [ + + ], + "versions": [ + "versions.yml:md5,05f671c6c6e530acedad0af0a5948dbd" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2024-04-09T10:54:02.88143" } } \ No newline at end of file diff --git a/modules/nf-core/gffread/tests/nextflow-fasta.config b/modules/nf-core/gffread/tests/nextflow-fasta.config new file mode 100644 index 00000000..ac6cb148 --- /dev/null +++ b/modules/nf-core/gffread/tests/nextflow-fasta.config @@ -0,0 +1,5 @@ +process { + withName: GFFREAD { + ext.args = '-w -S' + } +} diff --git a/modules/nf-core/gffread/tests/nextflow-gff3.config b/modules/nf-core/gffread/tests/nextflow-gff3.config new file mode 100644 index 00000000..afe0830e --- /dev/null +++ b/modules/nf-core/gffread/tests/nextflow-gff3.config @@ -0,0 +1,5 @@ +process { + withName: GFFREAD { + ext.args = '' + } +} diff --git a/modules/nf-core/gunzip/environment.yml b/modules/nf-core/gunzip/environment.yml index 25910b34..dfc02a7b 100644 --- a/modules/nf-core/gunzip/environment.yml +++ b/modules/nf-core/gunzip/environment.yml @@ -4,4 +4,6 @@ channels: - bioconda - defaults dependencies: - - conda-forge::sed=4.7 + - conda-forge::grep=3.11 + - conda-forge::sed=4.8 + - conda-forge::tar=1.34 diff --git a/modules/nf-core/gunzip/main.nf b/modules/nf-core/gunzip/main.nf index 468a6f28..5e67e3b9 100644 --- a/modules/nf-core/gunzip/main.nf +++ b/modules/nf-core/gunzip/main.nf @@ -4,8 +4,8 @@ process GUNZIP { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/ubuntu:20.04' : - 'nf-core/ubuntu:20.04' }" + 'https://depot.galaxyproject.org/singularity/ubuntu:22.04' : + 'nf-core/ubuntu:22.04' }" input: tuple val(meta), path(archive) @@ -18,8 +18,11 @@ process GUNZIP { task.ext.when == null || task.ext.when script: - def args = task.ext.args ?: '' - gunzip = archive.toString() - '.gz' + def args = task.ext.args ?: '' + def extension = ( archive.toString() - '.gz' ).tokenize('.')[-1] + def name = archive.toString() - '.gz' - ".$extension" + def prefix = task.ext.prefix ?: name + gunzip = prefix + ".$extension" """ # Not calling gunzip itself because it creates files # with the original group ownership rather than the @@ -37,7 +40,11 @@ process GUNZIP { """ stub: - gunzip = archive.toString() - '.gz' + def args = task.ext.args ?: '' + def extension = ( archive.toString() - '.gz' ).tokenize('.')[-1] + def name = archive.toString() - '.gz' - ".$extension" + def prefix = task.ext.prefix ?: name + gunzip = prefix + ".$extension" """ touch $gunzip cat <<-END_VERSIONS > versions.yml diff --git a/modules/nf-core/gunzip/meta.yml b/modules/nf-core/gunzip/meta.yml index 231034f2..f32973a0 100644 --- a/modules/nf-core/gunzip/meta.yml +++ b/modules/nf-core/gunzip/meta.yml @@ -37,3 +37,4 @@ maintainers: - "@joseespinosa" - "@drpatelh" - "@jfy133" + - "@gallvp" diff --git a/modules/nf-core/gunzip/tests/main.nf.test b/modules/nf-core/gunzip/tests/main.nf.test index 6406008e..776211ad 100644 --- a/modules/nf-core/gunzip/tests/main.nf.test +++ b/modules/nf-core/gunzip/tests/main.nf.test @@ -33,4 +33,89 @@ nextflow_process { } + test("Should run without failures - prefix") { + + config './nextflow.config' + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id: 'test' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) + ] + ) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + + test("Should run without failures - stub") { + + options '-stub' + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [], + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) + ] + ) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + + test("Should run without failures - prefix - stub") { + + options '-stub' + config './nextflow.config' + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id: 'test' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) + ] + ) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + + } + } diff --git a/modules/nf-core/gunzip/tests/main.nf.test.snap b/modules/nf-core/gunzip/tests/main.nf.test.snap index 720fd9ff..069967e7 100644 --- a/modules/nf-core/gunzip/tests/main.nf.test.snap +++ b/modules/nf-core/gunzip/tests/main.nf.test.snap @@ -1,4 +1,70 @@ { + "Should run without failures - prefix - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.xyz.fastq:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + ], + "gunzip": [ + [ + { + "id": "test" + }, + "test.xyz.fastq:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-25T11:35:10.861293" + }, + "Should run without failures - stub": { + "content": [ + { + "0": [ + [ + [ + + ], + "test_1.fastq:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + ], + "gunzip": [ + [ + [ + + ], + "test_1.fastq:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-25T11:35:05.857145" + }, "Should run without failures": { "content": [ { @@ -26,6 +92,43 @@ ] } ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-10-17T15:35:37.690477896" + }, + "Should run without failures - prefix": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.xyz.fastq:md5,4161df271f9bfcd25d5845a1e220dbec" + ] + ], + "1": [ + "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + ], + "gunzip": [ + [ + { + "id": "test" + }, + "test.xyz.fastq:md5,4161df271f9bfcd25d5845a1e220dbec" + ] + ], + "versions": [ + "versions.yml:md5,54376d32aca20e937a4ec26dac228e84" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-25T11:33:32.921739" } } \ No newline at end of file diff --git a/modules/nf-core/gunzip/tests/nextflow.config b/modules/nf-core/gunzip/tests/nextflow.config new file mode 100644 index 00000000..dec77642 --- /dev/null +++ b/modules/nf-core/gunzip/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: GUNZIP { + ext.prefix = { "${meta.id}.xyz" } + } +} diff --git a/modules/nf-core/hisat2/align/main.nf b/modules/nf-core/hisat2/align/main.nf index 2289a9fc..ea186f62 100644 --- a/modules/nf-core/hisat2/align/main.nf +++ b/modules/nf-core/hisat2/align/main.nf @@ -90,4 +90,23 @@ process HISAT2_ALIGN { END_VERSIONS """ } + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + def unaligned = params.save_unaligned ? "echo '' | gzip > ${prefix}.unmapped_1.fastq.gz \n echo '' | gzip > ${prefix}.unmapped_2.fastq.gz" : '' + def VERSION = '2.2.1' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + """ + ${unaligned} + + touch ${prefix}.hisat2.summary.log + touch ${prefix}.bam + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + hisat2: $VERSION + samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//') + END_VERSIONS + """ + + } diff --git a/modules/nf-core/hisat2/align/tests/main.nf.test b/modules/nf-core/hisat2/align/tests/main.nf.test index 3a520e9a..396757d7 100644 --- a/modules/nf-core/hisat2/align/tests/main.nf.test +++ b/modules/nf-core/hisat2/align/tests/main.nf.test @@ -68,6 +68,63 @@ nextflow_process { } } + test("Single-End - stub") { + options "-stub" + + setup { + run("HISAT2_EXTRACTSPLICESITES") { + script "../../extractsplicesites/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + """ + } + } + + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = Channel.of([ [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true)] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + test("Paired-End") { setup { @@ -127,6 +184,64 @@ nextflow_process { } } + test("Paired-End - stub") { + options "-stub" + + setup { + run("HISAT2_EXTRACTSPLICESITES") { + script "../../extractsplicesites/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + """ + } + } + + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = Channel.of([ [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.gtf', checkIfExists: true) + ]) + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = HISAT2_EXTRACTSPLICESITES.out.txt + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + test("Single-End No Splice Sites") { setup { @@ -171,6 +286,49 @@ nextflow_process { } } + test("Single-End No Splice Sites - stub") { + options "-stub" + + setup { + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = [[:],[]] + input[2] = [[:],[]] + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true) ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = [[:],[]] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + test("Paired-End No Splice Sites") { setup { @@ -215,4 +373,48 @@ nextflow_process { ) } } + + test("Paired-End No Splice Sites - stub") { + options "-stub" + + setup { + run("HISAT2_BUILD") { + script "../../build/main.nf" + process { + """ + input[0] = Channel.of([ + [id:'genome'], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + input[1] = [[:],[]] + input[2] = [[:],[]] + """ + } + } + } + + when { + params { + outdir = "$outputDir" + } + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_2.fastq.gz', checkIfExists: true) ] + ]) + input[1] = HISAT2_BUILD.out.index + input[2] = [[:],[]] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } } diff --git a/modules/nf-core/hisat2/align/tests/main.nf.test.snap b/modules/nf-core/hisat2/align/tests/main.nf.test.snap index a80fa3c5..ff670d45 100644 --- a/modules/nf-core/hisat2/align/tests/main.nf.test.snap +++ b/modules/nf-core/hisat2/align/tests/main.nf.test.snap @@ -5,21 +5,129 @@ "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" ] ], - "timestamp": "2023-10-16T15:14:50.269895296" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:08:33.735489" }, - "se_no_ss_summary": { + "Paired-End - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": true - }, - "test.hisat2.summary.log:md5,7b8a9e61b7646da1089b041333c41a87" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "fastq": [ + + ], + "summary": [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" ] - ] + } ], - "timestamp": "2023-10-16T15:15:22.897386626" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:14.35626" + }, + "Single-End - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ], + "bam": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "fastq": [ + + ], + "summary": [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:08:47.404885" }, "pe_no_ss_versions": { "content": [ @@ -27,15 +135,70 @@ "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" ] ], - "timestamp": "2023-10-16T15:15:42.583699978" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:52.076955" }, - "se_no_ss_versions": { + "Paired-End No Splice Sites - stub": { "content": [ - [ - "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" - ] + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "fastq": [ + + ], + "summary": [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + } ], - "timestamp": "2023-10-16T15:15:22.909407356" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:10:03.739697" }, "pe_no_ss_summary": { "content": [ @@ -49,7 +212,11 @@ ] ] ], - "timestamp": "2023-10-16T15:15:42.569775538" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:52.068244" }, "pe_no_ss_fastq": { "content": [ @@ -57,7 +224,11 @@ ] ], - "timestamp": "2023-10-16T15:15:42.576881608" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:52.072985" }, "se_summary": { "content": [ @@ -71,7 +242,11 @@ ] ] ], - "timestamp": "2023-10-16T15:14:50.252466896" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:08:33.727355" }, "pe_summary": { "content": [ @@ -85,7 +260,11 @@ ] ] ], - "timestamp": "2023-10-16T15:15:09.881690889" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:01.495439" }, "pe_fastq": { "content": [ @@ -93,23 +272,124 @@ ] ], - "timestamp": "2023-10-16T15:15:09.888696129" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:01.500755" }, - "se_no_ss_fastq": { + "se_fastq": { "content": [ [ ] ], - "timestamp": "2023-10-16T15:15:22.904010016" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:08:33.732523" }, - "se_fastq": { + "se_no_ss_summary": { + "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,7b8a9e61b7646da1089b041333c41a87" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:26.851884" + }, + "se_no_ss_versions": { + "content": [ + [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:26.89234" + }, + "se_no_ss_fastq": { "content": [ [ ] ], - "timestamp": "2023-10-16T15:14:50.264366105" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:26.871369" + }, + "Single-End No Splice Sites - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ], + "bam": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "fastq": [ + + ], + "summary": [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:39.544807" }, "pe_versions": { "content": [ @@ -117,6 +397,10 @@ "versions.yml:md5,ceb638f44ebdaf09ba1f5c5c409585e2" ] ], - "timestamp": "2023-10-16T15:15:09.894683308" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:09:01.506346" } } \ No newline at end of file diff --git a/modules/nf-core/homer/findpeaks/main.nf b/modules/nf-core/homer/findpeaks/main.nf index e70ca74b..f18e80d0 100644 --- a/modules/nf-core/homer/findpeaks/main.nf +++ b/modules/nf-core/homer/findpeaks/main.nf @@ -34,4 +34,17 @@ process HOMER_FINDPEAKS { homer: $VERSION END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + def VERSION = '4.11' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions. + + """ + touch ${prefix}.peaks.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + homer: $VERSION + END_VERSIONS + """ } diff --git a/modules/nf-core/homer/findpeaks/tests/main.nf.test b/modules/nf-core/homer/findpeaks/tests/main.nf.test new file mode 100644 index 00000000..4f7e100f --- /dev/null +++ b/modules/nf-core/homer/findpeaks/tests/main.nf.test @@ -0,0 +1,73 @@ +nextflow_process { + + name "Test Process HOMER_FINDPEAKS" + script "../main.nf" + process "HOMER_FINDPEAKS" + config "./nextflow.config" + + tag "modules" + tag "modules_nfcore" + tag "homer" + tag "homer/findpeaks" + tag "homer/maketagdirectory" + + setup { + run("HOMER_MAKETAGDIRECTORY") { + script "../../maketagdirectory/main.nf" + process { + """ + input[0] = [ + [ id:'test' ], + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test2.bed', checkIfExists: true) + ] + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + """ + } + } + + } + + test("sarscov2 - tagdir") { + + when { + process { + """ + input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("tagdir") } + ) + } + + } + + test("sarscov2 - tagdir - stub") { + + options "-stub" + + when { + process { + """ + input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("stub") } + ) + } + + } + +} diff --git a/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap b/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap new file mode 100644 index 00000000..05b9c786 --- /dev/null +++ b/modules/nf-core/homer/findpeaks/tests/main.nf.test.snap @@ -0,0 +1,68 @@ +{ + "stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,12c3e88a3eeb96208a1d352504ebebfa" + ], + "txt": [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,12c3e88a3eeb96208a1d352504ebebfa" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-05-17T13:57:52.208349083" + }, + "tagdir": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,86e15beaa4b439585786478e58418c0c" + ] + ], + "1": [ + "versions.yml:md5,12c3e88a3eeb96208a1d352504ebebfa" + ], + "txt": [ + [ + { + "id": "test" + }, + "test.peaks.txt:md5,86e15beaa4b439585786478e58418c0c" + ] + ], + "versions": [ + "versions.yml:md5,12c3e88a3eeb96208a1d352504ebebfa" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-05-17T13:56:22.119853182" + } +} \ No newline at end of file diff --git a/modules/nf-core/homer/findpeaks/tests/nextflow.config b/modules/nf-core/homer/findpeaks/tests/nextflow.config new file mode 100644 index 00000000..67a4a3f1 --- /dev/null +++ b/modules/nf-core/homer/findpeaks/tests/nextflow.config @@ -0,0 +1,8 @@ +process { + withName: HOMER_MAKETAGDIRECTORY { + ext.args = '-format bed' + } + withName: HOMER_FINDPEAKS { + ext.args = '-style factor' + } +} diff --git a/modules/nf-core/homer/findpeaks/tests/tags.yml b/modules/nf-core/homer/findpeaks/tests/tags.yml new file mode 100644 index 00000000..00f92a75 --- /dev/null +++ b/modules/nf-core/homer/findpeaks/tests/tags.yml @@ -0,0 +1,2 @@ +homer/findpeaks: + - "modules/nf-core/homer/findpeaks/**" diff --git a/modules/nf-core/homer/maketagdirectory/environment.yml b/modules/nf-core/homer/maketagdirectory/environment.yml index 6a32f8e6..c3ad2cc9 100644 --- a/modules/nf-core/homer/maketagdirectory/environment.yml +++ b/modules/nf-core/homer/maketagdirectory/environment.yml @@ -9,4 +9,4 @@ dependencies: - conda-forge::r-base=4.0.2 - bioconda::bioconductor-deseq2=1.30.0 - bioconda::bioconductor-edger=3.32.0 - - anaconda::perl=5.26.2 + - conda-forge::perl=5.26.2 diff --git a/modules/nf-core/homer/maketagdirectory/main.nf b/modules/nf-core/homer/maketagdirectory/main.nf index 9c35531d..e70b31b3 100644 --- a/modules/nf-core/homer/maketagdirectory/main.nf +++ b/modules/nf-core/homer/maketagdirectory/main.nf @@ -10,7 +10,7 @@ process HOMER_MAKETAGDIRECTORY { 'biocontainers/mulled-v2-29293b111ffe5b4c1d1e14c711264aaed6b97b4a:594338b771cacf1623bd27772b5e12825f8835f2-0' }" input: - tuple val(meta), path(bams), path(bais) + tuple val(meta), path(bam) path fasta output: @@ -30,7 +30,7 @@ process HOMER_MAKETAGDIRECTORY { ${prefix}_tagdir \\ -genome $fasta \\ $args \\ - $bams + $bam cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/homer/maketagdirectory/tests/bed.config b/modules/nf-core/homer/maketagdirectory/tests/bed.config new file mode 100644 index 00000000..9feb7265 --- /dev/null +++ b/modules/nf-core/homer/maketagdirectory/tests/bed.config @@ -0,0 +1,3 @@ +process { + ext.args = '-format bed' +} diff --git a/modules/nf-core/homer/maketagdirectory/tests/main.nf.test b/modules/nf-core/homer/maketagdirectory/tests/main.nf.test new file mode 100644 index 00000000..6bf570b6 --- /dev/null +++ b/modules/nf-core/homer/maketagdirectory/tests/main.nf.test @@ -0,0 +1,97 @@ +nextflow_process { + + name "Test Process HOMER_MAKETAGDIRECTORY" + script "../main.nf" + process "HOMER_MAKETAGDIRECTORY" + + tag "modules" + tag "modules_nfcore" + tag "homer" + tag "homer/maketagdirectory" + + test("sarscov2 - [bed, bed], fasta") { + + config "./bed.config" + + when { + process { + """ + input[0] = [ + [ id:'test' ], + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test2.bed', checkIfExists: true) + ] + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("bed") } + ) + } + + } + + test("sarscov2 - [bam, bam], fasta") { + + config "./sam.config" + + when { + process { + """ + input[0] = [ + [ id:'test' ], + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.single_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true) + ] + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("bam") } + ) + } + + } + + test("sarscov2 - [bed, bed], fasta - stub") { + + config "./bed.config" + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test' ], + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test2.bed', checkIfExists: true) + ] + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("stub") } + ) + } + + } + +} diff --git a/modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap b/modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap new file mode 100644 index 00000000..72349e22 --- /dev/null +++ b/modules/nf-core/homer/maketagdirectory/tests/main.nf.test.snap @@ -0,0 +1,185 @@ +{ + "bed": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + [ + "MT192765.1.tags.tsv:md5,e29522171ca2169b57396495f8b97485", + "tagAutocorrelation.txt:md5,62b107c4971b94126fb89a0bc2800455", + "tagCountDistribution.txt:md5,fd4ee7ce7c5dfd7c9d739534b8180578", + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e", + "tagLengthDistribution.txt:md5,e5aa2b9843ca9c04ace297280aed6af4" + ] + ] + ], + "1": [ + [ + { + "id": "test" + }, + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e" + ] + ], + "2": [ + "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + ], + "tagdir": [ + [ + { + "id": "test" + }, + [ + "MT192765.1.tags.tsv:md5,e29522171ca2169b57396495f8b97485", + "tagAutocorrelation.txt:md5,62b107c4971b94126fb89a0bc2800455", + "tagCountDistribution.txt:md5,fd4ee7ce7c5dfd7c9d739534b8180578", + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e", + "tagLengthDistribution.txt:md5,e5aa2b9843ca9c04ace297280aed6af4" + ] + ] + ], + "taginfo": [ + [ + { + "id": "test" + }, + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e" + ] + ], + "versions": [ + "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-05-17T14:25:33.3566233" + }, + "stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + [ + "MT192765.1.tags.tsv:md5,e29522171ca2169b57396495f8b97485", + "tagAutocorrelation.txt:md5,62b107c4971b94126fb89a0bc2800455", + "tagCountDistribution.txt:md5,fd4ee7ce7c5dfd7c9d739534b8180578", + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e", + "tagLengthDistribution.txt:md5,e5aa2b9843ca9c04ace297280aed6af4" + ] + ] + ], + "1": [ + [ + { + "id": "test" + }, + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e" + ] + ], + "2": [ + "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + ], + "tagdir": [ + [ + { + "id": "test" + }, + [ + "MT192765.1.tags.tsv:md5,e29522171ca2169b57396495f8b97485", + "tagAutocorrelation.txt:md5,62b107c4971b94126fb89a0bc2800455", + "tagCountDistribution.txt:md5,fd4ee7ce7c5dfd7c9d739534b8180578", + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e", + "tagLengthDistribution.txt:md5,e5aa2b9843ca9c04ace297280aed6af4" + ] + ] + ], + "taginfo": [ + [ + { + "id": "test" + }, + "tagInfo.txt:md5,c9bb2ca53bb101d74c1ec92d2b0ad26e" + ] + ], + "versions": [ + "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-05-17T14:25:52.525282663" + }, + "bam": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + [ + "MT192765.1.tags.tsv:md5,365808c4751ef6dd7085ac52037a22bc", + "tagAutocorrelation.txt:md5,8b396f2aef1cdd3af4fab57b142d3250", + "tagCountDistribution.txt:md5,afc6d007096c3872bbe84c9dc8edb832", + "tagInfo.txt:md5,aebf6ff15fd0a238ee6a94d623c578ca", + "tagLengthDistribution.txt:md5,44f231adb2a705ae81950808c55cf248" + ] + ] + ], + "1": [ + [ + { + "id": "test" + }, + "tagInfo.txt:md5,aebf6ff15fd0a238ee6a94d623c578ca" + ] + ], + "2": [ + "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + ], + "tagdir": [ + [ + { + "id": "test" + }, + [ + "MT192765.1.tags.tsv:md5,365808c4751ef6dd7085ac52037a22bc", + "tagAutocorrelation.txt:md5,8b396f2aef1cdd3af4fab57b142d3250", + "tagCountDistribution.txt:md5,afc6d007096c3872bbe84c9dc8edb832", + "tagInfo.txt:md5,aebf6ff15fd0a238ee6a94d623c578ca", + "tagLengthDistribution.txt:md5,44f231adb2a705ae81950808c55cf248" + ] + ] + ], + "taginfo": [ + [ + { + "id": "test" + }, + "tagInfo.txt:md5,aebf6ff15fd0a238ee6a94d623c578ca" + ] + ], + "versions": [ + "versions.yml:md5,59961acdd0fec163cc57095a1b058c31" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-05-17T14:28:11.567501705" + } +} \ No newline at end of file diff --git a/modules/nf-core/homer/maketagdirectory/tests/sam.config b/modules/nf-core/homer/maketagdirectory/tests/sam.config new file mode 100644 index 00000000..1299a296 --- /dev/null +++ b/modules/nf-core/homer/maketagdirectory/tests/sam.config @@ -0,0 +1,3 @@ +process { + ext.args = "-format sam" +} \ No newline at end of file diff --git a/modules/nf-core/homer/maketagdirectory/tests/tags.yml b/modules/nf-core/homer/maketagdirectory/tests/tags.yml new file mode 100644 index 00000000..41f7d644 --- /dev/null +++ b/modules/nf-core/homer/maketagdirectory/tests/tags.yml @@ -0,0 +1,2 @@ +homer/maketagdirectory: + - "modules/nf-core/homer/maketagdirectory/**" diff --git a/modules/nf-core/homer/pos2bed/tests/main.nf.test b/modules/nf-core/homer/pos2bed/tests/main.nf.test new file mode 100644 index 00000000..906d5719 --- /dev/null +++ b/modules/nf-core/homer/pos2bed/tests/main.nf.test @@ -0,0 +1,82 @@ +nextflow_process { + + name "Test Process HOMER_POS2BED" + script "../main.nf" + process "HOMER_POS2BED" + config "./nextflow.config" + + tag "modules" + tag "modules_nfcore" + tag "homer" + tag "homer/pos2bed" + tag "homer/findpeaks" + tag "homer/maketagdirectory" + + setup { + run("HOMER_MAKETAGDIRECTORY") { + script "../../maketagdirectory/main.nf" + process { + """ + input[0] = [ + [ id:'test' ], + [ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test2.bed', checkIfExists: true) + ] + ] + input[1] = file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + """ + } + } + + run("HOMER_FINDPEAKS") { + script "../../findpeaks/main.nf" + process { + """ + input[0] = HOMER_MAKETAGDIRECTORY.out.tagdir + """ + } + } + } + + test("sarscov2 - peaks") { + + when { + process { + """ + input[0] = HOMER_FINDPEAKS.out.txt + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("peaks") } + ) + } + + } + + test("sarscov2 - peaks - stub") { + + options "-stub" + + when { + process { + """ + input[0] = HOMER_FINDPEAKS.out.txt + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match("stub") } + ) + } + + } + +} diff --git a/modules/nf-core/homer/pos2bed/tests/main.nf.test.snap b/modules/nf-core/homer/pos2bed/tests/main.nf.test.snap new file mode 100644 index 00000000..8ae3948e --- /dev/null +++ b/modules/nf-core/homer/pos2bed/tests/main.nf.test.snap @@ -0,0 +1,68 @@ +{ + "stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,19077eb73823974278868e3e7930d3f6" + ], + "bed": [ + [ + { + "id": "test" + }, + "test.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,19077eb73823974278868e3e7930d3f6" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-05-17T14:35:47.996620099" + }, + "peaks": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.bed:md5,5d6ddd9c7e621a66f6f045b9b5abecb4" + ] + ], + "1": [ + "versions.yml:md5,19077eb73823974278868e3e7930d3f6" + ], + "bed": [ + [ + { + "id": "test" + }, + "test.bed:md5,5d6ddd9c7e621a66f6f045b9b5abecb4" + ] + ], + "versions": [ + "versions.yml:md5,19077eb73823974278868e3e7930d3f6" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.03.0" + }, + "timestamp": "2024-05-17T14:35:30.500600143" + } +} \ No newline at end of file diff --git a/modules/nf-core/homer/pos2bed/tests/nextflow.config b/modules/nf-core/homer/pos2bed/tests/nextflow.config new file mode 100644 index 00000000..9d683050 --- /dev/null +++ b/modules/nf-core/homer/pos2bed/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + withName: HOMER_MAKETAGDIRECTORY { + ext.args = '-format bed' + } +} diff --git a/modules/nf-core/homer/pos2bed/tests/tags.yml b/modules/nf-core/homer/pos2bed/tests/tags.yml new file mode 100644 index 00000000..5fb217da --- /dev/null +++ b/modules/nf-core/homer/pos2bed/tests/tags.yml @@ -0,0 +1,2 @@ +homer/pos2bed: + - "modules/nf-core/homer/pos2bed/**" diff --git a/modules/nf-core/multiqc/environment.yml b/modules/nf-core/multiqc/environment.yml index ca39fb67..2121492d 100644 --- a/modules/nf-core/multiqc/environment.yml +++ b/modules/nf-core/multiqc/environment.yml @@ -4,4 +4,4 @@ channels: - bioconda - defaults dependencies: - - bioconda::multiqc=1.21 + - bioconda::multiqc=1.23 diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf index 47ac352f..459dfea5 100644 --- a/modules/nf-core/multiqc/main.nf +++ b/modules/nf-core/multiqc/main.nf @@ -3,14 +3,16 @@ process MULTIQC { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/multiqc:1.21--pyhdfd78af_0' : - 'biocontainers/multiqc:1.21--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/multiqc:1.23--pyhdfd78af_0' : + 'biocontainers/multiqc:1.23--pyhdfd78af_0' }" input: path multiqc_files, stageAs: "?/*" path(multiqc_config) path(extra_multiqc_config) path(multiqc_logo) + path(replace_names) + path(sample_names) output: path "*multiqc_report.html", emit: report @@ -26,6 +28,8 @@ process MULTIQC { def config = multiqc_config ? "--config $multiqc_config" : '' def extra_config = extra_multiqc_config ? "--config $extra_multiqc_config" : '' def logo = multiqc_logo ? /--cl-config 'custom_logo: "${multiqc_logo}"'/ : '' + def replace = replace_names ? "--replace-names ${replace_names}" : '' + def samples = sample_names ? "--sample-names ${sample_names}" : '' """ multiqc \\ --force \\ @@ -33,6 +37,8 @@ process MULTIQC { $config \\ $extra_config \\ $logo \\ + $replace \\ + $samples \\ . cat <<-END_VERSIONS > versions.yml diff --git a/modules/nf-core/multiqc/meta.yml b/modules/nf-core/multiqc/meta.yml index 45a9bc35..382c08cb 100644 --- a/modules/nf-core/multiqc/meta.yml +++ b/modules/nf-core/multiqc/meta.yml @@ -29,6 +29,19 @@ input: type: file description: Optional logo file for MultiQC pattern: "*.{png}" + - replace_names: + type: file + description: | + Optional two-column sample renaming file. First column a set of + patterns, second column a set of corresponding replacements. Passed via + MultiQC's `--replace-names` option. + pattern: "*.{tsv}" + - sample_names: + type: file + description: | + Optional TSV file with headers, passed to the MultiQC --sample_names + argument. + pattern: "*.{tsv}" output: - report: type: file diff --git a/modules/nf-core/multiqc/tests/main.nf.test b/modules/nf-core/multiqc/tests/main.nf.test index f1c4242e..6aa27f4c 100644 --- a/modules/nf-core/multiqc/tests/main.nf.test +++ b/modules/nf-core/multiqc/tests/main.nf.test @@ -17,6 +17,8 @@ nextflow_process { input[1] = [] input[2] = [] input[3] = [] + input[4] = [] + input[5] = [] """ } } @@ -41,6 +43,8 @@ nextflow_process { input[1] = Channel.of(file("https://github.com/nf-core/tools/raw/dev/nf_core/pipeline-template/assets/multiqc_config.yml", checkIfExists: true)) input[2] = [] input[3] = [] + input[4] = [] + input[5] = [] """ } } @@ -66,6 +70,8 @@ nextflow_process { input[1] = [] input[2] = [] input[3] = [] + input[4] = [] + input[5] = [] """ } } diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap index bfebd802..45e95e5d 100644 --- a/modules/nf-core/multiqc/tests/main.nf.test.snap +++ b/modules/nf-core/multiqc/tests/main.nf.test.snap @@ -2,14 +2,14 @@ "multiqc_versions_single": { "content": [ [ - "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d" + "versions.yml:md5,87904cd321df21fac35d18f0fc01bb19" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-29T08:48:55.657331" + "timestamp": "2024-07-10T12:41:34.562023" }, "multiqc_stub": { "content": [ @@ -17,25 +17,25 @@ "multiqc_report.html", "multiqc_data", "multiqc_plots", - "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d" + "versions.yml:md5,87904cd321df21fac35d18f0fc01bb19" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-29T08:49:49.071937" + "timestamp": "2024-07-10T11:27:11.933869532" }, "multiqc_versions_config": { "content": [ [ - "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d" + "versions.yml:md5,87904cd321df21fac35d18f0fc01bb19" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-29T08:49:25.457567" + "timestamp": "2024-07-10T11:26:56.709849369" } } \ No newline at end of file diff --git a/modules/nf-core/preseq/lcextrap/main.nf b/modules/nf-core/preseq/lcextrap/main.nf index ebbf215f..3fec468e 100644 --- a/modules/nf-core/preseq/lcextrap/main.nf +++ b/modules/nf-core/preseq/lcextrap/main.nf @@ -1,7 +1,7 @@ process PRESEQ_LCEXTRAP { tag "$meta.id" label 'process_single' - label 'error_ignore' + label 'error_retry' conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? @@ -21,6 +21,7 @@ process PRESEQ_LCEXTRAP { script: def args = task.ext.args ?: '' + args = task.attempt > 1 ? args.join(' -defects') : args // Disable testing for defects def prefix = task.ext.prefix ?: "${meta.id}" def paired_end = meta.single_end ? '' : '-pe' """ @@ -37,4 +38,16 @@ process PRESEQ_LCEXTRAP { preseq: \$(echo \$(preseq 2>&1) | sed 's/^.*Version: //; s/Usage:.*\$//') END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.lc_extrap.txt + touch ${prefix}.command.log + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + preseq: \$(echo \$(preseq 2>&1) | sed 's/^.*Version: //; s/Usage:.*\$//') + END_VERSIONS + """ } diff --git a/modules/nf-core/preseq/lcextrap/tests/main.nf.test b/modules/nf-core/preseq/lcextrap/tests/main.nf.test index aa12bc1a..d1af1f0e 100644 --- a/modules/nf-core/preseq/lcextrap/tests/main.nf.test +++ b/modules/nf-core/preseq/lcextrap/tests/main.nf.test @@ -30,6 +30,29 @@ nextflow_process { } } + test("sarscov2 - single_end - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + [ file(params.modules_testdata_base_path + 'delete_me/preseq/SRR1003759_5M_subset.mr', checkIfExists: true) ] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + test("sarscov2 - paired_end") { when { process { @@ -51,4 +74,27 @@ nextflow_process { ) } } + + test("sarscov2 - paired_end - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + [ file(params.modules_testdata_base_path + 'delete_me/preseq/SRR1003759_5M_subset.mr', checkIfExists: true) ] + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } } \ No newline at end of file diff --git a/modules/nf-core/preseq/lcextrap/tests/main.nf.test.snap b/modules/nf-core/preseq/lcextrap/tests/main.nf.test.snap index c59dea7f..3f95cd49 100644 --- a/modules/nf-core/preseq/lcextrap/tests/main.nf.test.snap +++ b/modules/nf-core/preseq/lcextrap/tests/main.nf.test.snap @@ -11,12 +11,20 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T17:20:40.735535" }, "paired_end - log": { "content": [ "test.command.log" ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T17:20:51.981746" }, "single_end - versions": { @@ -25,20 +33,85 @@ "versions.yml:md5,9a62ff1c212c53573808ccd2137b8922" ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T17:20:40.74601" }, + "sarscov2 - single_end - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.lc_extrap.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.command.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,9a62ff1c212c53573808ccd2137b8922" + ], + "lc_extrap": [ + [ + { + "id": "test", + "single_end": true + }, + "test.lc_extrap.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": true + }, + "test.command.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,9a62ff1c212c53573808ccd2137b8922" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-20T18:43:12.689062" + }, "paired_end - versions": { "content": [ [ "versions.yml:md5,9a62ff1c212c53573808ccd2137b8922" ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T17:20:52.02843" }, "single_end - log": { "content": [ "test.command.log" ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T17:20:40.72985" }, "paired_end - lc_extrap": { @@ -53,6 +126,63 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T17:20:51.998533" + }, + "sarscov2 - paired_end - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.lc_extrap.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.command.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,9a62ff1c212c53573808ccd2137b8922" + ], + "lc_extrap": [ + [ + { + "id": "test", + "single_end": false + }, + "test.lc_extrap.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": false + }, + "test.command.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,9a62ff1c212c53573808ccd2137b8922" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-20T18:43:32.569811" } } \ No newline at end of file diff --git a/modules/nf-core/rseqc/inferexperiment/main.nf b/modules/nf-core/rseqc/inferexperiment/main.nf index 39fe816d..87c676ad 100644 --- a/modules/nf-core/rseqc/inferexperiment/main.nf +++ b/modules/nf-core/rseqc/inferexperiment/main.nf @@ -33,4 +33,15 @@ process RSEQC_INFEREXPERIMENT { rseqc: \$(infer_experiment.py --version | sed -e "s/infer_experiment.py //g") END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.infer_experiment.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(infer_experiment.py --version | sed -e "s/infer_experiment.py //g") + END_VERSIONS + """ } diff --git a/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test b/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test index 97cd2cb9..f0738444 100644 --- a/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test +++ b/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test @@ -4,7 +4,7 @@ nextflow_process { script "../main.nf" process "RSEQC_INFEREXPERIMENT" config "./nextflow.config" - + tag "modules" tag "modules_nfcore" tag "rseqc" @@ -15,11 +15,11 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = Channel.of([ [ id:'test' ], // meta map - file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true) - ] - input[1] = file(params.test_data['sarscov2']['genome']['test_bed'], checkIfExists: true) + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed", checkIfExists: true)) """ } } @@ -28,7 +28,27 @@ nextflow_process { assert process.success assert snapshot(process.out).match() } - } + test("sarscov2 - [[meta] - bam] - bed - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed", checkIfExists: true)) + """ + } + } + + then { + assert process.success + assert snapshot(process.out).match() + } + } } diff --git a/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test.snap b/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test.snap index 42ae74ff..e31c1129 100644 --- a/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test.snap +++ b/modules/nf-core/rseqc/inferexperiment/tests/main.nf.test.snap @@ -1,4 +1,37 @@ { + "sarscov2 - [[meta] - bam] - bed - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.infer_experiment.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,f56ba5c6208ae720dd730f3a432e3ba7" + ], + "txt": [ + [ + { + "id": "test" + }, + "test.infer_experiment.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,f56ba5c6208ae720dd730f3a432e3ba7" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:34:31.050305" + }, "sarscov2 - [[meta] - bam] - bed": { "content": [ { @@ -26,6 +59,10 @@ ] } ], - "timestamp": "2023-12-14T17:25:08.399005243" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:19.853327" } } \ No newline at end of file diff --git a/modules/nf-core/rseqc/readdistribution/main.nf b/modules/nf-core/rseqc/readdistribution/main.nf index e0d8bfe9..1d940649 100644 --- a/modules/nf-core/rseqc/readdistribution/main.nf +++ b/modules/nf-core/rseqc/readdistribution/main.nf @@ -32,4 +32,15 @@ process RSEQC_READDISTRIBUTION { rseqc: \$(read_distribution.py --version | sed -e "s/read_distribution.py //g") END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.read_distribution.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(read_distribution.py --version | sed -e "s/read_distribution.py //g") + END_VERSIONS + """ } diff --git a/modules/nf-core/rseqc/readdistribution/tests/main.nf.test b/modules/nf-core/rseqc/readdistribution/tests/main.nf.test index bd7245b7..5fa76950 100644 --- a/modules/nf-core/rseqc/readdistribution/tests/main.nf.test +++ b/modules/nf-core/rseqc/readdistribution/tests/main.nf.test @@ -13,11 +13,11 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = Channel.of([ [ id:'test', single_end: false ], // meta map file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) - ] - input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed12", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed12", checkIfExists: true)) """ } } @@ -28,7 +28,29 @@ nextflow_process { { assert snapshot(process.out).match() } ) } - } + test("sarscov2 paired-end [bam] - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end: false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed12", checkIfExists: true)) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } } diff --git a/modules/nf-core/rseqc/readdistribution/tests/main.nf.test.snap b/modules/nf-core/rseqc/readdistribution/tests/main.nf.test.snap index 91b41749..02e5e611 100644 --- a/modules/nf-core/rseqc/readdistribution/tests/main.nf.test.snap +++ b/modules/nf-core/rseqc/readdistribution/tests/main.nf.test.snap @@ -30,8 +30,43 @@ ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.01.0" }, - "timestamp": "2023-12-14T17:17:31.66536021" + "timestamp": "2024-02-26T15:38:36.441841" + }, + "sarscov2 paired-end [bam] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.read_distribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,fc68a268ab32a0d72a66f270d6c7925e" + ], + "txt": [ + [ + { + "id": "test", + "single_end": false + }, + "test.read_distribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,fc68a268ab32a0d72a66f270d6c7925e" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:50:29.345905" } } \ No newline at end of file diff --git a/modules/nf-core/rseqc/readduplication/main.nf b/modules/nf-core/rseqc/readduplication/main.nf index 7dc68cf8..35433802 100644 --- a/modules/nf-core/rseqc/readduplication/main.nf +++ b/modules/nf-core/rseqc/readduplication/main.nf @@ -34,4 +34,18 @@ process RSEQC_READDUPLICATION { rseqc: \$(read_duplication.py --version | sed -e "s/read_duplication.py //g") END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.seq.DupRate.xls + touch ${prefix}.pos.DupRate.xls + touch ${prefix}.DupRate_plot.pdf + touch ${prefix}.DupRate_plot.r + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(read_duplication.py --version | sed -e "s/read_duplication.py //g") + END_VERSIONS + """ } diff --git a/modules/nf-core/rseqc/readduplication/tests/main.nf.test b/modules/nf-core/rseqc/readduplication/tests/main.nf.test index 93d0cccd..334a4e67 100644 --- a/modules/nf-core/rseqc/readduplication/tests/main.nf.test +++ b/modules/nf-core/rseqc/readduplication/tests/main.nf.test @@ -13,9 +13,10 @@ nextflow_process { when { process { """ - input[0] = [ [ id:'test', single_end: false ], // meta map - file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true) - ] + input[0] = Channel.of([ + [ id:'test', single_end: false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) """ } } @@ -23,14 +24,35 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out.seq_xls).match("seq_xls") }, + { assert snapshot(file(process.out.pdf[0][1]).name).match("pdf") }, { assert snapshot(process.out.pos_xls).match("pos_xls") }, { assert snapshot(process.out.rscript).match("rscript") }, - { assert snapshot(process.out.versions).match("versions") }, - { assert snapshot(file(process.out.pdf[0][1]).name).match("pdf") } + { assert snapshot(process.out.seq_xls).match("seq_xls") }, + { assert snapshot(process.out.versions).match("versions") } ) } - } + test("sarscov2 paired-end [bam] - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end: false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } } diff --git a/modules/nf-core/rseqc/readduplication/tests/main.nf.test.snap b/modules/nf-core/rseqc/readduplication/tests/main.nf.test.snap index 28ffb87b..143a29dc 100644 --- a/modules/nf-core/rseqc/readduplication/tests/main.nf.test.snap +++ b/modules/nf-core/rseqc/readduplication/tests/main.nf.test.snap @@ -11,7 +11,11 @@ ] ] ], - "timestamp": "2023-11-24T00:52:45.27809706" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T15:43:14.989834" }, "rscript": { "content": [ @@ -25,13 +29,21 @@ ] ] ], - "timestamp": "2023-11-24T00:52:45.285457599" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T15:43:15.045525" }, "pdf": { "content": [ "test.DupRate_plot.pdf" ], - "timestamp": "2023-11-24T00:52:45.304152477" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:06.857254" }, "seq_xls": { "content": [ @@ -45,7 +57,11 @@ ] ] ], - "timestamp": "2023-11-24T00:52:45.262656562" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T15:43:15.101953" }, "versions": { "content": [ @@ -53,6 +69,99 @@ "versions.yml:md5,8a0721f3247f97135eadb8eecbe142a1" ] ], - "timestamp": "2023-12-14T17:23:41.82098803" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:06.877127" + }, + "sarscov2 paired-end [bam] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.seq.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.pos.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.DupRate_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.DupRate_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + "versions.yml:md5,8a0721f3247f97135eadb8eecbe142a1" + ], + "pdf": [ + [ + { + "id": "test", + "single_end": false + }, + "test.DupRate_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "pos_xls": [ + [ + { + "id": "test", + "single_end": false + }, + "test.pos.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "rscript": [ + [ + { + "id": "test", + "single_end": false + }, + "test.DupRate_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "seq_xls": [ + [ + { + "id": "test", + "single_end": false + }, + "test.seq.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,8a0721f3247f97135eadb8eecbe142a1" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:53:03.817194" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/flagstat/environment.yml b/modules/nf-core/samtools/flagstat/environment.yml index bd57cb54..68b81558 100644 --- a/modules/nf-core/samtools/flagstat/environment.yml +++ b/modules/nf-core/samtools/flagstat/environment.yml @@ -4,5 +4,5 @@ channels: - bioconda - defaults dependencies: - - bioconda::samtools=1.19.2 - - bioconda::htslib=1.19.1 + - bioconda::samtools=1.20 + - bioconda::htslib=1.20 diff --git a/modules/nf-core/samtools/flagstat/main.nf b/modules/nf-core/samtools/flagstat/main.nf index eb5f5252..754d84b7 100644 --- a/modules/nf-core/samtools/flagstat/main.nf +++ b/modules/nf-core/samtools/flagstat/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_FLAGSTAT { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.19.2--h50ea8bc_0' : - 'biocontainers/samtools:1.19.2--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : + 'biocontainers/samtools:1.20--h50ea8bc_0' }" input: tuple val(meta), path(bam), path(bai) diff --git a/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap b/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap index a76fc27e..e9f85efa 100644 --- a/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/flagstat/tests/main.nf.test.snap @@ -20,13 +20,13 @@ "versions": { "content": [ [ - "versions.yml:md5,fd0030ce49ab3a92091ad80260226452" + "versions.yml:md5,f606681ef971cbb548a4d9e3fbabdbc2" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:11:44.299617452" + "timestamp": "2024-05-28T15:41:52.516253882" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/idxstats/environment.yml b/modules/nf-core/samtools/idxstats/environment.yml index 174973b8..eb6c8809 100644 --- a/modules/nf-core/samtools/idxstats/environment.yml +++ b/modules/nf-core/samtools/idxstats/environment.yml @@ -4,5 +4,5 @@ channels: - bioconda - defaults dependencies: - - bioconda::samtools=1.19.2 - - bioconda::htslib=1.19.1 + - bioconda::samtools=1.20 + - bioconda::htslib=1.20 diff --git a/modules/nf-core/samtools/idxstats/main.nf b/modules/nf-core/samtools/idxstats/main.nf index a544026f..2ea2a5cc 100644 --- a/modules/nf-core/samtools/idxstats/main.nf +++ b/modules/nf-core/samtools/idxstats/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_IDXSTATS { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.19.2--h50ea8bc_0' : - 'biocontainers/samtools:1.19.2--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : + 'biocontainers/samtools:1.20--h50ea8bc_0' }" input: tuple val(meta), path(bam), path(bai) diff --git a/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap b/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap index a7050bdc..4eacdb90 100644 --- a/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/idxstats/tests/main.nf.test.snap @@ -2,14 +2,14 @@ "versions": { "content": [ [ - "versions.yml:md5,613dde56f108418039ffcdeeddba397a" + "versions.yml:md5,7acbcb2a8ec6436ba7b2916d3ff13351" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:16:50.147462763" + "timestamp": "2024-05-28T15:46:46.617989517" }, "idxstats": { "content": [ diff --git a/modules/nf-core/samtools/index/environment.yml b/modules/nf-core/samtools/index/environment.yml index a5e50649..260d516b 100644 --- a/modules/nf-core/samtools/index/environment.yml +++ b/modules/nf-core/samtools/index/environment.yml @@ -4,5 +4,5 @@ channels: - bioconda - defaults dependencies: - - bioconda::samtools=1.19.2 - - bioconda::htslib=1.19.1 + - bioconda::samtools=1.20 + - bioconda::htslib=1.20 diff --git a/modules/nf-core/samtools/index/main.nf b/modules/nf-core/samtools/index/main.nf index dc14f98d..b523c21b 100644 --- a/modules/nf-core/samtools/index/main.nf +++ b/modules/nf-core/samtools/index/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_INDEX { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.19.2--h50ea8bc_0' : - 'biocontainers/samtools:1.19.2--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : + 'biocontainers/samtools:1.20--h50ea8bc_0' }" input: tuple val(meta), path(input) diff --git a/modules/nf-core/samtools/index/tests/main.nf.test.snap b/modules/nf-core/samtools/index/tests/main.nf.test.snap index 3dc8e7de..52756e85 100644 --- a/modules/nf-core/samtools/index/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/index/tests/main.nf.test.snap @@ -2,26 +2,26 @@ "crai_versions": { "content": [ [ - "versions.yml:md5,cc4370091670b64bba7c7206403ffb3e" + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:12:00.324667957" + "timestamp": "2024-05-28T15:42:04.203740976" }, "csi_versions": { "content": [ [ - "versions.yml:md5,cc4370091670b64bba7c7206403ffb3e" + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:12:07.885103162" + "timestamp": "2024-05-28T15:42:09.57475878" }, "crai": { "content": [ @@ -62,13 +62,13 @@ "bai_versions": { "content": [ [ - "versions.yml:md5,cc4370091670b64bba7c7206403ffb3e" + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:11:51.641425452" + "timestamp": "2024-05-28T15:41:57.929287369" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/sort/environment.yml b/modules/nf-core/samtools/sort/environment.yml index 4d898e48..36a12eab 100644 --- a/modules/nf-core/samtools/sort/environment.yml +++ b/modules/nf-core/samtools/sort/environment.yml @@ -4,5 +4,5 @@ channels: - bioconda - defaults dependencies: - - bioconda::samtools=1.19.2 - - bioconda::htslib=1.19.1 + - bioconda::samtools=1.20 + - bioconda::htslib=1.20 diff --git a/modules/nf-core/samtools/sort/main.nf b/modules/nf-core/samtools/sort/main.nf index fc374f98..596c6f7e 100644 --- a/modules/nf-core/samtools/sort/main.nf +++ b/modules/nf-core/samtools/sort/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_SORT { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.19.2--h50ea8bc_0' : - 'biocontainers/samtools:1.19.2--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : + 'biocontainers/samtools:1.20--h50ea8bc_0' }" input: tuple val(meta) , path(bam) diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test b/modules/nf-core/samtools/sort/tests/main.nf.test index 8360e2b1..fb38ed9b 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test +++ b/modules/nf-core/samtools/sort/tests/main.nf.test @@ -30,7 +30,11 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.bam, + process.out.csi.collect { it.collect { it instanceof Map ? it : file(it).name } } + ).match("test_bam") + } ) } } @@ -44,11 +48,11 @@ nextflow_process { """ input[0] = Channel.of([ [ id:'test', single_end:false ], // meta map - file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.bam', checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram', checkIfExists: true) ]) input[1] = Channel.of([ [ id:'fasta' ], // meta map - file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ]) """ } @@ -57,7 +61,11 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.bam, + process.out.csi.collect { it.collect { it instanceof Map ? it : file(it).name } } + ).match("test_cram") + } ) } } diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test.snap b/modules/nf-core/samtools/sort/tests/main.nf.test.snap index 38477656..5a27de1d 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/sort/tests/main.nf.test.snap @@ -1,68 +1,21 @@ { "cram": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" - ] - ], - "4": [ - "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" - ], - "bam": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" - ] - ], - "crai": [ - - ], - "cram": [ - - ], - "csi": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" - ] - ], - "versions": [ - "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,21c992d59615936b99f2ad008aa54400" ] - } + ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T15:08:00.830294" + "timestamp": "2024-05-31T08:13:54.512837189" }, "bam_stub_bam": { "content": [ @@ -70,85 +23,92 @@ ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.04.3" + "nextflow": "24.04.2" + }, + "timestamp": "2024-05-31T07:29:00.761845507" + }, + "test_cram": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,22b2093be34a7637f5fbc84272b89d06" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" }, - "timestamp": "2024-02-12T19:21:04.364044" + "timestamp": "2024-05-31T09:16:51.924951855" + }, + "test_bam": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,21c992d59615936b99f2ad008aa54400" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-05-31T08:28:12.15952312" }, "bam_stub_versions": { "content": [ [ - "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" + "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-13T16:15:00.20800281" + "timestamp": "2024-05-31T07:29:00.765038811" }, "bam": { "content": [ - { - "0": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" - ] - ], - "4": [ - "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" - ], - "bam": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam:md5,bc0b7c25da26384a006ed84cc9e4da23" - ] - ], - "crai": [ - - ], - "cram": [ - - ], - "csi": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam.csi:md5,8d4e836c2fed6c0bf874d5e8cdba5831" - ] - ], - "versions": [ - "versions.yml:md5,e6d43fefc9a8bff91c2ce6e3a1716eca" + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,21c992d59615936b99f2ad008aa54400" ] - } + ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T15:07:48.773803" + "timestamp": "2024-05-31T08:13:48.538030517" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/stats/environment.yml b/modules/nf-core/samtools/stats/environment.yml index 67bb0ca4..1cc83bd9 100644 --- a/modules/nf-core/samtools/stats/environment.yml +++ b/modules/nf-core/samtools/stats/environment.yml @@ -4,5 +4,5 @@ channels: - bioconda - defaults dependencies: - - bioconda::samtools=1.19.2 - - bioconda::htslib=1.19.1 + - bioconda::samtools=1.20 + - bioconda::htslib=1.20 diff --git a/modules/nf-core/samtools/stats/main.nf b/modules/nf-core/samtools/stats/main.nf index 52b00f4b..982bc28e 100644 --- a/modules/nf-core/samtools/stats/main.nf +++ b/modules/nf-core/samtools/stats/main.nf @@ -4,8 +4,8 @@ process SAMTOOLS_STATS { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/samtools:1.19.2--h50ea8bc_0' : - 'biocontainers/samtools:1.19.2--h50ea8bc_0' }" + 'https://depot.galaxyproject.org/singularity/samtools:1.20--h50ea8bc_0' : + 'biocontainers/samtools:1.20--h50ea8bc_0' }" input: tuple val(meta), path(input), path(input_index) diff --git a/modules/nf-core/samtools/stats/tests/main.nf.test.snap b/modules/nf-core/samtools/stats/tests/main.nf.test.snap index 1b7c9ba4..2747fd6c 100644 --- a/modules/nf-core/samtools/stats/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/stats/tests/main.nf.test.snap @@ -8,11 +8,11 @@ "id": "test", "single_end": false }, - "test.stats:md5,01812900aa4027532906c5d431114233" + "test.stats:md5,c9d39b38c22de2057fc2f89949090975" ] ], "1": [ - "versions.yml:md5,0514ceb1769b2a88843e08c1f82624a9" + "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" ], "stats": [ [ @@ -20,19 +20,19 @@ "id": "test", "single_end": false }, - "test.stats:md5,01812900aa4027532906c5d431114233" + "test.stats:md5,c9d39b38c22de2057fc2f89949090975" ] ], "versions": [ - "versions.yml:md5,0514ceb1769b2a88843e08c1f82624a9" + "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" ] } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:15:25.562429714" + "timestamp": "2024-05-28T15:45:24.403941966" }, "bam": { "content": [ @@ -43,11 +43,11 @@ "id": "test", "single_end": false }, - "test.stats:md5,5d8681bf541199898c042bf400391d59" + "test.stats:md5,d522a1fa016b259d6a55620ae53dcd63" ] ], "1": [ - "versions.yml:md5,0514ceb1769b2a88843e08c1f82624a9" + "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" ], "stats": [ [ @@ -55,18 +55,18 @@ "id": "test", "single_end": false }, - "test.stats:md5,5d8681bf541199898c042bf400391d59" + "test.stats:md5,d522a1fa016b259d6a55620ae53dcd63" ] ], "versions": [ - "versions.yml:md5,0514ceb1769b2a88843e08c1f82624a9" + "versions.yml:md5,b3b70b126f867fdbb7dcea5e36e49d4a" ] } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "23.10.1" }, - "timestamp": "2024-02-13T16:15:07.857611509" + "timestamp": "2024-05-28T15:45:06.711251947" } } \ No newline at end of file diff --git a/modules/nf-core/subread/featurecounts/main.nf b/modules/nf-core/subread/featurecounts/main.nf index 20979962..471bd16f 100644 --- a/modules/nf-core/subread/featurecounts/main.nf +++ b/modules/nf-core/subread/featurecounts/main.nf @@ -44,4 +44,16 @@ process SUBREAD_FEATURECOUNTS { subread: \$( echo \$(featureCounts -v 2>&1) | sed -e "s/featureCounts v//g") END_VERSIONS """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.featureCounts.txt + touch ${prefix}.featureCounts.txt.summary + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + subread: \$( echo \$(featureCounts -v 2>&1) | sed -e "s/featureCounts v//g") + END_VERSIONS + """ } diff --git a/modules/nf-core/subread/featurecounts/tests/main.nf.test b/modules/nf-core/subread/featurecounts/tests/main.nf.test index 6ff22179..3b95da33 100644 --- a/modules/nf-core/subread/featurecounts/tests/main.nf.test +++ b/modules/nf-core/subread/featurecounts/tests/main.nf.test @@ -14,7 +14,7 @@ nextflow_process { when { process { """ - input[0] = [ + input[0] = [ [ id:'test', single_end:true, strandedness:'forward' ], // meta map file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.bam", checkIfExists: true), file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) @@ -33,12 +33,36 @@ nextflow_process { } } + test("sarscov2 [bam] - forward - stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:true, strandedness:'forward' ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + test("sarscov2 [bam] - reverse") { when { process { """ - input[0] = [ + input[0] = [ [ id:'test', single_end:true, strandedness:'reverse' ], // meta map file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.bam", checkIfExists: true), file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) @@ -57,15 +81,40 @@ nextflow_process { } } + test("sarscov2 [bam] - reverse - stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:true, strandedness:'reverse' ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + test("sarscov2 [bam] - unstranded") { when { process { """ - input[0] = [ [ id:'test', single_end:true, strandedness:'unstranded' ], // meta map - file(params.test_data['sarscov2']['illumina']['test_single_end_bam'], checkIfExists: true), - file(params.test_data['sarscov2']['genome']['genome_gtf'], checkIfExists: true) - ] + input[0] = [ + [ id:'test', single_end:true, strandedness:'unstranded' ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ] """ } } @@ -79,4 +128,28 @@ nextflow_process { ) } } + + test("sarscov2 [bam] - unstranded - stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test', single_end:true, strandedness:'unstranded' ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ] + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } } diff --git a/modules/nf-core/subread/featurecounts/tests/main.nf.test.snap b/modules/nf-core/subread/featurecounts/tests/main.nf.test.snap index ad5524f6..72e8dcdd 100644 --- a/modules/nf-core/subread/featurecounts/tests/main.nf.test.snap +++ b/modules/nf-core/subread/featurecounts/tests/main.nf.test.snap @@ -12,6 +12,10 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:10.685863663" }, "unstranded_counts": { @@ -27,6 +31,10 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:38.67903701" }, "reverse_summary": { @@ -42,8 +50,126 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:25.168206514" }, + "sarscov2 [bam] - forward - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "forward" + }, + "test.featureCounts.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "forward" + }, + "test.featureCounts.txt.summary:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" + ], + "counts": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "forward" + }, + "test.featureCounts.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "summary": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "forward" + }, + "test.featureCounts.txt.summary:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T10:04:22.628032" + }, + "sarscov2 [bam] - reverse - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "reverse" + }, + "test.featureCounts.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "reverse" + }, + "test.featureCounts.txt.summary:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" + ], + "counts": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "reverse" + }, + "test.featureCounts.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "summary": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "reverse" + }, + "test.featureCounts.txt.summary:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T10:04:52.371212" + }, "reverse_counts": { "content": [ [ @@ -57,8 +183,69 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:25.160010804" }, + "sarscov2 [bam] - unstranded - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "unstranded" + }, + "test.featureCounts.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "unstranded" + }, + "test.featureCounts.txt.summary:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" + ], + "counts": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "unstranded" + }, + "test.featureCounts.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "summary": [ + [ + { + "id": "test", + "single_end": true, + "strandedness": "unstranded" + }, + "test.featureCounts.txt.summary:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T10:05:25.058902" + }, "forward_summary": { "content": [ [ @@ -72,6 +259,10 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:10.699024934" }, "forward_versions": { @@ -80,6 +271,10 @@ "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:10.704797013" }, "unstranded_summary": { @@ -95,6 +290,10 @@ ] ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:38.68776235" }, "reverse_versions": { @@ -103,6 +302,10 @@ "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:25.175265594" }, "unstranded_versions": { @@ -111,6 +314,10 @@ "versions.yml:md5,c2c0903b93c93d9afd2667052b9ee726" ] ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, "timestamp": "2023-11-23T15:50:38.69390501" } } \ No newline at end of file diff --git a/modules/nf-core/umitools/dedup/main.nf b/modules/nf-core/umitools/dedup/main.nf index b2d11ebf..1e2a2aae 100644 --- a/modules/nf-core/umitools/dedup/main.nf +++ b/modules/nf-core/umitools/dedup/main.nf @@ -47,6 +47,7 @@ process UMITOOLS_DEDUP { """ stub: + prefix = task.ext.prefix ?: "${meta.id}" """ touch ${prefix}.bam touch ${prefix}.log diff --git a/modules/nf-core/umitools/dedup/tests/main.nf.test b/modules/nf-core/umitools/dedup/tests/main.nf.test index 84698be4..ab445536 100644 --- a/modules/nf-core/umitools/dedup/tests/main.nf.test +++ b/modules/nf-core/umitools/dedup/tests/main.nf.test @@ -31,8 +31,9 @@ nextflow_process { assertAll( { assert process.success }, { assert path("${process.out.log[0][1]}").exists() }, - { assert snapshot(process.out.bam).match("se no stats - bam") }, - { assert snapshot(process.out.versions).match("se no stats - versions") } + { assert snapshot( + bam(process.out.bam[0][1]).getSamLinesMD5(), + process.out.versions).match() } ) } } @@ -59,8 +60,9 @@ nextflow_process { assertAll( { assert process.success }, { assert path("${process.out.log[0][1]}").exists() }, - { assert snapshot(process.out.bam).match("pe no stats - bam") }, - { assert snapshot(process.out.versions).match("pe no stats - versions") } + { assert snapshot( + process.out.bam, + process.out.versions).match() } ) } } @@ -87,11 +89,99 @@ nextflow_process { assertAll( { assert process.success }, { assert path("${process.out.log[0][1]}").exists() }, - { assert snapshot(process.out.bam).match("pe - bam") }, - { assert snapshot(process.out.tsv_edit_distance).match("pe - tsv_edit_distance") }, - { assert snapshot(process.out.tsv_per_umi).match("pe - tsv_per_umi") }, - { assert snapshot(process.out.tsv_umi_per_position).match("pe - tsv_umi_per_position") }, - { assert snapshot(process.out.versions).match("pe - versions") } + { assert snapshot( + process.out.bam, + process.out.tsv_edit_distance, + process.out.tsv_per_umi, + process.out.tsv_umi_per_position, + process.out.versions).match() } + ) + } + } + + test("se - no stats - stub") { + + options "-stub" + + config "./nextflow.config" + + when { + process { + """ + get_output_stats = false + + input[0] = [ + [ id:'test', single_end:true ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.single_end.sorted.bam.bai", checkIfExists: true) + ] + input[1] = get_output_stats + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.bam).match() } + ) + } + } + + test("pe - no stats - stub") { + + options "-stub" + + config "./nextflow.config" + + when { + process { + """ + get_output_stats = false + + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + ] + input[1] = get_output_stats + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.bam).match() } + ) + } + } + + test("pe - with stats - stub") { + + options "-stub" + + config "./nextflow.config" + + when { + process { + """ + get_output_stats = true + + input[0] = [ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + ] + input[1] = get_output_stats + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out.bam).match() } ) } } diff --git a/modules/nf-core/umitools/dedup/tests/main.nf.test.snap b/modules/nf-core/umitools/dedup/tests/main.nf.test.snap index bc3c8693..f7f4e94f 100644 --- a/modules/nf-core/umitools/dedup/tests/main.nf.test.snap +++ b/modules/nf-core/umitools/dedup/tests/main.nf.test.snap @@ -1,5 +1,5 @@ { - "pe no stats - bam": { + "pe - no stats - stub": { "content": [ [ [ @@ -7,17 +7,17 @@ "id": "test", "single_end": false }, - "test.dedup.bam:md5,350e942a0d45e8356fa24bc8c47dc1ed" + "test.dedup.bam:md5,d41d8cd98f00b204e9800998ecf8427e" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T17:41:38.139428" + "timestamp": "2024-07-03T11:40:46.802233" }, - "pe - tsv_per_umi": { + "pe - with stats - stub": { "content": [ [ [ @@ -25,18 +25,27 @@ "id": "test", "single_end": false }, - "test.dedup_per_umi.tsv:md5,8e6783a4a79437b095f095f2aefe7c01" + "test.dedup.bam:md5,d41d8cd98f00b204e9800998ecf8427e" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T17:41:56.21078" + "timestamp": "2024-07-03T11:40:59.501624" }, - "pe - tsv_edit_distance": { + "pe - with stats": { "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.dedup.bam:md5,350e942a0d45e8356fa24bc8c47dc1ed" + ] + ], [ [ { @@ -45,16 +54,16 @@ }, "test.dedup_edit_distance.tsv:md5,65186b0964e2f8d970cc04d736d8b119" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-03-04T17:41:56.203654" - }, - "pe - tsv_umi_per_position": { - "content": [ + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.dedup_per_umi.tsv:md5,8e6783a4a79437b095f095f2aefe7c01" + ] + ], [ [ { @@ -63,15 +72,18 @@ }, "test.dedup_per_umi_per_position.tsv:md5,9386db4a104b8e4e32f3ca4a84efa4ac" ] + ], + [ + "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T17:41:56.217525" + "timestamp": "2024-07-03T11:27:24.231325" }, - "se no stats - bam": { + "se - no stats - stub": { "content": [ [ [ @@ -79,41 +91,30 @@ "id": "test", "single_end": true }, - "test.dedup.bam:md5,c9da2ee4f07f5c6922251bd01d6bcb01" + "test.dedup.bam:md5,d41d8cd98f00b204e9800998ecf8427e" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T17:41:16.383148" + "timestamp": "2024-07-03T11:40:34.598176" }, - "se no stats - versions": { + "se - no stats": { "content": [ + "a114abd9fccce6fe2869852b5cd18964", [ "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T17:41:16.391241" + "timestamp": "2024-07-03T13:45:48.553561" }, - "pe - versions": { - "content": [ - [ - "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-03-04T17:41:56.226748" - }, - "pe - bam": { + "pe - no stats": { "content": [ [ [ @@ -123,24 +124,15 @@ }, "test.dedup.bam:md5,350e942a0d45e8356fa24bc8c47dc1ed" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-03-04T17:41:56.19652" - }, - "pe no stats - versions": { - "content": [ + ], [ "versions.yml:md5,e2f5146464c09bf7ae98c85ea5410e50" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-04T17:41:38.157629" + "timestamp": "2024-07-03T11:27:06.957467" } } \ No newline at end of file diff --git a/modules/nf-core/untar/environment.yml b/modules/nf-core/untar/environment.yml index 0c9cbb10..4f498244 100644 --- a/modules/nf-core/untar/environment.yml +++ b/modules/nf-core/untar/environment.yml @@ -1,11 +1,9 @@ name: untar - channels: - conda-forge - bioconda - defaults - dependencies: - conda-forge::grep=3.11 - - conda-forge::sed=4.7 + - conda-forge::sed=4.8 - conda-forge::tar=1.34 diff --git a/modules/nf-core/untar/main.nf b/modules/nf-core/untar/main.nf index 8a75bb95..9bd8f554 100644 --- a/modules/nf-core/untar/main.nf +++ b/modules/nf-core/untar/main.nf @@ -4,8 +4,8 @@ process UNTAR { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/ubuntu:20.04' : - 'nf-core/ubuntu:20.04' }" + 'https://depot.galaxyproject.org/singularity/ubuntu:22.04' : + 'nf-core/ubuntu:22.04' }" input: tuple val(meta), path(archive) @@ -52,8 +52,29 @@ process UNTAR { stub: prefix = task.ext.prefix ?: ( meta.id ? "${meta.id}" : archive.toString().replaceFirst(/\.[^\.]+(.gz)?$/, "")) """ - mkdir $prefix - touch ${prefix}/file.txt + mkdir ${prefix} + ## Dry-run untaring the archive to get the files and place all in prefix + if [[ \$(tar -taf ${archive} | grep -o -P "^.*?\\/" | uniq | wc -l) -eq 1 ]]; then + for i in `tar -tf ${archive}`; + do + if [[ \$(echo "\${i}" | grep -E "/\$") == "" ]]; + then + touch \${i} + else + mkdir -p \${i} + fi + done + else + for i in `tar -tf ${archive}`; + do + if [[ \$(echo "\${i}" | grep -E "/\$") == "" ]]; + then + touch ${prefix}/\${i} + else + mkdir -p ${prefix}/\${i} + fi + done + fi cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/untar/tests/main.nf.test b/modules/nf-core/untar/tests/main.nf.test index 679e83c7..c957517a 100644 --- a/modules/nf-core/untar/tests/main.nf.test +++ b/modules/nf-core/untar/tests/main.nf.test @@ -3,7 +3,6 @@ nextflow_process { name "Test Process UNTAR" script "../main.nf" process "UNTAR" - tag "modules" tag "modules_nfcore" tag "untar" @@ -11,9 +10,6 @@ nextflow_process { test("test_untar") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = [ [], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/db/kraken2.tar.gz', checkIfExists: true) ] @@ -24,18 +20,14 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out.untar).match("test_untar") }, + { assert snapshot(process.out).match() }, ) } - } test("test_untar_onlyfiles") { when { - params { - outdir = "$outputDir" - } process { """ input[0] = [ [], file(params.modules_testdata_base_path + 'generic/tar/hello.tar.gz', checkIfExists: true) ] @@ -46,10 +38,48 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out.untar).match("test_untar_onlyfiles") }, + { assert snapshot(process.out).match() }, ) } + } + + test("test_untar - stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ [], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/db/kraken2.tar.gz', checkIfExists: true) ] + """ + } + } + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() }, + ) + } } + test("test_untar_onlyfiles - stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ [], file(params.modules_testdata_base_path + 'generic/tar/hello.tar.gz', checkIfExists: true) ] + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() }, + ) + } + } } diff --git a/modules/nf-core/untar/tests/main.nf.test.snap b/modules/nf-core/untar/tests/main.nf.test.snap index ace42576..ceb91b79 100644 --- a/modules/nf-core/untar/tests/main.nf.test.snap +++ b/modules/nf-core/untar/tests/main.nf.test.snap @@ -1,34 +1,158 @@ { "test_untar_onlyfiles": { "content": [ - [ - [ + { + "0": [ [ - - ], + [ + + ], + [ + "hello.txt:md5,e59ff97941044f85df5297e1c302d260" + ] + ] + ], + "1": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" + ], + "untar": [ + [ + [ + + ], + [ + "hello.txt:md5,e59ff97941044f85df5297e1c302d260" + ] + ] + ], + "versions": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-10T12:04:28.231047" + }, + "test_untar_onlyfiles - stub": { + "content": [ + { + "0": [ + [ + [ + + ], + [ + "hello.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + ], + "1": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" + ], + "untar": [ [ - "hello.txt:md5,e59ff97941044f85df5297e1c302d260" + [ + + ], + [ + "hello.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] ] + ], + "versions": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" ] - ] + } ], - "timestamp": "2023-10-18T11:56:46.878844" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-10T12:04:45.773103" + }, + "test_untar - stub": { + "content": [ + { + "0": [ + [ + [ + + ], + [ + "hash.k2d:md5,d41d8cd98f00b204e9800998ecf8427e", + "opts.k2d:md5,d41d8cd98f00b204e9800998ecf8427e", + "taxo.k2d:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + ], + "1": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" + ], + "untar": [ + [ + [ + + ], + [ + "hash.k2d:md5,d41d8cd98f00b204e9800998ecf8427e", + "opts.k2d:md5,d41d8cd98f00b204e9800998ecf8427e", + "taxo.k2d:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + ], + "versions": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-10T12:04:36.777441" }, "test_untar": { "content": [ - [ - [ + { + "0": [ [ - - ], + [ + + ], + [ + "hash.k2d:md5,8b8598468f54a7087c203ad0190555d9", + "opts.k2d:md5,a033d00cf6759407010b21700938f543", + "taxo.k2d:md5,094d5891cdccf2f1468088855c214b2c" + ] + ] + ], + "1": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" + ], + "untar": [ [ - "hash.k2d:md5,8b8598468f54a7087c203ad0190555d9", - "opts.k2d:md5,a033d00cf6759407010b21700938f543", - "taxo.k2d:md5,094d5891cdccf2f1468088855c214b2c" + [ + + ], + [ + "hash.k2d:md5,8b8598468f54a7087c203ad0190555d9", + "opts.k2d:md5,a033d00cf6759407010b21700938f543", + "taxo.k2d:md5,094d5891cdccf2f1468088855c214b2c" + ] ] + ], + "versions": [ + "versions.yml:md5,6063247258c56fd271d076bb04dd7536" ] - ] + } ], - "timestamp": "2023-10-18T11:56:08.16574" + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-10T12:04:19.377674" } } \ No newline at end of file diff --git a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main.nf b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main.nf index 7c07084f..fe6ff312 100644 --- a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main.nf +++ b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/main.nf @@ -44,6 +44,7 @@ workflow BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS { emit: bam = UMITOOLS_DEDUP.out.bam // channel: [ val(meta), path(bam) ] + deduplog = UMITOOLS_DEDUP.out.log // channel: [ val(meta), path(log) ] bai = SAMTOOLS_INDEX.out.bai // channel: [ val(meta), path(bai) ] csi = SAMTOOLS_INDEX.out.csi // channel: [ val(meta), path(csi) ] diff --git a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/meta.yml b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/meta.yml index e655484e..93e1238b 100644 --- a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/meta.yml +++ b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/meta.yml @@ -37,6 +37,10 @@ output: description: | CSI samtools index Structure: [ val(meta), path(csi) ] + - deduplog: + description: | + UMI-tools deduplication log + Structure: [ val(meta), path(log) ] - stats: description: | File containing samtools stats output diff --git a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test index 476e7320..9d38022b 100644 --- a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test +++ b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test @@ -20,9 +20,6 @@ nextflow_workflow { test("sarscov2_bam_bai") { when { - params { - outdir = "$outputDir" - } workflow { """ val_get_dedup_stats = false @@ -40,14 +37,43 @@ nextflow_workflow { then { assertAll( { assert workflow.success}, + { assert workflow.out.deduplog.get(0).get(1) ==~ ".*.log"}, { assert workflow.out.bam.get(0).get(1) ==~ ".*.bam"}, { assert workflow.out.bai.get(0).get(1) ==~ ".*.bai"}, - { assert snapshot(workflow.out.stats).match("test_bam_dedup_stats_samtools_umitools_stats") }, - { assert snapshot(workflow.out.flagstat).match("test_bam_dedup_stats_samtools_umitools_flagstats") }, - { assert snapshot(workflow.out.idxstats).match("test_bam_dedup_stats_samtools_umitools_idxstats") } + { assert snapshot( + workflow.out.stats, + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.versions + ).match() } ) } - } + test("sarscov2_bam_bai - stub") { + + options "-stub" + + when { + workflow { + """ + val_get_dedup_stats = false + + input[0] = Channel.of([ + [ id:'test'], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = val_get_dedup_stats + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match() } + ) + } + } } diff --git a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap index 5a3e80b4..4be4640e 100644 --- a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap @@ -1,23 +1,14 @@ { - "test_bam_dedup_stats_samtools_umitools_idxstats": { + "sarscov2_bam_bai": { "content": [ [ [ { "id": "test" }, - "test.idxstats:md5,1adb27b52d4d64b826f48b59d61dcd4d" + "test.stats:md5,09d1bd8f10e000921202f7ea1cd0679e" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2023-11-06T09:58:40.394333937" - }, - "test_bam_dedup_stats_samtools_umitools_flagstats": { - "content": [ + ], [ [ { @@ -25,29 +16,164 @@ }, "test.flagstat:md5,0bb716e40fae381b97484b58e0b16efe" ] + ], + [ + [ + { + "id": "test" + }, + "test.idxstats:md5,1adb27b52d4d64b826f48b59d61dcd4d" + ] + ], + [ + "versions.yml:md5,32b4a349a563fb5b01cf0688ae3ca860", + "versions.yml:md5,803d3f4d3992a7a597a09cf330bd46a4", + "versions.yml:md5,9b7824114bf90d4b60110ddaf149f1db", + "versions.yml:md5,f0864f64f8ebb81826a1cf5c14b77e69", + "versions.yml:md5,f4935d4e563646266cc6bb4d75d0fb7d" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2023-11-06T09:58:40.385185447" + "timestamp": "2024-07-03T11:53:11.53709" }, - "test_bam_dedup_stats_samtools_umitools_stats": { + "sarscov2_bam_bai - stub": { "content": [ - [ - [ - { - "id": "test" - }, - "test.stats:md5,02342d307779941001376ff5d19e941a" + { + "0": [ + [ + { + "id": "test" + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test" + }, + "test.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test" + }, + "test.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test" + }, + "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test" + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + [ + { + "id": "test" + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "6": [ + [ + { + "id": "test" + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "7": [ + "versions.yml:md5,32b4a349a563fb5b01cf0688ae3ca860", + "versions.yml:md5,803d3f4d3992a7a597a09cf330bd46a4", + "versions.yml:md5,9b7824114bf90d4b60110ddaf149f1db", + "versions.yml:md5,f0864f64f8ebb81826a1cf5c14b77e69", + "versions.yml:md5,f4935d4e563646266cc6bb4d75d0fb7d" + ], + "bai": [ + [ + { + "id": "test" + }, + "test.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "bam": [ + [ + { + "id": "test" + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "csi": [ + [ + { + "id": "test" + }, + "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "deduplog": [ + [ + { + "id": "test" + }, + "test.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "flagstat": [ + [ + { + "id": "test" + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test" + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test" + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,32b4a349a563fb5b01cf0688ae3ca860", + "versions.yml:md5,803d3f4d3992a7a597a09cf330bd46a4", + "versions.yml:md5,9b7824114bf90d4b60110ddaf149f1db", + "versions.yml:md5,f0864f64f8ebb81826a1cf5c14b77e69", + "versions.yml:md5,f4935d4e563646266cc6bb4d75d0fb7d" ] - ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-13T16:45:33.563016651" + "timestamp": "2024-07-03T11:53:25.735454" } } \ No newline at end of file diff --git a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test index 75b5b934..821a3cf5 100644 --- a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test +++ b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test @@ -19,9 +19,6 @@ nextflow_workflow { test("test_bam_sort_stats_samtools_single_end") { when { - params { - outdir = "$outputDir" - } workflow { """ input[0] = Channel.of([ @@ -41,9 +38,11 @@ nextflow_workflow { { assert workflow.success}, { assert workflow.out.bam.get(0).get(1) ==~ ".*.bam"}, { assert workflow.out.bai.get(0).get(1) ==~ ".*.bai"}, - { assert snapshot(workflow.out.stats).match("test_bam_sort_stats_samtools_single_end_stats") }, - { assert snapshot(workflow.out.flagstat).match("test_bam_sort_stats_samtools_single_end_flagstats") }, - { assert snapshot(workflow.out.idxstats).match("test_bam_sort_stats_samtools_single_end_idxstats") } + { assert snapshot( + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.stats, + workflow.out.versions).match() } ) } } @@ -51,9 +50,6 @@ nextflow_workflow { test("test_bam_sort_stats_samtools_paired_end") { when { - params { - outdir = "$outputDir" - } workflow { """ input[0] = Channel.of([ @@ -73,9 +69,65 @@ nextflow_workflow { { assert workflow.success}, { assert workflow.out.bam.get(0).get(1) ==~ ".*.bam"}, { assert workflow.out.bai.get(0).get(1) ==~ ".*.bai"}, - { assert snapshot(workflow.out.stats).match("test_bam_sort_stats_samtools_paired_end_stats") }, - { assert snapshot(workflow.out.flagstat).match("test_bam_sort_stats_samtools_paired_end_flagstats") }, - { assert snapshot(workflow.out.idxstats).match("test_bam_sort_stats_samtools_paired_end_idxstats") } + { assert snapshot( + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.stats, + workflow.out.versions).match() } + ) + } + } + + test("test_bam_sort_stats_samtools_single_end - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.single_end.bam', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'genome' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match() } + ) + } + } + + test("test_bam_sort_stats_samtools_paired_end - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.bam', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'genome' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match() } ) } } diff --git a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap index 6645a092..044536f9 100644 --- a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap @@ -1,5 +1,5 @@ { - "test_bam_sort_stats_samtools_paired_end_flagstats": { + "test_bam_sort_stats_samtools_single_end": { "content": [ [ [ @@ -7,53 +7,42 @@ "id": "test", "single_end": false }, - "test.flagstat:md5,4f7ffd1e6a5e85524d443209ac97d783" + "test.flagstat:md5,2191911d72575a2358b08b1df64ccb53" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2023-10-22T20:25:03.687121177" - }, - "test_bam_sort_stats_samtools_paired_end_idxstats": { - "content": [ + ], [ [ { "id": "test", "single_end": false }, - "test.idxstats:md5,df60a8c8d6621100d05178c93fb053a2" + "test.idxstats:md5,613e048487662c694aa4a2f73ca96a20" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2023-10-22T20:25:03.709648916" - }, - "test_bam_sort_stats_samtools_single_end_stats": { - "content": [ + ], [ [ { "id": "test", "single_end": false }, - "test.stats:md5,cb0bf2b79de52fdf0c61e80efcdb0bb4" + "test.stats:md5,d32de3b3716a11039cef2367c3c1a56e" ] + ], + [ + "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", + "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", + "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", + "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", + "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-13T16:44:38.553256801" + "timestamp": "2024-07-03T12:20:38.911799" }, - "test_bam_sort_stats_samtools_paired_end_stats": { + "test_bam_sort_stats_samtools_paired_end": { "content": [ [ [ @@ -61,50 +50,305 @@ "id": "test", "single_end": false }, - "test.stats:md5,d7796222a087b9bb97f631f1c21b9c95" + "test.flagstat:md5,4f7ffd1e6a5e85524d443209ac97d783" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-13T16:44:48.355870518" - }, - "test_bam_sort_stats_samtools_single_end_idxstats": { - "content": [ + ], [ [ { "id": "test", "single_end": false }, - "test.idxstats:md5,613e048487662c694aa4a2f73ca96a20" + "test.idxstats:md5,df60a8c8d6621100d05178c93fb053a2" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-01-18T17:10:02.84631" - }, - "test_bam_sort_stats_samtools_single_end_flagstats": { - "content": [ + ], [ [ { "id": "test", "single_end": false }, - "test.flagstat:md5,2191911d72575a2358b08b1df64ccb53" + "test.stats:md5,cca83e4fc9406fc3875b5e60055d6574" ] + ], + [ + "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", + "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", + "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", + "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", + "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-03T12:20:51.171967" + }, + "test_bam_sort_stats_samtools_single_end - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "6": [ + "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", + "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", + "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", + "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", + "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + ], + "bai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", + "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", + "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", + "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", + "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-03T12:13:52.386146" + }, + "test_bam_sort_stats_samtools_paired_end - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "6": [ + "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", + "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", + "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", + "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", + "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + ], + "bai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,494b5530a1aa29fd5867cf655bebbfe1", + "versions.yml:md5,9fcb0cd845bfb1f89d83201bb20649b4", + "versions.yml:md5,bacc323ec4055d6f69f07a09089772d1", + "versions.yml:md5,ce946e97097c6a9ccf834a3f91f6da30", + "versions.yml:md5,d6c8dae685f1b7d050165fc15c7a20b5" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" }, - "timestamp": "2024-01-18T17:10:02.829756" + "timestamp": "2024-07-03T12:14:06.231663" } } \ No newline at end of file diff --git a/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test b/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test index c8b21f28..76e7a40a 100644 --- a/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test +++ b/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test @@ -15,9 +15,6 @@ nextflow_workflow { test("test_bam_stats_samtools_single_end") { when { - params { - outdir = "$outputDir" - } workflow { """ input[0] = Channel.of([ @@ -36,9 +33,11 @@ nextflow_workflow { then { assertAll( { assert workflow.success}, - { assert snapshot(workflow.out.stats).match("test_bam_stats_samtools_single_end_stats") }, - { assert snapshot(workflow.out.flagstat).match("test_bam_stats_samtools_single_end_flagstats") }, - { assert snapshot(workflow.out.idxstats).match("test_bam_stats_samtools_single_end_idxstats") } + { assert snapshot( + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.stats, + workflow.out.versions).match() } ) } } @@ -46,9 +45,6 @@ nextflow_workflow { test("test_bam_stats_samtools_paired_end") { when { - params { - outdir = "$outputDir" - } workflow { """ input[0] = Channel.of([ @@ -67,9 +63,11 @@ nextflow_workflow { then { assertAll( { assert workflow.success }, - { assert snapshot(workflow.out.stats).match("test_bam_stats_samtools_paired_end_stats") }, - { assert snapshot(workflow.out.flagstat).match("test_bam_stats_samtools_paired_end_flagstats") }, - { assert snapshot(workflow.out.idxstats).match("test_bam_stats_samtools_paired_end_idxstats") } + { assert snapshot( + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.stats, + workflow.out.versions).match() } ) } } @@ -77,9 +75,6 @@ nextflow_workflow { test("test_bam_stats_samtools_paired_end_cram") { when { - params { - outdir = "$outputDir" - } workflow { """ input[0] = Channel.of([ @@ -98,11 +93,96 @@ nextflow_workflow { then { assertAll( { assert workflow.success}, - { assert snapshot(workflow.out.stats).match("test_bam_stats_samtools_paired_end_cram_stats") }, - { assert snapshot(workflow.out.flagstat).match("test_bam_stats_samtools_paired_end_cram_flagstats") }, - { assert snapshot(workflow.out.idxstats).match("test_bam_stats_samtools_paired_end_cram_idxstats") } + { assert snapshot( + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.stats, + workflow.out.versions).match() } ) } } + test ("test_bam_stats_samtools_single_end - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.single_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.single_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'genome' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match() } + ) + } + } + + test("test_bam_stats_samtools_paired_end - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'genome' ], + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(workflow.out).match() } + ) + } + } + + test("test_bam_stats_samtools_paired_end_cram - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram.crai', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'genome' ], + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match() } + ) + } + } } diff --git a/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap index bf0b0c69..a3ddcc5c 100644 --- a/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_stats_samtools/tests/main.nf.test.snap @@ -1,59 +1,230 @@ { - "test_bam_stats_samtools_paired_end_cram_flagstats": { + "test_bam_stats_samtools_paired_end - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": false - }, - "test.flagstat:md5,a53f3d26e2e9851f7d528442bbfe9781" + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": true + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" ] - ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2023-11-06T09:31:26.194017574" + "timestamp": "2024-07-03T12:20:06.699297" }, - "test_bam_stats_samtools_paired_end_stats": { + "test_bam_stats_samtools_single_end - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": true - }, - "test.stats:md5,ddaf8f33fe9c1ebe9b06933213aec8ed" + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": true + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" ] - ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-13T16:45:06.230091746" + "timestamp": "2024-07-03T12:19:57.708621" }, - "test_bam_stats_samtools_paired_end_flagstats": { + "test_bam_stats_samtools_paired_end_cram - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": true - }, - "test.flagstat:md5,4f7ffd1e6a5e85524d443209ac97d783" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" ] - ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-01-18T17:17:27.717482" + "timestamp": "2024-07-03T12:20:17.051493" }, - "test_bam_stats_samtools_single_end_flagstats": { + "test_bam_stats_samtools_single_end": { "content": [ [ [ @@ -63,52 +234,48 @@ }, "test.flagstat:md5,2191911d72575a2358b08b1df64ccb53" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2023-11-06T09:26:10.340046381" - }, - "test_bam_stats_samtools_paired_end_cram_idxstats": { - "content": [ + ], [ [ { "id": "test", - "single_end": false + "single_end": true }, - "test.idxstats:md5,e179601fa7b8ebce81ac3765206f6c15" + "test.idxstats:md5,613e048487662c694aa4a2f73ca96a20" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2023-11-06T09:31:26.207052003" - }, - "test_bam_stats_samtools_single_end_stats": { - "content": [ + ], [ [ { "id": "test", "single_end": true }, - "test.stats:md5,dc178e1a4956043aba8abc83e203521b" + "test.stats:md5,4a0c429c661d6aa0b60acb9309da642d" ] + ], + [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-13T16:44:57.442208382" + "timestamp": "2024-07-03T12:19:25.801394" }, - "test_bam_stats_samtools_paired_end_idxstats": { + "test_bam_stats_samtools_paired_end": { "content": [ + [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,4f7ffd1e6a5e85524d443209ac97d783" + ] + ], [ [ { @@ -117,33 +284,29 @@ }, "test.idxstats:md5,df60a8c8d6621100d05178c93fb053a2" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-01-18T17:17:27.726719" - }, - "test_bam_stats_samtools_single_end_idxstats": { - "content": [ + ], [ [ { "id": "test", "single_end": true }, - "test.idxstats:md5,613e048487662c694aa4a2f73ca96a20" + "test.stats:md5,7afd486ad6abb9a2a3dac90c99e1d87b" ] + ], + [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2023-11-06T09:26:10.349439801" + "timestamp": "2024-07-03T12:19:36.158768" }, - "test_bam_stats_samtools_paired_end_cram_stats": { + "test_bam_stats_samtools_paired_end_cram": { "content": [ [ [ @@ -151,14 +314,37 @@ "id": "test", "single_end": false }, - "test.stats:md5,d3345c4887f4a9ea4f7f56405b495db0" + "test.flagstat:md5,a53f3d26e2e9851f7d528442bbfe9781" ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,e179601fa7b8ebce81ac3765206f6c15" + ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,16b59a1f2c99d9fe30f711adc3ebe32d" + ] + ], + [ + "versions.yml:md5,3c485730f712b115bcdc235e7294133b", + "versions.yml:md5,90f593a26a2d53e0f0345df7888f448e", + "versions.yml:md5,9ae003814e63a0907d52eec64d5d3ca3" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-13T16:45:14.997164209" + "timestamp": "2024-07-03T12:19:46.625907" } } \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_bowtie2/meta.yml b/subworkflows/nf-core/fastq_align_bowtie2/meta.yml index 58023a89..b18e4054 100644 --- a/subworkflows/nf-core/fastq_align_bowtie2/meta.yml +++ b/subworkflows/nf-core/fastq_align_bowtie2/meta.yml @@ -37,7 +37,7 @@ input: - sort_bam: type: boolean description: | - Save reads that do not map to the reference (true) or discard them (false) + Use samtools sort (true) or samtools view (false) default: false - ch_fasta: type: file diff --git a/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test index b5e84f51..2fabb42e 100644 --- a/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test +++ b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test @@ -49,7 +49,7 @@ nextflow_workflow { workflow.out.stats, workflow.out.flagstat, workflow.out.idxstats, - workflow.out.versions, + workflow.out.versions ).match()} ) } @@ -91,7 +91,97 @@ nextflow_workflow { workflow.out.stats, workflow.out.flagstat, workflow.out.idxstats, - workflow.out.versions, + workflow.out.versions + ).match()} + ) + } + } + + test("test_align_bowtie2_single_end - stub") { + + options "-stub" + + setup { + run("BOWTIE2_BUILD") { + script "../../../../modules/nf-core/bowtie2/build/main.nf" + process { + """ + input[0] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + } + when { + workflow { + """ + input[0] = Channel.of([[ id:'test', single_end:true ], [ file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ]]) + input[1] = BOWTIE2_BUILD.out.index + input[2] = false + input[3] = false + input[4] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot( + file(workflow.out.bam_orig[0][1]).name, + workflow.out.fastq, + workflow.out.log_out, + file(workflow.out.bam[0][1]).name, + file(workflow.out.bai[0][1]).name, + workflow.out.csi, + workflow.out.stats, + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.versions + ).match()} + ) + } + } + + test("test_align_bowtie2_paired_end - stub") { + + options "-stub" + + setup { + run("BOWTIE2_BUILD") { + script "../../../../modules/nf-core/bowtie2/build/main.nf" + process { + """ + input[0] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + } + when { + workflow { + """ + input[0] = Channel.of([[ id:'test', single_end:false ], [file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true), file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true)]]) + input[1] = BOWTIE2_BUILD.out.index + input[2] = false + input[3] = false + input[4] = Channel.value([ [ id:'genome' ],file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot( + file(workflow.out.bam_orig[0][1]).name, + workflow.out.fastq, + workflow.out.log_out, + file(workflow.out.bam[0][1]).name, + file(workflow.out.bai[0][1]).name, + workflow.out.csi, + workflow.out.stats, + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.versions ).match()} ) } diff --git a/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap index c0f3f8bf..c8490961 100644 --- a/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap +++ b/subworkflows/nf-core/fastq_align_bowtie2/tests/main.nf.test.snap @@ -25,7 +25,7 @@ "id": "test", "single_end": true }, - "test.sorted.bam.stats:md5,9a65272e49581873b1ea211f738e992f" + "test.sorted.bam.stats:md5,d499a70739ffa0a96880eaad229dcf7c" ] ], [ @@ -47,19 +47,19 @@ ] ], [ - "versions.yml:md5,5d5ab1d650a93d8bb5ed142943798a6a", - "versions.yml:md5,666dbae2343fc479e483656c35d3d8a1", + "versions.yml:md5,0b1901279f738fa8e22cabea6e2a48bd", + "versions.yml:md5,60be918ac1032f74137ad27024c002ef", + "versions.yml:md5,8644be336f2fd05a04b95050a4de9094", "versions.yml:md5,aab337e63eac9055aadb9a35cec16053", - "versions.yml:md5,c27f74d9c37fbb3365c437a9f7e81c27", - "versions.yml:md5,eb9364a9f1745d6a345b8b4b03aebe25", - "versions.yml:md5,f982efa9031f340ace29f76dd47a8ce1" + "versions.yml:md5,dd60999d74ea42ae4f5483c9d94507f3", + "versions.yml:md5,ddb252583f75777033ee6467e4b6d545" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-18T14:40:54.318808117" + "timestamp": "2024-07-03T13:07:32.050239" }, "test_align_bowtie2_paired_end": { "content": [ @@ -87,7 +87,7 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,1086d408391af2a5c80c6dee0efa7e59" + "test.sorted.bam.stats:md5,c02dbd116c1f49339dda208cb950261d" ] ], [ @@ -109,18 +109,18 @@ ] ], [ - "versions.yml:md5,5d5ab1d650a93d8bb5ed142943798a6a", - "versions.yml:md5,666dbae2343fc479e483656c35d3d8a1", + "versions.yml:md5,0b1901279f738fa8e22cabea6e2a48bd", + "versions.yml:md5,60be918ac1032f74137ad27024c002ef", + "versions.yml:md5,8644be336f2fd05a04b95050a4de9094", "versions.yml:md5,aab337e63eac9055aadb9a35cec16053", - "versions.yml:md5,c27f74d9c37fbb3365c437a9f7e81c27", - "versions.yml:md5,eb9364a9f1745d6a345b8b4b03aebe25", - "versions.yml:md5,f982efa9031f340ace29f76dd47a8ce1" + "versions.yml:md5,dd60999d74ea42ae4f5483c9d94507f3", + "versions.yml:md5,ddb252583f75777033ee6467e4b6d545" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-18T14:41:11.243874685" + "timestamp": "2024-07-03T13:07:48.653475" } } \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap index 8e8075da..afd97b70 100644 --- a/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap +++ b/subworkflows/nf-core/fastq_align_bwa/tests/main.nf.test.snap @@ -8,7 +8,7 @@ "id": "test", "single_end": false }, - "test.bam:md5,aea123a3828a99da1906126355f15a12" + "test.bam:md5,0bac6813d36636e735eae75887e70cd5" ] ], "1": [ @@ -17,7 +17,7 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,8d6755b312c5c41ff32632a0734e13df" + "test.sorted.bam:md5,bfea46d006b5884fcca0653cc5b886e1" ] ], "2": [ @@ -26,7 +26,7 @@ "id": "test", "single_end": false }, - "test.sorted.bam.bai:md5,b5b49beae3e9ff2c620e680d81ceff81" + "test.sorted.bam.bai:md5,140d22f4f374b485ac49e8b8c56a59b6" ] ], "3": [ @@ -38,7 +38,7 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,9c42440e435b7ad02a343d367affafcd" + "test.sorted.bam.stats:md5,42029d1e18c289f441232c0e6851fe5a" ] ], "5": [ @@ -60,12 +60,12 @@ ] ], "7": [ - "versions.yml:md5,484d99e7712f776c479382a1f338845f", - "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", - "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", - "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", - "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", - "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + "versions.yml:md5,1a2ad0aad8b5a39089079d531734bdfe", + "versions.yml:md5,4905894958d972728ef3fb67d420971d", + "versions.yml:md5,54b76f87f10cc17e260aefd4e61b73ba", + "versions.yml:md5,616f164b996173af56b58861be3e6130", + "versions.yml:md5,7d1cd2920757b85fbae766a6b28b8e27", + "versions.yml:md5,ee109695a3b368e657b190ccf0f21ab5" ], "bai": [ [ @@ -73,7 +73,7 @@ "id": "test", "single_end": false }, - "test.sorted.bam.bai:md5,b5b49beae3e9ff2c620e680d81ceff81" + "test.sorted.bam.bai:md5,140d22f4f374b485ac49e8b8c56a59b6" ] ], "bam": [ @@ -82,7 +82,7 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,8d6755b312c5c41ff32632a0734e13df" + "test.sorted.bam:md5,bfea46d006b5884fcca0653cc5b886e1" ] ], "bam_orig": [ @@ -91,7 +91,7 @@ "id": "test", "single_end": false }, - "test.bam:md5,aea123a3828a99da1906126355f15a12" + "test.bam:md5,0bac6813d36636e735eae75887e70cd5" ] ], "csi": [ @@ -121,24 +121,24 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,9c42440e435b7ad02a343d367affafcd" + "test.sorted.bam.stats:md5,42029d1e18c289f441232c0e6851fe5a" ] ], "versions": [ - "versions.yml:md5,484d99e7712f776c479382a1f338845f", - "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", - "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", - "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", - "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", - "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + "versions.yml:md5,1a2ad0aad8b5a39089079d531734bdfe", + "versions.yml:md5,4905894958d972728ef3fb67d420971d", + "versions.yml:md5,54b76f87f10cc17e260aefd4e61b73ba", + "versions.yml:md5,616f164b996173af56b58861be3e6130", + "versions.yml:md5,7d1cd2920757b85fbae766a6b28b8e27", + "versions.yml:md5,ee109695a3b368e657b190ccf0f21ab5" ] } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-14T13:25:38.265819012" + "timestamp": "2024-06-03T12:27:40.432319749" }, "fastq_align_bwa_single_end": { "content": [ @@ -149,7 +149,7 @@ "id": "test", "single_end": true }, - "test.bam:md5,a74710a0345b4717bb4431bf9c257120" + "test.bam:md5,dc633d557de438092c4d72d04195c5a8" ] ], "1": [ @@ -158,7 +158,7 @@ "id": "test", "single_end": true }, - "test.sorted.bam:md5,e023c5a6d28a4998a0d8199c459c2a08" + "test.sorted.bam:md5,c5820f18aeaab8715195824f1f693f9f" ] ], "2": [ @@ -167,7 +167,7 @@ "id": "test", "single_end": true }, - "test.sorted.bam.bai:md5,9257847727b20a8f7288ad6912fbada4" + "test.sorted.bam.bai:md5,13ba4b9f3445fa6de43cea9b28342783" ] ], "3": [ @@ -179,7 +179,7 @@ "id": "test", "single_end": true }, - "test.sorted.bam.stats:md5,c8e4edbf950def8abbd9e4ae74b31383" + "test.sorted.bam.stats:md5,71846e184d196d1b6664028aeb318bac" ] ], "5": [ @@ -201,12 +201,12 @@ ] ], "7": [ - "versions.yml:md5,484d99e7712f776c479382a1f338845f", - "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", - "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", - "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", - "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", - "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + "versions.yml:md5,1a2ad0aad8b5a39089079d531734bdfe", + "versions.yml:md5,4905894958d972728ef3fb67d420971d", + "versions.yml:md5,54b76f87f10cc17e260aefd4e61b73ba", + "versions.yml:md5,616f164b996173af56b58861be3e6130", + "versions.yml:md5,7d1cd2920757b85fbae766a6b28b8e27", + "versions.yml:md5,ee109695a3b368e657b190ccf0f21ab5" ], "bai": [ [ @@ -214,7 +214,7 @@ "id": "test", "single_end": true }, - "test.sorted.bam.bai:md5,9257847727b20a8f7288ad6912fbada4" + "test.sorted.bam.bai:md5,13ba4b9f3445fa6de43cea9b28342783" ] ], "bam": [ @@ -223,7 +223,7 @@ "id": "test", "single_end": true }, - "test.sorted.bam:md5,e023c5a6d28a4998a0d8199c459c2a08" + "test.sorted.bam:md5,c5820f18aeaab8715195824f1f693f9f" ] ], "bam_orig": [ @@ -232,7 +232,7 @@ "id": "test", "single_end": true }, - "test.bam:md5,a74710a0345b4717bb4431bf9c257120" + "test.bam:md5,dc633d557de438092c4d72d04195c5a8" ] ], "csi": [ @@ -262,23 +262,23 @@ "id": "test", "single_end": true }, - "test.sorted.bam.stats:md5,c8e4edbf950def8abbd9e4ae74b31383" + "test.sorted.bam.stats:md5,71846e184d196d1b6664028aeb318bac" ] ], "versions": [ - "versions.yml:md5,484d99e7712f776c479382a1f338845f", - "versions.yml:md5,4ebdf6c874da163e55a849b73e30a5d1", - "versions.yml:md5,634430380db3a08ad4e56159b82af9e8", - "versions.yml:md5,703c0bec9aac86f8e74b082131814e55", - "versions.yml:md5,959c12230206836d2572f1ac5a401f2f", - "versions.yml:md5,ca8dc5bf65d052d902af1b03fec0b1fd" + "versions.yml:md5,1a2ad0aad8b5a39089079d531734bdfe", + "versions.yml:md5,4905894958d972728ef3fb67d420971d", + "versions.yml:md5,54b76f87f10cc17e260aefd4e61b73ba", + "versions.yml:md5,616f164b996173af56b58861be3e6130", + "versions.yml:md5,7d1cd2920757b85fbae766a6b28b8e27", + "versions.yml:md5,ee109695a3b368e657b190ccf0f21ab5" ] } ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-14T13:25:08.154131783" + "timestamp": "2024-06-03T12:27:19.693756639" } } \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_hisat2/main.nf b/subworkflows/nf-core/fastq_align_hisat2/main.nf index a2ec1cf5..511fe035 100644 --- a/subworkflows/nf-core/fastq_align_hisat2/main.nf +++ b/subworkflows/nf-core/fastq_align_hisat2/main.nf @@ -41,4 +41,3 @@ workflow FASTQ_ALIGN_HISAT2 { versions = ch_versions // channel: [ versions.yml ] } - diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test index b0c0ca51..221ce56d 100644 --- a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test @@ -32,6 +32,19 @@ nextflow_workflow { """ } } + + run("HISAT2_EXTRACTSPLICESITES", alias: "HISAT2_EXTRACTSPLICESITES_STUB") { + script "../../../../modules/nf-core/hisat2/extractsplicesites/main.nf" + process { + """ + input[0] = Channel.of([ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ]) + """ + } + } + run("HISAT2_BUILD") { script "../../../../modules/nf-core/hisat2/build/main.nf" process { @@ -48,6 +61,23 @@ nextflow_workflow { """ } } + + run("HISAT2_BUILD", alias: "HISAT2_BUILD_STUB") { + script "../../../../modules/nf-core/hisat2/build/main.nf" + process { + """ + input[0] = Channel.of([ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + ]) + input[1] = Channel.of([ + [id: 'test'], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.gtf", checkIfExists: true) + ]) + input[2] = HISAT2_EXTRACTSPLICESITES_STUB.out.txt + """ + } + } } test("sarscov2 - bam - single_end") { @@ -74,16 +104,17 @@ nextflow_workflow { then { assertAll( { assert workflow.success}, - { assert snapshot(file(workflow.out.bai[0][1]).name).match("se - bai")}, - { assert snapshot(file(workflow.out.bam[0][1]).name).match("se - bam")}, - { assert snapshot(file(workflow.out.orig_bam[0][1]).name).match("se - orig_bam")}, - { assert snapshot(workflow.out.csi).match("se - csi")}, - { assert snapshot(workflow.out.fastq).match("se - fastq")}, - { assert snapshot(workflow.out.flagstat).match("se - flagstat")}, - { assert snapshot(workflow.out.idxstats).match("se - idxstats")}, - { assert snapshot(workflow.out.stats).match("se - stats")}, - { assert snapshot(workflow.out.summary).match("se - summary")}, - { assert snapshot(workflow.out.versions).match("se - versions")} + { assert snapshot( + file(workflow.out.bai[0][1]).name, + file(workflow.out.bam[0][1]).name, + file(workflow.out.orig_bam[0][1]).name, + workflow.out.csi, + workflow.out.fastq, + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.stats, + workflow.out.summary, + workflow.out.versions).match()} ) } } @@ -112,16 +143,79 @@ nextflow_workflow { then { assertAll( { assert workflow.success}, - { assert snapshot(file(workflow.out.bai[0][1]).name).match("pe - bai")}, - { assert snapshot(file(workflow.out.bam[0][1]).name).match("pe - bam")}, - { assert snapshot(file(workflow.out.orig_bam[0][1]).name).match("pe - orig_bam")}, - { assert snapshot(workflow.out.csi).match("pe - csi")}, - { assert snapshot(workflow.out.fastq).match("pe - fastq")}, - { assert snapshot(workflow.out.flagstat).match("pe - flagstat")}, - { assert snapshot(workflow.out.idxstats).match("pe - idxstats")}, - { assert snapshot(workflow.out.stats).match("pe - stats")}, - { assert snapshot(workflow.out.summary).match("pe - summary")}, - { assert snapshot(workflow.out.versions).match("pe - versions")} + { assert snapshot( + file(workflow.out.bai[0][1]).name, + file(workflow.out.bam[0][1]).name, + file(workflow.out.orig_bam[0][1]).name, + workflow.out.csi, + workflow.out.fastq, + workflow.out.flagstat, + workflow.out.idxstats, + workflow.out.stats, + workflow.out.summary, + workflow.out.versions).match()} + ) + } + } + + test("sarscov2 - bam - single_end - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:true ], + [ + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/fastq/test_1.fastq.gz", checkIfExists: true) + ] + ]) + input[1] = HISAT2_BUILD_STUB.out.index + input[2] = HISAT2_EXTRACTSPLICESITES_STUB.out.txt + input[3] = Channel.of([ + [ id:'test' ], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match()} + ) + } + } + test("sarscov2 - bam - paired_end - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], + [ + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/fastq/test_1.fastq.gz", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/fastq/test_2.fastq.gz", checkIfExists: true) + ] + ]) + input[1] = HISAT2_BUILD_STUB.out.index + input[2] = HISAT2_EXTRACTSPLICESITES_STUB.out.txt + input[3] = Channel.of([ + [ id:'test' ], + file(params.modules_testdata_base_path + "genomics/sarscov2/genome/genome.fasta", checkIfExists: true) + ]) + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match()} ) } } diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap index d3f66927..5d7e48bc 100644 --- a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap @@ -1,288 +1,480 @@ { - "pe - stats": { + "sarscov2 - bam - single_end": { "content": [ + "test.sorted.bam.bai", + "test.sorted.bam", + "test.bam", + [ + + ], + [ + + ], [ [ { "id": "test", - "single_end": false + "single_end": true }, - "test.stats:md5,ed4e2ba437f4819b7ab93a6df8dd5348" + "test.flagstat:md5,6de3bfde9582ad2532033832091f5c46" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.091982" - }, - "pe - csi": { - "content": [ - [ - - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.081055" - }, - "se - bai": { - "content": [ - "test.sorted.bam.bai" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.763127" - }, - "pe - flagstat": { - "content": [ + ], [ [ { "id": "test", - "single_end": false + "single_end": true }, - "test.flagstat:md5,2fa0d90162a1b655863796c2a6bd8f45" + "test.idxstats:md5,2a5df85e0d90e55bb2b359f6e05d5fbb" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.08653" - }, - "pe - orig_bam": { - "content": [ - "test.bam" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.077797" - }, - "se - bam": { - "content": [ - "test.sorted.bam" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.773767" - }, - "se - summary": { - "content": [ + ], [ [ { "id": "test", "single_end": true }, - "test.hisat2.summary.log:md5,7b8a9e61b7646da1089b041333c41a87" + "test.stats:md5,845655ccfd1fd701b9f692f8db9508af" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.818659" - }, - "pe - bam": { - "content": [ - "test.sorted.bam" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.074968" - }, - "se - versions": { - "content": [ - [ - "versions.yml:md5,34be144fb97a11f1c581b39301f6f0d1", - "versions.yml:md5,4392ca9e255d9137e74a73a8d1e1559d", - "versions.yml:md5,651e735a2754f3be76b516f5fbf099b5", - "versions.yml:md5,912e1daa1e432f6b5ca601ab2294e37f", - "versions.yml:md5,9b7dd7f9a173fbf92f5e476451c840c1", - "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.826601" - }, - "pe - idxstats": { - "content": [ + ], [ [ { "id": "test", - "single_end": false + "single_end": true }, - "test.idxstats:md5,1adb27b52d4d64b826f48b59d61dcd4d" + "test.hisat2.summary.log:md5,7b8a9e61b7646da1089b041333c41a87" ] + ], + [ + "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", + "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", + "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", + "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", + "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-29T13:28:06.089411" + "timestamp": "2024-07-03T12:36:06.813423" }, - "pe - bai": { + "sarscov2 - bam - single_end - stub": { "content": [ - "test.sorted.bam.bai" + { + "0": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "6": [ + [ + { + "id": "test", + "single_end": true + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "7": [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "8": [ + [ + { + "id": "test", + "single_end": true + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "9": [ + "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", + "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", + "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", + "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", + "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + ], + "bai": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "bam": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "csi": [ + [ + { + "id": "test", + "single_end": true + }, + "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "fastq": [ + + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": true + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "orig_bam": [ + [ + { + "id": "test", + "single_end": true + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": true + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "summary": [ + [ + { + "id": "test", + "single_end": true + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", + "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", + "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", + "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", + "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-29T13:28:06.071767" + "timestamp": "2024-07-03T12:36:44.15748" }, - "pe - fastq": { + "sarscov2 - bam - paired_end": { "content": [ + "test.sorted.bam.bai", + "test.sorted.bam", + "test.bam", [ - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.083598" - }, - "se - fastq": { - "content": [ + ], [ - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.782981" - }, - "se - csi": { - "content": [ - [ - - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.77962" - }, - "se - idxstats": { - "content": [ + ], [ [ { "id": "test", - "single_end": true + "single_end": false }, - "test.idxstats:md5,2a5df85e0d90e55bb2b359f6e05d5fbb" + "test.flagstat:md5,2fa0d90162a1b655863796c2a6bd8f45" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.798637" - }, - "se - orig_bam": { - "content": [ - "test.bam" - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:27:50.776773" - }, - "pe - summary": { - "content": [ + ], [ [ { "id": "test", "single_end": false }, - "test.hisat2.summary.log:md5,9839b31db795958cc4b70711a3414e9c" + "test.idxstats:md5,1adb27b52d4d64b826f48b59d61dcd4d" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.095265" - }, - "pe - versions": { - "content": [ + ], [ - "versions.yml:md5,34be144fb97a11f1c581b39301f6f0d1", - "versions.yml:md5,4392ca9e255d9137e74a73a8d1e1559d", - "versions.yml:md5,651e735a2754f3be76b516f5fbf099b5", - "versions.yml:md5,912e1daa1e432f6b5ca601ab2294e37f", - "versions.yml:md5,9b7dd7f9a173fbf92f5e476451c840c1", - "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.01.0" - }, - "timestamp": "2024-02-29T13:28:06.098801" - }, - "se - flagstat": { - "content": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,603fa8c9e0e9eb3769498fc989a29250" + ] + ], [ [ { "id": "test", - "single_end": true + "single_end": false }, - "test.flagstat:md5,6de3bfde9582ad2532033832091f5c46" + "test.hisat2.summary.log:md5,9839b31db795958cc4b70711a3414e9c" ] + ], + [ + "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", + "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", + "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", + "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", + "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-29T13:27:50.786813" + "timestamp": "2024-07-03T12:36:25.071168" }, - "se - stats": { + "sarscov2 - bam - paired_end - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": true - }, - "test.stats:md5,f712acf6108a70c3fb06ac51e5e76f15" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "6": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "7": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "8": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "9": [ + "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", + "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", + "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", + "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", + "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" + ], + "bai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "fastq": [ + + ], + "flagstat": [ + [ + { + "id": "test", + "single_end": false + }, + "test.flagstat:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "idxstats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.idxstats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "orig_bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "stats": [ + [ + { + "id": "test", + "single_end": false + }, + "test.stats:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "summary": [ + [ + { + "id": "test", + "single_end": false + }, + "test.hisat2.summary.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,2d9432e15956fe71fe0ba811547acea6", + "versions.yml:md5,5fcbed7fee2404be4ecee6efab5914b8", + "versions.yml:md5,6b9d9eed13bf074965d1623a7e8a1741", + "versions.yml:md5,7767a57d88fff540ce475902df2e9e0a", + "versions.yml:md5,b4ccce0351e5718d36600858452dd4b1", + "versions.yml:md5,bb6710ee58b84a1ed212f9c599d84066" ] - ] + } ], "meta": { "nf-test": "0.8.4", - "nextflow": "24.01.0" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-29T13:27:50.804219" + "timestamp": "2024-07-03T12:36:59.553237" } } \ No newline at end of file From 64acae7fd967a84871dea8fb6abb36234855a01b Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 11:34:05 -0500 Subject: [PATCH 043/255] fix: Catch up with module updates --- subworkflows/local/align_bwamem2/main.nf | 2 +- subworkflows/local/align_dragmap/main.nf | 2 +- subworkflows/local/coverage_graphs.nf | 6 +- workflows/nascent.nf | 6 +- workflows/tests/bowtie2.nf.test.snap | 6 +- workflows/tests/main.nf.test.snap | 96 ++++++++++++------------ workflows/tests/skip_gzip.config | 4 + workflows/tests/skip_pints.config | 4 + 8 files changed, 69 insertions(+), 57 deletions(-) diff --git a/subworkflows/local/align_bwamem2/main.nf b/subworkflows/local/align_bwamem2/main.nf index b950954e..beb6d863 100644 --- a/subworkflows/local/align_bwamem2/main.nf +++ b/subworkflows/local/align_bwamem2/main.nf @@ -19,7 +19,7 @@ workflow ALIGN_BWAMEM2 { // Map reads with BWA // - BWAMEM2_MEM ( ch_reads, ch_index, val_sort_bam ) + BWAMEM2_MEM ( ch_reads, ch_index, ch_fasta, val_sort_bam ) ch_versions = ch_versions.mix(BWAMEM2_MEM.out.versions.first()) // diff --git a/subworkflows/local/align_dragmap/main.nf b/subworkflows/local/align_dragmap/main.nf index 34f641c8..17a74ec6 100644 --- a/subworkflows/local/align_dragmap/main.nf +++ b/subworkflows/local/align_dragmap/main.nf @@ -19,7 +19,7 @@ workflow ALIGN_DRAGMAP { // Map reads with dragmap // - DRAGMAP_ALIGN ( ch_reads, ch_index, val_sort_bam ) + DRAGMAP_ALIGN ( ch_reads, ch_index, ch_fasta, val_sort_bam ) ch_versions = ch_versions.mix(DRAGMAP_ALIGN.out.versions.first()) // diff --git a/subworkflows/local/coverage_graphs.nf b/subworkflows/local/coverage_graphs.nf index c06baf99..8df49aa4 100644 --- a/subworkflows/local/coverage_graphs.nf +++ b/subworkflows/local/coverage_graphs.nf @@ -29,14 +29,16 @@ workflow COVERAGE_GRAPHS { BEDTOOLS_GENOMECOV_PLUS ( ch_genomecov_bam, sizes, - 'bedGraph' + 'bedGraph', + true ) ch_versions = ch_versions.mix(BEDTOOLS_GENOMECOV_PLUS.out.versions.first()) BEDTOOLS_GENOMECOV_MINUS ( ch_genomecov_bam, sizes, - 'bedGraph' + 'bedGraph', + true ) ch_versions = ch_versions.mix(BEDTOOLS_GENOMECOV_MINUS.out.versions.first()) diff --git a/workflows/nascent.nf b/workflows/nascent.nf index f50a2106..e893c9c8 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -98,7 +98,7 @@ workflow NASCENT { ch_reads = Channel.empty() if(!params.skip_trimming) { - FASTP ( ch_samplesheet, [], false, false ) + FASTP ( ch_samplesheet, [], false, false, false ) ch_reads = FASTP.out.reads ch_versions = ch_versions.mix(FASTP.out.versions.first()) } else { @@ -374,7 +374,9 @@ workflow NASCENT { ch_multiqc_files.collect(), ch_multiqc_config.toList(), ch_multiqc_custom_config.toList(), - ch_multiqc_logo.toList() + ch_multiqc_logo.toList(), + [], + [], ) emit: diff --git a/workflows/tests/bowtie2.nf.test.snap b/workflows/tests/bowtie2.nf.test.snap index 8cef6127..8da3e0b3 100644 --- a/workflows/tests/bowtie2.nf.test.snap +++ b/workflows/tests/bowtie2.nf.test.snap @@ -1,12 +1,12 @@ { "Should run with bowtie2 (default)": { "content": [ - 126 + 132 ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.3" }, - "timestamp": "2024-03-05T16:05:54.646114124" + "timestamp": "2024-07-20T11:38:39.368341091" } } \ No newline at end of file diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index 449b1e46..952ea58e 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -1,7 +1,7 @@ { "Should run with bwa (default)": { "content": [ - 128, + 134, [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", @@ -41,45 +41,45 @@ [ "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam:md5,11a805cfc0bde874d6a7de7467ca25cc", - "cd4_REP1.sorted.bam.bai:md5,85c4acc92dc079ec42adb5fbea6cbcce", - "cd4_REP1.stats:md5,1a937e63fb7b1f8063121d8f14f4e918", + "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", + "cd4_REP1.stats:md5,1536c80bae78b2062508e1de210f6387", "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam:md5,76bf40b388dc71e35c05792bec0b44c6", - "cd4_REP2.sorted.bam.bai:md5,2a8ea9af3c3ac5c6923aac765850b833", - "cd4_REP2.stats:md5,6ac59691b72f0ccbe2dfa4408586a39b", + "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", + "cd4_REP2.stats:md5,561610e53fb676ac83252712dcac30d4", "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam:md5,39bdb1f466ce3fa508547b2b7aa1ca92", - "cd4_REP3.sorted.bam.bai:md5,f30a9cd423736d71cbe25a9cd685cb54", - "cd4_REP3.stats:md5,43cfc143cb086a7fa22a0c8d9d1fc9bb", + "cd4_REP3.sorted.bam:md5,87759126ce19e605d415e11d32b758b2", + "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", + "cd4_REP3.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam:md5,8dfe41ab8ad05dcca85cafb8797c8db0", - "cd4_REP4.sorted.bam.bai:md5,2982bfa9b766a29bb8291a56e58855d5", - "cd4_REP4.stats:md5,e91a8bd8d0918555892235999ff15b1e", + "cd4_REP4.sorted.bam:md5,be020f98894a831a25b32e0e74d96edd", + "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", + "cd4_REP4.stats:md5,edc57478278aa35b7376cee9afd634a7", "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam:md5,ef3c7becc330cff76bf1d3490b743c8b", - "jurkat_REP1.sorted.bam.bai:md5,9af71e18c414c16dbb28dd3330157d60", - "jurkat_REP1.stats:md5,895eddd56d3fc3487f54649dcf063fc7", + "jurkat_REP1.sorted.bam:md5,322394245e8ba6fb51fb591b4ba2dc82", + "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", + "jurkat_REP1.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam:md5,7dfe0b9eb0918426bf03f639114d571f", - "jurkat_REP2.sorted.bam.bai:md5,ad78f94a551665d02177debe97df74db", - "jurkat_REP2.stats:md5,9466c2094bb843e845d1c15d25aec2ab" + "jurkat_REP2.sorted.bam:md5,ece1ae4ce266a64a4d27aa12b4bb630e", + "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", + "jurkat_REP2.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.3" }, - "timestamp": "2024-03-19T21:59:19.074977598" + "timestamp": "2024-07-20T11:42:20.240672824" }, "Should run with bwamem2": { "content": [ - 128, + 134, [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", @@ -119,45 +119,45 @@ [ "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam:md5,0ef96c52d334ac02709b65cdd603f869", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP1.stats:md5,1a937e63fb7b1f8063121d8f14f4e918", + "cd4_REP1.sorted.bam:md5,43a9fccfbbe9825bb795bdd7c0788f62", + "cd4_REP1.sorted.bam.bai:md5,941ed9d1bf8e04ab916967a4f6c03db4", + "cd4_REP1.stats:md5,1536c80bae78b2062508e1de210f6387", "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam:md5,298c44c1b77d008aa5a8f3e77dfae0c8", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "cd4_REP2.stats:md5,6ac59691b72f0ccbe2dfa4408586a39b", + "cd4_REP2.sorted.bam:md5,974e4a49c44d039eb5b7c4980f456b93", + "cd4_REP2.sorted.bam.bai:md5,a89d7777e8172df5a13872061f358ee6", + "cd4_REP2.stats:md5,561610e53fb676ac83252712dcac30d4", "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam:md5,836cda61a69c692394ae8aebb3af89d7", - "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", - "cd4_REP3.stats:md5,43cfc143cb086a7fa22a0c8d9d1fc9bb", + "cd4_REP3.sorted.bam:md5,0c3885efbbe81f32892a36d9eb089662", + "cd4_REP3.sorted.bam.bai:md5,1c51cf88d2e1b15f9ee6f5f7d70bc6b4", + "cd4_REP3.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam:md5,6778d910ddfabde8e13de2687833e8b7", - "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", - "cd4_REP4.stats:md5,e91a8bd8d0918555892235999ff15b1e", + "cd4_REP4.sorted.bam:md5,da9c026c7fd17c4ef38521defbddda4a", + "cd4_REP4.sorted.bam.bai:md5,d359889d85b44eeeb636938182373406", + "cd4_REP4.stats:md5,edc57478278aa35b7376cee9afd634a7", "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam:md5,dd813d4d4f076a1a6317c4f3578f60f5", - "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", - "jurkat_REP1.stats:md5,895eddd56d3fc3487f54649dcf063fc7", + "jurkat_REP1.sorted.bam:md5,5bfe7a83e0cbaf75a5d5ceab596ec3bc", + "jurkat_REP1.sorted.bam.bai:md5,f708e9ceb33ab56881b8a96af9bfbe53", + "jurkat_REP1.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam:md5,910b84a2697b85801cf8b2711c4fae5f", - "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", - "jurkat_REP2.stats:md5,9466c2094bb843e845d1c15d25aec2ab" + "jurkat_REP2.sorted.bam:md5,47f65dea0ad16d3e62205a5ba900297d", + "jurkat_REP2.sorted.bam.bai:md5,6cf4f5945f99f94c762c3e8cc7bd8fb0", + "jurkat_REP2.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.3" }, - "timestamp": "2024-03-19T22:01:36.548364874" + "timestamp": "2024-07-20T16:46:41.867831982" }, "Should run with dragmap": { "content": [ - 128, + 134, [ "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", @@ -197,13 +197,13 @@ ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.3" }, - "timestamp": "2024-03-05T15:58:59.071139821" + "timestamp": "2024-07-20T16:50:43.677355963" }, "Should run with HISAT2": { "content": [ - 128, + 134, [ "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", @@ -243,8 +243,8 @@ ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.3" }, - "timestamp": "2024-03-18T19:39:47.797490045" + "timestamp": "2024-07-20T11:46:32.845750064" } } \ No newline at end of file diff --git a/workflows/tests/skip_gzip.config b/workflows/tests/skip_gzip.config index 768823ea..b3822812 100644 --- a/workflows/tests/skip_gzip.config +++ b/workflows/tests/skip_gzip.config @@ -19,4 +19,8 @@ process { withName: HOMER_MAKETAGDIRECTORY { ext.when = false } + + withName: DREG_PREP { + ext.when = false + } } diff --git a/workflows/tests/skip_pints.config b/workflows/tests/skip_pints.config index c3f0af53..1b3dad74 100644 --- a/workflows/tests/skip_pints.config +++ b/workflows/tests/skip_pints.config @@ -2,4 +2,8 @@ process { withName: '.*:TRANSCRIPT_INDENTIFICATION:.*' { ext.when = false } + + withName: DREG_PREP { + ext.when = false + } } From ed8510f2c6b6b50397002263ddb18c4827c7364c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 17:52:44 -0500 Subject: [PATCH 044/255] chore: nf-core modules update subworkflow --- modules.json | 2 +- .../fastq_align_star/tests/main.nf.test.snap | 102 +++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/modules.json b/modules.json index da2b9985..2e4168f8 100644 --- a/modules.json +++ b/modules.json @@ -268,7 +268,7 @@ }, "fastq_align_star": { "branch": "master", - "git_sha": "1d1d7df613ff53223259c14185858cd742cd4743", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", "installed_by": ["subworkflows"] }, "homer/groseq": { diff --git a/subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap index 989d38a6..93a4329a 100644 --- a/subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap +++ b/subworkflows/nf-core/fastq_align_star/tests/main.nf.test.snap @@ -61,15 +61,15 @@ "id": "test", "single_end": true }, - "test.sorted.bam.stats:md5,2b8eb6967b68f03584cc242499658e92" + "test.sorted.bam.stats:md5,8e74b58e799fbf5082c39f98f14c3f46" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-16T11:01:51.011841774" + "timestamp": "2024-06-21T10:58:48.537976" }, "bam_sorted_single_end": { "content": [ @@ -229,15 +229,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.bai:md5,5e05259dc3e00965ed3ffaaf5c3b7e2a" + "test.sorted.bam.bai:md5,ad0665b0f48b4374f21ca3dd6d3c0d88" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:10:08.920576" + "timestamp": "2024-06-21T10:59:42.224779" }, "stats_paired_end_with_transcriptome": { "content": [ @@ -247,15 +247,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,39273789abce501dc706fa94bbd0079d" + "test.sorted.bam.stats:md5,ba343720cd202366636bdb606c1361b9" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-16T11:04:06.583114732" + "timestamp": "2024-06-21T11:00:38.630724" }, "tab_single_end": { "content": [ @@ -331,15 +331,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,304982537be52d39f99c33e6079297ff" + "test.sorted.bam:md5,40de55db306ef865530f939bbf9299d5" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:12:26.792244" + "timestamp": "2024-06-21T11:01:40.533399" }, "bai_transcript_paired_end_with_transcriptome": { "content": [ @@ -349,15 +349,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.bai:md5,6cf664f6eeb968efdebbc44edf5a4bcb" + "test.sorted.bam.bai:md5,1dd687a38a2d7fb959272c659678a484" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:11:20.001206" + "timestamp": "2024-06-21T11:00:38.813279" }, "bai_paired_end_with_transcriptome": { "content": [ @@ -367,15 +367,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.bai:md5,8bd17c254a618d5ef0cc2642abc00e40" + "test.sorted.bam.bai:md5,f4104865dd069f7b0922f94bd7b05b9f" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:11:19.900054" + "timestamp": "2024-06-21T11:00:38.552294" }, "idxstats_transcript_paired_end": { "content": [ @@ -415,15 +415,15 @@ "id": "test", "single_end": true }, - "test.sorted.bam:md5,c1c390806279fee5f7f904c1bddd6937" + "test.sorted.bam:md5,6c4beda83d0372cc3f16864e2f5990de" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:09:07.255318" + "timestamp": "2024-06-21T10:58:48.479685" }, "idxstats_single_end": { "content": [ @@ -463,15 +463,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,8b4b458a77eb4ffb04a568de36ecb677" + "test.sorted.bam.stats:md5,ba860fb9ece9a136b262d4b7779c6a52" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-16T18:17:49.016776458" + "timestamp": "2024-06-21T11:00:38.911706" }, "orig_bam_transcript_paired_end_transcripts_no_transcriptome": { "content": [ @@ -535,15 +535,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,f4b96ef58a9e762495e8a3ed27541ddf" + "test.sorted.bam:md5,7dccfc9a0e8d530aa222dd8fde13c03e" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:11:19.947042" + "timestamp": "2024-06-21T11:00:38.714095" }, "fastq_single_end": { "content": [ @@ -565,15 +565,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,39273789abce501dc706fa94bbd0079d" + "test.sorted.bam.stats:md5,ba343720cd202366636bdb606c1361b9" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-15T19:37:37.71383862" + "timestamp": "2024-06-21T10:59:42.341245" }, "flagstat_paired_end_with_transcriptome": { "content": [ @@ -619,15 +619,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,0e9f3d3c04cd1916f070e37aee7b1479" + "test.sorted.bam:md5,318219d2960e6ae1fdde8d3da0d4bb64" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:11:19.850548" + "timestamp": "2024-06-21T11:00:38.477259" }, "flagstat_transcript_paired_end_transcripts_no_transcriptome": { "content": [ @@ -709,15 +709,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,39273789abce501dc706fa94bbd0079d" + "test.sorted.bam.stats:md5,ba343720cd202366636bdb606c1361b9" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-15T19:39:50.625556349" + "timestamp": "2024-06-21T11:01:40.477062" }, "bai_transcript_paired_end_transcripts_no_transcriptome": { "content": [ @@ -727,15 +727,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.bai:md5,b713ac63c6114db4482fde48a87a3b55" + "test.sorted.bam.bai:md5,e6382105b52943a408505f25f27872b0" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:12:26.840899" + "timestamp": "2024-06-21T11:01:40.58742" }, "orig_bam_single_end": { "content": [ @@ -781,15 +781,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,1d2371a1492623c665e7df1f377d30b1" + "test.sorted.bam:md5,3758b81996c73509c052aac035530aaf" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:10:08.892059" + "timestamp": "2024-06-21T10:59:42.104272" }, "bam_paired_end_transcripts_no_transcriptome": { "content": [ @@ -799,15 +799,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,0e9f3d3c04cd1916f070e37aee7b1479" + "test.sorted.bam:md5,318219d2960e6ae1fdde8d3da0d4bb64" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:12:26.692602" + "timestamp": "2024-06-21T11:01:40.363913" }, "stats_transcript_paired_end": { "content": [ @@ -841,15 +841,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.bai:md5,8bd17c254a618d5ef0cc2642abc00e40" + "test.sorted.bam.bai:md5,f4104865dd069f7b0922f94bd7b05b9f" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-03-01T14:12:26.731803" + "timestamp": "2024-06-21T11:01:40.422582" }, "idxstats_paired_end_with_transcriptome": { "content": [ @@ -931,15 +931,15 @@ "id": "test", "single_end": false }, - "test.sorted.bam.stats:md5,fa2f10820ffe578ebe7d5935155b4366" + "test.sorted.bam.stats:md5,625f0d8e29429337c7383d4d25814c6c" ] ] ], "meta": { "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nextflow": "24.04.2" }, - "timestamp": "2024-02-15T19:39:50.847385522" + "timestamp": "2024-06-21T11:01:40.644021" }, "bam_sorted_paired_end_with_transcriptome": { "content": [ From 45455b6910e9a4f8eff49d6435914424d4f17f53 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 19:54:08 -0500 Subject: [PATCH 045/255] ci: Bump detect-nf-test-changes to 0.0.3 --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0908a246..194f8c08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,11 +35,12 @@ jobs: - name: List nf-test files id: list - uses: adamrtalbot/detect-nf-test-changes@v0.0.2 + uses: adamrtalbot/detect-nf-test-changes@v0.0.3 with: head: ${{ github.sha }} base: origin/${{ github.base_ref }} - include: .github/include.yaml + types: "pipeline" + ignored: ".git/* .gitpod.yml .prettierignore .prettierrc.yml *.md *.png modules.json pyproject.toml tower.yml" - name: print list of nf-test files run: | From f41ddfd415ddd0b08f31ac080b13d36f39d92a11 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 20:00:13 -0500 Subject: [PATCH 046/255] style: Fix CI triggers https://nf-co.re/tools/docs/2.14.1/pipeline_lint_tests/actions_ci --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 194f8c08..537dcc71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,15 +1,12 @@ -# This workflow runs the pipeline with the minimal test dataset to check that it completes without any syntax errors name: nf-core CI +# This workflow runs the pipeline with the minimal test dataset to check that it completes without any syntax errors on: + push: + branches: + - dev pull_request: release: types: [published] - merge_group: - types: - - checks_requested - branches: - - master - - dev env: NXF_ANSI_LOG: false From 9226907cd4796d73b275fa9ab9795b6bb61cf124 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 20 Jul 2024 20:01:39 -0500 Subject: [PATCH 047/255] style: Minimum pipeline NF version https://nf-co.re/tools/docs/2.14.1/pipeline_lint_tests/actions_ci --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 537dcc71..f5ab2cbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,9 +51,8 @@ jobs: strategy: fail-fast: false matrix: - NXF_VER: - - "latest-everything" - - "23.04" + # Nextflow versions: check pipeline minimum and current latest + NXF_VER: ["23.04.0", ""] nf_test_files: ["${{ fromJson(needs.changes.outputs.nf_test_files) }}"] profile: - "docker" From 1582d2b619aadd45c74a9eb02545633e094a0115 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 22 Jul 2024 13:51:20 -0500 Subject: [PATCH 048/255] style: Ignore ci.yml --- .nf-core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.nf-core.yml b/.nf-core.yml index 6df9b1da..65fbb6a0 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -1,6 +1,7 @@ repository_type: pipeline nf_core_version: "2.14.1" lint: + actions_ci: false files_unchanged: - .github/workflows/linting.yml - LICENSE From f5ae7ff0f8e8cc27b4ae42f62df4a765c5b8fdf4 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 22 Jul 2024 13:53:44 -0500 Subject: [PATCH 049/255] chore: nf-core subworkflows update --- modules.json | 10 +- modules/nf-core/samtools/index/main.nf | 7 +- .../nf-core/samtools/index/tests/main.nf.test | 87 ++++-- .../samtools/index/tests/main.nf.test.snap | 264 +++++++++++++++--- modules/nf-core/samtools/sort/main.nf | 14 +- .../nf-core/samtools/sort/tests/main.nf.test | 54 +++- .../samtools/sort/tests/main.nf.test.snap | 202 ++++++++++---- .../samtools/sort/tests/nextflow_cram.config | 8 + .../tests/main.nf.test.snap | 22 +- .../tests/main.nf.test.snap | 56 ++-- .../tests/main.nf.test.snap | 44 +-- 11 files changed, 530 insertions(+), 238 deletions(-) create mode 100644 modules/nf-core/samtools/sort/tests/nextflow_cram.config diff --git a/modules.json b/modules.json index 2e4168f8..1a0ff7b6 100644 --- a/modules.json +++ b/modules.json @@ -189,12 +189,12 @@ }, "samtools/index": { "branch": "master", - "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", + "git_sha": "46eca555142d6e597729fcb682adcc791796f514", "installed_by": ["bam_dedup_stats_samtools_umitools", "bam_sort_stats_samtools"] }, "samtools/sort": { "branch": "master", - "git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519", + "git_sha": "46eca555142d6e597729fcb682adcc791796f514", "installed_by": ["bam_sort_stats_samtools"] }, "samtools/stats": { @@ -233,12 +233,12 @@ "nf-core": { "bam_dedup_stats_samtools_umitools": { "branch": "master", - "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", + "git_sha": "46eca555142d6e597729fcb682adcc791796f514", "installed_by": ["subworkflows"] }, "bam_sort_stats_samtools": { "branch": "master", - "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", + "git_sha": "46eca555142d6e597729fcb682adcc791796f514", "installed_by": [ "fastq_align_bowtie2", "fastq_align_bwa", @@ -263,7 +263,7 @@ }, "fastq_align_hisat2": { "branch": "master", - "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", + "git_sha": "c789476080a150f87066ca3ed42a622339a26c0b", "installed_by": ["subworkflows"] }, "fastq_align_star": { diff --git a/modules/nf-core/samtools/index/main.nf b/modules/nf-core/samtools/index/main.nf index b523c21b..e002585b 100644 --- a/modules/nf-core/samtools/index/main.nf +++ b/modules/nf-core/samtools/index/main.nf @@ -35,10 +35,11 @@ process SAMTOOLS_INDEX { """ stub: + def args = task.ext.args ?: '' + def extension = file(input).getExtension() == 'cram' ? + "crai" : args.contains("-c") ? "csi" : "bai" """ - touch ${input}.bai - touch ${input}.crai - touch ${input}.csi + touch ${input}.${extension} cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/samtools/index/tests/main.nf.test b/modules/nf-core/samtools/index/tests/main.nf.test index bb7756d1..ca34fb5c 100644 --- a/modules/nf-core/samtools/index/tests/main.nf.test +++ b/modules/nf-core/samtools/index/tests/main.nf.test @@ -9,11 +9,7 @@ nextflow_process { tag "samtools/index" test("bai") { - when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -27,18 +23,13 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out.bai).match("bai") }, - { assert snapshot(process.out.versions).match("bai_versions") } + { assert snapshot(process.out).match() } ) } } test("crai") { - when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -52,20 +43,83 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(process.out.crai).match("crai") }, - { assert snapshot(process.out.versions).match("crai_versions") } + { assert snapshot(process.out).match() } ) } } test("csi") { - config "./csi.nextflow.config" when { - params { - outdir = "$outputDir" + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot( + file(process.out.csi[0][1]).name, + process.out.versions + ).match() } + ) + } + } + + test("bai - stub") { + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("crai - stub") { + options "-stub" + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.recalibrated.sorted.cram', checkIfExists: true) + ]) + """ } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("csi - stub") { + options "-stub" + config "./csi.nextflow.config" + + when { process { """ input[0] = Channel.of([ @@ -79,8 +133,7 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert path(process.out.csi.get(0).get(1)).exists() }, - { assert snapshot(process.out.versions).match("csi_versions") } + { assert snapshot(process.out).match() } ) } } diff --git a/modules/nf-core/samtools/index/tests/main.nf.test.snap b/modules/nf-core/samtools/index/tests/main.nf.test.snap index 52756e85..799d199c 100644 --- a/modules/nf-core/samtools/index/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/index/tests/main.nf.test.snap @@ -1,74 +1,250 @@ { - "crai_versions": { + "csi - stub": { "content": [ - [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" - ] + { + "0": [ + + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ], + "bai": [ + + ], + "crai": [ + + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-05-28T15:42:04.203740976" + "timestamp": "2024-07-22T16:51:53.9057" }, - "csi_versions": { + "crai - stub": { "content": [ - [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" - ] + { + "0": [ + + ], + "1": [ + + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.recalibrated.sorted.cram.crai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ], + "bai": [ + + ], + "crai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.recalibrated.sorted.cram.crai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "csi": [ + + ], + "versions": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-05-28T15:42:09.57475878" + "timestamp": "2024-07-22T16:51:45.931558" }, - "crai": { + "bai - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": false - }, - "test.paired_end.recalibrated.sorted.cram.crai:md5,14bc3bd5c89cacc8f4541f9062429029" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ], + "bai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.bai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "crai": [ + + ], + "csi": [ + + ], + "versions": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" ] - ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.04.3" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-02-12T18:41:38.446424" + "timestamp": "2024-07-22T16:51:34.807525" }, - "bai": { + "csi": { "content": [ + "test.paired_end.sorted.bam.csi", [ - [ - { - "id": "test", - "single_end": false - }, - "test.paired_end.sorted.bam.bai:md5,704c10dd1326482448ca3073fdebc2f4" - ] + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.04.3" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-02-12T18:40:46.579747" + "timestamp": "2024-07-22T16:52:55.688799" }, - "bai_versions": { + "crai": { "content": [ - [ - "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" - ] + { + "0": [ + + ], + "1": [ + + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.recalibrated.sorted.cram.crai:md5,14bc3bd5c89cacc8f4541f9062429029" + ] + ], + "3": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ], + "bai": [ + + ], + "crai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.recalibrated.sorted.cram.crai:md5,14bc3bd5c89cacc8f4541f9062429029" + ] + ], + "csi": [ + + ], + "versions": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ] + } + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-22T16:51:17.609533" + }, + "bai": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.bai:md5,704c10dd1326482448ca3073fdebc2f4" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ], + "bai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.bai:md5,704c10dd1326482448ca3073fdebc2f4" + ] + ], + "crai": [ + + ], + "csi": [ + + ], + "versions": [ + "versions.yml:md5,802c9776d9c5e95314e888cf18e96d77" + ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-05-28T15:41:57.929287369" + "timestamp": "2024-07-22T16:51:04.16585" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/sort/main.nf b/modules/nf-core/samtools/sort/main.nf index 596c6f7e..8e019099 100644 --- a/modules/nf-core/samtools/sort/main.nf +++ b/modules/nf-core/samtools/sort/main.nf @@ -50,10 +50,20 @@ process SAMTOOLS_SORT { """ stub: + def args = task.ext.args ?: '' def prefix = task.ext.prefix ?: "${meta.id}" + def extension = args.contains("--output-fmt sam") ? "sam" : + args.contains("--output-fmt cram") ? "cram" : + "bam" """ - touch ${prefix}.bam - touch ${prefix}.bam.csi + touch ${prefix}.${extension} + if [ "${extension}" == "bam" ]; + then + touch ${prefix}.${extension}.csi + elif [ "${extension}" == "cram" ]; + then + touch ${prefix}.${extension}.crai + fi cat <<-END_VERSIONS > versions.yml "${task.process}": diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test b/modules/nf-core/samtools/sort/tests/main.nf.test index fb38ed9b..c2ea9c72 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test +++ b/modules/nf-core/samtools/sort/tests/main.nf.test @@ -32,16 +32,16 @@ nextflow_process { { assert process.success }, { assert snapshot( process.out.bam, - process.out.csi.collect { it.collect { it instanceof Map ? it : file(it).name } } - ).match("test_bam") - } + process.out.csi.collect { it.collect { it instanceof Map ? it : file(it).name } }, + process.out.versions + ).match()} ) } } test("cram") { - config "./nextflow.config" + config "./nextflow_cram.config" when { process { @@ -62,23 +62,20 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - process.out.bam, - process.out.csi.collect { it.collect { it instanceof Map ? it : file(it).name } } - ).match("test_cram") - } + process.out.cram.collect { it.collect { it instanceof Map ? it : file(it).name } }, + process.out.crai.collect { it.collect { it instanceof Map ? it : file(it).name } }, + process.out.versions + ).match()} ) } } - test("bam_stub") { + test("bam - stub") { - config "./nextflow.config" options "-stub" + config "./nextflow.config" when { - params { - outdir = "$outputDir" - } process { """ input[0] = Channel.of([ @@ -96,8 +93,35 @@ nextflow_process { then { assertAll ( { assert process.success }, - { assert snapshot(file(process.out.bam[0][1]).name).match("bam_stub_bam") }, - { assert snapshot(process.out.versions).match("bam_stub_versions") } + { assert snapshot(process.out).match() } + ) + } + } + + test("cram - stub") { + + options "-stub" + config "./nextflow_cram.config" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.sorted.cram', checkIfExists: true) + ]) + input[1] = Channel.of([ + [ id:'fasta' ], // meta map + file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) + ]) + """ + } + } + + then { + assertAll ( + { assert process.success }, + { assert snapshot(process.out).match() } ) } } diff --git a/modules/nf-core/samtools/sort/tests/main.nf.test.snap b/modules/nf-core/samtools/sort/tests/main.nf.test.snap index 5a27de1d..da38d5d1 100644 --- a/modules/nf-core/samtools/sort/tests/main.nf.test.snap +++ b/modules/nf-core/samtools/sort/tests/main.nf.test.snap @@ -7,54 +7,159 @@ "id": "test", "single_end": false }, - "test.sorted.bam:md5,21c992d59615936b99f2ad008aa54400" + "test.sorted.cram" ] + ], + [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.cram.crai" + ] + ], + [ + "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-05-31T08:13:54.512837189" + "timestamp": "2024-07-22T17:19:37.196205" }, - "bam_stub_bam": { + "bam - stub": { "content": [ - "test.sorted.bam" + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + + ], + "2": [ + + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + ], + "bam": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "crai": [ + + ], + "cram": [ + + ], + "csi": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-05-31T07:29:00.761845507" + "timestamp": "2024-07-22T15:54:46.580756" }, - "test_cram": { + "cram - stub": { "content": [ - [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam:md5,22b2093be34a7637f5fbc84272b89d06" - ] - ], - [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam.csi" + { + "0": [ + + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.cram:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.cram.crai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + + ], + "4": [ + "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" + ], + "bam": [ + + ], + "crai": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.cram.crai:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "cram": [ + [ + { + "id": "test", + "single_end": false + }, + "test.sorted.cram:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "csi": [ + + ], + "versions": [ + "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" ] - ] + } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-05-31T09:16:51.924951855" + "timestamp": "2024-07-22T15:57:30.505698" }, - "test_bam": { + "bam": { "content": [ [ [ @@ -73,42 +178,15 @@ }, "test.sorted.bam.csi" ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" - }, - "timestamp": "2024-05-31T08:28:12.15952312" - }, - "bam_stub_versions": { - "content": [ + ], [ "versions.yml:md5,7a360de20e1d7a6f15a5e8fbe0a9c062" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" - }, - "timestamp": "2024-05-31T07:29:00.765038811" - }, - "bam": { - "content": [ - [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam:md5,21c992d59615936b99f2ad008aa54400" - ] - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-05-31T08:13:48.538030517" + "timestamp": "2024-07-22T15:54:25.872954" } } \ No newline at end of file diff --git a/modules/nf-core/samtools/sort/tests/nextflow_cram.config b/modules/nf-core/samtools/sort/tests/nextflow_cram.config new file mode 100644 index 00000000..3a8c0188 --- /dev/null +++ b/modules/nf-core/samtools/sort/tests/nextflow_cram.config @@ -0,0 +1,8 @@ +process { + + withName: SAMTOOLS_SORT { + ext.prefix = { "${meta.id}.sorted" } + ext.args = "--write-index --output-fmt cram" + } + +} diff --git a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap index 4be4640e..4fd70b5f 100644 --- a/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_dedup_stats_samtools_umitools/tests/main.nf.test.snap @@ -67,12 +67,7 @@ ] ], "3": [ - [ - { - "id": "test" - }, - "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "4": [ [ @@ -122,12 +117,7 @@ ] ], "csi": [ - [ - { - "id": "test" - }, - "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "deduplog": [ [ @@ -171,9 +161,9 @@ } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-07-03T11:53:25.735454" + "timestamp": "2024-07-22T16:34:35.959581" } -} \ No newline at end of file +} diff --git a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap index 044536f9..b7f4da17 100644 --- a/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap +++ b/subworkflows/nf-core/bam_sort_stats_samtools/tests/main.nf.test.snap @@ -37,10 +37,10 @@ ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-07-03T12:20:38.911799" + "timestamp": "2024-07-22T17:02:44.34964" }, "test_bam_sort_stats_samtools_paired_end": { "content": [ @@ -80,10 +80,10 @@ ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-07-03T12:20:51.171967" + "timestamp": "2024-07-22T17:03:02.583095" }, "test_bam_sort_stats_samtools_single_end - stub": { "content": [ @@ -107,13 +107,7 @@ ] ], "2": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "3": [ [ @@ -168,13 +162,7 @@ ] ], "csi": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "flagstat": [ [ @@ -213,10 +201,10 @@ } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-07-03T12:13:52.386146" + "timestamp": "2024-07-22T17:03:22.328703" }, "test_bam_sort_stats_samtools_paired_end - stub": { "content": [ @@ -240,13 +228,7 @@ ] ], "2": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "3": [ [ @@ -301,13 +283,7 @@ ] ], "csi": [ - [ - { - "id": "test", - "single_end": false - }, - "test.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "flagstat": [ [ @@ -346,9 +322,9 @@ } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-07-03T12:14:06.231663" + "timestamp": "2024-07-22T17:03:38.833662" } } \ No newline at end of file diff --git a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap index 5d7e48bc..408dabff 100644 --- a/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap +++ b/subworkflows/nf-core/fastq_align_hisat2/tests/main.nf.test.snap @@ -104,13 +104,7 @@ ] ], "5": [ - [ - { - "id": "test", - "single_end": true - }, - "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "6": [ [ @@ -166,13 +160,7 @@ ] ], "csi": [ - [ - { - "id": "test", - "single_end": true - }, - "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "fastq": [ @@ -233,10 +221,10 @@ } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-07-03T12:36:44.15748" + "timestamp": "2024-07-22T19:36:23.861012" }, "sarscov2 - bam - paired_end": { "content": [ @@ -343,13 +331,7 @@ ] ], "5": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "6": [ [ @@ -405,13 +387,7 @@ ] ], "csi": [ - [ - { - "id": "test", - "single_end": false - }, - "test.sorted.bam.csi:md5,d41d8cd98f00b204e9800998ecf8427e" - ] + ], "fastq": [ @@ -472,9 +448,9 @@ } ], "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.2" + "nf-test": "0.9.0", + "nextflow": "24.04.3" }, - "timestamp": "2024-07-03T12:36:59.553237" + "timestamp": "2024-07-22T19:36:44.894976" } } \ No newline at end of file From 2801deaaeb41478d212a578f8727ae9380f13627 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 22 Jul 2024 14:00:56 -0500 Subject: [PATCH 050/255] style: Remove stray comment update --- subworkflows/nf-core/homer/groseq/main.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subworkflows/nf-core/homer/groseq/main.nf b/subworkflows/nf-core/homer/groseq/main.nf index 2ee8dfa5..ad6f0bf1 100644 --- a/subworkflows/nf-core/homer/groseq/main.nf +++ b/subworkflows/nf-core/homer/groseq/main.nf @@ -9,7 +9,7 @@ include { HOMER_POS2BED } from '../../../../modules/nf-core/homer/pos2b workflow HOMER_GROSEQ { take: - bam // channel: [ val(meta), [ bams ], [ bai ] ] + bam // channel: [ val(meta), [ reads ] ] fasta // file: /path/to/bwa/index/ main: From cc8cc7e9834cc34a320fa486b3122c6b499992a5 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 22 Jul 2024 16:06:20 -0500 Subject: [PATCH 051/255] test: Update snapshot for GitHub actions --- workflows/tests/main.nf.test.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index 952ea58e..db825457 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -26,7 +26,7 @@ "cd4_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", "cd4_REP2.lc_extrap.txt:md5,6aac6dd78dfd85a18fadd20be7377019", "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP3.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", + "cd4_REP3.command.log:md5,19f873f655516fcd40c72e7a9b1fdd9b", "cd4_REP3.lc_extrap.txt:md5,02c4b0fc0afd282a402a316d44598173", "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", "cd4_REP4.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", From 0319bc150928bf0b7a0b167ec423f347be7dabc6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 22 Jul 2024 16:30:20 -0500 Subject: [PATCH 052/255] test: Skip preseq in BWA test https://github.com/nf-core/nascent/issues/148 --- workflows/tests/main.nf.test | 3 ++- workflows/tests/main.nf.test.snap | 22 +--------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/workflows/tests/main.nf.test b/workflows/tests/main.nf.test index a452555a..db04599b 100644 --- a/workflows/tests/main.nf.test +++ b/workflows/tests/main.nf.test @@ -29,7 +29,8 @@ nextflow_pipeline { // path("$outputDir/gtf2bed").list(), path("$outputDir/homer/cd4.bed"), path("$outputDir/homer/jurkat.bed"), - path("$outputDir/preseq").list(), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), path("$outputDir/samtools").list(), ).match() diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index db825457..12314ae9 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -18,26 +18,6 @@ ], "cd4.bed:md5,ab94918610a560772fdbec591200295f", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP1.lc_extrap.txt:md5,6d0e7f782f34ee54213c022cbe19df5b", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP2.lc_extrap.txt:md5,6aac6dd78dfd85a18fadd20be7377019", - "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP3.command.log:md5,19f873f655516fcd40c72e7a9b1fdd9b", - "cd4_REP3.lc_extrap.txt:md5,02c4b0fc0afd282a402a316d44598173", - "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP4.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP4.lc_extrap.txt:md5,9efbab9d2aee791e7e9cae9237f2c500", - "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP1.lc_extrap.txt:md5,390386e428ce783b3a373a5f60ee912f", - "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP2.lc_extrap.txt:md5,cfdda91d83dd381dcefdc754e4b4c54c" - ], [ "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", @@ -247,4 +227,4 @@ }, "timestamp": "2024-07-20T11:46:32.845750064" } -} \ No newline at end of file +} From 93c5d3749fd337c932d1aa2f785feb1338b0b7fd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 23 Jul 2024 12:06:47 -0500 Subject: [PATCH 053/255] chore: Add citations --- CHANGELOG.md | 1 + CITATIONS.md | 4 ++ .../utils_nfcore_nascent_pipeline/main.nf | 62 ++++++++++++++----- 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eff8694b..07e1c640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [a3bc907](https://github.com/nf-core/nascent/commit/a3bc907e9afd9dd2a9572798fa16fbc781c3dcb0) - Update pipeline template to [nf-core/tools 2.13.1](https://github.com/nf-core/tools/releases/tag/2.13.1) - [#140](https://github.com/nf-core/nascent/pull/140) - Add HISAT2 aligner - [#142](https://github.com/nf-core/nascent/pull/142) - Add STAR aligner +- [#149](https://github.com/nf-core/nascent/pull/149) - Add Software citations to MultiQC ### Changed diff --git a/CITATIONS.md b/CITATIONS.md index d6f930af..a49733e5 100644 --- a/CITATIONS.md +++ b/CITATIONS.md @@ -78,6 +78,10 @@ > Li H, Handsaker B, Wysoker A, Fennell T, Ruan J, Homer N, Marth G, Abecasis G, Durbin R; 1000 Genome Project Data Processing Subgroup. The Sequence Alignment/Map format and SAMtools. Bioinformatics. 2009 Aug 15;25(16):2078-9. doi: 10.1093/bioinformatics/btp352. Epub 2009 Jun 8. PubMed PMID: 19505943; PubMed Central PMCID: PMC2723002. +- [STAR](https://pubmed.ncbi.nlm.nih.gov/23104886/) + + > Dobin A, Davis CA, Schlesinger F, Drenkow J, Zaleski C, Jha S, Batut P, Chaisson M, Gingeras TR. STAR: ultrafast universal RNA-seq aligner Bioinformatics. 2013 Jan 1;29(1):15-21. doi: 10.1093/bioinformatics/bts635. Epub 2012 Oct 25. PubMed PMID: 23104886; PubMed Central PMCID: PMC3530905. + - [UMI-tools](https://pubmed.ncbi.nlm.nih.gov/28100584/) > Smith T, Heger A, Sudbery I. UMI-tools: modeling sequencing errors in Unique Molecular Identifiers to improve quantification accuracy Genome Res. 2017 Mar;27(3):491-499. doi: 10.1101/gr.209601.116. Epub 2017 Jan 18. PubMed PMID: 28100584; PubMed Central PMCID: PMC5340976. diff --git a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf index 2988d8ac..ebbdba1b 100644 --- a/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf +++ b/subworkflows/local/utils_nfcore_nascent_pipeline/main.nf @@ -202,27 +202,60 @@ def genomeExistsError() { // Generate methods description for MultiQC // def toolCitationText() { - // TODO nf-core: 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() + def citation_text = "Tools used in the workflow included: " + [ + "BEDTools (Quinlan 2010)", + "Bowtie 2 (Langmead 2012)", + "BWA-MEM (Li 2013)", // TODO if bwamem + "BWA-MEM2 (Vasimuddin 2019)", // TODO if bwamem2 + "deepTools (Ramírez 2016)", + "FastQC (Andrews 2010)", + "FastP (Chen 2018)", // TODO if trimming + "featureCounts (Liao 2013)", + "GffRead (Pertea 2013)", + "HISAT2 (Kim 2019)", // TODO if hisat2 + "HOMER (Heinz 2010)", // TODO if homer + "MultiQC (Ewels et al. 2016)", + "PINTS (Yao 2022)", // TODO if pints + "preseq (Daley 2013)", + "RSeQC (Wang 2012)", + "SAMTools (Li 2009)", + "STAR (Dobin 2013)", // TODO if STAR + "UMI-tools (Li 2009)", + "Genomic Alignments (Lawrence 2013)", + "groHMM (Chae 2015)", // TODO if grohmm + "." + ].join(', ').trim() return citation_text } def toolBibliographyText() { - // TODO nf-core: 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() + def reference_text = "
  • " + [ + "Quinlan AR, Hall IM. BEDTools: a flexible suite of utilities for comparing genomic features. Bioinformatics. 2010 Mar 15;26(6):841-2. doi: 10.1093/bioinformatics/btq033. Epub 2010 Jan 28. PubMed PMID: 20110278; PubMed Central PMCID: PMC2832824.", + "Langmead, B., Salzberg, S. Fast gapped-read alignment with Bowtie 2. Nat Methods 9, 357–359 (2012). doi: 10.1038/nmeth.1923.", + "Li H: Aligning sequence reads, clone sequences and assembly contigs with BWA-MEM. arXiv 2013. doi: 10.48550/arXiv.1303.3997", // TODO if bwamem + "M. Vasimuddin, S. Misra, H. Li and S. Aluru, Efficient Architecture-Aware Acceleration of BWA-MEM for Multicore Systems, 2019 IEEE International Parallel and Distributed Processing Symposium (IPDPS), 2019, pp. 314-324. doi: 10.1109/IPDPS.2019.00041.", // TODO if bwamem2 + "Ramírez, Fidel, Devon P. Ryan, Björn Grüning, Vivek Bhardwaj, Fabian Kilpert, Andreas S. Richter, Steffen Heyne, Friederike Dündar, and Thomas Manke. deepTools2: A next Generation Web Server for Deep-Sequencing Data Analysis. Nucleic Acids Research (2016). doi:10.1093/nar/gkw257.", + "Shifu Chen, Yanqing Zhou, Yaru Chen, Jia Gu, fastp: an ultra-fast all-in-one FASTQ preprocessor, Bioinformatics, Volume 34, Issue 17, 01 September 2018, Pages i884–i890, doi: 10.1093/bioinformatics/bty560. PubMed PMID: 30423086. PubMed Central PMCID: PMC6129281", + "Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online].", + "Liao Y, Smyth GK, Shi W. featureCounts: an efficient general purpose program for assigning sequence reads to genomic features. Bioinformatics. 2014 Apr 1;30(7):923-30. doi: 10.1093/bioinformatics/btt656. Epub 2013 Nov 13. PubMed PMID: 24227677.", + "Pertea G, Pertea M. GFF Utilities: GffRead and GffCompare. F1000Res. 2020 Apr 28;9:ISCB Comm J-304. doi: 10.12688/f1000research.23297.2. eCollection 2020. PubMed PMID: 32489650; PubMed Central PMCID: PMC7222033.", + "Kim D, Paggi JM, Park C, Bennett C, Salzberg SL. Graph-based genome alignment and genotyping with HISAT2 and HISAT-genotype Graph-based genome alignment and genotyping with HISAT2 and HISAT-genotype. Nat Biotechnol. 2019 Aug;37(8):907-915. doi: 10.1038/s41587-019-0201-4. Epub 2019 Aug 2. PubMed PMID: 31375807.", // TODO if hisat2 + "Heinz S, Benner C, Spann N, Bertolino E et al. Simple Combinations of Lineage-Determining Transcription Factors Prime cis-Regulatory Elements Required for Macrophage and B Cell Identities. Mol Cell 2010 May 28;38(4):576-589. PMID: 20513432", // TODO if homer + "Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.", + "Yao, L., Liang, J., Ozer, A. et al. A comparison of experimental assays and analytical methods for genome-wide identification of active enhancers. Nat Biotechnol 40, 1056–1065 (2022). https://doi.org/10.1038/s41587-022-01211-7", // TODO if pints + "Daley T, Smith AD. Predicting the molecular complexity of sequencing libraries. Nat Methods. 2013 Apr;10(4):325-7. doi: 10.1038/nmeth.2375. Epub 2013 Feb 24. PubMed PMID: 23435259; PubMed Central PMCID: PMC3612374.", + "Wang L, Wang S, Li W. RSeQC: quality control of RNA-seq experiments Bioinformatics. 2012 Aug 15;28(16):2184-5. doi: 10.1093/bioinformatics/bts356. Epub 2012 Jun 27. PubMed PMID: 22743226.", + "Li H, Handsaker B, Wysoker A, Fennell T, Ruan J, Homer N, Marth G, Abecasis G, Durbin R; 1000 Genome Project Data Processing Subgroup. The Sequence Alignment/Map format and SAMtools. Bioinformatics. 2009 Aug 15;25(16):2078-9. doi: 10.1093/bioinformatics/btp352. Epub 2009 Jun 8. PubMed PMID: 19505943; PubMed Central PMCID: PMC2723002.", + "Dobin A, Davis CA, Schlesinger F, Drenkow J, Zaleski C, Jha S, Batut P, Chaisson M, Gingeras TR. STAR: ultrafast universal RNA-seq aligner Bioinformatics. 2013 Jan 1;29(1):15-21. doi: 10.1093/bioinformatics/bts635. Epub 2012 Oct 25. PubMed PMID: 23104886; PubMed Central PMCID: PMC3530905.", // TODO if STAR + "Smith T, Heger A, Sudbery I. UMI-tools: modeling sequencing errors in Unique Molecular Identifiers to improve quantification accuracy Genome Res. 2017 Mar;27(3):491-499. doi: 10.1101/gr.209601.116. Epub 2017 Jan 18. PubMed PMID: 28100584; PubMed Central PMCID: PMC5340976.", + "Lawrence M, Huber W, Pagès H, Aboyoun P, Carlson M, Gentleman R, Morgan M, Carey V (2013). “Software for Computing and Annotating Genomic Ranges.” PLoS Computational Biology, 9. doi: 10.1371/journal.pcbi.1003118, http://www.ploscompbiol.org/article/info%3Adoi%2F10.1371%2Fjournal.pcbi.1003118.", + "Chae M, Danko CG, Kraus WL (2015). “groHMM: a computational tool for identifying unannotated and cell type-specific transcription units from global run-on sequencing data.” BMC Bioinformatics, 16(222).", // TODO if grohmm + ].join('
  • ').trim() return reference_text } @@ -249,9 +282,8 @@ def methodsDescriptionText(mqc_methods_yaml) { meta["tool_citations"] = "" meta["tool_bibliography"] = "" - // TODO nf-core: Only uncomment below if logic in toolCitationText/toolBibliographyText has been filled! - // meta["tool_citations"] = toolCitationText().replaceAll(", \\.", ".").replaceAll("\\. \\.", ".").replaceAll(", \\.", ".") - // meta["tool_bibliography"] = toolBibliographyText() + meta["tool_citations"] = toolCitationText().replaceAll(", \\.", ".").replaceAll("\\. \\.", ".").replaceAll(", \\.", ".") + meta["tool_bibliography"] = toolBibliographyText() def methods_text = mqc_methods_yaml.text From 73aad318621cc376c89a312bf32d94c7ed76ba4e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 30 Jul 2024 14:15:32 -0500 Subject: [PATCH 054/255] chore: Update naming --- subworkflows/local/grohmm/main.nf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/subworkflows/local/grohmm/main.nf b/subworkflows/local/grohmm/main.nf index ed5ca20b..0c6d04ba 100644 --- a/subworkflows/local/grohmm/main.nf +++ b/subworkflows/local/grohmm/main.nf @@ -10,7 +10,7 @@ include { GROHMM_PARAMETERTUNING } from '../../../modules/local/grohmm/parameter */ workflow GROHMM { take: - bams + bams_bais gtf tuning_file @@ -22,7 +22,7 @@ workflow GROHMM { if(!params.skip_tuning) { GROHMM_PARAMETERTUNING ( - bams, + bams_bais, gtf, tuning_file ) @@ -31,7 +31,7 @@ workflow GROHMM { } GROHMM_TRANSCRIPTCALLING ( - bams, + bams_bais, gtf, ch_tuning ) From bce004da77c14e42f132174a8d1698c85c634c86 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 30 Jul 2024 14:37:11 -0500 Subject: [PATCH 055/255] chore(homer): Fix errors about unexpected input tuple size --- subworkflows/local/transcript_identification.nf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subworkflows/local/transcript_identification.nf b/subworkflows/local/transcript_identification.nf index 14fda616..a13082b4 100644 --- a/subworkflows/local/transcript_identification.nf +++ b/subworkflows/local/transcript_identification.nf @@ -36,7 +36,8 @@ workflow TRANSCRIPT_INDENTIFICATION { homer_peaks = Channel.empty() homer_tagdir = Channel.empty() if(params.assay_type == "GROseq") { - HOMER_GROSEQ ( group_bam_bai, fasta ) + group_bam = group_bam_bai.map { meta, bam, bai -> [meta, bam] } + HOMER_GROSEQ ( group_bam, fasta ) ch_identification_bed = ch_identification_bed.mix(HOMER_GROSEQ.out.bed) homer_peaks = HOMER_GROSEQ.out.peaks homer_tagdir = HOMER_GROSEQ.out.tagdir From e5037b7ed1d7b2296afd23ebf6dc648b2fd5750c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 30 Jul 2024 15:09:26 -0500 Subject: [PATCH 056/255] build: Add nft-bam --- nf-test.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nf-test.config b/nf-test.config index 9c1d57d3..5813a0fd 100644 --- a/nf-test.config +++ b/nf-test.config @@ -3,5 +3,8 @@ config { testsDir "." workDir System.getenv("NFT_WORKDIR") ?: ".nf-test" configFile "tests/nextflow.config" + plugins { + load "nft-bam@0.1.1" + } } From 4297d9c3acb109a3169eda30640a13e3ff8b8d25 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 13:14:19 -0500 Subject: [PATCH 057/255] build: Bump nft-bam version --- nf-test.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nf-test.config b/nf-test.config index 5813a0fd..7abd3c95 100644 --- a/nf-test.config +++ b/nf-test.config @@ -4,7 +4,7 @@ config { workDir System.getenv("NFT_WORKDIR") ?: ".nf-test" configFile "tests/nextflow.config" plugins { - load "nft-bam@0.1.1" + load "nft-bam@0.3.0" } } From f3f30704a91c00ad897cae5cc06c1423c637d11d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 13:14:32 -0500 Subject: [PATCH 058/255] test: Write first bam test --- workflows/tests/main.nf.test | 6 ++++++ workflows/tests/main.nf.test.snap | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/workflows/tests/main.nf.test b/workflows/tests/main.nf.test index db04599b..3aa9d20b 100644 --- a/workflows/tests/main.nf.test +++ b/workflows/tests/main.nf.test @@ -33,6 +33,12 @@ nextflow_pipeline { // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), path("$outputDir/samtools").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), ).match() } diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index 12314ae9..f00888c2 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -49,13 +49,19 @@ "jurkat_REP2.sorted.bam:md5,ece1ae4ce266a64a4d27aa12b4bb630e", "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", "jurkat_REP2.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" - ] + ], + "366dda72360cb6fef08914f246c23fe0", + "7ff8b1c06b1d47b26062624d2baf83a5", + "281fcd74eeaea3ccf15b864e60c70006", + "1401ddb7b887f1b81644c516bfde7e88", + "4a679dc8ae1fd96bed9da1e3f772daaa", + "21970a646ce32e2ccb2aa3d99dc0ebc" ], "meta": { - "nf-test": "0.8.4", + "nf-test": "0.9.0", "nextflow": "24.04.3" }, - "timestamp": "2024-07-20T11:42:20.240672824" + "timestamp": "2024-07-31T13:12:47.453894174" }, "Should run with bwamem2": { "content": [ @@ -227,4 +233,4 @@ }, "timestamp": "2024-07-20T11:46:32.845750064" } -} +} \ No newline at end of file From b9d0394df7dd69185aaa475d31ce9159e5c5fe53 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 13:26:58 -0500 Subject: [PATCH 059/255] test: Refactor default test Use: - AssertAll - removeNextflowVersion --- tests/lib/UTILS.groovy | 11 +++++ workflows/tests/main.nf.test | 59 ++++++++++++------------ workflows/tests/main.nf.test.snap | 74 +++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 28 deletions(-) create mode 100644 tests/lib/UTILS.groovy diff --git a/tests/lib/UTILS.groovy b/tests/lib/UTILS.groovy new file mode 100644 index 00000000..1bd58a49 --- /dev/null +++ b/tests/lib/UTILS.groovy @@ -0,0 +1,11 @@ +// Function to remove Nextflow version from pipeline_software_mqc_versions.yml + +class UTILS { + public static String removeNextflowVersion(pipeline_software_mqc_versions) { + def softwareVersions = path(pipeline_software_mqc_versions).yaml + if (softwareVersions.containsKey("Workflow")) { + softwareVersions.Workflow.remove("Nextflow") + } + return softwareVersions + } +} diff --git a/workflows/tests/main.nf.test b/workflows/tests/main.nf.test index 3aa9d20b..16bef5fe 100644 --- a/workflows/tests/main.nf.test +++ b/workflows/tests/main.nf.test @@ -13,35 +13,38 @@ nextflow_pipeline { } then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - path("$outputDir/samtools").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), - ).match() + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + path("$outputDir/samtools").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match("output_files") + } + ) } - } test("Should run with bwamem2") { diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap index f00888c2..0d759736 100644 --- a/workflows/tests/main.nf.test.snap +++ b/workflows/tests/main.nf.test.snap @@ -1,4 +1,78 @@ { + "output_files": { + "content": [ + 134, + [ + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", + "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", + "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", + "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", + "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", + "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" + ], + "cd4.bed:md5,ab94918610a560772fdbec591200295f", + "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", + [ + "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", + "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", + "cd4_REP1.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", + "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", + "cd4_REP2.stats:md5,561610e53fb676ac83252712dcac30d4", + "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", + "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", + "cd4_REP3.sorted.bam:md5,87759126ce19e605d415e11d32b758b2", + "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", + "cd4_REP3.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", + "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", + "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", + "cd4_REP4.sorted.bam:md5,be020f98894a831a25b32e0e74d96edd", + "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", + "cd4_REP4.stats:md5,edc57478278aa35b7376cee9afd634a7", + "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat_REP1.sorted.bam:md5,322394245e8ba6fb51fb591b4ba2dc82", + "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", + "jurkat_REP1.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", + "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", + "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", + "jurkat_REP2.sorted.bam:md5,ece1ae4ce266a64a4d27aa12b4bb630e", + "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", + "jurkat_REP2.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" + ], + "366dda72360cb6fef08914f246c23fe0", + "7ff8b1c06b1d47b26062624d2baf83a5", + "281fcd74eeaea3ccf15b864e60c70006", + "1401ddb7b887f1b81644c516bfde7e88", + "4a679dc8ae1fd96bed9da1e3f772daaa", + "21970a646ce32e2ccb2aa3d99dc0ebc" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-31T14:40:54.009528354" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.3" + }, + "timestamp": "2024-07-31T15:11:43.367518606" + }, "Should run with bwa (default)": { "content": [ 134, From 5e9a6c10783a6312b05fb27bdde40dc03205d874 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 18:48:57 -0500 Subject: [PATCH 060/255] test: Refactor all the tests --- workflows/tests/aligner/bowtie2.nf.test | 50 +++ workflows/tests/aligner/bowtie2.nf.test.snap | 44 +++ workflows/tests/aligner/bwa.nf.test | 96 ++++++ workflows/tests/aligner/bwa.nf.test.snap | 64 ++++ workflows/tests/aligner/bwamem2.nf.test | 48 +++ workflows/tests/aligner/bwamem2.nf.test.snap | 44 +++ workflows/tests/aligner/dragmap.nf.test | 48 +++ workflows/tests/aligner/dragmap.nf.test.snap | 44 +++ workflows/tests/aligner/hisat2.nf.test | 51 +++ workflows/tests/aligner/hisat2.nf.test.snap | 44 +++ workflows/tests/aligner/star.nf.test | 93 ++++++ workflows/tests/aligner/star.nf.test.snap | 76 +++++ workflows/tests/bowtie2.nf.test | 24 -- workflows/tests/bowtie2.nf.test.snap | 12 - workflows/tests/main.nf.test | 154 --------- workflows/tests/main.nf.test.snap | 310 ------------------- workflows/tests/references.nf.test | 52 ---- workflows/tests/references.nf.test.snap | 22 -- workflows/tests/star.nf.test | 42 --- workflows/tests/star.nf.test.snap | 22 -- 20 files changed, 702 insertions(+), 638 deletions(-) create mode 100644 workflows/tests/aligner/bowtie2.nf.test create mode 100644 workflows/tests/aligner/bowtie2.nf.test.snap create mode 100644 workflows/tests/aligner/bwa.nf.test create mode 100644 workflows/tests/aligner/bwa.nf.test.snap create mode 100644 workflows/tests/aligner/bwamem2.nf.test create mode 100644 workflows/tests/aligner/bwamem2.nf.test.snap create mode 100644 workflows/tests/aligner/dragmap.nf.test create mode 100644 workflows/tests/aligner/dragmap.nf.test.snap create mode 100644 workflows/tests/aligner/hisat2.nf.test create mode 100644 workflows/tests/aligner/hisat2.nf.test.snap create mode 100644 workflows/tests/aligner/star.nf.test create mode 100644 workflows/tests/aligner/star.nf.test.snap delete mode 100644 workflows/tests/bowtie2.nf.test delete mode 100644 workflows/tests/bowtie2.nf.test.snap delete mode 100644 workflows/tests/main.nf.test delete mode 100644 workflows/tests/main.nf.test.snap delete mode 100644 workflows/tests/references.nf.test delete mode 100644 workflows/tests/references.nf.test.snap delete mode 100644 workflows/tests/star.nf.test delete mode 100644 workflows/tests/star.nf.test.snap diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test new file mode 100644 index 00000000..11b10ce1 --- /dev/null +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -0,0 +1,50 @@ +nextflow_pipeline { + + name "Bowtie2" + script "../../../main.nf" + tag "aligner" + tag "bowtie2" + + test("Should run with defaults") { + + when { + params { + outdir = "$outputDir" + aligner = "bowtie2" + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap new file mode 100644 index 00000000..e3c2e16a --- /dev/null +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -0,0 +1,44 @@ +{ + "output_files": { + "content": [ + 132, + [ + "cd4_REP1.coverage.hist.txt:md5,ffd8c0a94869dd782779fc871a9b781a", + "cd4_REP1.coverage.stats.txt:md5,bebdef1adcce4296878f8699a0f5cb32", + "cd4_REP2.coverage.hist.txt:md5,6e0ca13df7b06ff6a81fb21596df4ca4", + "cd4_REP2.coverage.stats.txt:md5,ffb701c2be33360a96ce85b1330b13f8", + "cd4_REP3.coverage.hist.txt:md5,f602c7b2b7c125938cd8f1cafdfede5b", + "cd4_REP3.coverage.stats.txt:md5,90152fc99f072e654427864f28c198ee", + "cd4_REP4.coverage.hist.txt:md5,2b50c34a6e046b24a47b0c428e9d25b1", + "cd4_REP4.coverage.stats.txt:md5,ac9ceffc7e75db10d30c3809f16f83fb", + "jurkat_REP1.coverage.hist.txt:md5,656e30e8c4bd12e45a036c62c18730c1", + "jurkat_REP1.coverage.stats.txt:md5,627f0ec96ea9bdbd7f41b09b64c389d6", + "jurkat_REP2.coverage.hist.txt:md5,d6fa988165cadf5c852ea9b83c57f6c8", + "jurkat_REP2.coverage.stats.txt:md5,92ad48418a85e844bb62b0392397bb84" + ], + "cd4.bed:md5,eae2a0135e62184e6117ced483b9cd9a", + "jurkat.bed:md5,9255e426e272a406b3507847d4a57d5c", + "900325c1ad109ee12fa5f12c52f95b3f", + "c4e464e4c5f299c0fcb92d3e3ad856c1", + "35d5b2fbc71152546e7b6869986a3727", + "83171d18926d770e7accb0be6812a517", + "9b2f44262beeebcff3ccc103bb619894", + "4ccb14286f06945d7779e08b911501bd" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:48:16.280408015" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:48:15.403043368" + } +} \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test new file mode 100644 index 00000000..9365c279 --- /dev/null +++ b/workflows/tests/aligner/bwa.nf.test @@ -0,0 +1,96 @@ +nextflow_pipeline { + + name "BWA" + script "../../../main.nf" + tag "aligner" + tag "bwa" + + test("Should run with defaults") { + + when { + params { + outdir = "$outputDir" + aligner = "bwa" + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match("output_files") + } + ) + } + } + + def igenomes_base = 's3://ngi-igenomes/igenomes' + + // https://github.com/nf-core/nascent/issues/106 + test("Should work with BWA Index") { + // FIXME PINTS Fails because it doesn't find anything. + config '../skip_pints.config' + when { + params { + outdir = "$outputDir" + aligner = "bwa" + // TODO Update these to human + bwa_index = "${igenomes_base}/Saccharomyces_cerevisiae/Ensembl/R64-1-1/Sequence/BWAIndex/version0.6.0/" + fasta = "${igenomes_base}/Saccharomyces_cerevisiae/Ensembl/R64-1-1/Sequence/WholeGenomeFasta/genome.fa" + gtf = "${igenomes_base}/Saccharomyces_cerevisiae/Ensembl/R64-1-1/Annotation/Genes/genes.gtf" + } + } + + then { + assert workflow.success + assert snapshot( + workflow.trace.tasks().size(), + ).match() + } + } + + // https://github.com/nf-core/nascent/issues/119 + test("Should work with gzipped references") { + config '../skip_gzip.config' + when { + params { + outdir = "$outputDir" + aligner = "bwa" + fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/reference/genome.fasta.gz' + gtf = 'https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/reference/genes.gtf.gz' + } + } + + then { + assert workflow.success + assert snapshot( + workflow.trace.tasks().size(), + ).match() + } + + } +} diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap new file mode 100644 index 00000000..481578cd --- /dev/null +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -0,0 +1,64 @@ +{ + "output_files": { + "content": [ + 134, + [ + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", + "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", + "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", + "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", + "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", + "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" + ], + "cd4.bed:md5,ab94918610a560772fdbec591200295f", + "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", + "366dda72360cb6fef08914f246c23fe0", + "7ff8b1c06b1d47b26062624d2baf83a5", + "281fcd74eeaea3ccf15b864e60c70006", + "1401ddb7b887f1b81644c516bfde7e88", + "4a679dc8ae1fd96bed9da1e3f772daaa", + "21970a646ce32e2ccb2aa3d99dc0ebc" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:52:23.111205909" + }, + "Should work with gzipped references": { + "content": [ + 98 + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:56:52.636381287" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:52:22.661915581" + }, + "Should work with BWA Index": { + "content": [ + 113 + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:54:47.955825977" + } +} \ No newline at end of file diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test new file mode 100644 index 00000000..f12e2e73 --- /dev/null +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -0,0 +1,48 @@ +nextflow_pipeline { + + name "bwamem2" + script "../../../main.nf" + + test("Should run with defaults") { + + when { + params { + outdir = "$outputDir" + aligner = "bwamem2" + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap new file mode 100644 index 00000000..654ec4fd --- /dev/null +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -0,0 +1,44 @@ +{ + "output_files": { + "content": [ + 134, + [ + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", + "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", + "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", + "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", + "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", + "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", + "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" + ], + "cd4.bed:md5,ab94918610a560772fdbec591200295f", + "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", + "366dda72360cb6fef08914f246c23fe0", + "7ff8b1c06b1d47b26062624d2baf83a5", + "281fcd74eeaea3ccf15b864e60c70006", + "1401ddb7b887f1b81644c516bfde7e88", + "4a679dc8ae1fd96bed9da1e3f772daaa", + "21970a646ce32e2ccb2aa3d99dc0ebc" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:59:55.730451885" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWAMEM2_MEM={bwamem2=2.2.1, samtools=1.19.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T19:59:55.332896924" + } +} \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test new file mode 100644 index 00000000..799b21b1 --- /dev/null +++ b/workflows/tests/aligner/dragmap.nf.test @@ -0,0 +1,48 @@ +nextflow_pipeline { + + name "DRAGMAP" + script "../../../main.nf" + + test("Should run with defaults") { + + when { + params { + outdir = "$outputDir" + aligner = "dragmap" + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap new file mode 100644 index 00000000..b238b073 --- /dev/null +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -0,0 +1,44 @@ +{ + "output_files": { + "content": [ + 134, + [ + "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", + "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", + "cd4_REP2.coverage.hist.txt:md5,edadf440d1c3658118ffd6b6a46821f8", + "cd4_REP2.coverage.stats.txt:md5,cb1ce057d05fc53e7ad9b0b2e3d5aaad", + "cd4_REP3.coverage.hist.txt:md5,096ce6905c96587ba80ebcbe5893cf3e", + "cd4_REP3.coverage.stats.txt:md5,f4b88f4eebab0c010a1cfdc3404dfafb", + "cd4_REP4.coverage.hist.txt:md5,01f93b5c248e0b78f6d94e28eee3f9e7", + "cd4_REP4.coverage.stats.txt:md5,a4c6f61be8263e7461f8b961cfcc9053", + "jurkat_REP1.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", + "jurkat_REP1.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a", + "jurkat_REP2.coverage.hist.txt:md5,03301957b2f29c43cb8ea3462998c315", + "jurkat_REP2.coverage.stats.txt:md5,c3fc3f11e84f4d075ba95adbdbb2ee29" + ], + "cd4.bed:md5,e9380700e48c1e52f76a2bb3fa4f59d9", + "jurkat.bed:md5,fe88d4dc3c100262d7aec484e15b1c73", + "54edc10bad3d380f2389f9a61b13a1c", + "9899ae3197a810e6f18e55caea424a99", + "328015578661fb01eeb6b03b82f14af4", + "39a98a35b0011dae7f6af96d4d306ce1", + "d76849b792c9246366f7bfd68ba52708", + "4bc4eebe2ef3d4f2d7d5b2571a684ec5" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T20:04:35.189267908" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, DRAGMAP_ALIGN={dragmap=1.2.1, samtools=1.15.1, pigz=2.3.4}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T20:04:34.724457691" + } +} \ No newline at end of file diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test new file mode 100644 index 00000000..11c98ec6 --- /dev/null +++ b/workflows/tests/aligner/hisat2.nf.test @@ -0,0 +1,51 @@ +nextflow_pipeline { + + name "HISAT2" + script "../../../main.nf" + + test("Should run with defaults") { + + tag "HISAT2" + + when { + params { + outdir = "$outputDir" + aligner = "hisat2" + hisat2_index = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21_hisat2.tar.gz' + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap new file mode 100644 index 00000000..c535a9a1 --- /dev/null +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -0,0 +1,44 @@ +{ + "output_files": { + "content": [ + 134, + [ + "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", + "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", + "cd4_REP2.coverage.hist.txt:md5,ca9e862c16d556b3f1baa230d565e0a7", + "cd4_REP2.coverage.stats.txt:md5,14d8e9d53e129de3caf98fe6c8f52ace", + "cd4_REP3.coverage.hist.txt:md5,411058935790bff32f9e6d9b7d136597", + "cd4_REP3.coverage.stats.txt:md5,46bcbba43196873e663d3fa8ca381917", + "cd4_REP4.coverage.hist.txt:md5,5888d0a421c07cd417e18b09b25b68ab", + "cd4_REP4.coverage.stats.txt:md5,611d637d4bbdd0d96071cd1e291be5dd", + "jurkat_REP1.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", + "jurkat_REP1.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4", + "jurkat_REP2.coverage.hist.txt:md5,aba00d7a48866322ce46c9427023fd36", + "jurkat_REP2.coverage.stats.txt:md5,4a5f9c89f04b4792669ca4d23bcfb66e" + ], + "cd4.bed:md5,74d4739278c1d8af17a5f9d3296325da", + "jurkat.bed:md5,6d3edfc671c1bed970ca5934edc60756", + "7c6f110b93f069f6767d508f24e46986", + "4b9dc03040268548300072c1ce32566f", + "400f5f7f7744b7efa43a97c70a1d5359", + "6d3a3f79144a0513ad93ffc27923ec5d", + "d434e4ca752838ed82474bded157c92b", + "b591522f5c8efb3bbd1b28ba64928c56" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T20:07:42.799393547" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HISAT2_ALIGN={hisat2=2.2.1, samtools=1.16.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, UNTAR_HISAT2_INDEX={untar=1.34}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T20:07:42.536938496" + } +} \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test new file mode 100644 index 00000000..ceffe967 --- /dev/null +++ b/workflows/tests/aligner/star.nf.test @@ -0,0 +1,93 @@ +nextflow_pipeline { + + name "STAR" + script "../../../main.nf" + tag "aligner" + tag "star" + + test("Should run with defaults") { + + when { + params { + outdir = "$outputDir" + aligner = "star" + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match("output_files") + } + ) + } + } + + test("Should run with gzipped gtf") { + + when { + params { + outdir = "$outputDir" + aligner = "star" + gtf = "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gtf.gz" + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot( + workflow.trace.tasks().size(), + path("$outputDir/bbmap").list(), + // BUG https://github.com/nf-core/nascent/issues/102 + // path("$outputDir/bedtools").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/bwa/featurecounts/gene").list(), + // FIXME cd4 isn't deterministic + // path("$outputDir/bwa/featurecounts/predicted").list(), + // path("$outputDir/deeptools").list(), + // path("$outputDir/fastp/*.json").list(), + // FIXME gtf2bed isn't deterministic + // path("$outputDir/gtf2bed").list(), + path("$outputDir/homer/cd4.bed"), + path("$outputDir/homer/jurkat.bed"), + // FIXME https://github.com/nf-core/nascent/issues/148 + // path("$outputDir/preseq").list(), + // path("$outputDir/rseqc").list(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + ).match() + } + ) + } + } +} diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap new file mode 100644 index 00000000..763d65b4 --- /dev/null +++ b/workflows/tests/aligner/star.nf.test.snap @@ -0,0 +1,76 @@ +{ + "Should run with gzipped gtf": { + "content": [ + 140, + [ + "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", + "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", + "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", + "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", + "cd4_REP3.coverage.hist.txt:md5,b428396f5f411d41f153baf8e044396d", + "cd4_REP3.coverage.stats.txt:md5,09ec44c74a750ea8a4ae37906895fcd0", + "cd4_REP4.coverage.hist.txt:md5,d782368a31301073527fdfc2276c89be", + "cd4_REP4.coverage.stats.txt:md5,18e7b11cb37d4df1c6a5b3af3b99007d", + "jurkat_REP1.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", + "jurkat_REP1.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee", + "jurkat_REP2.coverage.hist.txt:md5,ebccbb8fd619fc8a448df316552ba50d", + "jurkat_REP2.coverage.stats.txt:md5,7a9e5b7261a10f71fc6d6dab004a2ddb" + ], + "cd4.bed:md5,13c33dccb65a27f6b917e7114b5860a5", + "jurkat.bed:md5,72972c1f13c66195d59e5382bc73ca5a", + "d46f82aca0d563ac1d4ec5e92a3dd751", + "3f3233a2b9f9d23531e0e08f31f11af2", + "f2fa95f4588815951eb244aad98ff6e1", + "1d2e67cf8d09204b26d46a16fb858704", + "fa22f29727ce9c1a50cec37049d65fb5", + "1c5257c54cab2c8197a06a0f522649cf" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T20:22:39.260502556" + }, + "output_files": { + "content": [ + 139, + [ + "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", + "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", + "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", + "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", + "cd4_REP3.coverage.hist.txt:md5,b428396f5f411d41f153baf8e044396d", + "cd4_REP3.coverage.stats.txt:md5,09ec44c74a750ea8a4ae37906895fcd0", + "cd4_REP4.coverage.hist.txt:md5,d782368a31301073527fdfc2276c89be", + "cd4_REP4.coverage.stats.txt:md5,18e7b11cb37d4df1c6a5b3af3b99007d", + "jurkat_REP1.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", + "jurkat_REP1.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee", + "jurkat_REP2.coverage.hist.txt:md5,ebccbb8fd619fc8a448df316552ba50d", + "jurkat_REP2.coverage.stats.txt:md5,7a9e5b7261a10f71fc6d6dab004a2ddb" + ], + "cd4.bed:md5,13c33dccb65a27f6b917e7114b5860a5", + "jurkat.bed:md5,72972c1f13c66195d59e5382bc73ca5a", + "d46f82aca0d563ac1d4ec5e92a3dd751", + "3f3233a2b9f9d23531e0e08f31f11af2", + "f2fa95f4588815951eb244aad98ff6e1", + "1d2e67cf8d09204b26d46a16fb858704", + "fa22f29727ce9c1a50cec37049d65fb5", + "1c5257c54cab2c8197a06a0f522649cf" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T20:15:19.31686282" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-01T20:15:17.868733535" + } +} \ No newline at end of file diff --git a/workflows/tests/bowtie2.nf.test b/workflows/tests/bowtie2.nf.test deleted file mode 100644 index c1e32cb2..00000000 --- a/workflows/tests/bowtie2.nf.test +++ /dev/null @@ -1,24 +0,0 @@ -nextflow_pipeline { - - name "Test Workflow main.nf" - script "../../main.nf" - tag "aligner" - tag "bowtie2" - - test("Should run with bowtie2 (default)") { - - when { - params { - outdir = "$outputDir" - aligner = "bowtie2" - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - ).match() - } - } -} diff --git a/workflows/tests/bowtie2.nf.test.snap b/workflows/tests/bowtie2.nf.test.snap deleted file mode 100644 index 8da3e0b3..00000000 --- a/workflows/tests/bowtie2.nf.test.snap +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Should run with bowtie2 (default)": { - "content": [ - 132 - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.3" - }, - "timestamp": "2024-07-20T11:38:39.368341091" - } -} \ No newline at end of file diff --git a/workflows/tests/main.nf.test b/workflows/tests/main.nf.test deleted file mode 100644 index 16bef5fe..00000000 --- a/workflows/tests/main.nf.test +++ /dev/null @@ -1,154 +0,0 @@ -nextflow_pipeline { - - name "Test Workflow main.nf" - script "../../main.nf" - - test("Should run with bwa (default)") { - - when { - params { - outdir = "$outputDir" - aligner = "bwa" - } - } - - then { - assertAll( - { assert workflow.success }, - { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, - { assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - path("$outputDir/samtools").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), - ).match("output_files") - } - ) - } - } - - test("Should run with bwamem2") { - - when { - params { - outdir = "$outputDir" - aligner = "bwamem2" - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - path("$outputDir/samtools").list(), - ).match() - } - - } - - test("Should run with dragmap") { - - when { - params { - outdir = "$outputDir" - aligner = "dragmap" - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - // FIXME Not deterministic - // path("$outputDir/samtools").list(), - ).match() - } - } - - test("Should run with HISAT2") { - - tag "HISAT2" - - when { - params { - outdir = "$outputDir" - aligner = "hisat2" - hisat2_index = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21_hisat2.tar.gz' - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - // FIXME Not deterministic - // path("$outputDir/samtools").list(), - ).match() - } - } -} diff --git a/workflows/tests/main.nf.test.snap b/workflows/tests/main.nf.test.snap deleted file mode 100644 index 0d759736..00000000 --- a/workflows/tests/main.nf.test.snap +++ /dev/null @@ -1,310 +0,0 @@ -{ - "output_files": { - "content": [ - 134, - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", - "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", - "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", - "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", - "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", - "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" - ], - "cd4.bed:md5,ab94918610a560772fdbec591200295f", - "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - [ - "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP1.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "cd4_REP2.stats:md5,561610e53fb676ac83252712dcac30d4", - "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", - "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam:md5,87759126ce19e605d415e11d32b758b2", - "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", - "cd4_REP3.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", - "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", - "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam:md5,be020f98894a831a25b32e0e74d96edd", - "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", - "cd4_REP4.stats:md5,edc57478278aa35b7376cee9afd634a7", - "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam:md5,322394245e8ba6fb51fb591b4ba2dc82", - "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", - "jurkat_REP1.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", - "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", - "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam:md5,ece1ae4ce266a64a4d27aa12b4bb630e", - "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", - "jurkat_REP2.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" - ], - "366dda72360cb6fef08914f246c23fe0", - "7ff8b1c06b1d47b26062624d2baf83a5", - "281fcd74eeaea3ccf15b864e60c70006", - "1401ddb7b887f1b81644c516bfde7e88", - "4a679dc8ae1fd96bed9da1e3f772daaa", - "21970a646ce32e2ccb2aa3d99dc0ebc" - ], - "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.3" - }, - "timestamp": "2024-07-31T14:40:54.009528354" - }, - "software_versions": { - "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" - ], - "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.3" - }, - "timestamp": "2024-07-31T15:11:43.367518606" - }, - "Should run with bwa (default)": { - "content": [ - 134, - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", - "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", - "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", - "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", - "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", - "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" - ], - "cd4.bed:md5,ab94918610a560772fdbec591200295f", - "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - [ - "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam:md5,24ca659d88a69778fb54794055a7d321", - "cd4_REP1.sorted.bam.bai:md5,89c4319f5f28020940ba31ca7e602e84", - "cd4_REP1.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam:md5,896546706635319d9d1acc3777e3e79c", - "cd4_REP2.sorted.bam.bai:md5,f87fb585bc0d570a16d5ae9230f36113", - "cd4_REP2.stats:md5,561610e53fb676ac83252712dcac30d4", - "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", - "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam:md5,87759126ce19e605d415e11d32b758b2", - "cd4_REP3.sorted.bam.bai:md5,39c4c10e041e812be47b20996c004594", - "cd4_REP3.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", - "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", - "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam:md5,be020f98894a831a25b32e0e74d96edd", - "cd4_REP4.sorted.bam.bai:md5,8cb9c3c74faf7c3594bdbd9fd642434d", - "cd4_REP4.stats:md5,edc57478278aa35b7376cee9afd634a7", - "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam:md5,322394245e8ba6fb51fb591b4ba2dc82", - "jurkat_REP1.sorted.bam.bai:md5,78490e10f957ad2b0b05d1106e67d3d5", - "jurkat_REP1.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", - "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", - "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam:md5,ece1ae4ce266a64a4d27aa12b4bb630e", - "jurkat_REP2.sorted.bam.bai:md5,eff0f3690baa030685f76a0687301827", - "jurkat_REP2.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" - ], - "366dda72360cb6fef08914f246c23fe0", - "7ff8b1c06b1d47b26062624d2baf83a5", - "281fcd74eeaea3ccf15b864e60c70006", - "1401ddb7b887f1b81644c516bfde7e88", - "4a679dc8ae1fd96bed9da1e3f772daaa", - "21970a646ce32e2ccb2aa3d99dc0ebc" - ], - "meta": { - "nf-test": "0.9.0", - "nextflow": "24.04.3" - }, - "timestamp": "2024-07-31T13:12:47.453894174" - }, - "Should run with bwamem2": { - "content": [ - 134, - [ - "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", - "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", - "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", - "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", - "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", - "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", - "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", - "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", - "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" - ], - "cd4.bed:md5,ab94918610a560772fdbec591200295f", - "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP1.lc_extrap.txt:md5,6d0e7f782f34ee54213c022cbe19df5b", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP2.lc_extrap.txt:md5,6aac6dd78dfd85a18fadd20be7377019", - "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP3.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP3.lc_extrap.txt:md5,02c4b0fc0afd282a402a316d44598173", - "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP4.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP4.lc_extrap.txt:md5,9efbab9d2aee791e7e9cae9237f2c500", - "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP1.lc_extrap.txt:md5,390386e428ce783b3a373a5f60ee912f", - "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP2.lc_extrap.txt:md5,cfdda91d83dd381dcefdc754e4b4c54c" - ], - [ - "cd4_REP1.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", - "cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam:md5,43a9fccfbbe9825bb795bdd7c0788f62", - "cd4_REP1.sorted.bam.bai:md5,941ed9d1bf8e04ab916967a4f6c03db4", - "cd4_REP1.stats:md5,1536c80bae78b2062508e1de210f6387", - "cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", - "cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam:md5,974e4a49c44d039eb5b7c4980f456b93", - "cd4_REP2.sorted.bam.bai:md5,a89d7777e8172df5a13872061f358ee6", - "cd4_REP2.stats:md5,561610e53fb676ac83252712dcac30d4", - "cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", - "cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam:md5,0c3885efbbe81f32892a36d9eb089662", - "cd4_REP3.sorted.bam.bai:md5,1c51cf88d2e1b15f9ee6f5f7d70bc6b4", - "cd4_REP3.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", - "cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", - "cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam:md5,da9c026c7fd17c4ef38521defbddda4a", - "cd4_REP4.sorted.bam.bai:md5,d359889d85b44eeeb636938182373406", - "cd4_REP4.stats:md5,edc57478278aa35b7376cee9afd634a7", - "jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", - "jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam:md5,5bfe7a83e0cbaf75a5d5ceab596ec3bc", - "jurkat_REP1.sorted.bam.bai:md5,f708e9ceb33ab56881b8a96af9bfbe53", - "jurkat_REP1.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", - "jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d", - "jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam:md5,47f65dea0ad16d3e62205a5ba900297d", - "jurkat_REP2.sorted.bam.bai:md5,6cf4f5945f99f94c762c3e8cc7bd8fb0", - "jurkat_REP2.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.3" - }, - "timestamp": "2024-07-20T16:46:41.867831982" - }, - "Should run with dragmap": { - "content": [ - 134, - [ - "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", - "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", - "cd4_REP2.coverage.hist.txt:md5,edadf440d1c3658118ffd6b6a46821f8", - "cd4_REP2.coverage.stats.txt:md5,cb1ce057d05fc53e7ad9b0b2e3d5aaad", - "cd4_REP3.coverage.hist.txt:md5,096ce6905c96587ba80ebcbe5893cf3e", - "cd4_REP3.coverage.stats.txt:md5,f4b88f4eebab0c010a1cfdc3404dfafb", - "cd4_REP4.coverage.hist.txt:md5,01f93b5c248e0b78f6d94e28eee3f9e7", - "cd4_REP4.coverage.stats.txt:md5,a4c6f61be8263e7461f8b961cfcc9053", - "jurkat_REP1.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", - "jurkat_REP1.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a", - "jurkat_REP2.coverage.hist.txt:md5,03301957b2f29c43cb8ea3462998c315", - "jurkat_REP2.coverage.stats.txt:md5,c3fc3f11e84f4d075ba95adbdbb2ee29" - ], - "cd4.bed:md5,e9380700e48c1e52f76a2bb3fa4f59d9", - "jurkat.bed:md5,fe88d4dc3c100262d7aec484e15b1c73", - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP1.lc_extrap.txt:md5,5ecde39eb3bbec0b056b57a5f95f10e7", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP2.lc_extrap.txt:md5,abb6a284d959110d35dd3b9659244188", - "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP3.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP3.lc_extrap.txt:md5,af11536a40238dc3417468a2f670126c", - "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP4.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP4.lc_extrap.txt:md5,b36b409ec88047cd354eb04a42b852e5", - "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP1.lc_extrap.txt:md5,024057a6211bf22384df658bce250d21", - "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP2.lc_extrap.txt:md5,33bdd91e7df616988c1ec043818b346b" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.3" - }, - "timestamp": "2024-07-20T16:50:43.677355963" - }, - "Should run with HISAT2": { - "content": [ - 134, - [ - "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", - "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", - "cd4_REP2.coverage.hist.txt:md5,ca9e862c16d556b3f1baa230d565e0a7", - "cd4_REP2.coverage.stats.txt:md5,14d8e9d53e129de3caf98fe6c8f52ace", - "cd4_REP3.coverage.hist.txt:md5,411058935790bff32f9e6d9b7d136597", - "cd4_REP3.coverage.stats.txt:md5,46bcbba43196873e663d3fa8ca381917", - "cd4_REP4.coverage.hist.txt:md5,5888d0a421c07cd417e18b09b25b68ab", - "cd4_REP4.coverage.stats.txt:md5,611d637d4bbdd0d96071cd1e291be5dd", - "jurkat_REP1.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", - "jurkat_REP1.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4", - "jurkat_REP2.coverage.hist.txt:md5,aba00d7a48866322ce46c9427023fd36", - "jurkat_REP2.coverage.stats.txt:md5,4a5f9c89f04b4792669ca4d23bcfb66e" - ], - "cd4.bed:md5,74d4739278c1d8af17a5f9d3296325da", - "jurkat.bed:md5,6d3edfc671c1bed970ca5934edc60756", - [ - "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP1.lc_extrap.txt:md5,81f27f75f082bca4eeeaed416a484429", - "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP2.lc_extrap.txt:md5,7c95f712b396568825145383cea0c525", - "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP3.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP3.lc_extrap.txt:md5,e83ef4e546a1d66ec5cc5e84a9766c33", - "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "cd4_REP4.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "cd4_REP4.lc_extrap.txt:md5,728975500782651e233de6705a044e8b", - "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP1.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP1.lc_extrap.txt:md5,04931737e170ed1764125f940684983e", - "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", - "jurkat_REP2.command.log:md5,d41d8cd98f00b204e9800998ecf8427e", - "jurkat_REP2.lc_extrap.txt:md5,157f7f7532f865226da4fb460c2ff7da" - ] - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.04.3" - }, - "timestamp": "2024-07-20T11:46:32.845750064" - } -} \ No newline at end of file diff --git a/workflows/tests/references.nf.test b/workflows/tests/references.nf.test deleted file mode 100644 index a7a5cfd1..00000000 --- a/workflows/tests/references.nf.test +++ /dev/null @@ -1,52 +0,0 @@ -def igenomes_base = 's3://ngi-igenomes/igenomes' - -nextflow_pipeline { - - name "Test passing references" - script "../../main.nf" - - // https://github.com/nf-core/nascent/issues/106 - test("Should work with BWA Index") { - // FIXME PINTS Fails because it doesn't find anything. - config './skip_pints.config' - when { - params { - outdir = "$outputDir" - aligner = "bwa" - // TODO Update these to human - bwa_index = "${igenomes_base}/Saccharomyces_cerevisiae/Ensembl/R64-1-1/Sequence/BWAIndex/version0.6.0/" - fasta = "${igenomes_base}/Saccharomyces_cerevisiae/Ensembl/R64-1-1/Sequence/WholeGenomeFasta/genome.fa" - gtf = "${igenomes_base}/Saccharomyces_cerevisiae/Ensembl/R64-1-1/Annotation/Genes/genes.gtf" - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - ).match() - } - } - - // https://github.com/nf-core/nascent/issues/119 - test("Should work with gzipped references") { - config './skip_gzip.config' - when { - params { - outdir = "$outputDir" - aligner = "bwa" - fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/reference/genome.fasta.gz' - gtf = 'https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/reference/genes.gtf.gz' - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - ).match() - } - - } - -} diff --git a/workflows/tests/references.nf.test.snap b/workflows/tests/references.nf.test.snap deleted file mode 100644 index 2761a7d4..00000000 --- a/workflows/tests/references.nf.test.snap +++ /dev/null @@ -1,22 +0,0 @@ -{ - "Should work with gzipped references": { - "content": [ - 98 - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-03-05T16:02:57.855321372" - }, - "Should work with BWA Index": { - "content": [ - 113 - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" - }, - "timestamp": "2024-03-05T16:01:56.042895683" - } -} \ No newline at end of file diff --git a/workflows/tests/star.nf.test b/workflows/tests/star.nf.test deleted file mode 100644 index 5b15df14..00000000 --- a/workflows/tests/star.nf.test +++ /dev/null @@ -1,42 +0,0 @@ -nextflow_pipeline { - - name "Test Workflow main.nf with STAR" - script "../../main.nf" - tag "aligner" - tag "star" - - test("Should run with STAR (default)") { - - when { - params { - outdir = "$outputDir" - aligner = "star" - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - ).match() - } - } - - test("Should run with gzipped gtf") { - - when { - params { - outdir = "$outputDir" - aligner = "star" - gtf = "https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gtf.gz" - } - } - - then { - assert workflow.success - assert snapshot( - workflow.trace.tasks().size(), - ).match() - } - } -} diff --git a/workflows/tests/star.nf.test.snap b/workflows/tests/star.nf.test.snap deleted file mode 100644 index e6e803ae..00000000 --- a/workflows/tests/star.nf.test.snap +++ /dev/null @@ -1,22 +0,0 @@ -{ - "Should run with gzipped gtf": { - "content": [ - 140 - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.03.0" - }, - "timestamp": "2024-04-27T12:40:13.788464472" - }, - "Should run with STAR (default)": { - "content": [ - 139 - ], - "meta": { - "nf-test": "0.8.4", - "nextflow": "24.03.0" - }, - "timestamp": "2024-04-25T17:27:56.772645664" - } -} \ No newline at end of file From 0a2d003eb3e9f9ba5d696e516789c900e36d3262 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 3 Aug 2024 08:02:44 -0500 Subject: [PATCH 061/255] docs: Update HOMER docs --- docs/output.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/output.md b/docs/output.md index 915b5c83..c44cb9da 100644 --- a/docs/output.md +++ b/docs/output.md @@ -295,6 +295,12 @@ The [Preseq](http://smithlabresearch.org/software/preseq/) package is aimed at p For now the pipeline only supports the HOMER groseq workflow, feel free to open an issue or PR if you'd like to see others. For more information about how to use HOMER, see the [GRO-Seq Analysis Tutorial](http://homer.ucsd.edu/homer/ngs/groseq/groseq.html). +Per the [HOMER GRO-Seq Analysis Tutorial](http://homer.ucsd.edu/homer/ngs/groseq/groseq.html): + +> In the case of technical replicates (i.e. runs from the same sequencing library), it is advisable to always "pool" the data. If they are biological replicates, it is often a good idea to keep them separate for and take advantage of their variability to refine your analysis. For some types of analysis, such as transcript identification, it is a good idea to create a single META-experiment that contains all of the GRO-Seq reads for a given cell type. This will provide increased power for identifying transcripts de novo. + +The pipeline will pool the reads if they are in the same group. See [#153](https://github.com/nf-core/nascent/issues/153) for the status of supporting other methods. + ### PINTS
    From 8b6cfc627365f43d52145e8b6d3e8bb0a19e51af Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 3 Aug 2024 07:58:38 -0500 Subject: [PATCH 062/255] test: Use small_samplesheet And getSamLinesMD5sum --- assets/small_samplesheet.csv | 4 ++ tests/nextflow.config | 2 +- workflows/tests/aligner/bowtie2.nf.test | 9 ++-- workflows/tests/aligner/bowtie2.nf.test.snap | 31 +++++------- workflows/tests/aligner/bwa.nf.test | 13 ++--- workflows/tests/aligner/bwa.nf.test.snap | 26 +++++----- workflows/tests/aligner/bwamem2.nf.test | 9 ++-- workflows/tests/aligner/bwamem2.nf.test.snap | 27 ++++------ workflows/tests/aligner/dragmap.nf.test | 9 ++-- workflows/tests/aligner/dragmap.nf.test.snap | 27 ++++------ workflows/tests/aligner/hisat2.nf.test | 9 ++-- workflows/tests/aligner/hisat2.nf.test.snap | 29 ++++------- workflows/tests/aligner/star.nf.test | 16 ++---- workflows/tests/aligner/star.nf.test.snap | 52 ++++++-------------- 14 files changed, 96 insertions(+), 167 deletions(-) create mode 100644 assets/small_samplesheet.csv diff --git a/assets/small_samplesheet.csv b/assets/small_samplesheet.csv new file mode 100644 index 00000000..01a71655 --- /dev/null +++ b/assets/small_samplesheet.csv @@ -0,0 +1,4 @@ +sample,fastq_1,fastq_2 +cd4_REP1,https://raw.githubusercontent.com/nf-core/test-datasets/nascent/testdata/SRX882903_T1.fastq.gz, +cd4_REP2,https://raw.githubusercontent.com/nf-core/test-datasets/nascent/testdata/SRX882903_T2.fastq.gz, +jurkat,https://raw.githubusercontent.com/nf-core/test-datasets/nascent/testdata/SRX882904_T1.fastq.gz, diff --git a/tests/nextflow.config b/tests/nextflow.config index 8d899cb5..3aba030e 100644 --- a/tests/nextflow.config +++ b/tests/nextflow.config @@ -30,7 +30,7 @@ dag { enabled = false } // HACK Hard code all the params for now params { // Input data - input = "${projectDir}/assets/samplesheet.csv" + input = "${projectDir}/assets/small_samplesheet.csv" // Genome references fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21.fa' diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index 11b10ce1..1ea6cf14 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -36,12 +36,9 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index e3c2e16a..8f6834e4 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -1,44 +1,35 @@ { "output_files": { "content": [ - 132, + 75, [ "cd4_REP1.coverage.hist.txt:md5,ffd8c0a94869dd782779fc871a9b781a", "cd4_REP1.coverage.stats.txt:md5,bebdef1adcce4296878f8699a0f5cb32", "cd4_REP2.coverage.hist.txt:md5,6e0ca13df7b06ff6a81fb21596df4ca4", "cd4_REP2.coverage.stats.txt:md5,ffb701c2be33360a96ce85b1330b13f8", - "cd4_REP3.coverage.hist.txt:md5,f602c7b2b7c125938cd8f1cafdfede5b", - "cd4_REP3.coverage.stats.txt:md5,90152fc99f072e654427864f28c198ee", - "cd4_REP4.coverage.hist.txt:md5,2b50c34a6e046b24a47b0c428e9d25b1", - "cd4_REP4.coverage.stats.txt:md5,ac9ceffc7e75db10d30c3809f16f83fb", - "jurkat_REP1.coverage.hist.txt:md5,656e30e8c4bd12e45a036c62c18730c1", - "jurkat_REP1.coverage.stats.txt:md5,627f0ec96ea9bdbd7f41b09b64c389d6", - "jurkat_REP2.coverage.hist.txt:md5,d6fa988165cadf5c852ea9b83c57f6c8", - "jurkat_REP2.coverage.stats.txt:md5,92ad48418a85e844bb62b0392397bb84" + "jurkat.coverage.hist.txt:md5,656e30e8c4bd12e45a036c62c18730c1", + "jurkat.coverage.stats.txt:md5,627f0ec96ea9bdbd7f41b09b64c389d6" ], - "cd4.bed:md5,eae2a0135e62184e6117ced483b9cd9a", - "jurkat.bed:md5,9255e426e272a406b3507847d4a57d5c", - "900325c1ad109ee12fa5f12c52f95b3f", - "c4e464e4c5f299c0fcb92d3e3ad856c1", - "35d5b2fbc71152546e7b6869986a3727", - "83171d18926d770e7accb0be6812a517", - "9b2f44262beeebcff3ccc103bb619894", - "4ccb14286f06945d7779e08b911501bd" + "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", + "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", + "5b7ec2c8bf1b7741bc130e5f92feb384", + "6b23567f81977ce485470421bbf759e4", + "b1954affeaa1120cefb1be4e767a26a5" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:48:16.280408015" + "timestamp": "2024-08-03T10:21:28.535327285" }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:48:15.403043368" + "timestamp": "2024-08-03T10:21:27.50697892" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 9365c279..9c2c79ca 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -11,6 +11,7 @@ nextflow_pipeline { params { outdir = "$outputDir" aligner = "bwa" + input = "${projectDir}/assets/samplesheet.csv" } } @@ -36,12 +37,12 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP3.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP4.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 481578cd..482f3ec8 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -18,47 +18,47 @@ ], "cd4.bed:md5,ab94918610a560772fdbec591200295f", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - "366dda72360cb6fef08914f246c23fe0", - "7ff8b1c06b1d47b26062624d2baf83a5", - "281fcd74eeaea3ccf15b864e60c70006", - "1401ddb7b887f1b81644c516bfde7e88", - "4a679dc8ae1fd96bed9da1e3f772daaa", - "21970a646ce32e2ccb2aa3d99dc0ebc" + "c529a16c839e85e119b98354f109352d", + "9e63b682af88fa902cf92b5c485845b1", + "2aa200bbbce374ec7dedb9b46ce4aae1", + "122274730dd5386e1b26c174df886a8b", + "c2adf5327ff6d4edda2fdad00c7cb9bf", + "63fea3b1e2e08e5f6fdf3f7ba0aa7818" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:52:23.111205909" + "timestamp": "2024-08-03T08:58:17.037588077" }, "Should work with gzipped references": { "content": [ - 98 + 53 ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:56:52.636381287" + "timestamp": "2024-08-03T07:39:38.160960801" }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:52:22.661915581" + "timestamp": "2024-08-03T07:37:00.256122533" }, "Should work with BWA Index": { "content": [ - 113 + 59 ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:54:47.955825977" + "timestamp": "2024-08-03T07:38:19.100788775" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test index f12e2e73..8279effe 100644 --- a/workflows/tests/aligner/bwamem2.nf.test +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -34,12 +34,9 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 654ec4fd..73979232 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -1,35 +1,26 @@ { "output_files": { "content": [ - 134, + 77, [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", - "cd4_REP3.coverage.hist.txt:md5,4a8397c1ea08f35ca7046e3c2c014a08", - "cd4_REP3.coverage.stats.txt:md5,b88592b469d504a93f2389255ac15f38", - "cd4_REP4.coverage.hist.txt:md5,d2cbf89e1f753d99bcd03b4e472270dd", - "cd4_REP4.coverage.stats.txt:md5,4c2b5fe6793aab8560cc87c176ac06ab", - "jurkat_REP1.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", - "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", - "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", - "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" ], - "cd4.bed:md5,ab94918610a560772fdbec591200295f", - "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - "366dda72360cb6fef08914f246c23fe0", - "7ff8b1c06b1d47b26062624d2baf83a5", - "281fcd74eeaea3ccf15b864e60c70006", - "1401ddb7b887f1b81644c516bfde7e88", - "4a679dc8ae1fd96bed9da1e3f772daaa", - "21970a646ce32e2ccb2aa3d99dc0ebc" + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + "c529a16c839e85e119b98354f109352d", + "9e63b682af88fa902cf92b5c485845b1", + "c2adf5327ff6d4edda2fdad00c7cb9bf" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:59:55.730451885" + "timestamp": "2024-08-03T10:28:23.205786296" }, "software_versions": { "content": [ diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index 799b21b1..b6280580 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -34,12 +34,9 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index b238b073..61bfc464 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -1,35 +1,26 @@ { "output_files": { "content": [ - 134, + 77, [ "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", "cd4_REP2.coverage.hist.txt:md5,edadf440d1c3658118ffd6b6a46821f8", "cd4_REP2.coverage.stats.txt:md5,cb1ce057d05fc53e7ad9b0b2e3d5aaad", - "cd4_REP3.coverage.hist.txt:md5,096ce6905c96587ba80ebcbe5893cf3e", - "cd4_REP3.coverage.stats.txt:md5,f4b88f4eebab0c010a1cfdc3404dfafb", - "cd4_REP4.coverage.hist.txt:md5,01f93b5c248e0b78f6d94e28eee3f9e7", - "cd4_REP4.coverage.stats.txt:md5,a4c6f61be8263e7461f8b961cfcc9053", - "jurkat_REP1.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", - "jurkat_REP1.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a", - "jurkat_REP2.coverage.hist.txt:md5,03301957b2f29c43cb8ea3462998c315", - "jurkat_REP2.coverage.stats.txt:md5,c3fc3f11e84f4d075ba95adbdbb2ee29" + "jurkat.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", + "jurkat.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a" ], - "cd4.bed:md5,e9380700e48c1e52f76a2bb3fa4f59d9", - "jurkat.bed:md5,fe88d4dc3c100262d7aec484e15b1c73", - "54edc10bad3d380f2389f9a61b13a1c", - "9899ae3197a810e6f18e55caea424a99", - "328015578661fb01eeb6b03b82f14af4", - "39a98a35b0011dae7f6af96d4d306ce1", - "d76849b792c9246366f7bfd68ba52708", - "4bc4eebe2ef3d4f2d7d5b2571a684ec5" + "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", + "jurkat.bed:md5,31454804c53975171a763d3049406598", + "a509da4f94dd9d58a5cd0a71f1fab606", + "b8dbf259d852dac0adab5af10bfc7d27", + "da11a883b278853d7be1393c7273b343" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T20:04:35.189267908" + "timestamp": "2024-08-03T10:30:20.34120051" }, "software_versions": { "content": [ diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 11c98ec6..1099016a 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -37,12 +37,9 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index c535a9a1..8d83c296 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -1,35 +1,26 @@ { "output_files": { "content": [ - 134, + 77, [ "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", "cd4_REP2.coverage.hist.txt:md5,ca9e862c16d556b3f1baa230d565e0a7", "cd4_REP2.coverage.stats.txt:md5,14d8e9d53e129de3caf98fe6c8f52ace", - "cd4_REP3.coverage.hist.txt:md5,411058935790bff32f9e6d9b7d136597", - "cd4_REP3.coverage.stats.txt:md5,46bcbba43196873e663d3fa8ca381917", - "cd4_REP4.coverage.hist.txt:md5,5888d0a421c07cd417e18b09b25b68ab", - "cd4_REP4.coverage.stats.txt:md5,611d637d4bbdd0d96071cd1e291be5dd", - "jurkat_REP1.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", - "jurkat_REP1.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4", - "jurkat_REP2.coverage.hist.txt:md5,aba00d7a48866322ce46c9427023fd36", - "jurkat_REP2.coverage.stats.txt:md5,4a5f9c89f04b4792669ca4d23bcfb66e" + "jurkat.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", + "jurkat.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4" ], - "cd4.bed:md5,74d4739278c1d8af17a5f9d3296325da", - "jurkat.bed:md5,6d3edfc671c1bed970ca5934edc60756", - "7c6f110b93f069f6767d508f24e46986", - "4b9dc03040268548300072c1ce32566f", - "400f5f7f7744b7efa43a97c70a1d5359", - "6d3a3f79144a0513ad93ffc27923ec5d", - "d434e4ca752838ed82474bded157c92b", - "b591522f5c8efb3bbd1b28ba64928c56" + "cd4.bed:md5,d8c78818eb1666575ef4c2534ea3727e", + "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", + "e4a8dd8442a85921d5b9a7f2fd1fce1e", + "4dba3f03e302b5d4a31c50987844ced7", + "2f7a17a247d070580890c62005d261fa" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T20:07:42.799393547" + "timestamp": "2024-08-03T10:31:53.720198479" }, "software_versions": { "content": [ @@ -39,6 +30,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T20:07:42.536938496" + "timestamp": "2024-08-03T09:05:42.254786523" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test index ceffe967..6d2d222e 100644 --- a/workflows/tests/aligner/star.nf.test +++ b/workflows/tests/aligner/star.nf.test @@ -36,12 +36,9 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) @@ -79,12 +76,7 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getReadsMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getReadsMD5(), + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), ).match() } ) diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 763d65b4..0f8d9e62 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -1,67 +1,47 @@ { "Should run with gzipped gtf": { "content": [ - 140, + 83, [ "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", - "cd4_REP3.coverage.hist.txt:md5,b428396f5f411d41f153baf8e044396d", - "cd4_REP3.coverage.stats.txt:md5,09ec44c74a750ea8a4ae37906895fcd0", - "cd4_REP4.coverage.hist.txt:md5,d782368a31301073527fdfc2276c89be", - "cd4_REP4.coverage.stats.txt:md5,18e7b11cb37d4df1c6a5b3af3b99007d", - "jurkat_REP1.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", - "jurkat_REP1.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee", - "jurkat_REP2.coverage.hist.txt:md5,ebccbb8fd619fc8a448df316552ba50d", - "jurkat_REP2.coverage.stats.txt:md5,7a9e5b7261a10f71fc6d6dab004a2ddb" + "jurkat.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", + "jurkat.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee" ], - "cd4.bed:md5,13c33dccb65a27f6b917e7114b5860a5", - "jurkat.bed:md5,72972c1f13c66195d59e5382bc73ca5a", - "d46f82aca0d563ac1d4ec5e92a3dd751", - "3f3233a2b9f9d23531e0e08f31f11af2", - "f2fa95f4588815951eb244aad98ff6e1", - "1d2e67cf8d09204b26d46a16fb858704", - "fa22f29727ce9c1a50cec37049d65fb5", - "1c5257c54cab2c8197a06a0f522649cf" + "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", + "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", + "4df1ea73be642288f18fa0d84f2f2820" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T20:22:39.260502556" + "timestamp": "2024-08-03T10:38:18.050552995" }, "output_files": { "content": [ - 139, + 82, [ "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", - "cd4_REP3.coverage.hist.txt:md5,b428396f5f411d41f153baf8e044396d", - "cd4_REP3.coverage.stats.txt:md5,09ec44c74a750ea8a4ae37906895fcd0", - "cd4_REP4.coverage.hist.txt:md5,d782368a31301073527fdfc2276c89be", - "cd4_REP4.coverage.stats.txt:md5,18e7b11cb37d4df1c6a5b3af3b99007d", - "jurkat_REP1.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", - "jurkat_REP1.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee", - "jurkat_REP2.coverage.hist.txt:md5,ebccbb8fd619fc8a448df316552ba50d", - "jurkat_REP2.coverage.stats.txt:md5,7a9e5b7261a10f71fc6d6dab004a2ddb" + "jurkat.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", + "jurkat.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee" ], - "cd4.bed:md5,13c33dccb65a27f6b917e7114b5860a5", - "jurkat.bed:md5,72972c1f13c66195d59e5382bc73ca5a", - "d46f82aca0d563ac1d4ec5e92a3dd751", - "3f3233a2b9f9d23531e0e08f31f11af2", - "f2fa95f4588815951eb244aad98ff6e1", - "1d2e67cf8d09204b26d46a16fb858704", - "fa22f29727ce9c1a50cec37049d65fb5", - "1c5257c54cab2c8197a06a0f522649cf" + "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", + "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", + "4df1ea73be642288f18fa0d84f2f2820", + "32b824f32b196761243365d93065a0da", + "519b0eb7154a059df04f6a74e01c0578" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T20:15:19.31686282" + "timestamp": "2024-08-03T10:35:05.994986959" }, "software_versions": { "content": [ From 04d4162198a7ac8c520a557633957142aa8b0cfd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 3 Aug 2024 21:25:30 -0500 Subject: [PATCH 063/255] test: Fix non-deterministic tests --- workflows/tests/aligner/bowtie2.nf.test | 7 ++++--- workflows/tests/aligner/bowtie2.nf.test.snap | 12 ++++++------ workflows/tests/aligner/dragmap.nf.test | 7 ++++--- workflows/tests/aligner/dragmap.nf.test.snap | 8 ++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index 1ea6cf14..51c229fd 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -36,9 +36,10 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), + // FIXME Bowtie2 isn't deterministic + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getHeaderMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getHeaderMD5(), + bam("$outputDir/samtools/jurkat.sorted.bam").getHeaderMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 8f6834e4..3af0ee7e 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -12,24 +12,24 @@ ], "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", - "5b7ec2c8bf1b7741bc130e5f92feb384", - "6b23567f81977ce485470421bbf759e4", - "b1954affeaa1120cefb1be4e767a26a5" + "7945f971cd63ad99ff2d9cc81e19ea39", + "43982cec9077e7030428267841cf04ef", + "8813c6dd42cabd94042f4f9e4aee3560" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T10:21:28.535327285" + "timestamp": "2024-08-03T22:17:27.92555495" }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T10:21:27.50697892" + "timestamp": "2024-08-03T21:20:15.261777672" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index b6280580..af2dd099 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -34,9 +34,10 @@ nextflow_pipeline { // FIXME https://github.com/nf-core/nascent/issues/148 // path("$outputDir/preseq").list(), // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), + // FIXME Dragmap isn't deterministic + bam("$outputDir/samtools/cd4_REP1.sorted.bam").getHeaderMD5(), + bam("$outputDir/samtools/cd4_REP2.sorted.bam").getHeaderMD5(), + bam("$outputDir/samtools/jurkat.sorted.bam").getHeaderMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index 61bfc464..dcaf9f23 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -12,15 +12,15 @@ ], "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", "jurkat.bed:md5,31454804c53975171a763d3049406598", - "a509da4f94dd9d58a5cd0a71f1fab606", - "b8dbf259d852dac0adab5af10bfc7d27", - "da11a883b278853d7be1393c7273b343" + "9294458e8828aa4446fc6ea24f828d11", + "767cae9340255d914b40f5f0a76f9d65", + "b47414b7dada10ad11535d36af2e2cb" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T10:30:20.34120051" + "timestamp": "2024-08-03T21:25:35.878072689" }, "software_versions": { "content": [ From ce4ed8c2659965ece9120105fadf16458ab335a9 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 1 Aug 2024 13:06:59 -0500 Subject: [PATCH 064/255] build: nf-core modules install bam_rseqc --- modules.json | 36 +- modules/nf-core/rseqc/bamstat/environment.yml | 8 + modules/nf-core/rseqc/bamstat/main.nf | 45 + modules/nf-core/rseqc/bamstat/meta.yml | 40 + .../nf-core/rseqc/bamstat/tests/main.nf.test | 53 + .../rseqc/bamstat/tests/main.nf.test.snap | 68 ++ .../rseqc/bamstat/tests/nextflow.config | 5 + modules/nf-core/rseqc/bamstat/tests/tags.yml | 2 + .../rseqc/innerdistance/environment.yml | 8 + modules/nf-core/rseqc/innerdistance/main.nf | 66 ++ modules/nf-core/rseqc/innerdistance/meta.yml | 60 ++ .../rseqc/innerdistance/tests/main.nf.test | 63 ++ .../innerdistance/tests/main.nf.test.snap | 189 ++++ .../rseqc/innerdistance/tests/nextflow.config | 5 + .../rseqc/innerdistance/tests/tags.yml | 2 + .../rseqc/junctionannotation/environment.yml | 8 + .../nf-core/rseqc/junctionannotation/main.nf | 60 ++ .../nf-core/rseqc/junctionannotation/meta.yml | 68 ++ .../junctionannotation/tests/main.nf.test | 60 ++ .../tests/main.nf.test.snap | 175 ++++ .../rseqc/junctionannotation/tests/tags.yml | 2 + .../rseqc/junctionsaturation/environment.yml | 8 + .../nf-core/rseqc/junctionsaturation/main.nf | 49 + .../nf-core/rseqc/junctionsaturation/meta.yml | 48 + .../junctionsaturation/tests/main.nf.test | 59 ++ .../tests/main.nf.test.snap | 95 ++ .../rseqc/junctionsaturation/tests/tags.yml | 2 + modules/nf-core/rseqc/tin/environment.yml | 8 + modules/nf-core/rseqc/tin/main.nf | 48 + modules/nf-core/rseqc/tin/meta.yml | 50 + modules/nf-core/rseqc/tin/tests/main.nf.test | 58 ++ .../nf-core/rseqc/tin/tests/main.nf.test.snap | 108 +++ modules/nf-core/rseqc/tin/tests/tags.yml | 2 + subworkflows/nf-core/bam_rseqc/main.nf | 185 ++++ subworkflows/nf-core/bam_rseqc/meta.yml | 162 ++++ .../nf-core/bam_rseqc/tests/main.nf.test | 147 +++ .../nf-core/bam_rseqc/tests/main.nf.test.snap | 903 ++++++++++++++++++ subworkflows/nf-core/bam_rseqc/tests/tags.yml | 2 + 38 files changed, 2954 insertions(+), 3 deletions(-) create mode 100644 modules/nf-core/rseqc/bamstat/environment.yml create mode 100644 modules/nf-core/rseqc/bamstat/main.nf create mode 100644 modules/nf-core/rseqc/bamstat/meta.yml create mode 100644 modules/nf-core/rseqc/bamstat/tests/main.nf.test create mode 100644 modules/nf-core/rseqc/bamstat/tests/main.nf.test.snap create mode 100644 modules/nf-core/rseqc/bamstat/tests/nextflow.config create mode 100644 modules/nf-core/rseqc/bamstat/tests/tags.yml create mode 100644 modules/nf-core/rseqc/innerdistance/environment.yml create mode 100644 modules/nf-core/rseqc/innerdistance/main.nf create mode 100644 modules/nf-core/rseqc/innerdistance/meta.yml create mode 100644 modules/nf-core/rseqc/innerdistance/tests/main.nf.test create mode 100644 modules/nf-core/rseqc/innerdistance/tests/main.nf.test.snap create mode 100644 modules/nf-core/rseqc/innerdistance/tests/nextflow.config create mode 100644 modules/nf-core/rseqc/innerdistance/tests/tags.yml create mode 100644 modules/nf-core/rseqc/junctionannotation/environment.yml create mode 100644 modules/nf-core/rseqc/junctionannotation/main.nf create mode 100644 modules/nf-core/rseqc/junctionannotation/meta.yml create mode 100644 modules/nf-core/rseqc/junctionannotation/tests/main.nf.test create mode 100644 modules/nf-core/rseqc/junctionannotation/tests/main.nf.test.snap create mode 100644 modules/nf-core/rseqc/junctionannotation/tests/tags.yml create mode 100644 modules/nf-core/rseqc/junctionsaturation/environment.yml create mode 100644 modules/nf-core/rseqc/junctionsaturation/main.nf create mode 100644 modules/nf-core/rseqc/junctionsaturation/meta.yml create mode 100644 modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test create mode 100644 modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test.snap create mode 100644 modules/nf-core/rseqc/junctionsaturation/tests/tags.yml create mode 100644 modules/nf-core/rseqc/tin/environment.yml create mode 100644 modules/nf-core/rseqc/tin/main.nf create mode 100644 modules/nf-core/rseqc/tin/meta.yml create mode 100644 modules/nf-core/rseqc/tin/tests/main.nf.test create mode 100644 modules/nf-core/rseqc/tin/tests/main.nf.test.snap create mode 100644 modules/nf-core/rseqc/tin/tests/tags.yml create mode 100644 subworkflows/nf-core/bam_rseqc/main.nf create mode 100644 subworkflows/nf-core/bam_rseqc/meta.yml create mode 100644 subworkflows/nf-core/bam_rseqc/tests/main.nf.test create mode 100644 subworkflows/nf-core/bam_rseqc/tests/main.nf.test.snap create mode 100644 subworkflows/nf-core/bam_rseqc/tests/tags.yml diff --git a/modules.json b/modules.json index 1a0ff7b6..1a3c6102 100644 --- a/modules.json +++ b/modules.json @@ -162,20 +162,45 @@ "git_sha": "2c6b1144ed58b6184ad58fc4e6b6a90219b4bf4f", "installed_by": ["modules"] }, + "rseqc/bamstat": { + "branch": "master", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", + "installed_by": ["bam_rseqc"] + }, "rseqc/inferexperiment": { "branch": "master", "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", - "installed_by": ["modules"] + "installed_by": ["bam_rseqc", "modules"] + }, + "rseqc/innerdistance": { + "branch": "master", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", + "installed_by": ["bam_rseqc"] + }, + "rseqc/junctionannotation": { + "branch": "master", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", + "installed_by": ["bam_rseqc"] + }, + "rseqc/junctionsaturation": { + "branch": "master", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", + "installed_by": ["bam_rseqc"] }, "rseqc/readdistribution": { "branch": "master", "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", - "installed_by": ["modules"] + "installed_by": ["bam_rseqc", "modules"] }, "rseqc/readduplication": { "branch": "master", "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", - "installed_by": ["modules"] + "installed_by": ["bam_rseqc", "modules"] + }, + "rseqc/tin": { + "branch": "master", + "git_sha": "b4919e9a2b4d8b71061e601633db4600a3858fa1", + "installed_by": ["bam_rseqc"] }, "samtools/flagstat": { "branch": "master", @@ -236,6 +261,11 @@ "git_sha": "46eca555142d6e597729fcb682adcc791796f514", "installed_by": ["subworkflows"] }, + "bam_rseqc": { + "branch": "master", + "git_sha": "0eacd714effe5aac1c1de26593873960b3346cab", + "installed_by": ["subworkflows"] + }, "bam_sort_stats_samtools": { "branch": "master", "git_sha": "46eca555142d6e597729fcb682adcc791796f514", diff --git a/modules/nf-core/rseqc/bamstat/environment.yml b/modules/nf-core/rseqc/bamstat/environment.yml new file mode 100644 index 00000000..e960c994 --- /dev/null +++ b/modules/nf-core/rseqc/bamstat/environment.yml @@ -0,0 +1,8 @@ +name: rseqc_bamstat +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::rseqc=5.0.3 + - conda-forge::r-base>=3.5 diff --git a/modules/nf-core/rseqc/bamstat/main.nf b/modules/nf-core/rseqc/bamstat/main.nf new file mode 100644 index 00000000..167240c4 --- /dev/null +++ b/modules/nf-core/rseqc/bamstat/main.nf @@ -0,0 +1,45 @@ +process RSEQC_BAMSTAT { + tag "$meta.id" + label 'process_medium' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/rseqc:5.0.3--py39hf95cd2a_0' : + 'biocontainers/rseqc:5.0.3--py39hf95cd2a_0' }" + + input: + tuple val(meta), path(bam) + + output: + tuple val(meta), path("*.bam_stat.txt"), emit: txt + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + """ + bam_stat.py \\ + -i $bam \\ + $args \\ + > ${prefix}.bam_stat.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(bam_stat.py --version | sed -e "s/bam_stat.py //g") + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.bam_stat.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(bam_stat.py --version | sed -e "s/bam_stat.py //g") + END_VERSIONS + """ +} diff --git a/modules/nf-core/rseqc/bamstat/meta.yml b/modules/nf-core/rseqc/bamstat/meta.yml new file mode 100644 index 00000000..72745310 --- /dev/null +++ b/modules/nf-core/rseqc/bamstat/meta.yml @@ -0,0 +1,40 @@ +name: rseqc_bamstat +description: Generate statistics from a bam file +keywords: + - bam + - qc + - bamstat +tools: + - rseqc: + description: | + RSeQC package provides a number of useful modules that can comprehensively evaluate + high throughput sequence data especially RNA-seq data. + homepage: http://rseqc.sourceforge.net/ + documentation: http://rseqc.sourceforge.net/ + doi: 10.1093/bioinformatics/bts356 + licence: ["GPL-3.0-or-later"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: the bam file to calculate statistics of + pattern: "*.{bam}" +output: + - txt: + type: file + description: bam statistics report + pattern: "*.bam_stat.txt" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" + - "@kevinmenden" +maintainers: + - "@drpatelh" + - "@kevinmenden" diff --git a/modules/nf-core/rseqc/bamstat/tests/main.nf.test b/modules/nf-core/rseqc/bamstat/tests/main.nf.test new file mode 100644 index 00000000..86f4301e --- /dev/null +++ b/modules/nf-core/rseqc/bamstat/tests/main.nf.test @@ -0,0 +1,53 @@ +nextflow_process { + + name "Test Process RSEQC_BAMSTAT" + script "../main.nf" + process "RSEQC_BAMSTAT" + + tag "modules" + tag "modules_nfcore" + tag "rseqc" + tag "rseqc/bamstat" + + config "./nextflow.config" + + test("sarscov2 - [meta] - bam") { + + when { + process { + """ + input[0] = [ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam') + ] + """ + } + } + + then { + assert process.success + assert snapshot(process.out).match() + } + } + + test("sarscov2 - [meta] - bam - stub") { + + options "-stub" + + when { + process { + """ + input[0] = [ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam') + ] + """ + } + } + + then { + assert process.success + assert snapshot(process.out).match() + } + } +} diff --git a/modules/nf-core/rseqc/bamstat/tests/main.nf.test.snap b/modules/nf-core/rseqc/bamstat/tests/main.nf.test.snap new file mode 100644 index 00000000..deae0e80 --- /dev/null +++ b/modules/nf-core/rseqc/bamstat/tests/main.nf.test.snap @@ -0,0 +1,68 @@ +{ + "sarscov2 - [meta] - bam - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.bam_stat.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + "versions.yml:md5,58f74a7ff9d2966142c81a4a4735dbf3" + ], + "txt": [ + [ + { + "id": "test" + }, + "test.bam_stat.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,58f74a7ff9d2966142c81a4a4735dbf3" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:16:13.970299" + }, + "sarscov2 - [meta] - bam": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.bam_stat.txt:md5,2675857864c1d1139b2a19d25dc36b09" + ] + ], + "1": [ + "versions.yml:md5,58f74a7ff9d2966142c81a4a4735dbf3" + ], + "txt": [ + [ + { + "id": "test" + }, + "test.bam_stat.txt:md5,2675857864c1d1139b2a19d25dc36b09" + ] + ], + "versions": [ + "versions.yml:md5,58f74a7ff9d2966142c81a4a4735dbf3" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "23.10.1" + }, + "timestamp": "2023-12-14T17:00:23.830276754" + } +} \ No newline at end of file diff --git a/modules/nf-core/rseqc/bamstat/tests/nextflow.config b/modules/nf-core/rseqc/bamstat/tests/nextflow.config new file mode 100644 index 00000000..8730f1c4 --- /dev/null +++ b/modules/nf-core/rseqc/bamstat/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + + publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" } + +} diff --git a/modules/nf-core/rseqc/bamstat/tests/tags.yml b/modules/nf-core/rseqc/bamstat/tests/tags.yml new file mode 100644 index 00000000..ed9a41fa --- /dev/null +++ b/modules/nf-core/rseqc/bamstat/tests/tags.yml @@ -0,0 +1,2 @@ +rseqc/bamstat: + - modules/nf-core/rseqc/bamstat/** diff --git a/modules/nf-core/rseqc/innerdistance/environment.yml b/modules/nf-core/rseqc/innerdistance/environment.yml new file mode 100644 index 00000000..fb6e9e92 --- /dev/null +++ b/modules/nf-core/rseqc/innerdistance/environment.yml @@ -0,0 +1,8 @@ +name: rseqc_innerdistance +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::rseqc=5.0.3 + - conda-forge::r-base>=3.5 diff --git a/modules/nf-core/rseqc/innerdistance/main.nf b/modules/nf-core/rseqc/innerdistance/main.nf new file mode 100644 index 00000000..207f5fb4 --- /dev/null +++ b/modules/nf-core/rseqc/innerdistance/main.nf @@ -0,0 +1,66 @@ +process RSEQC_INNERDISTANCE { + tag "$meta.id" + label 'process_medium' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/rseqc:5.0.3--py39hf95cd2a_0' : + 'biocontainers/rseqc:5.0.3--py39hf95cd2a_0' }" + + input: + tuple val(meta), path(bam) + path bed + + output: + tuple val(meta), path("*distance.txt"), optional:true, emit: distance + tuple val(meta), path("*freq.txt") , optional:true, emit: freq + tuple val(meta), path("*mean.txt") , optional:true, emit: mean + tuple val(meta), path("*.pdf") , optional:true, emit: pdf + tuple val(meta), path("*.r") , optional:true, emit: rscript + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + if (!meta.single_end) { + """ + inner_distance.py \\ + -i $bam \\ + -r $bed \\ + -o $prefix \\ + $args \\ + > stdout.txt + head -n 2 stdout.txt > ${prefix}.inner_distance_mean.txt + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(inner_distance.py --version | sed -e "s/inner_distance.py //g") + END_VERSIONS + """ + } else { + """ + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(inner_distance.py --version | sed -e "s/inner_distance.py //g") + END_VERSIONS + """ + } + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.inner_distance.txt + touch ${prefix}.inner_distance_freq.txt + touch ${prefix}.inner_distance_mean.txt + touch ${prefix}.inner_distance_plot.pdf + touch ${prefix}.inner_distance_plot.r + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(inner_distance.py --version | sed -e "s/inner_distance.py //g") + END_VERSIONS + """ +} diff --git a/modules/nf-core/rseqc/innerdistance/meta.yml b/modules/nf-core/rseqc/innerdistance/meta.yml new file mode 100644 index 00000000..d0a5bf18 --- /dev/null +++ b/modules/nf-core/rseqc/innerdistance/meta.yml @@ -0,0 +1,60 @@ +name: rseqc_innerdistance +description: Calculate inner distance between read pairs. +keywords: + - read_pairs + - fragment_size + - inner_distance +tools: + - rseqc: + description: | + RSeQC package provides a number of useful modules that can comprehensively evaluate + high throughput sequence data especially RNA-seq data. + homepage: http://rseqc.sourceforge.net/ + documentation: http://rseqc.sourceforge.net/ + doi: 10.1093/bioinformatics/bts356 + licence: ["GPL-3.0-or-later"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: the alignment in bam format + pattern: "*.{bam}" + - bed: + type: file + description: a bed file for the reference gene model + pattern: "*.{bed}" +output: + - distance: + type: file + description: the inner distances + pattern: "*.inner_distance.txt" + - freq: + type: file + description: frequencies of different insert sizes + pattern: "*.inner_distance_freq.txt" + - mean: + type: file + description: mean/median values of inner distances + pattern: "*.inner_distance_mean.txt" + - pdf: + type: file + description: distribution plot of inner distances + pattern: "*.inner_distance_plot.pdf" + - rscript: + type: file + description: script to reproduce the plot + pattern: "*.inner_distance_plot.R" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" + - "@kevinmenden" +maintainers: + - "@drpatelh" + - "@kevinmenden" diff --git a/modules/nf-core/rseqc/innerdistance/tests/main.nf.test b/modules/nf-core/rseqc/innerdistance/tests/main.nf.test new file mode 100644 index 00000000..cb19fe14 --- /dev/null +++ b/modules/nf-core/rseqc/innerdistance/tests/main.nf.test @@ -0,0 +1,63 @@ +nextflow_process { + + name "Test Process RSEQC_INNERDISTANCE" + script "../main.nf" + process "RSEQC_INNERDISTANCE" + config "./nextflow.config" + + tag "modules" + tag "modules_nfcore" + tag "rseqc" + tag "rseqc/innerdistance" + + test("sarscov2 - [[meta] - bam] - bed") { + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed12", checkIfExists: true)) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.pdf[0][1]).name).match("pdf") }, + { assert snapshot(process.out.distance).match("distance") }, + { assert snapshot(process.out.freq).match("freq") }, + { assert snapshot(process.out.freq).match("rscript") }, + { assert snapshot(process.out.mean).match("mean") }, + { assert snapshot(process.out.versions).match("versions") } + ) + } + } + + test("sarscov2 - [[meta] - bam] - bed - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed12", checkIfExists: true)) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } +} diff --git a/modules/nf-core/rseqc/innerdistance/tests/main.nf.test.snap b/modules/nf-core/rseqc/innerdistance/tests/main.nf.test.snap new file mode 100644 index 00000000..83f33363 --- /dev/null +++ b/modules/nf-core/rseqc/innerdistance/tests/main.nf.test.snap @@ -0,0 +1,189 @@ +{ + "rscript": { + "content": [ + [ + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,3fc037501f5899b5da009c8ce02fc25e" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:42.467401" + }, + "pdf": { + "content": [ + "test.inner_distance_plot.pdf" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:42.461959" + }, + "distance": { + "content": [ + [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,a1acc9def0f64a5500d4c4cb47cbe32b" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:42.463083" + }, + "versions": { + "content": [ + [ + "versions.yml:md5,3ca19644c7f02a53db3ffe50c7706797" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:42.474576" + }, + "mean": { + "content": [ + [ + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,58398b7d5a29a5e564f9e3c50b55996c" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:42.470638" + }, + "sarscov2 - [[meta] - bam] - bed - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + "versions.yml:md5,3ca19644c7f02a53db3ffe50c7706797" + ], + "distance": [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "freq": [ + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "mean": [ + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "pdf": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "rscript": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,3ca19644c7f02a53db3ffe50c7706797" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:22:20.844642" + }, + "freq": { + "content": [ + [ + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,3fc037501f5899b5da009c8ce02fc25e" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:33:42.464983" + } +} \ No newline at end of file diff --git a/modules/nf-core/rseqc/innerdistance/tests/nextflow.config b/modules/nf-core/rseqc/innerdistance/tests/nextflow.config new file mode 100644 index 00000000..8730f1c4 --- /dev/null +++ b/modules/nf-core/rseqc/innerdistance/tests/nextflow.config @@ -0,0 +1,5 @@ +process { + + publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" } + +} diff --git a/modules/nf-core/rseqc/innerdistance/tests/tags.yml b/modules/nf-core/rseqc/innerdistance/tests/tags.yml new file mode 100644 index 00000000..4a9d0acf --- /dev/null +++ b/modules/nf-core/rseqc/innerdistance/tests/tags.yml @@ -0,0 +1,2 @@ +rseqc/innerdistance: + - modules/nf-core/rseqc/innerdistance/** diff --git a/modules/nf-core/rseqc/junctionannotation/environment.yml b/modules/nf-core/rseqc/junctionannotation/environment.yml new file mode 100644 index 00000000..35276b71 --- /dev/null +++ b/modules/nf-core/rseqc/junctionannotation/environment.yml @@ -0,0 +1,8 @@ +name: rseqc_junctionannotation +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::rseqc=5.0.3 + - conda-forge::r-base>=3.5 diff --git a/modules/nf-core/rseqc/junctionannotation/main.nf b/modules/nf-core/rseqc/junctionannotation/main.nf new file mode 100644 index 00000000..9a8a4653 --- /dev/null +++ b/modules/nf-core/rseqc/junctionannotation/main.nf @@ -0,0 +1,60 @@ +process RSEQC_JUNCTIONANNOTATION { + tag "$meta.id" + label 'process_medium' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/rseqc:5.0.3--py39hf95cd2a_0' : + 'biocontainers/rseqc:5.0.3--py39hf95cd2a_0' }" + + input: + tuple val(meta), path(bam) + path bed + + output: + tuple val(meta), path("*.xls") , emit: xls + tuple val(meta), path("*.r") , emit: rscript + tuple val(meta), path("*.log") , emit: log + tuple val(meta), path("*.junction.bed"), optional:true, emit: bed + tuple val(meta), path("*.Interact.bed"), optional:true, emit: interact_bed + tuple val(meta), path("*junction.pdf") , optional:true, emit: pdf + tuple val(meta), path("*events.pdf") , optional:true, emit: events_pdf + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + """ + junction_annotation.py \\ + -i $bam \\ + -r $bed \\ + -o $prefix \\ + $args \\ + 2> >(grep -v 'E::idx_find_and_load' | tee ${prefix}.junction_annotation.log >&2) + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(junction_annotation.py --version | sed -e "s/junction_annotation.py //g") + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.junction.xls + touch ${prefix}.junction_plot.r + touch ${prefix}.junction_annotation.log + touch ${prefix}.junction.bed + touch ${prefix}.Interact.bed + touch ${prefix}.junction.pdf + touch ${prefix}.events.pdf + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(junction_annotation.py --version | sed -e "s/junction_annotation.py //g") + END_VERSIONS + """ +} diff --git a/modules/nf-core/rseqc/junctionannotation/meta.yml b/modules/nf-core/rseqc/junctionannotation/meta.yml new file mode 100644 index 00000000..a88aa2db --- /dev/null +++ b/modules/nf-core/rseqc/junctionannotation/meta.yml @@ -0,0 +1,68 @@ +name: rseqc_junctionannotation +description: compare detected splice junctions to reference gene model +keywords: + - junctions + - splicing + - rnaseq +tools: + - rseqc: + description: | + RSeQC package provides a number of useful modules that can comprehensively evaluate + high throughput sequence data especially RNA-seq data. + homepage: http://rseqc.sourceforge.net/ + documentation: http://rseqc.sourceforge.net/ + doi: 10.1093/bioinformatics/bts356 + licence: ["GPL-3.0-or-later"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: the alignment in bam format + pattern: "*.{bam}" + - bed: + type: file + description: a bed file for the reference gene model + pattern: "*.{bed}" +output: + - bed: + type: file + description: bed file of annotated junctions + pattern: "*.junction.bed" + - interact_bed: + type: file + description: Interact bed file + pattern: "*.Interact.bed" + - xls: + type: file + description: xls file with junction information + pattern: "*.xls" + - pdf: + type: file + description: junction plot + pattern: "*.junction.pdf" + - events_pdf: + type: file + description: events plot + pattern: "*.events.pdf" + - rscript: + type: file + description: Rscript to reproduce the plots + pattern: "*.r" + - log: + type: file + description: Log file of execution + pattern: "*.junction_annotation.log" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" + - "@kevinmenden" +maintainers: + - "@drpatelh" + - "@kevinmenden" diff --git a/modules/nf-core/rseqc/junctionannotation/tests/main.nf.test b/modules/nf-core/rseqc/junctionannotation/tests/main.nf.test new file mode 100644 index 00000000..36d5f6e2 --- /dev/null +++ b/modules/nf-core/rseqc/junctionannotation/tests/main.nf.test @@ -0,0 +1,60 @@ +nextflow_process { + + name "Test Process RSEQC_JUNCTIONANNOTATION" + script "../main.nf" + process "RSEQC_JUNCTIONANNOTATION" + + tag "modules" + tag "modules_nfcore" + tag "rseqc" + tag "rseqc/junctionannotation" + + test("sarscov2 - paired end [bam]") { + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end: false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed", checkIfExists: true)) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert process.out.rscript.get(0).get(1) ==~ ".*/test.junction_plot.r" }, + { assert process.out.xls.get(0).get(1) ==~ ".*/test.junction.xls" }, + { assert snapshot(process.out.log).match("log") }, + { assert snapshot(process.out.versions).match("versions") } + ) + } + } + + test("sarscov2 - paired end [bam] - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end: false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed", checkIfExists: true)) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } +} diff --git a/modules/nf-core/rseqc/junctionannotation/tests/main.nf.test.snap b/modules/nf-core/rseqc/junctionannotation/tests/main.nf.test.snap new file mode 100644 index 00000000..e87594f0 --- /dev/null +++ b/modules/nf-core/rseqc/junctionannotation/tests/main.nf.test.snap @@ -0,0 +1,175 @@ +{ + "log": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction_annotation.log:md5,ef37d06d169a1adbeec23fddf82aee2b" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:32:52.732937" + }, + "versions": { + "content": [ + [ + "versions.yml:md5,091865c0ebd6de262c9b0968b5771091" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:32:52.734515" + }, + "sarscov2 - paired end [bam] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction_annotation.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "3": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test", + "single_end": false + }, + "test.Interact.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "6": [ + [ + { + "id": "test", + "single_end": false + }, + "test.events.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "7": [ + "versions.yml:md5,091865c0ebd6de262c9b0968b5771091" + ], + "bed": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "events_pdf": [ + [ + { + "id": "test", + "single_end": false + }, + "test.events.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "interact_bed": [ + [ + { + "id": "test", + "single_end": false + }, + "test.Interact.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "log": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction_annotation.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "pdf": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "rscript": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,091865c0ebd6de262c9b0968b5771091" + ], + "xls": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junction.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:39:10.213511" + } +} \ No newline at end of file diff --git a/modules/nf-core/rseqc/junctionannotation/tests/tags.yml b/modules/nf-core/rseqc/junctionannotation/tests/tags.yml new file mode 100644 index 00000000..5f719fb8 --- /dev/null +++ b/modules/nf-core/rseqc/junctionannotation/tests/tags.yml @@ -0,0 +1,2 @@ +rseqc/junctionannotation: + - modules/nf-core/rseqc/junctionannotation/** diff --git a/modules/nf-core/rseqc/junctionsaturation/environment.yml b/modules/nf-core/rseqc/junctionsaturation/environment.yml new file mode 100644 index 00000000..7b9cc4fa --- /dev/null +++ b/modules/nf-core/rseqc/junctionsaturation/environment.yml @@ -0,0 +1,8 @@ +name: rseqc_junctionsaturation +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::rseqc=5.0.3 + - conda-forge::r-base>=3.5 diff --git a/modules/nf-core/rseqc/junctionsaturation/main.nf b/modules/nf-core/rseqc/junctionsaturation/main.nf new file mode 100644 index 00000000..18f063f3 --- /dev/null +++ b/modules/nf-core/rseqc/junctionsaturation/main.nf @@ -0,0 +1,49 @@ +process RSEQC_JUNCTIONSATURATION { + tag "$meta.id" + label 'process_medium' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/rseqc:5.0.3--py39hf95cd2a_0' : + 'biocontainers/rseqc:5.0.3--py39hf95cd2a_0' }" + + input: + tuple val(meta), path(bam) + path bed + + output: + tuple val(meta), path("*.pdf"), emit: pdf + tuple val(meta), path("*.r") , emit: rscript + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + """ + junction_saturation.py \\ + -i $bam \\ + -r $bed \\ + -o $prefix \\ + $args + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(junction_saturation.py --version | sed -e "s/junction_saturation.py //g") + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${prefix}.junctionSaturation_plot.pdf + touch ${prefix}.junctionSaturation_plot.r + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(junction_saturation.py --version | sed -e "s/junction_saturation.py //g") + END_VERSIONS + """ +} diff --git a/modules/nf-core/rseqc/junctionsaturation/meta.yml b/modules/nf-core/rseqc/junctionsaturation/meta.yml new file mode 100644 index 00000000..19ae3f52 --- /dev/null +++ b/modules/nf-core/rseqc/junctionsaturation/meta.yml @@ -0,0 +1,48 @@ +name: rseqc_junctionsaturation +description: compare detected splice junctions to reference gene model +keywords: + - junctions + - splicing + - rnaseq +tools: + - rseqc: + description: | + RSeQC package provides a number of useful modules that can comprehensively evaluate + high throughput sequence data especially RNA-seq data. + homepage: http://rseqc.sourceforge.net/ + documentation: http://rseqc.sourceforge.net/ + doi: 10.1093/bioinformatics/bts356 + licence: ["GPL-3.0-or-later"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: the alignment in bam format + pattern: "*.{bam}" + - bed: + type: file + description: a bed file for the reference gene model + pattern: "*.{bed}" +output: + - pdf: + type: file + description: Junction saturation report + pattern: "*.pdf" + - rscript: + type: file + description: Junction saturation R-script + pattern: "*.r" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" + - "@kevinmenden" +maintainers: + - "@drpatelh" + - "@kevinmenden" diff --git a/modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test b/modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test new file mode 100644 index 00000000..7bd3cfc2 --- /dev/null +++ b/modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test @@ -0,0 +1,59 @@ +nextflow_process { + + name "Test Process RSEQC_JUNCTIONSATURATION" + script "../main.nf" + process "RSEQC_JUNCTIONSATURATION" + + tag "modules" + tag "modules_nfcore" + tag "rseqc" + tag "rseqc/junctionsaturation" + + test("sarscov2 paired-end [bam]") { + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end: false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed", checkIfExists: true) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(file(process.out.pdf[0][1]).name).match("pdf") }, + { assert snapshot(process.out.rscript).match("rscript") }, + { assert snapshot(process.out.versions).match("versions") } + ) + } + } + + test("sarscov2 paired-end [bam] - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end: false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true) + ]) + input[1] = file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed", checkIfExists: true) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } +} diff --git a/modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test.snap b/modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test.snap new file mode 100644 index 00000000..8d702a4e --- /dev/null +++ b/modules/nf-core/rseqc/junctionsaturation/tests/main.nf.test.snap @@ -0,0 +1,95 @@ +{ + "rscript": { + "content": [ + [ + [ + { + "id": "test", + "single_end": false + }, + "test.junctionSaturation_plot.r:md5,caa6e63dcb477aabb169882b2f30dadd" + ] + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:32:24.018924" + }, + "pdf": { + "content": [ + "test.junctionSaturation_plot.pdf" + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:32:24.011942" + }, + "versions": { + "content": [ + [ + "versions.yml:md5,cd4638541a825dbd44e3cb65d2980aa1" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:32:24.021984" + }, + "sarscov2 paired-end [bam] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junctionSaturation_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junctionSaturation_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,cd4638541a825dbd44e3cb65d2980aa1" + ], + "pdf": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junctionSaturation_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "rscript": [ + [ + { + "id": "test", + "single_end": false + }, + "test.junctionSaturation_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,cd4638541a825dbd44e3cb65d2980aa1" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:43:55.853893" + } +} \ No newline at end of file diff --git a/modules/nf-core/rseqc/junctionsaturation/tests/tags.yml b/modules/nf-core/rseqc/junctionsaturation/tests/tags.yml new file mode 100644 index 00000000..7022b59a --- /dev/null +++ b/modules/nf-core/rseqc/junctionsaturation/tests/tags.yml @@ -0,0 +1,2 @@ +rseqc/junctionsaturation: + - modules/nf-core/rseqc/junctionsaturation/** diff --git a/modules/nf-core/rseqc/tin/environment.yml b/modules/nf-core/rseqc/tin/environment.yml new file mode 100644 index 00000000..288da430 --- /dev/null +++ b/modules/nf-core/rseqc/tin/environment.yml @@ -0,0 +1,8 @@ +name: rseqc_tin +channels: + - conda-forge + - bioconda + - defaults +dependencies: + - bioconda::rseqc=5.0.3 + - conda-forge::r-base>=3.5 diff --git a/modules/nf-core/rseqc/tin/main.nf b/modules/nf-core/rseqc/tin/main.nf new file mode 100644 index 00000000..397442f0 --- /dev/null +++ b/modules/nf-core/rseqc/tin/main.nf @@ -0,0 +1,48 @@ +process RSEQC_TIN { + tag "$meta.id" + label 'process_high' + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + 'https://depot.galaxyproject.org/singularity/rseqc:5.0.3--py39hf95cd2a_0' : + 'biocontainers/rseqc:5.0.3--py39hf95cd2a_0' }" + + input: + tuple val(meta), path(bam), path(bai) + path bed + + output: + tuple val(meta), path("*.txt"), emit: txt + tuple val(meta), path("*.xls"), emit: xls + path "versions.yml" , emit: versions + + when: + task.ext.when == null || task.ext.when + + script: + def args = task.ext.args ?: '' + def prefix = task.ext.prefix ?: "${meta.id}" + """ + tin.py \\ + -i $bam \\ + -r $bed \\ + $args + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(tin.py --version | sed -e "s/tin.py //g") + END_VERSIONS + """ + + stub: + def prefix = task.ext.prefix ?: "${meta.id}" + """ + touch ${bam.fileName}.summary.txt + touch ${bam.fileName}.tin.xls + + cat <<-END_VERSIONS > versions.yml + "${task.process}": + rseqc: \$(tin.py --version | sed -e "s/tin.py //g") + END_VERSIONS + """ +} diff --git a/modules/nf-core/rseqc/tin/meta.yml b/modules/nf-core/rseqc/tin/meta.yml new file mode 100644 index 00000000..f760bb2f --- /dev/null +++ b/modules/nf-core/rseqc/tin/meta.yml @@ -0,0 +1,50 @@ +name: rseqc_tin +description: Calculte TIN (transcript integrity number) from RNA-seq reads +keywords: + - rnaseq + - transcript + - integrity +tools: + - rseqc: + description: | + RSeQC package provides a number of useful modules that can comprehensively evaluate + high throughput sequence data especially RNA-seq data. + homepage: http://rseqc.sourceforge.net/ + documentation: http://rseqc.sourceforge.net/ + doi: 10.1093/bioinformatics/bts356 + licence: ["GPL-3.0-or-later"] +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: Input BAM file + pattern: "*.{bam}" + - bai: + type: file + description: Index for input BAM file + pattern: "*.{bai}" + - bed: + type: file + description: BED file containing the reference gene model + pattern: "*.{bed}" +output: + - txt: + type: file + description: TXT file containing tin.py results summary + pattern: "*.txt" + - xls: + type: file + description: XLS file containing tin.py results + pattern: "*.xls" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" +maintainers: + - "@drpatelh" diff --git a/modules/nf-core/rseqc/tin/tests/main.nf.test b/modules/nf-core/rseqc/tin/tests/main.nf.test new file mode 100644 index 00000000..b11eba80 --- /dev/null +++ b/modules/nf-core/rseqc/tin/tests/main.nf.test @@ -0,0 +1,58 @@ +nextflow_process { + + name "Test Process RSEQC_TIN" + script "../main.nf" + process "RSEQC_TIN" + tag "modules" + tag "modules_nfcore" + tag "rseqc" + tag "rseqc/tin" + + test("sarscov2 paired-end [bam]") { + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed12", checkIfExists: true)) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } + + test("sarscov2 paired-end [bam] - stub") { + + options "-stub" + + when { + process { + """ + input[0] = Channel.of([ + [ id:'test', single_end:false ], // meta map + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam", checkIfExists: true), + file(params.modules_testdata_base_path + "genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai", checkIfExists: true) + ]) + input[1] = Channel.of(file(params.modules_testdata_base_path + "genomics/sarscov2/genome/bed/test.bed12", checkIfExists: true)) + """ + } + } + + then { + assertAll( + { assert process.success }, + { assert snapshot(process.out).match() } + ) + } + } +} diff --git a/modules/nf-core/rseqc/tin/tests/main.nf.test.snap b/modules/nf-core/rseqc/tin/tests/main.nf.test.snap new file mode 100644 index 00000000..caab3a09 --- /dev/null +++ b/modules/nf-core/rseqc/tin/tests/main.nf.test.snap @@ -0,0 +1,108 @@ +{ + "sarscov2 paired-end [bam]": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.summary.txt:md5,9d98447e178b89a89f6f5aba7a772fe6" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.tin.xls:md5,abdbb6d51a5cd7038cd862ce241ecef1" + ] + ], + "2": [ + "versions.yml:md5,79670dedaa11a978951c16ead7f49c24" + ], + "txt": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.summary.txt:md5,9d98447e178b89a89f6f5aba7a772fe6" + ] + ], + "versions": [ + "versions.yml:md5,79670dedaa11a978951c16ead7f49c24" + ], + "xls": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.tin.xls:md5,abdbb6d51a5cd7038cd862ce241ecef1" + ] + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.01.0" + }, + "timestamp": "2024-02-26T14:32:42.823857" + }, + "sarscov2 paired-end [bam] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.summary.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.tin.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + "versions.yml:md5,79670dedaa11a978951c16ead7f49c24" + ], + "txt": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.summary.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,79670dedaa11a978951c16ead7f49c24" + ], + "xls": [ + [ + { + "id": "test", + "single_end": false + }, + "test.paired_end.sorted.bam.tin.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-06-21T09:55:57.905927" + } +} \ No newline at end of file diff --git a/modules/nf-core/rseqc/tin/tests/tags.yml b/modules/nf-core/rseqc/tin/tests/tags.yml new file mode 100644 index 00000000..741bbd0c --- /dev/null +++ b/modules/nf-core/rseqc/tin/tests/tags.yml @@ -0,0 +1,2 @@ +rseqc/tin: + - modules/nf-core/rseqc/tin/** diff --git a/subworkflows/nf-core/bam_rseqc/main.nf b/subworkflows/nf-core/bam_rseqc/main.nf new file mode 100644 index 00000000..043321a1 --- /dev/null +++ b/subworkflows/nf-core/bam_rseqc/main.nf @@ -0,0 +1,185 @@ +// +// Run RSeQC modules +// + +include { RSEQC_BAMSTAT } from '../../../modules/nf-core/rseqc/bamstat/main' +include { RSEQC_INNERDISTANCE } from '../../../modules/nf-core/rseqc/innerdistance/main' +include { RSEQC_INFEREXPERIMENT } from '../../../modules/nf-core/rseqc/inferexperiment/main' +include { RSEQC_JUNCTIONANNOTATION } from '../../../modules/nf-core/rseqc/junctionannotation/main' +include { RSEQC_JUNCTIONSATURATION } from '../../../modules/nf-core/rseqc/junctionsaturation/main' +include { RSEQC_READDISTRIBUTION } from '../../../modules/nf-core/rseqc/readdistribution/main' +include { RSEQC_READDUPLICATION } from '../../../modules/nf-core/rseqc/readduplication/main' +include { RSEQC_TIN } from '../../../modules/nf-core/rseqc/tin/main' + +workflow BAM_RSEQC { + take: + bam_bai // channel: [ val(meta), [ bam, bai ] ] + bed // channel: [ genome.bed ] + rseqc_modules // list: rseqc modules to run + + main: + + bam = bam_bai.map{ [ it[0], it[1] ] } + + versions = Channel.empty() + + // + // Run RSeQC bam_stat.py + // + bamstat_txt = Channel.empty() + + if ('bam_stat' in rseqc_modules) { + RSEQC_BAMSTAT(bam) + bamstat_txt = RSEQC_BAMSTAT.out.txt + versions = versions.mix(RSEQC_BAMSTAT.out.versions.first()) + } + + // + // Run RSeQC inner_distance.py + // + innerdistance_all = Channel.empty() + innerdistance_distance = Channel.empty() + innerdistance_freq = Channel.empty() + innerdistance_mean = Channel.empty() + innerdistance_pdf = Channel.empty() + innerdistance_rscript = Channel.empty() + + if ('inner_distance' in rseqc_modules) { + RSEQC_INNERDISTANCE(bam, bed) + innerdistance_distance = RSEQC_INNERDISTANCE.out.distance + innerdistance_freq = RSEQC_INNERDISTANCE.out.freq + innerdistance_mean = RSEQC_INNERDISTANCE.out.mean + innerdistance_pdf = RSEQC_INNERDISTANCE.out.pdf + innerdistance_rscript = RSEQC_INNERDISTANCE.out.rscript + innerdistance_all = innerdistance_distance.mix(innerdistance_freq, innerdistance_mean, innerdistance_pdf, innerdistance_rscript) + versions = versions.mix(RSEQC_INNERDISTANCE.out.versions.first()) + } + + // + // Run RSeQC infer_experiment.py + // + inferexperiment_txt = Channel.empty() + if ('infer_experiment' in rseqc_modules) { + RSEQC_INFEREXPERIMENT(bam, bed) + inferexperiment_txt = RSEQC_INFEREXPERIMENT.out.txt + versions = versions.mix(RSEQC_INFEREXPERIMENT.out.versions.first()) + } + + // + // Run RSeQC junction_annotation.py + // + junctionannotation_all = Channel.empty() + junctionannotation_bed = Channel.empty() + junctionannotation_interact_bed = Channel.empty() + junctionannotation_xls = Channel.empty() + junctionannotation_pdf = Channel.empty() + junctionannotation_events_pdf = Channel.empty() + junctionannotation_rscript = Channel.empty() + junctionannotation_log = Channel.empty() + + if ('junction_annotation' in rseqc_modules) { + RSEQC_JUNCTIONANNOTATION(bam, bed) + junctionannotation_bed = RSEQC_JUNCTIONANNOTATION.out.bed + junctionannotation_interact_bed = RSEQC_JUNCTIONANNOTATION.out.interact_bed + junctionannotation_xls = RSEQC_JUNCTIONANNOTATION.out.xls + junctionannotation_pdf = RSEQC_JUNCTIONANNOTATION.out.pdf + junctionannotation_events_pdf = RSEQC_JUNCTIONANNOTATION.out.events_pdf + junctionannotation_rscript = RSEQC_JUNCTIONANNOTATION.out.rscript + junctionannotation_log = RSEQC_JUNCTIONANNOTATION.out.log + junctionannotation_all = junctionannotation_bed.mix(junctionannotation_interact_bed, junctionannotation_xls, junctionannotation_pdf, junctionannotation_events_pdf, junctionannotation_rscript, junctionannotation_log) + versions = versions.mix(RSEQC_JUNCTIONANNOTATION.out.versions.first()) + } + + // + // Run RSeQC junction_saturation.py + // + junctionsaturation_all = Channel.empty() + junctionsaturation_pdf = Channel.empty() + junctionsaturation_rscript = Channel.empty() + + if ('junction_saturation' in rseqc_modules) { + RSEQC_JUNCTIONSATURATION(bam, bed) + junctionsaturation_pdf = RSEQC_JUNCTIONSATURATION.out.pdf + junctionsaturation_rscript = RSEQC_JUNCTIONSATURATION.out.rscript + junctionsaturation_all = junctionsaturation_pdf.mix(junctionsaturation_rscript) + versions = versions.mix(RSEQC_JUNCTIONSATURATION.out.versions.first()) + } + + // + // Run RSeQC read_distribution.py + // + readdistribution_txt = Channel.empty() + + if ('read_distribution' in rseqc_modules) { + RSEQC_READDISTRIBUTION(bam, bed) + readdistribution_txt = RSEQC_READDISTRIBUTION.out.txt + versions = versions.mix(RSEQC_READDISTRIBUTION.out.versions.first()) + } + + // + // Run RSeQC read_duplication.py + // + readduplication_all = Channel.empty() + readduplication_seq_xls = Channel.empty() + readduplication_pos_xls = Channel.empty() + readduplication_pdf = Channel.empty() + readduplication_rscript = Channel.empty() + + if ('read_duplication' in rseqc_modules) { + RSEQC_READDUPLICATION(bam ) + readduplication_seq_xls = RSEQC_READDUPLICATION.out.seq_xls + readduplication_pos_xls = RSEQC_READDUPLICATION.out.pos_xls + readduplication_pdf = RSEQC_READDUPLICATION.out.pdf + readduplication_rscript = RSEQC_READDUPLICATION.out.rscript + readduplication_all = readduplication_seq_xls.mix(readduplication_pos_xls, readduplication_pdf, readduplication_rscript) + versions = versions.mix(RSEQC_READDUPLICATION.out.versions.first()) + } + + // + // Run RSeQC tin.py + // + tin_txt = Channel.empty() + + if ('tin' in rseqc_modules) { + RSEQC_TIN(bam_bai, bed) + tin_txt = RSEQC_TIN.out.txt + versions = versions.mix(RSEQC_TIN.out.versions.first()) + } + + emit: + bamstat_txt // channel: [ val(meta), txt ] + + innerdistance_all // channel: [ val(meta), {txt, pdf, r} ] + innerdistance_distance // channel: [ val(meta), txt ] + innerdistance_freq // channel: [ val(meta), txt ] + innerdistance_mean // channel: [ val(meta), txt ] + innerdistance_pdf // channel: [ val(meta), pdf ] + innerdistance_rscript // channel: [ val(meta), r ] + + inferexperiment_txt // channel: [ val(meta), txt ] + + junctionannotation_all // channel: [ val(meta), {bed, xls, pdf, r, log} ] + junctionannotation_bed // channel: [ val(meta), bed ] + junctionannotation_interact_bed // channel: [ val(meta), bed ] + junctionannotation_xls // channel: [ val(meta), xls ] + junctionannotation_pdf // channel: [ val(meta), pdf ] + junctionannotation_events_pdf // channel: [ val(meta), pdf ] + junctionannotation_rscript // channel: [ val(meta), r ] + junctionannotation_log // channel: [ val(meta), log ] + + junctionsaturation_all // channel: [ val(meta), {pdf, r} ] + junctionsaturation_pdf // channel: [ val(meta), pdf ] + junctionsaturation_rscript // channel: [ val(meta), r ] + + readdistribution_txt // channel: [ val(meta), txt ] + + readduplication_all // channel: [ val(meta), {xls, pdf, r} ] + readduplication_seq_xls // channel: [ val(meta), xls ] + readduplication_pos_xls // channel: [ val(meta), xls ] + readduplication_pdf // channel: [ val(meta), pdf ] + readduplication_rscript // channel: [ val(meta), r ] + + tin_txt // channel: [ val(meta), txt ] + + versions // channel: [ versions.yml ] +} diff --git a/subworkflows/nf-core/bam_rseqc/meta.yml b/subworkflows/nf-core/bam_rseqc/meta.yml new file mode 100644 index 00000000..6e76ff56 --- /dev/null +++ b/subworkflows/nf-core/bam_rseqc/meta.yml @@ -0,0 +1,162 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json +name: bam_rseqc +description: Subworkflow to run multiple commands in the RSeqC package +keywords: + - rnaseq + - experiment + - inferexperiment + - bamstat + - innerdistance + - junctionannotation + - junctionsaturation + - readdistribution + - readduplication + - tin +components: + - rseqc + - rseqc/tin + - rseqc/readduplication + - rseqc/readdistribution + - rseqc/junctionsaturation + - rseqc/junctionannotation + - rseqc/innerdistance + - rseqc/inferexperiment + - rseqc/bamstat +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - bam: + type: file + description: BAM file to calculate statistics + pattern: "*.{bam}" + - bai: + type: file + description: Index for input BAM file + pattern: "*.{bai}" + - bed: + type: file + description: BED file for the reference gene model + pattern: "*.{bed}" + - rseqc_modules: + type: list + description: | + List of rseqc modules to run + e.g. [ 'bam_stat', 'infer_experiment' ] +output: + - bamstat_txt: + type: file + description: bam statistics report + pattern: "*.bam_stat.txt" + - innerdistance_all: + type: file + description: All the output files from RSEQC_INNERDISTANCE + pattern: "*.{txt,pdf,R}" + - innerdistance_distance: + type: file + description: the inner distances + pattern: "*.inner_distance.txt" + - innerdistance_freq: + type: file + description: frequencies of different insert sizes + pattern: "*.inner_distance_freq.txt" + - innerdistance_mean: + type: file + description: mean/median values of inner distances + pattern: "*.inner_distance_mean.txt" + - innerdistance_pdf: + type: file + description: distribution plot of inner distances + pattern: "*.inner_distance_plot.pdf" + - innerdistance_rscript: + type: file + description: script to reproduce the plot + pattern: "*.inner_distance_plot.R" + - inferexperiment_txt: + type: file + description: infer_experiment results report + pattern: "*.infer_experiment.txt" + - junctionannotation_all: + type: file + description: All the output files from RSEQC_JUNCTIONANNOTATION + pattern: "*.{bed,xls,pdf,R,log}" + - junctionannotation_bed: + type: file + description: bed file of annotated junctions + pattern: "*.junction.bed" + - junctionannotation_interact_bed: + type: file + description: Interact bed file + pattern: "*.Interact.bed" + - junctionannotation_xls: + type: file + description: xls file with junction information + pattern: "*.xls" + - junctionannotation_pdf: + type: file + description: junction plot + pattern: "*.junction.pdf" + - junctionannotation_events_pdf: + type: file + description: events plot + pattern: "*.events.pdf" + - junctionannotation_rscript: + type: file + description: Rscript to reproduce the plots + pattern: "*.r" + - junctionannotation_log: + type: file + description: Log file generated by tool + pattern: "*.log" + - junctionsaturation_all: + type: file + description: All the output files from RSEQC_JUNCTIONSATURATION + pattern: "*.{pdf,R}" + - junctionsaturation_pdf: + type: file + description: Junction saturation report + pattern: "*.pdf" + - junctionsaturation_rscript: + type: file + description: Junction saturation R-script + pattern: "*.r" + - readdistribution_txt: + type: file + description: the read distribution report + pattern: "*.read_distribution.txt" + - readduplication_all: + type: file + description: All the output files from RSEQC_READDUPLICATION + pattern: "*.{xls,pdf,R}" + - readduplication_seq_xls: + type: file + description: Read duplication rate determined from mapping position of read + pattern: "*seq.DupRate.xls" + - readduplication_pos_xls: + type: file + description: Read duplication rate determined from sequence of read + pattern: "*pos.DupRate.xls" + - readduplication_pdf: + type: file + description: plot of duplication rate + pattern: "*.pdf" + - readduplication_rscript: + type: file + description: script to reproduce the plot + pattern: "*.R" + - tin_txt: + type: file + description: TXT file containing tin.py results summary + pattern: "*.txt" + - versions: + type: file + description: File containing software versions + pattern: "versions.yml" +authors: + - "@drpatelh" + - "@kevinmenden" +maintainers: + - "@drpatelh" + - "@kevinmenden" diff --git a/subworkflows/nf-core/bam_rseqc/tests/main.nf.test b/subworkflows/nf-core/bam_rseqc/tests/main.nf.test new file mode 100644 index 00000000..d228c6b4 --- /dev/null +++ b/subworkflows/nf-core/bam_rseqc/tests/main.nf.test @@ -0,0 +1,147 @@ +nextflow_workflow { + + name "Test Workflow BAM_RSEQC" + script "../main.nf" + workflow "BAM_RSEQC" + tag "subworkflows" + tag "subworkflows_nfcore" + tag "subworkflows/bam_rseqc" + tag "bam_rseqc" + tag "rseqc" + tag "rseqc/bamstat" + tag "rseqc/inferexperiment" + tag "rseqc/innerdistance" + tag "rseqc/junctionannotation" + tag "rseqc/junctionsaturation" + tag "rseqc/readdistribution" + tag "rseqc/readduplication" + tag "rseqc/tin" + + test("sarscov2 paired-end [bam]") { + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = Channel.of([ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed12', checkIfExists: true) + ]) + input[2] = ['bam_stat', 'inner_distance', 'infer_experiment', 'junction_annotation', 'junction_saturation', 'read_distribution', 'read_duplication', 'tin'] + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert workflow.out.innerdistance_all.any { it[1].endsWith('.pdf') && file(it[1]).exists() } }, + { assert workflow.out.readduplication_all.any { it[1].endsWith('.pdf') && file(it[1]).exists() } }, + { assert workflow.out.junctionsaturation_all.any { it[1].endsWith('.pdf') && file(it[1]).exists() } }, + { assert snapshot( + workflow.out.bamstat_txt, + workflow.out.innerdistance_all.findAll { it[1].endsWith('.pdf') == false }, + workflow.out.inferexperiment_txt, + workflow.out.junctionannotation_all.findAll { it[1].endsWith('.xls') == false && it[1].endsWith('.r') == false }, + workflow.out.junctionsaturation_all.findAll { it[1].endsWith('.pdf') == false }, + workflow.out.readdistribution_txt, + workflow.out.readduplication_all.findAll { it[1].endsWith('.pdf') == false }, + workflow.out.tin_txt, + workflow.out.versions).match()} + ) + } + } + + test("sarscov2 paired-end [bam] no modules") { + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = Channel.of([ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed12', checkIfExists: true) + ]) + input[2] = [] + """ + } + } + + then { + assertAll( + { assert workflow.success }, + { assert workflow.out.bamstat_txt.size() == 0 }, + { assert workflow.out.innerdistance_all.size() == 0 }, + { assert workflow.out.inferexperiment_txt.size() == 0 }, + { assert workflow.out.junctionannotation_all.size() == 0 }, + { assert workflow.out.junctionsaturation_all.size() == 0 }, + { assert workflow.out.readdistribution_txt.size() == 0 }, + { assert workflow.out.readduplication_all.size() == 0 }, + { assert workflow.out.tin_txt.size() == 0 }, + { assert workflow.out.versions.size() == 0 } + ) + } + } + + test("sarscov2 paired-end [bam] - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = Channel.of([ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed12', checkIfExists: true) + ]) + input[2] = ['bam_stat', 'inner_distance', 'infer_experiment', 'junction_annotation', 'junction_saturation', 'read_distribution', 'read_duplication', 'tin'] + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match()} + ) + } + } + + test("sarscov2 paired-end [bam] no modules - stub") { + + options "-stub" + + when { + workflow { + """ + input[0] = Channel.of([ + [ id:'test' ], // meta map + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam', checkIfExists: true), + file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/bam/test.paired_end.sorted.bam.bai', checkIfExists: true) + ]) + input[1] = Channel.of([ + file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/bed/test.bed12', checkIfExists: true) + ]) + input[2] = [] + """ + } + } + + then { + assertAll( + { assert workflow.success}, + { assert snapshot(workflow.out).match()} + ) + } + } +} diff --git a/subworkflows/nf-core/bam_rseqc/tests/main.nf.test.snap b/subworkflows/nf-core/bam_rseqc/tests/main.nf.test.snap new file mode 100644 index 00000000..0040810c --- /dev/null +++ b/subworkflows/nf-core/bam_rseqc/tests/main.nf.test.snap @@ -0,0 +1,903 @@ +{ + "sarscov2 paired-end [bam]": { + "content": [ + [ + [ + { + "id": "test" + }, + "test.bam_stat.txt:md5,2675857864c1d1139b2a19d25dc36b09" + ] + ], + [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,a1acc9def0f64a5500d4c4cb47cbe32b" + ], + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,3fc037501f5899b5da009c8ce02fc25e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,58398b7d5a29a5e564f9e3c50b55996c" + ], + [ + { + "id": "test" + }, + "test.inner_distance_plot.r:md5,5859fbd5b42046d47e8b9aa85077f4ea" + ] + ], + [ + [ + { + "id": "test" + }, + "test.infer_experiment.txt:md5,f9d0bfc239df637cd8aeda40ade3c59a" + ] + ], + [ + [ + { + "id": "test" + }, + "test.junction_annotation.log:md5,d75e0f5d62fada8aa9449991b209554c" + ] + ], + [ + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.r:md5,caa6e63dcb477aabb169882b2f30dadd" + ] + ], + [ + [ + { + "id": "test" + }, + "test.read_distribution.txt:md5,56893fdc0809d968629a363551a1655f" + ] + ], + [ + [ + { + "id": "test" + }, + "test.DupRate_plot.r:md5,3c0325095cee4835b921e57d61c23dca" + ], + [ + { + "id": "test" + }, + "test.pos.DupRate.xls:md5,a859bc2031d46bf1cc4336205847caa3" + ], + [ + { + "id": "test" + }, + "test.seq.DupRate.xls:md5,ee8783399eec5a18522a6f08bece338b" + ] + ], + [ + [ + { + "id": "test" + }, + "test.paired_end.sorted.summary.txt:md5,9d98447e178b89a89f6f5aba7a772fe6" + ] + ], + [ + "versions.yml:md5,60dc1afce7fecb7270e998a00ee393e2", + "versions.yml:md5,9bc3caee6aeb54f23f5296b499546515", + "versions.yml:md5,a25161998ca60d5ce4e9a86abbf1bcb8", + "versions.yml:md5,c175b92f50b5be38a8808cbf7ac7452e", + "versions.yml:md5,ca7e95cf7ff7cff5d052b890729f7ead", + "versions.yml:md5,d03beea3c68934c3f3623a005c1424d2", + "versions.yml:md5,f2f3ecd549045f7595245f904f5d9414", + "versions.yml:md5,fd16f1098b9c285f3ea7bd3daf4e8f10" + ] + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-03T12:07:54.452949" + }, + "sarscov2 paired-end [bam] - stub": { + "content": [ + { + "0": [ + [ + { + "id": "test" + }, + "test.bam_stat.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "1": [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "10": [ + [ + { + "id": "test" + }, + "test.Interact.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "11": [ + [ + { + "id": "test" + }, + "test.junction.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "12": [ + [ + { + "id": "test" + }, + "test.junction.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "13": [ + [ + { + "id": "test" + }, + "test.events.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "14": [ + [ + { + "id": "test" + }, + "test.junction_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "15": [ + [ + { + "id": "test" + }, + "test.junction_annotation.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "16": [ + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "17": [ + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "18": [ + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "19": [ + [ + { + "id": "test" + }, + "test.read_distribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "2": [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "20": [ + [ + { + "id": "test" + }, + "test.DupRate_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.DupRate_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.pos.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.seq.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "21": [ + [ + { + "id": "test" + }, + "test.seq.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "22": [ + [ + { + "id": "test" + }, + "test.pos.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "23": [ + [ + { + "id": "test" + }, + "test.DupRate_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "24": [ + [ + { + "id": "test" + }, + "test.DupRate_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "25": [ + [ + { + "id": "test" + }, + "test.paired_end.sorted.bam.summary.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "26": [ + "versions.yml:md5,60dc1afce7fecb7270e998a00ee393e2", + "versions.yml:md5,9bc3caee6aeb54f23f5296b499546515", + "versions.yml:md5,a25161998ca60d5ce4e9a86abbf1bcb8", + "versions.yml:md5,c175b92f50b5be38a8808cbf7ac7452e", + "versions.yml:md5,ca7e95cf7ff7cff5d052b890729f7ead", + "versions.yml:md5,d03beea3c68934c3f3623a005c1424d2", + "versions.yml:md5,f2f3ecd549045f7595245f904f5d9414", + "versions.yml:md5,fd16f1098b9c285f3ea7bd3daf4e8f10" + ], + "3": [ + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "4": [ + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "5": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "6": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "7": [ + [ + { + "id": "test" + }, + "test.infer_experiment.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "8": [ + [ + { + "id": "test" + }, + "test.Interact.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.events.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction_annotation.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "9": [ + [ + { + "id": "test" + }, + "test.junction.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "bamstat_txt": [ + [ + { + "id": "test" + }, + "test.bam_stat.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "inferexperiment_txt": [ + [ + { + "id": "test" + }, + "test.infer_experiment.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "innerdistance_all": [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.inner_distance_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "innerdistance_distance": [ + [ + { + "id": "test" + }, + "test.inner_distance.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "innerdistance_freq": [ + [ + { + "id": "test" + }, + "test.inner_distance_freq.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "innerdistance_mean": [ + [ + { + "id": "test" + }, + "test.inner_distance_mean.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "innerdistance_pdf": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "innerdistance_rscript": [ + [ + { + "id": "test" + }, + "test.inner_distance_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_all": [ + [ + { + "id": "test" + }, + "test.Interact.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.events.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction_annotation.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junction_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_bed": [ + [ + { + "id": "test" + }, + "test.junction.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_events_pdf": [ + [ + { + "id": "test" + }, + "test.events.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_interact_bed": [ + [ + { + "id": "test" + }, + "test.Interact.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_log": [ + [ + { + "id": "test" + }, + "test.junction_annotation.log:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_pdf": [ + [ + { + "id": "test" + }, + "test.junction.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_rscript": [ + [ + { + "id": "test" + }, + "test.junction_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionannotation_xls": [ + [ + { + "id": "test" + }, + "test.junction.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionsaturation_all": [ + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionsaturation_pdf": [ + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "junctionsaturation_rscript": [ + [ + { + "id": "test" + }, + "test.junctionSaturation_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "readdistribution_txt": [ + [ + { + "id": "test" + }, + "test.read_distribution.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "readduplication_all": [ + [ + { + "id": "test" + }, + "test.DupRate_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.DupRate_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.pos.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + { + "id": "test" + }, + "test.seq.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "readduplication_pdf": [ + [ + { + "id": "test" + }, + "test.DupRate_plot.pdf:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "readduplication_pos_xls": [ + [ + { + "id": "test" + }, + "test.pos.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "readduplication_rscript": [ + [ + { + "id": "test" + }, + "test.DupRate_plot.r:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "readduplication_seq_xls": [ + [ + { + "id": "test" + }, + "test.seq.DupRate.xls:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "tin_txt": [ + [ + { + "id": "test" + }, + "test.paired_end.sorted.bam.summary.txt:md5,d41d8cd98f00b204e9800998ecf8427e" + ] + ], + "versions": [ + "versions.yml:md5,60dc1afce7fecb7270e998a00ee393e2", + "versions.yml:md5,9bc3caee6aeb54f23f5296b499546515", + "versions.yml:md5,a25161998ca60d5ce4e9a86abbf1bcb8", + "versions.yml:md5,c175b92f50b5be38a8808cbf7ac7452e", + "versions.yml:md5,ca7e95cf7ff7cff5d052b890729f7ead", + "versions.yml:md5,d03beea3c68934c3f3623a005c1424d2", + "versions.yml:md5,f2f3ecd549045f7595245f904f5d9414", + "versions.yml:md5,fd16f1098b9c285f3ea7bd3daf4e8f10" + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-03T12:08:17.304769" + }, + "sarscov2 paired-end [bam] no modules - stub": { + "content": [ + { + "0": [ + + ], + "1": [ + + ], + "10": [ + + ], + "11": [ + + ], + "12": [ + + ], + "13": [ + + ], + "14": [ + + ], + "15": [ + + ], + "16": [ + + ], + "17": [ + + ], + "18": [ + + ], + "19": [ + + ], + "2": [ + + ], + "20": [ + + ], + "21": [ + + ], + "22": [ + + ], + "23": [ + + ], + "24": [ + + ], + "25": [ + + ], + "26": [ + + ], + "3": [ + + ], + "4": [ + + ], + "5": [ + + ], + "6": [ + + ], + "7": [ + + ], + "8": [ + + ], + "9": [ + + ], + "bamstat_txt": [ + + ], + "inferexperiment_txt": [ + + ], + "innerdistance_all": [ + + ], + "innerdistance_distance": [ + + ], + "innerdistance_freq": [ + + ], + "innerdistance_mean": [ + + ], + "innerdistance_pdf": [ + + ], + "innerdistance_rscript": [ + + ], + "junctionannotation_all": [ + + ], + "junctionannotation_bed": [ + + ], + "junctionannotation_events_pdf": [ + + ], + "junctionannotation_interact_bed": [ + + ], + "junctionannotation_log": [ + + ], + "junctionannotation_pdf": [ + + ], + "junctionannotation_rscript": [ + + ], + "junctionannotation_xls": [ + + ], + "junctionsaturation_all": [ + + ], + "junctionsaturation_pdf": [ + + ], + "junctionsaturation_rscript": [ + + ], + "readdistribution_txt": [ + + ], + "readduplication_all": [ + + ], + "readduplication_pdf": [ + + ], + "readduplication_pos_xls": [ + + ], + "readduplication_rscript": [ + + ], + "readduplication_seq_xls": [ + + ], + "tin_txt": [ + + ], + "versions": [ + + ] + } + ], + "meta": { + "nf-test": "0.8.4", + "nextflow": "24.04.2" + }, + "timestamp": "2024-07-03T12:08:24.443731" + } +} \ No newline at end of file diff --git a/subworkflows/nf-core/bam_rseqc/tests/tags.yml b/subworkflows/nf-core/bam_rseqc/tests/tags.yml new file mode 100644 index 00000000..c8dfce3a --- /dev/null +++ b/subworkflows/nf-core/bam_rseqc/tests/tags.yml @@ -0,0 +1,2 @@ +subworkflows/bam_rseqc: + - subworkflows/nf-core/bam_rseqc/** From bd7de60dca6bda57c2f451a5574e3d55bc266557 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 1 Aug 2024 13:18:45 -0500 Subject: [PATCH 065/255] refactor: Use bam_rseqc subworkflow --- subworkflows/local/coverage_graphs.nf | 14 +++---- subworkflows/local/quality_control.nf | 39 ++++++++------------ workflows/nascent.nf | 7 ++-- workflows/tests/aligner/bowtie2.nf.test.snap | 2 +- workflows/tests/aligner/bwa.nf.test.snap | 2 +- workflows/tests/aligner/bwamem2.nf.test.snap | 2 +- workflows/tests/aligner/dragmap.nf.test.snap | 2 +- workflows/tests/aligner/hisat2.nf.test.snap | 2 +- workflows/tests/aligner/star.nf.test.snap | 2 +- 9 files changed, 31 insertions(+), 41 deletions(-) diff --git a/subworkflows/local/coverage_graphs.nf b/subworkflows/local/coverage_graphs.nf index 8df49aa4..5add10a7 100644 --- a/subworkflows/local/coverage_graphs.nf +++ b/subworkflows/local/coverage_graphs.nf @@ -14,14 +14,15 @@ include { DREG_PREP } from '../../modules/local/dreg_prep/main' workflow COVERAGE_GRAPHS { take: - bam - bai + bam_bai sizes fasta fai main: + bam = bam_bai.map{ [ it[0], it[1] ] } + ch_versions = Channel.empty() ch_genomecov_bam = bam.combine(Channel.from(1)) @@ -42,18 +43,15 @@ workflow COVERAGE_GRAPHS { ) ch_versions = ch_versions.mix(BEDTOOLS_GENOMECOV_MINUS.out.versions.first()) - - bam.join(bai, by: [0], remainder: true).set { ch_bam_bai } - DEEPTOOLS_BAMCOVERAGE_PLUS ( - ch_bam_bai, + bam_bai, fasta, fai ) ch_versions = ch_versions.mix(DEEPTOOLS_BAMCOVERAGE_PLUS.out.versions.first()) DEEPTOOLS_BAMCOVERAGE_MINUS ( - ch_bam_bai, + bam_bai, fasta, fai ) @@ -62,7 +60,7 @@ workflow COVERAGE_GRAPHS { ch_plus_minus = DEEPTOOLS_BAMCOVERAGE_PLUS.out.bigwig.join(DEEPTOOLS_BAMCOVERAGE_MINUS.out.bigwig) DREG_PREP ( - ch_bam_bai, + bam_bai, sizes ) diff --git a/subworkflows/local/quality_control.nf b/subworkflows/local/quality_control.nf index dd438bcc..ad24c7d9 100644 --- a/subworkflows/local/quality_control.nf +++ b/subworkflows/local/quality_control.nf @@ -1,17 +1,18 @@ include { PRESEQ_CCURVE } from '../../modules/nf-core/preseq/ccurve/main' include { PRESEQ_LCEXTRAP } from '../../modules/nf-core/preseq/lcextrap/main' -include { RSEQC_READDISTRIBUTION } from '../../modules/nf-core/rseqc/readdistribution/main' -include { RSEQC_READDUPLICATION } from '../../modules/nf-core/rseqc/readduplication/main' -include { RSEQC_INFEREXPERIMENT } from '../../modules/nf-core/rseqc/inferexperiment/main' include { BBMAP_PILEUP } from '../../modules/nf-core/bbmap/pileup/main' +include { BAM_RSEQC } from '../../subworkflows/nf-core/bam_rseqc' + workflow QUALITY_CONTROL { take: - bam + bam_bai bed main: + bam = bam_bai.map{ [ it[0], it[1] ] } + ch_versions = Channel.empty() PRESEQ_CCURVE ( bam ) @@ -20,20 +21,10 @@ workflow QUALITY_CONTROL { PRESEQ_LCEXTRAP ( bam ) ch_versions = ch_versions.mix(PRESEQ_LCEXTRAP.out.versions.first()) - RSEQC_READDISTRIBUTION ( - bam, - bed - ) - ch_versions = ch_versions.mix(RSEQC_READDISTRIBUTION.out.versions.first()) - - RSEQC_READDUPLICATION ( bam ) - ch_versions = ch_versions.mix(RSEQC_READDUPLICATION.out.versions.first()) - - RSEQC_INFEREXPERIMENT ( - bam, - bed - ) - ch_versions = ch_versions.mix(RSEQC_INFEREXPERIMENT.out.versions.first()) + // TODO Set this in a param? + rseqc_modules = ['read_duplication', 'read_distribution', 'infer_experiment'] + BAM_RSEQC ( bam_bai, bed, rseqc_modules ) + ch_versions = ch_versions.mix(BAM_RSEQC.out.versions) BBMAP_PILEUP ( bam ) ch_versions = ch_versions.mix(BBMAP_PILEUP.out.versions.first()) @@ -42,12 +33,12 @@ workflow QUALITY_CONTROL { preseq_ccurve = PRESEQ_CCURVE.out.c_curve preseq_lcextrap = PRESEQ_LCEXTRAP.out.lc_extrap - readdistribution_txt = RSEQC_READDISTRIBUTION.out.txt - readduplication_seq_xls = RSEQC_READDUPLICATION.out.seq_xls - readduplication_pos_xls = RSEQC_READDUPLICATION.out.pos_xls - readduplication_pdf = RSEQC_READDUPLICATION.out.pdf - readduplication_rscript = RSEQC_READDUPLICATION.out.rscript - inferexperiment_txt = RSEQC_INFEREXPERIMENT.out.txt + inferexperiment_txt = BAM_RSEQC.out.inferexperiment_txt + readdistribution_txt = BAM_RSEQC.out.readdistribution_txt + readduplication_seq_xls = BAM_RSEQC.out.readduplication_seq_xls + readduplication_pos_xls = BAM_RSEQC.out.readduplication_pos_xls + readduplication_pdf = BAM_RSEQC.out.readduplication_pdf + readduplication_rscript = BAM_RSEQC.out.readduplication_rscript pileup_stats = BBMAP_PILEUP.out.covstats pileup_hist = BBMAP_PILEUP.out.hist diff --git a/workflows/nascent.nf b/workflows/nascent.nf index e893c9c8..c74dbead 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -246,15 +246,16 @@ workflow NASCENT { ch_versions = ch_versions.mix(BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS.out.versions) } + ch_genome_bam_bai = ch_genome_bam.join(ch_genome_bai, by: [0], remainder: true) + QUALITY_CONTROL ( - ch_genome_bam, + ch_genome_bam_bai, PREPARE_GENOME.out.gene_bed ) ch_versions = ch_versions.mix(QUALITY_CONTROL.out.versions) COVERAGE_GRAPHS ( - ch_genome_bam, - ch_genome_bai, + ch_genome_bam_bai, PREPARE_GENOME.out.chrom_sizes, PREPARE_GENOME.out.fasta, PREPARE_GENOME.out.fai diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 3af0ee7e..9fa959db 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -30,6 +30,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T21:20:15.261777672" + "timestamp": "2024-08-04T20:09:31.105618713" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 482f3ec8..084b00e4 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -49,7 +49,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T07:37:00.256122533" + "timestamp": "2024-08-04T20:12:41.277553487" }, "Should work with BWA Index": { "content": [ diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 73979232..ec1151b7 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -30,6 +30,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T19:59:55.332896924" + "timestamp": "2024-08-04T20:16:56.413251993" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index dcaf9f23..c77e5711 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -30,6 +30,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T20:04:34.724457691" + "timestamp": "2024-08-04T20:19:06.859222166" } } \ No newline at end of file diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 8d83c296..00a6968a 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -30,6 +30,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T09:05:42.254786523" + "timestamp": "2024-08-04T20:20:46.356464865" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 0f8d9e62..d34a85fa 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -51,6 +51,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-01T20:15:17.868733535" + "timestamp": "2024-08-04T20:24:33.931557374" } } \ No newline at end of file From 7da223826504cb1d107e9e13956bfb98b236a6fd Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 Aug 2024 13:29:10 -0500 Subject: [PATCH 066/255] ci: Copy Sharding example https://www.nf-test.com/tutorials/github-actions --- .github/workflows/ci.yml | 91 ++++++---------------------------------- 1 file changed, 12 insertions(+), 79 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5ab2cbb..917ff658 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,51 +20,22 @@ concurrency: cancel-in-progress: true jobs: - changes: - name: Check for changes - runs-on: ubuntu-latest - outputs: - nf_test_files: ${{ steps.list.outputs.components }} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: List nf-test files - id: list - uses: adamrtalbot/detect-nf-test-changes@v0.0.3 - with: - head: ${{ github.sha }} - base: origin/${{ github.base_ref }} - types: "pipeline" - ignored: ".git/* .gitpod.yml .prettierignore .prettierrc.yml *.md *.png modules.json pyproject.toml tower.yml" - - - name: print list of nf-test files - run: | - echo ${{ steps.list.outputs.components }} - test: - name: ${{ matrix.nf_test_files }} ${{ matrix.profile }} NF-${{ matrix.NXF_VER }} - needs: [changes] - if: needs.changes.outputs.nf_test_files != '[]' runs-on: ubuntu-latest strategy: - fail-fast: false matrix: - # Nextflow versions: check pipeline minimum and current latest + shard: [1, 2, 3, 4] NXF_VER: ["23.04.0", ""] - nf_test_files: ["${{ fromJson(needs.changes.outputs.nf_test_files) }}"] - profile: - - "docker" - + profile: ["docker"] steps: - name: Check out pipeline code uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - - name: Install Nextflow - uses: nf-core/setup-nextflow@v2 - with: - version: "${{ matrix.NXF_VER }}" + # - name: Set up JDK 11 + # uses: actions/setup-java@v2 + # with: + # java-version: "11" + # distribution: "adopt" - uses: actions/setup-python@v4 with: @@ -76,58 +47,20 @@ jobs: python -m pip install --upgrade pip pip install pdiff - - name: Cache nf-test installation - id: cache-software - uses: actions/cache@v3 + - uses: nf-core/setup-nextflow@v2 with: - path: | - /usr/local/bin/nf-test - /home/runner/.nf-test/nf-test.jar - key: ${{ runner.os }}-${{ env.NFT_VER }}-nftest + version: "${{ matrix.NXF_VER }}" - name: Install nf-test - if: steps.cache-software.outputs.cache-hit != 'true' run: | - wget -qO- https://code.askimed.com/install/nf-test | bash + wget -qO- https://get.nf-test.com | bash sudo mv nf-test /usr/local/bin/ - - name: Run nf-test - run: | - nf-test test --verbose ${{ matrix.nf_test_files }} --profile "+${{ matrix.profile }}" --junitxml=test.xml --tap=test.tap - - - uses: pcolby/tap-summary@v1 - with: - path: >- - test.tap - - - name: Output log on failure - if: failure() - run: | - sudo apt install bat > /dev/null - batcat --decorations=always --color=always ${{ github.workspace }}/.nf-test/tests/*/meta/nextflow.log + - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) + run: nf-test test --ci --shard ${{ matrix.shard }}/${{ strategy.job-total }} - name: Publish Test Report uses: mikepenz/action-junit-report@v3 if: always() # always run even if the previous step fails with: report_paths: test.xml - - confirm-pass: - runs-on: ubuntu-latest - needs: - - changes - - test - if: always() - steps: - - name: All tests ok - if: ${{ !contains(needs.*.result, 'failure') }} - run: exit 0 - - name: One or more tests failed - if: ${{ contains(needs.*.result, 'failure') }} - run: exit 1 - - - name: debug-print - if: always() - run: | - echo "toJSON(needs) = ${{ toJSON(needs) }}" - echo "toJSON(needs.*.result) = ${{ toJSON(needs.*.result) }}" From ea077fbb7956bad94ffe2c65c7fac0ffacc8349d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 Aug 2024 13:29:59 -0500 Subject: [PATCH 067/255] ci: Add changed since --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 917ff658..5e1192ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,8 @@ jobs: steps: - name: Check out pipeline code uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + with: + fetch-depth: 0 # - name: Set up JDK 11 # uses: actions/setup-java@v2 @@ -57,7 +59,7 @@ jobs: sudo mv nf-test /usr/local/bin/ - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) - run: nf-test test --ci --shard ${{ matrix.shard }}/${{ strategy.job-total }} + run: nf-test test --ci --shard ${{ matrix.shard }}/${{ strategy.job-total }} --changed-since HEAD^ - name: Publish Test Report uses: mikepenz/action-junit-report@v3 From 862ae74d07c45b98535543a5ac5bf70e0a1b81ac Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 Aug 2024 13:30:42 -0500 Subject: [PATCH 068/255] ci: Add profile --- .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 5e1192ae..e7dcc593 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: sudo mv nf-test /usr/local/bin/ - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) - run: nf-test test --ci --shard ${{ matrix.shard }}/${{ strategy.job-total }} --changed-since HEAD^ + run: nf-test test --ci --shard ${{ matrix.shard }}/${{ strategy.job-total }} --changed-since HEAD^ --profile "+${{ matrix.profile }}" - name: Publish Test Report uses: mikepenz/action-junit-report@v3 From c8cf90b6c30bfb76311c74597d423d3e3208c708 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 Aug 2024 13:49:48 -0500 Subject: [PATCH 069/255] ci: Only run on latest-stable Otherwise it has the wrong number of "shards" --- .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 e7dcc593..76f7be43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: shard: [1, 2, 3, 4] - NXF_VER: ["23.04.0", ""] + NXF_VER: ["latest-stable"] # TODO Test minimum version on release profile: ["docker"] steps: - name: Check out pipeline code From 1fa4f62e97f17470a552079a2c32629377174f48 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 Aug 2024 13:56:35 -0500 Subject: [PATCH 070/255] style: Make it more readable --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76f7be43..ec9d4d5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,12 @@ jobs: sudo mv nf-test /usr/local/bin/ - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) - run: nf-test test --ci --shard ${{ matrix.shard }}/${{ strategy.job-total }} --changed-since HEAD^ --profile "+${{ matrix.profile }}" + run: | + nf-test test \ + --ci \ + --shard ${{ matrix.shard }}/${{ strategy.job-total }} \ + --changed-since HEAD^ \ + --profile "+${{ matrix.profile }}" - name: Publish Test Report uses: mikepenz/action-junit-report@v3 From d869e07b8480b6516fec117de375c79cdb24900c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 Aug 2024 13:59:35 -0500 Subject: [PATCH 071/255] ci: Only run pipeline tests for now --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec9d4d5a..6fe442e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,8 @@ jobs: --ci \ --shard ${{ matrix.shard }}/${{ strategy.job-total }} \ --changed-since HEAD^ \ - --profile "+${{ matrix.profile }}" + --profile "+${{ matrix.profile }}" \ + --filter pipeline - name: Publish Test Report uses: mikepenz/action-junit-report@v3 From 8581a646265af2c3184f8a9cd5997a728e3c53f6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 6 Aug 2024 19:53:16 -0500 Subject: [PATCH 072/255] ci: Use nf-core/setup-nf-test --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fe442e9..56a74214 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: env: NXF_ANSI_LOG: false - NFT_VER: "0.8.4" + NFT_VER: "0.9.0" NFT_WORKDIR: "~" NFT_DIFF: "pdiff" NFT_DIFF_ARGS: "--line-numbers --expand-tabs=2" @@ -53,10 +53,9 @@ jobs: with: version: "${{ matrix.NXF_VER }}" - - name: Install nf-test - run: | - wget -qO- https://get.nf-test.com | bash - sudo mv nf-test /usr/local/bin/ + - uses: nf-core/setup-nf-test@v1 + with: + version: ${{ NFT_VER }} - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) run: | From d12d1c83fa64ee874e7369f244a708e680bfa7e6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 7 Aug 2024 16:57:58 -0500 Subject: [PATCH 073/255] ci: Fix env variable --- .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 56a74214..ae2ab8df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - uses: nf-core/setup-nf-test@v1 with: - version: ${{ NFT_VER }} + version: ${{ env.NFT_VER }} - name: Run Tests (Shard ${{ matrix.shard }}/${{ strategy.job-total }}) run: | From 1dc2a91836eed2c6915fbfe495ab91152b1831ba Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 21:55:23 -0500 Subject: [PATCH 074/255] Add comment boxes for sections --- conf/modules.config | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/conf/modules.config b/conf/modules.config index 0f9cb48c..501b1790 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -31,6 +31,10 @@ process { ] } + /////////////////// + // Preprocessing // + /////////////////// + withName: FASTP { ext.prefix = { "${meta.id}.trimmed" } } @@ -39,6 +43,10 @@ process { ext.args = "--keep-exon-attrs -F -T" } + //////////////// + // Alignement // + //////////////// + withName: BWA_MEM { publishDir = [ [ @@ -156,6 +164,10 @@ process { ext.prefix = { "${meta.id}.sorted" } } + ///////////////////// + // Quality Control // + ///////////////////// + withName: PRESEQ_CCURVE { ext.args = "-B" } @@ -164,6 +176,10 @@ process { ext.args = "-B" } + ///////////////////// + // Coverage Graphs // + ///////////////////// + withName: BEDTOOLS_GENOMECOV_PLUS { ext.args = "-bg -strand +" ext.prefix = { "${meta.id}.plus" } @@ -188,6 +204,10 @@ process { ext.prefix = { "${meta.id}.dreg" } } + //////////////////// + // Quantification // + //////////////////// + withName: SUBREAD_FEATURECOUNTS_GENE { ext.args = "-B -C" publishDir = [ @@ -205,6 +225,10 @@ process { ] } + /////////////////////////////// + // Transcript Identification // + /////////////////////////////// + withName: HOMER_FINDPEAKS { // TODO Handle other assays ext.args = "-style groseq" From 82498a48a905e708824d41312fc42aa67959c28f Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 22:14:35 -0500 Subject: [PATCH 075/255] refactor: Clean up publishing of preprocessing and prepare genome --- conf/modules.config | 58 ++++++++++++++++++++++++++++++++------------- docs/output.md | 7 +++--- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 501b1790..9b80e032 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -20,6 +20,11 @@ process { withName: FASTQC { ext.args = '--quiet' + publishDir = [ + path: { "${params.outdir}/preprocessing/fastqc" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ] } withName: 'MULTIQC' { @@ -31,16 +36,37 @@ process { ] } + //////////////////// + // Prepare Genome // + //////////////////// + + withName: GFFREAD { + ext.args = "--keep-exon-attrs -F -T" + publishDir = [ + enabled: false + ] + } + + withName: '.*:PREPARE_GENOME:.*' { + publishDir = [ + enabled: params.save_reference, + mode: params.publish_dir_mode, + path: { "${params.outdir}/reference" }, + ] + } + /////////////////// // Preprocessing // /////////////////// withName: FASTP { ext.prefix = { "${meta.id}.trimmed" } - } - - withName: GFFREAD { - ext.args = "--keep-exon-attrs -F -T" + publishDir = [ + path: { "${params.outdir}/preprocessing/fastp" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename }, + pattern: "*.{html,log,json}" + ] } //////////////// @@ -62,19 +88,17 @@ process { ] } - withName: 'DRAGMAP_HASHTABLE' { - ext.when = { !params.dragmap && params.aligner == "dragmap" } - publishDir = [ - enabled: params.save_reference, - mode: params.publish_dir_mode, - path: { "${params.outdir}/reference" }, - pattern: "dragmap" - ] - } - withName: ".*DRAGMAP_ALIGN" { ext.when = { params.aligner == "dragmap" } ext.args = { "--RGSM ${meta.read_group}" } + publishDir = [ + [ + path: { "${params.outdir}/${params.aligner}/log" }, + mode: 'copy', + pattern: "*.log" + ], + ] + } withName: '.*:FASTQ_ALIGN_HISAT2:HISAT2_ALIGN' { @@ -83,7 +107,7 @@ process { [ path: { "${params.outdir}/${params.aligner}/log" }, mode: params.publish_dir_mode, - pattern: '*.log' + pattern: "*.log" ] ] } @@ -211,7 +235,7 @@ process { withName: SUBREAD_FEATURECOUNTS_GENE { ext.args = "-B -C" publishDir = [ - path: { "${params.outdir}/${params.aligner}/featurecounts/gene" }, + path: { "${params.outdir}/quanitification/gene" }, mode: 'copy', ] } @@ -220,7 +244,7 @@ process { ext.prefix = { "${meta.id}-group_${annotation.baseName}-transcripts" } ext.args = '-F "SAF"' publishDir = [ - path: { "${params.outdir}/${params.aligner}/featurecounts/predicted" }, + path: { "${params.outdir}/quantification/predicted" }, mode: 'copy', ] } diff --git a/docs/output.md b/docs/output.md index c44cb9da..28279096 100644 --- a/docs/output.md +++ b/docs/output.md @@ -47,7 +47,7 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d
    Output files -- `fastqc/` +- `preprocessing/fastqc` - `*_fastqc.html`: FastQC report containing quality metrics. - `*_fastqc.zip`: Zip archive containing the FastQC report, tab-delimited data file and plot images. @@ -70,7 +70,7 @@ The FastQC plots displayed in the MultiQC report shows _untrimmed_ reads. They m
    Output files -- `/` +- `preprocessing/fastp` - `*.fastp.html`: Trimming report in html format. - `*.fastp.json`: Trimming report in json format. - `*.fastp.log`: Trimming log file. @@ -389,9 +389,8 @@ They've also created some bed files that might be useful for analysis.
    Output files -- `genome/` +- `reference/` - `*.fa`, `*.gtf`, `*.gff`, `*.bed`, `.tsv`: If the `--save_reference` parameter is provided then all of the genome reference files will be placed in this directory. -- `genome/index/` - `bwa/`: Directory containing bwa indices. - `bwa-mem2/`: Directory containing bwa-mem2 indices. - `dragmap/`: Directory containing DRAGMAP indices. From 1c6090a7fcb8656ed69be7328177603123f65e42 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 22:25:40 -0500 Subject: [PATCH 076/255] refactor: Clean up alignment and post-processing publishing --- conf/modules.config | 109 ++++++++++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 35 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 9b80e032..a3927058 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -73,22 +73,29 @@ process { // Alignement // //////////////// - withName: BWA_MEM { + withName: "BWA_MEM" { + publishDir = [ + enabled: false + ] + } + + withName: "BWAMEM2_MEM" { + publishDir = [ + enabled: false + ] + } + + withName: "BOWTIE2_ALIGN" { publishDir = [ [ path: { "${params.outdir}/${params.aligner}/log" }, - mode: 'copy', - pattern: "out" + mode: params.publish_dir_mode, + pattern: "*.log" ], - [ - path: { "${params.outdir}/${params.aligner}/log" }, - mode: 'copy', - pattern: "tab" - ] ] } - withName: ".*DRAGMAP_ALIGN" { + withName: "DRAGMAP_ALIGN" { ext.when = { params.aligner == "dragmap" } ext.args = { "--RGSM ${meta.read_group}" } publishDir = [ @@ -101,8 +108,8 @@ process { } - withName: '.*:FASTQ_ALIGN_HISAT2:HISAT2_ALIGN' { - ext.args = '--met-stderr --new-summary --dta' + withName: ".*:FASTQ_ALIGN_HISAT2:HISAT2_ALIGN" { + ext.args = "--met-stderr --new-summary --dta" publishDir = [ [ path: { "${params.outdir}/${params.aligner}/log" }, @@ -112,7 +119,7 @@ process { ] } - withName: 'STAR_ALIGN' { + withName: "STAR_ALIGN" { ext.args = { // Function to convert argument strings into a map def argsToMap = { String args -> @@ -150,18 +157,42 @@ process { mode: params.publish_dir_mode, pattern: '*.{out,tab}' ], - [ - path: { params.save_align_intermeds ? "${params.outdir}/${params.aligner}" : params.outdir }, - mode: params.publish_dir_mode, - pattern: '*.bam', - saveAs: { params.save_align_intermeds ? it : null } - ], - [ - path: { params.save_unaligned ? "${params.outdir}/${params.aligner}/unmapped" : params.outdir }, - mode: params.publish_dir_mode, - pattern: '*.fastq.gz', - saveAs: { params.save_unaligned ? it : null } - ] + // TODO save_align_intermeds? + // [ + // path: { params.save_align_intermeds ? "${params.outdir}/${params.aligner}" : params.outdir }, + // mode: params.publish_dir_mode, + // pattern: '*.bam', + // saveAs: { params.save_align_intermeds ? it : null } + // ], + // TODO save_unaligned? + // [ + // path: { params.save_unaligned ? "${params.outdir}/${params.aligner}/unmapped" : params.outdir }, + // mode: params.publish_dir_mode, + // pattern: '*.fastq.gz', + // saveAs: { params.save_unaligned ? it : null } + // ] + ] + } + + /////////////////////////////// + // Alignment post-processing // + /////////////////////////////// + + withName: '.*:BAM_SORT_STATS_SAMTOOLS:.*|.*:BAM_SORT_STATS_SAMTOOLS_GENOME:.*' { + ext.prefix = { "${meta.id}.sorted.bam" } + publishDir = [ + path: { "${params.outdir}/${params.aligner}/samtools_stats" }, + mode: params.publish_dir_mode, + pattern: "*.{stats,flagstat,idxstats}" + ] + } + + withName: '.*:BAM_SORT_STATS_SAMTOOLS:SAMTOOLS_.*|.*:BAM_SORT_STATS_SAMTOOLS_GENOME:SAMTOOLS_.*' { + ext.prefix = { "${meta.id}.sorted" } + publishDir = [ + path: { "${params.outdir}/${params.aligner}" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } ] } @@ -171,23 +202,31 @@ process { meta.single_end ? '' : '--unpaired-reads=discard --chimeric-pairs=discard', ].join(' ').trim() } ext.prefix = { "${meta.id}.umi_dedup.sorted" } - } + publishDir = [ + [ + path: { "${params.outdir}/${params.aligner}/umitools" }, + mode: params.publish_dir_mode, + pattern: '*.tsv' + ], + [ + path: { "${params.outdir}/${params.aligner}/umitools/genomic_dedup_log" }, + mode: params.publish_dir_mode, + pattern: '*.log' + ] + ] - withName: '.*:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:SAMTOOLS_INDEX' { - ext.prefix = { "${meta.id}.umi_dedup.sorted" } } - if(params.umitools_dedup_stats) { - withName: '.*:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:BAM_STATS_SAMTOOLS:.*' { - ext.prefix = { "${meta.id}.umi_dedup.sorted.bam" } - } + withName: '.*:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:BAM_STATS_SAMTOOLS:.*' { + ext.prefix = { "${meta.id}.umi_dedup.sorted.bam" } + publishDir = [ + path: { "${params.outdir}/${params.aligner}/samtools_stats" }, + mode: params.publish_dir_mode, + pattern: '*.{stats,flagstat,idxstats}' + ] } } - withName: SAMTOOLS_SORT { - ext.prefix = { "${meta.id}.sorted" } - } - ///////////////////// // Quality Control // ///////////////////// From f21ebd25ec31f353fb4a34117425c4991718c7a6 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 22:34:14 -0500 Subject: [PATCH 077/255] refactor: Clean up publishing of Quality Control --- conf/modules.config | 62 ++++++++++++++++++++++++++++++++++++++++++--- docs/output.md | 6 ++--- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index a3927058..3d84c38c 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -231,12 +231,66 @@ process { // Quality Control // ///////////////////// - withName: PRESEQ_CCURVE { - ext.args = "-B" + withName: '.*:BAM_RSEQC:RSEQC_READDUPLICATION' { + publishDir = [ + [ + path: { "${params.outdir}/quality_control/rseqc/read_duplication/pdf" }, + mode: params.publish_dir_mode, + pattern: '*.pdf' + ], + [ + path: { "${params.outdir}/quality_control/rseqc/read_duplication/xls" }, + mode: params.publish_dir_mode, + pattern: '*.xls' + ], + [ + path: { "${params.outdir}/quality_control/rseqc/read_duplication/rscript" }, + mode: params.publish_dir_mode, + pattern: '*.r' + ] + ] + } + + withName: '.*:BAM_RSEQC:RSEQC_INFEREXPERIMENT' { + publishDir = [ + path: { "${params.outdir}/quality_control/rseqc/infer_experiment" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ] } - withName: PRESEQ_LCEXTRAP { - ext.args = "-B" + withName: '.*:BAM_RSEQC:RSEQC_READDISTRIBUTION ' { + publishDir = [ + path: { "${params.outdir}/quality_control/rseqc/read_distribution" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ] + } + + withName: 'PRESEQ_.*' { + ext.args = '-verbose -bam -seed 1 -seg_len 100000000' + publishDir = [ + [ + path: { "${params.outdir}/quality_control/preseq" }, + mode: params.publish_dir_mode, + pattern: "*.txt" + ], + [ + path: { "${params.outdir}/quality_control/preseq/log" }, + mode: params.publish_dir_mode, + pattern: "*.log" + ] + ] + } + + withName: 'BBMAP_PILEUP' { + publishDir = [ + [ + path: { "${params.outdir}/quality_control/bbsplit" }, + mode: params.publish_dir_mode, + pattern: '*.txt' + ], + ] } ///////////////////// diff --git a/docs/output.md b/docs/output.md index 28279096..cbf622a3 100644 --- a/docs/output.md +++ b/docs/output.md @@ -228,9 +228,9 @@ The majority of RSeQC scripts generate output files which can be plotted and sum
    Output files -- `/preseq/` +- `quality_control/preseq/` - `*.lc_extrap.txt`: Preseq expected future yield file. -- `/preseq/log/` +- `quality_control/preseq/log/` - `*.command.log`: Standard error output from command.
    @@ -244,7 +244,7 @@ The [Preseq](http://smithlabresearch.org/software/preseq/) package is aimed at p
    Output files -- `bbmap/` +- `quality_control/bbmap/` - `*.coverage.hist.txt`: Histogram of read coverage over each chromosome - `*.coverage.stats.txt`: Coverage stats broken down by chromosome including %GC, pos/neg read coverage, total coverage, etc. From 176dff79f9d5b0796d99d44ac155c994a1bff9b3 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 22:40:05 -0500 Subject: [PATCH 078/255] refactor: Finish coverage graphs publishing --- conf/modules.config | 11 +++++++++++ docs/output.md | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 3d84c38c..827bd324 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -297,6 +297,17 @@ process { // Coverage Graphs // ///////////////////// + withName: ".*:COVERAGE_GRAPHS:.*" { + publishDir = [ + [ + path: { "${params.outdir}/coverage_graphs" }, + mode: params.publish_dir_mode, + pattern: '*.{bedGraph,bigWig}' + ], + ] + } + + withName: BEDTOOLS_GENOMECOV_PLUS { ext.args = "-bg -strand +" ext.prefix = { "${meta.id}.plus" } diff --git a/docs/output.md b/docs/output.md index cbf622a3..2db44c1d 100644 --- a/docs/output.md +++ b/docs/output.md @@ -259,7 +259,7 @@ The [Preseq](http://smithlabresearch.org/software/preseq/) package is aimed at p
    Output files -- `bedtools/` +- `coverage_graphs/` - `*.minus.bedGraph`: Sample coverage file (negative strand only) in bedGraph format - `*.plus.bedGraph`: Sample coverage file (positive strand only) in bedGraph format @@ -270,7 +270,7 @@ The [Preseq](http://smithlabresearch.org/software/preseq/) package is aimed at p
    Output files -- `deeptools/` +- `coverage_graphs/` - `*.minus.bigWig`: Sample coverage file (negative strand only) in bigWig format - `*.plus.bigWig`: Sample coverage file (positive strand only) in bigWig format From 3596137b1af561d5dc2af5e365100aac1b45a8da Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 22:41:19 -0500 Subject: [PATCH 079/255] refactor: Finish quantification publishing --- conf/modules.config | 44 +++++++++++++++++++++++--------------------- docs/output.md | 2 +- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 827bd324..f9d15fb0 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -332,27 +332,6 @@ process { ext.prefix = { "${meta.id}.dreg" } } - //////////////////// - // Quantification // - //////////////////// - - withName: SUBREAD_FEATURECOUNTS_GENE { - ext.args = "-B -C" - publishDir = [ - path: { "${params.outdir}/quanitification/gene" }, - mode: 'copy', - ] - } - - withName: SUBREAD_FEATURECOUNTS_PREDICTED { - ext.prefix = { "${meta.id}-group_${annotation.baseName}-transcripts" } - ext.args = '-F "SAF"' - publishDir = [ - path: { "${params.outdir}/quantification/predicted" }, - mode: 'copy', - ] - } - /////////////////////////////// // Transcript Identification // /////////////////////////////// @@ -394,4 +373,27 @@ process { ext.args = "-wa" } + //////////////////// + // Quantification // + //////////////////// + + withName: SUBREAD_FEATURECOUNTS_GENE { + ext.args = "-B -C" + publishDir = [ + path: { "${params.outdir}/quantification/gene" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ] + } + + withName: SUBREAD_FEATURECOUNTS_PREDICTED { + ext.prefix = { "${meta.id}-group_${annotation.baseName}-transcripts" } + ext.args = '-F "SAF"' + publishDir = [ + path: { "${params.outdir}/quantification/nascent" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ] + } + } diff --git a/docs/output.md b/docs/output.md index 2db44c1d..a549458a 100644 --- a/docs/output.md +++ b/docs/output.md @@ -371,7 +371,7 @@ They've also created some bed files that might be useful for analysis.
    Output files -- `/featurecounts/` +- `quantification/featurecounts/` - `*.featureCounts.txt`: featureCounts biotype-level quantification results for each sample. - `*.featureCounts.txt.summary`: featureCounts summary file containing overall statistics about the counts. - `*_mqc.tsv`: MultiQC custom content files used to plot biotypes in report. From d166808c1e5cef54e47901695ba5fc42672938ff Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 22:50:52 -0500 Subject: [PATCH 080/255] refactor: Clean up transcript identification publishing --- conf/modules.config | 50 ++++++++++++++++++++ docs/output.md | 8 ++-- workflows/tests/aligner/bowtie2.nf.test.snap | 4 +- workflows/tests/aligner/star.nf.test.snap | 4 +- 4 files changed, 58 insertions(+), 8 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index f9d15fb0..37f74dc3 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -336,6 +336,15 @@ process { // Transcript Identification // /////////////////////////////// + withName: "HOMER_.*" { + publishDir = [ + [ + path: { "${params.outdir}/transcript_identification/homer" }, + mode: params.publish_dir_mode, + ], + ] + } + withName: HOMER_FINDPEAKS { // TODO Handle other assays ext.args = "-style groseq" @@ -352,25 +361,66 @@ process { withName: PINTS_CALLER { // FIXME bowtie2 fails for some reason ext.when = { params.aligner != "bowtie2" } + publishDir = [ + [ + path: { "${params.outdir}/transcript_identification/pints" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ], + ] + } + + withName: GROHMM_TRANSCRIPTCALLING { + publishDir = [ + [ + path: { "${params.outdir}/transcript_identification/grohmm" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ], + ] } withName: BEDTOOLS_SORT { ext.prefix = { "${meta.id}_sorted" } + publishDir = [ + enabled: false + ] } withName: BEDTOOLS_MERGE { ext.args = "-header" ext.prefix = { "${meta.id}_merged" } + publishDir = [ + [ + path: { "${params.outdir}/transcript_identification/merged" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ], + ] } withName: BEDTOOLS_INTERSECT_FILTER { ext.prefix = { "${meta.id}_filtered" } ext.args = "-v" + publishDir = [ + [ + path: { "${params.outdir}/transcript_identification/filtered" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ], + ] } withName: BEDTOOLS_INTERSECT { ext.prefix = { "${meta.id}_intersect" } ext.args = "-wa" + publishDir = [ + [ + path: { "${params.outdir}/transcript_identification/intersect" }, + mode: params.publish_dir_mode, + saveAs: { filename -> filename.equals('versions.yml') ? null : filename } + ], + ] } //////////////////// diff --git a/docs/output.md b/docs/output.md index a549458a..4b251dbe 100644 --- a/docs/output.md +++ b/docs/output.md @@ -283,7 +283,7 @@ The [Preseq](http://smithlabresearch.org/software/preseq/) package is aimed at p
    Output files -- `homer/` +- `transcript_identification/homer/` - `*.bed`: HOMER Nascent RNA (GroSeq) transcripts after pos2bed - `*.peaks.txt`: HOMER Nascent RNA (GroSeq) transcripts - `*.bedGraph.gz`: UCSC bedGraph @@ -306,7 +306,7 @@ The pipeline will pool the reads if they are in the same group. See [#153](https
    Output files -- `pints/` +- `transcript_identification/pints/` - `*_bidirectional_peaks.bed`: Bidirectional TREs (divergent + convergent) - `*_divergent_peaks.bed`: Divergent TREs - `*_unidirectional_peaks.bed`: Unidirectional TREs, maybe lncRNAs transcribed from enhancers (e-lncRNAs) @@ -322,11 +322,11 @@ For more information about how PINTS works, see the paper [A comparison of exper
    Output files -- `grohmm/` +- `transcript_identification/grohmm/` - `*.eval.txt`: Evaluation of HMM Annotations - `*.final.transcripts.bed`: Predicted transcripts - `*.tdFinal.txt`: Final quality metrics - - `*.tdplot_mqc.jpg`: TD plot included in multiqc + - `*.tdplot_mqc.jpg`: TD plot included in MultiQC - `*.transcripts.txt`: Predicted transcripts in txt form - `*.tuning.csv`: The tuning csv that was used diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 9fa959db..605ab1e8 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -24,12 +24,12 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T20:09:31.105618713" + "timestamp": "2024-08-04T21:59:33.78683953" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index d34a85fa..47574113 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -45,12 +45,12 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T20:24:33.931557374" + "timestamp": "2024-08-04T22:14:36.419331739" } } \ No newline at end of file From 9631fd6ca97ce987013d179802432035e6a6fa94 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 31 Jul 2024 23:00:11 -0500 Subject: [PATCH 081/255] style: Cleanup --- conf/modules.config | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/modules.config b/conf/modules.config index 37f74dc3..e254bb62 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -105,7 +105,6 @@ process { pattern: "*.log" ], ] - } withName: ".*:FASTQ_ALIGN_HISAT2:HISAT2_ALIGN" { @@ -214,7 +213,6 @@ process { pattern: '*.log' ] ] - } withName: '.*:BAM_DEDUP_STATS_SAMTOOLS_UMITOOLS:BAM_STATS_SAMTOOLS:.*' { @@ -445,5 +443,4 @@ process { saveAs: { filename -> filename.equals('versions.yml') ? null : filename } ] } - } From 7b73b4a8a1dc8eb2975c10d5c0ec7df9e1991d60 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 8 Aug 2024 10:39:08 -0500 Subject: [PATCH 082/255] test: Add triggers --- nf-test.config | 1 + 1 file changed, 1 insertion(+) diff --git a/nf-test.config b/nf-test.config index 7abd3c95..261ec1c2 100644 --- a/nf-test.config +++ b/nf-test.config @@ -6,5 +6,6 @@ config { plugins { load "nft-bam@0.3.0" } + triggers "nextflow.config", "nf-test.config", "conf/modules.config", "conf/test.config", "tests/nextflow.config" } From f6ee047a686992af194d1654fab15f3e88d10af9 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 8 Aug 2024 10:40:41 -0500 Subject: [PATCH 083/255] ci: Remove fail-fast --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae2ab8df..66d671fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,7 @@ jobs: test: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: shard: [1, 2, 3, 4] NXF_VER: ["latest-stable"] # TODO Test minimum version on release From 5e91c4088ddf60b05a7617d785372caa8b20c463 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 8 Aug 2024 11:45:50 -0500 Subject: [PATCH 084/255] test: Update expected paths --- workflows/tests/aligner/bwa.nf.test | 50 +++++----- workflows/tests/aligner/bwa.nf.test.snap | 118 +++++++++++++++++++++-- 2 files changed, 138 insertions(+), 30 deletions(-) diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 9c2c79ca..d5c9cd3d 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -21,28 +21,34 @@ nextflow_pipeline { { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP3.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP4.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getSamLinesMD5(), + // TODO path("$outputDir/preprocessing/fastp/*.json").list(), + path("$outputDir/bwa/log").list(), + path("$outputDir/bwa/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + // FIXME Empty + path("$outputDir/quality_control/preseq").list().findAll { it.contains(".txt") }, + // process.out.outs[0][1].findAll { file(it).name.contains('.pb') }, + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + // FIXME Empty + path("$outputDir/transcript_identification/").list().findAll { file(it.toString()).name.contains('.bed') }, + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + // FIXME path("$outputDir/transcript_identification/pints/").list().findAll(), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + // FIXME path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + // TODO + // bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), + // bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), + // bam("$outputDir/samtools/cd4_REP3.sorted.bam").getSamLinesMD5(), + // bam("$outputDir/samtools/cd4_REP4.sorted.bam").getSamLinesMD5(), + // bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getSamLinesMD5(), + // bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 084b00e4..91b38b5d 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -2,6 +2,29 @@ "output_files": { "content": [ 134, + [ + + ], + [ + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,ba177ae2d9a5ab5a972bc056df28acc1", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,8c8fc51169528132b1cca54d3689e3c0", + "cd4_REP3.sorted.bam.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", + "cd4_REP3.sorted.bam.idxstats:md5,42de227ff397013cf288759871b0e938", + "cd4_REP3.sorted.bam.stats:md5,fe5be813bf2d55fd0e4877c650a0b266", + "cd4_REP4.sorted.bam.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", + "cd4_REP4.sorted.bam.idxstats:md5,959dc185ae59de4cebe374026711a55e", + "cd4_REP4.sorted.bam.stats:md5,46bf6f2b140d369986027bc2f588b440", + "jurkat_REP1.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat_REP1.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat_REP1.sorted.bam.stats:md5,3f1b0a4214daa368a307f856f7a809dc", + "jurkat_REP2.sorted.bam.flagstat:md5,86ed47bd41a745ab59de473082c7742d", + "jurkat_REP2.sorted.bam.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", + "jurkat_REP2.sorted.bam.stats:md5,48732cff30d5a9a272f68fc850b0eb84" + ], [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", @@ -15,21 +38,100 @@ "jurkat_REP1.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569", "jurkat_REP2.coverage.hist.txt:md5,d124bdadaf2dc5cdd9e3db5a1ab4c588", "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" + ], + [ + + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "cd4_REP3.pos.DupRate.xls:md5,fd3e91bfe070deccef65b265957cb733", + "cd4_REP3.seq.DupRate.xls:md5,f4c9f61081e6ef309abe82bb34aa4bd0", + "cd4_REP4.pos.DupRate.xls:md5,7fb8a7e96fd521561f62ccf7bf490212", + "cd4_REP4.seq.DupRate.xls:md5,8c671e5b0029d396a666839029298828", + "jurkat_REP1.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat_REP1.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de", + "jurkat_REP2.pos.DupRate.xls:md5,253ec69be4f5322dc92f6cb3fb41f7e0", + "jurkat_REP2.seq.DupRate.xls:md5,c7c83a29e6dfd49ff17858fe83dc07c8" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "cd4_REP3.DupRate_plot.r:md5,5b37293c52beaecc5980aa2b9bafd82c", + "cd4_REP4.DupRate_plot.r:md5,ffa0f611b7f86d36134f9d80c3e1c9de", + "jurkat_REP1.DupRate_plot.r:md5,8e4dc99cae73c94eda275aeee08a5390", + "jurkat_REP2.DupRate_plot.r:md5,3507444f5965ca98a448ab15659ba34f" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "cd4_REP3.infer_experiment.txt:md5,b0157d081d0ba0c27b370915f13c8c8a", + "cd4_REP4.infer_experiment.txt:md5,37ec4ee4ed5f707f073be5a7d4c9acfb", + "jurkat_REP1.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e", + "jurkat_REP2.infer_experiment.txt:md5,cde67a32fc922fb61fe5c5ea4b0e5c92" + ], + [ + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "cd4_REP3.read_distribution.txt:md5,2f05c4cc866b4f8068e02008cad20cb3", + "cd4_REP4.read_distribution.txt:md5,ececae7f535b4fd5606bf763fdba7a34", + "jurkat_REP1.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909", + "jurkat_REP2.read_distribution.txt:md5,a5f8bed2cff9d780a31c3ce43e289d9e" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "cd4_REP3.dreg.bedGraph:md5,201e690c619ee231416b643740141588", + "cd4_REP3.minus.bedGraph:md5,1c44c165f663d08c869a013b78f051b0", + "cd4_REP3.minus.bigWig:md5,aa3f5e86c635e182f9173543751cfbfd", + "cd4_REP3.plus.bedGraph:md5,a475098ed14da6f3242c4cfdf3abb713", + "cd4_REP3.plus.bigWig:md5,b255ae7c47424c223c537d00ecc025b5", + "cd4_REP4.dreg.bedGraph:md5,dfcfce7df666c0e24a3d0d4e21447a0b", + "cd4_REP4.minus.bedGraph:md5,b7a3d3c822155dfd8052c67a330fd6d5", + "cd4_REP4.minus.bigWig:md5,fc61c62613dc0f74a65c32419aba8f76", + "cd4_REP4.plus.bedGraph:md5,5623367b681562a2567afc62a8da4151", + "cd4_REP4.plus.bigWig:md5,ed00ad7a22c49860debc86cfa7ffb457", + "jurkat_REP1.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat_REP1.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat_REP1.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat_REP1.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat_REP1.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390", + "jurkat_REP2.dreg.bedGraph:md5,aad861b6fd8d296fe6bb4bc82d5eeeed", + "jurkat_REP2.minus.bedGraph:md5,cd83486cb6bb71e6b6e31a69c94d0d85", + "jurkat_REP2.minus.bigWig:md5,686f719978de948f7045acc95f9d1c82", + "jurkat_REP2.plus.bedGraph:md5,569e8a25c9cf48d1ef953f3da77c48a1", + "jurkat_REP2.plus.bigWig:md5,cbe3fd38fe8f9508645bbfad83924212" + ], + [ + ], "cd4.bed:md5,ab94918610a560772fdbec591200295f", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", - "c529a16c839e85e119b98354f109352d", - "9e63b682af88fa902cf92b5c485845b1", - "2aa200bbbce374ec7dedb9b46ce4aae1", - "122274730dd5386e1b26c174df886a8b", - "c2adf5327ff6d4edda2fdad00c7cb9bf", - "63fea3b1e2e08e5f6fdf3f7ba0aa7818" + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,22a41b0aef6da7f4fa0f0644cc60ef32", + "jurkat_filtered.bed:md5,a491231815327b0d0fab1885b8a8662e" + ], + true ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T08:58:17.037588077" + "timestamp": "2024-08-09T17:35:32.797123474" }, "Should work with gzipped references": { "content": [ @@ -49,7 +151,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T20:12:41.277553487" + "timestamp": "2024-08-09T13:24:17.114505802" }, "Should work with BWA Index": { "content": [ From 2d049ff030afec9c27dadff308abe0a70a45ca10 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 10 Aug 2024 13:19:58 -0500 Subject: [PATCH 085/255] test: Add UTILS functions from function guy https://github.com/nf-core/eager/pull/1063 Co-authored-by: jfy133 Co-authored-by: nvnieuwk --- tests/lib/UTILS.groovy | 34 ++++++++++++++++++++++++ workflows/tests/aligner/bwa.nf.test | 10 +++---- workflows/tests/aligner/bwa.nf.test.snap | 26 ++++++++++++++---- 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/tests/lib/UTILS.groovy b/tests/lib/UTILS.groovy index 1bd58a49..7bd4a9b9 100644 --- a/tests/lib/UTILS.groovy +++ b/tests/lib/UTILS.groovy @@ -8,4 +8,38 @@ class UTILS { } return softwareVersions } + +// Recursively list all files in a directory and its sub-directories, matching a given suffix +// TODO: use regex pattern instead of suffix? +public static getAllFilesFromDir(dir, suffix) { + def output = [] + new File(dir).eachFileRecurse() { + if (it.name.toString().endsWith(suffix)) { + output.add(it) + } + } + return output.sort() +} +// Recursively list all files names in a directory and its sub-directories, matching a given suffix, return file names +public static getAllFileNamesFromDir(dir, suffix) { + def output = [] + new File(dir).eachFileRecurse() { + if (it.name.toString().endsWith(suffix)) { + output.add(it.toString().split("/")[-1]) + } + } + return output.sort() +} + +// Recursively list all files names in a directory and its sub-directories, matching a given suffix, return if check if given string is in file +public static checkAllFilesNamesFromDirForString(dir, suffix, string) { + def output = [] + new File(dir).eachFileRecurse() { + if (it.name.toString().endsWith(suffix)) { + output.add(it.text.contains(string)) + } + } + return output.sort() +} + } diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index d5c9cd3d..7ea62bb6 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -21,23 +21,19 @@ nextflow_pipeline { { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - // TODO path("$outputDir/preprocessing/fastp/*.json").list(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), path("$outputDir/bwa/log").list(), path("$outputDir/bwa/samtools_stats").list(), path("$outputDir/quality_control/bbsplit").list(), - // FIXME Empty - path("$outputDir/quality_control/preseq").list().findAll { it.contains(".txt") }, - // process.out.outs[0][1].findAll { file(it).name.contains('.pb') }, + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), path("$outputDir/quality_control/rseqc/infer_experiment").list(), path("$outputDir/quality_control/rseqc/read_distribution").list(), path("$outputDir/coverage_graphs/").list(), - // FIXME Empty - path("$outputDir/transcript_identification/").list().findAll { file(it.toString()).name.contains('.bed') }, path("$outputDir/transcript_identification/homer/cd4.bed"), path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME path("$outputDir/transcript_identification/pints/").list().findAll(), + // FIXME UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), path("$outputDir/transcript_identification/intersect/").list(), path("$outputDir/transcript_identification/filtered/").list(), // FIXME path("$outputDir/quantification/").list(), diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 91b38b5d..a1ddee51 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -2,6 +2,14 @@ "output_files": { "content": [ 134, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "cd4_REP3.trimmed.fastp.json:md5,c9c3a1dd0a2ebac77c9d7c3b0daf3790", + "cd4_REP4.trimmed.fastp.json:md5,c073bd26609ddca91396d0f374ec5b80", + "jurkat_REP1.trimmed.fastp.json:md5,329fd8e56421a196fc2ebd37ab3bc22d", + "jurkat_REP2.trimmed.fastp.json:md5,8bad5b02a27e5386255b998a6a69db15" + ], [ ], @@ -40,7 +48,18 @@ "jurkat_REP2.coverage.stats.txt:md5,b1940346719e4070091f2eef6e508f49" ], [ - + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "cd4_REP3.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP3.lc_extrap.txt:md5,25ebbeabee46caa86a4d6d82dd0091f1", + "cd4_REP4.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP4.lc_extrap.txt:md5,d0df86774dd54421fd362d46faa3f937", + "jurkat_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat_REP1.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5", + "jurkat_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat_REP2.lc_extrap.txt:md5,8ae0a77bcc59da38ec2da0fc1f973227" ], [ "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", @@ -111,9 +130,6 @@ "jurkat_REP2.minus.bigWig:md5,686f719978de948f7045acc95f9d1c82", "jurkat_REP2.plus.bedGraph:md5,569e8a25c9cf48d1ef953f3da77c48a1", "jurkat_REP2.plus.bigWig:md5,cbe3fd38fe8f9508645bbfad83924212" - ], - [ - ], "cd4.bed:md5,ab94918610a560772fdbec591200295f", "jurkat.bed:md5,41908723fa423a78476feb2e7627a3a4", @@ -131,7 +147,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-09T17:35:32.797123474" + "timestamp": "2024-08-10T12:48:55.984269469" }, "Should work with gzipped references": { "content": [ From 5f0c3b14b4f591cb39e5bc586d46507c8c273910 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 10 Aug 2024 14:46:53 -0500 Subject: [PATCH 086/255] test: Add back in bam tests --- workflows/tests/aligner/bwa.nf.test | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 7ea62bb6..6d455221 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -22,6 +22,12 @@ nextflow_pipeline { { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/cd4_REP3.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/cd4_REP4.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/jurkat_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/jurkat_REP2.sorted.bam").getSamLinesMD5(), path("$outputDir/bwa/log").list(), path("$outputDir/bwa/samtools_stats").list(), path("$outputDir/quality_control/bbsplit").list(), @@ -38,13 +44,6 @@ nextflow_pipeline { path("$outputDir/transcript_identification/filtered/").list(), // FIXME path("$outputDir/quantification/").list(), path("$outputDir/multiqc/multiqc_report.html").exists(), - // TODO - // bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), - // bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), - // bam("$outputDir/samtools/cd4_REP3.sorted.bam").getSamLinesMD5(), - // bam("$outputDir/samtools/cd4_REP4.sorted.bam").getSamLinesMD5(), - // bam("$outputDir/samtools/jurkat_REP1.sorted.bam").getSamLinesMD5(), - // bam("$outputDir/samtools/jurkat_REP2.sorted.bam").getSamLinesMD5(), ).match("output_files") } ) From 6fb83a5c14be39f1873e45cf0948eacd1a8e96df Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sat, 10 Aug 2024 14:49:56 -0500 Subject: [PATCH 087/255] test: Update the rest of the tests for new output --- workflows/tests/aligner/bowtie2.nf.test | 39 ++++--- workflows/tests/aligner/bowtie2.nf.test.snap | 88 ++++++++++++++- workflows/tests/aligner/bwa.nf.test | 9 +- workflows/tests/aligner/bwa.nf.test.snap | 23 ++-- workflows/tests/aligner/bwamem2.nf.test | 36 +++---- workflows/tests/aligner/bwamem2.nf.test.snap | 81 +++++++++++++- workflows/tests/aligner/dragmap.nf.test | 39 ++++--- workflows/tests/aligner/dragmap.nf.test.snap | 81 +++++++++++++- workflows/tests/aligner/hisat2.nf.test | 37 ++++--- workflows/tests/aligner/hisat2.nf.test.snap | 86 ++++++++++++++- workflows/tests/aligner/star.nf.test | 56 ++++------ workflows/tests/aligner/star.nf.test.snap | 108 +++++++++++++++---- 12 files changed, 521 insertions(+), 162 deletions(-) diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index 51c229fd..daeff718 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -20,26 +20,25 @@ nextflow_pipeline { { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - // FIXME Bowtie2 isn't deterministic - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getHeaderMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getHeaderMD5(), - bam("$outputDir/samtools/jurkat.sorted.bam").getHeaderMD5(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + // NOTE Not deterministic + path("$outputDir/bowtie2/cd4_REP1.sorted.bam").exists(), + path("$outputDir/bowtie2/cd4_REP2.sorted.bam").exists(), + path("$outputDir/bowtie2/jurkat.sorted.bam").exists(), + path("$outputDir/bowtie2/log").list(), + path("$outputDir/bowtie2/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 605ab1e8..60005471 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -2,6 +2,30 @@ "output_files": { "content": [ 75, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + true, + true, + true, + [ + "cd4_REP1.bowtie2.log:md5,024c3b6bca27f3836cdd86c0287d2971", + "cd4_REP2.bowtie2.log:md5,089af358aad637ec94c10172eb024773", + "jurkat.bowtie2.log:md5,24031e901f4ce11cfb227c7d30d1373a" + ], + [ + "cd4_REP1.sorted.bam.flagstat:md5,14e684e73cb41155ab1168a0a99a97e6", + "cd4_REP1.sorted.bam.idxstats:md5,e32ac3215ba948bb7dd1559dab6c3c36", + "cd4_REP1.sorted.bam.stats:md5,490f84b5520b83daa95653671ce43921", + "cd4_REP2.sorted.bam.flagstat:md5,e00d036bcbea6f944d45fb5cb7c34516", + "cd4_REP2.sorted.bam.idxstats:md5,0803f2dce4b972ccc14943e22145c3e8", + "cd4_REP2.sorted.bam.stats:md5,f8872ba7ef4b4e66b16a4ca3d63c1a65", + "jurkat.sorted.bam.flagstat:md5,1b24ceabc8cecf34d745d06cf9d43cd0", + "jurkat.sorted.bam.idxstats:md5,15e67d4d9d71c6cc6c37d5ce5414ede0", + "jurkat.sorted.bam.stats:md5,ff1a4b8f6456a539943a14c8daeb75d3" + ], [ "cd4_REP1.coverage.hist.txt:md5,ffd8c0a94869dd782779fc871a9b781a", "cd4_REP1.coverage.stats.txt:md5,bebdef1adcce4296878f8699a0f5cb32", @@ -10,17 +34,71 @@ "jurkat.coverage.hist.txt:md5,656e30e8c4bd12e45a036c62c18730c1", "jurkat.coverage.stats.txt:md5,627f0ec96ea9bdbd7f41b09b64c389d6" ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,cbacd5a2e62bccbb73a5d0f5d0791304", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,cd3d0f6bc45ff35f6729fb7d66ffaf09", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,85206c3788cd2d1cede39fbd6bab5a5c" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,8d377e230fc1df98fd10045ed686ba2b", + "cd4_REP1.seq.DupRate.xls:md5,9d01f20cefc5a5d76c42c64715933705", + "cd4_REP2.pos.DupRate.xls:md5,6939c35f32445351210b07b17a9e424d", + "cd4_REP2.seq.DupRate.xls:md5,ef56fed7d960a88eca66d5514faed7fb", + "jurkat.pos.DupRate.xls:md5,17f5622123e0d0b97f200e53fe7e165d", + "jurkat.seq.DupRate.xls:md5,566934dad135bc0168c36a8f8d297065" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,6b19f80622d25eab51fa5962deac7882", + "cd4_REP2.DupRate_plot.r:md5,94d0e7599e7a83a5ea2f251cb8f2b879", + "jurkat.DupRate_plot.r:md5,d081ee3f5ef5f85ff8fccd013fe04f71" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,a17e22cdbaa5db454d3dfa0624c8acdf", + "cd4_REP2.infer_experiment.txt:md5,d705d9b2c2d8fab525df84b4c943c34a", + "jurkat.infer_experiment.txt:md5,0b4fb80f4ec8466778fa224e4f274e4e" + ], + [ + "cd4_REP1.read_distribution.txt:md5,1df0ae48c81e68ea1d5602897a865f2b", + "cd4_REP2.read_distribution.txt:md5,ff1b593276f36df0cbf7bbc1361e6aad", + "jurkat.read_distribution.txt:md5,a67baffde38aa7a85223148532a18ba4" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,f48ab66b1ddaf0d1b4867183aedb670a", + "cd4_REP1.minus.bedGraph:md5,6930097f008d44b850d8bb5c681e0d1d", + "cd4_REP1.minus.bigWig:md5,a28d277b360522476ceead81b28adc7f", + "cd4_REP1.plus.bedGraph:md5,c9f9c25c6af4285d7535907e37d62793", + "cd4_REP1.plus.bigWig:md5,fb555dbbb1458d56f167660ebfa0f4f0", + "cd4_REP2.dreg.bedGraph:md5,754cbac7c960a8d3424a11f14f78ff71", + "cd4_REP2.minus.bedGraph:md5,843cdcf18dcd791a7d2030c37eb8d62f", + "cd4_REP2.minus.bigWig:md5,782c83b97ea4794f191a6ac7f9231151", + "cd4_REP2.plus.bedGraph:md5,12892778f9451ed5d3578955f14dda7e", + "cd4_REP2.plus.bigWig:md5,ef622d439b5b90bf6d0232ed2faa9ab6", + "jurkat.dreg.bedGraph:md5,01bab031eee63726446d9260f6ebd3eb", + "jurkat.minus.bedGraph:md5,529ad9cfc3f050366f54a2d99085b94b", + "jurkat.minus.bigWig:md5,f211b5371583f0e373c508ad6ab311ee", + "jurkat.plus.bedGraph:md5,2475bada8a001c763caffa12c5c0e98e", + "jurkat.plus.bigWig:md5,c30a99c3f603b268442f8b6081f6f2c9" + ], "cd4.bed:md5,c311e32ebdca7f3e978a271407de7241", "jurkat.bed:md5,5e170e72c4e2b27a7bb0a6de7b735c1c", - "7945f971cd63ad99ff2d9cc81e19ea39", - "43982cec9077e7030428267841cf04ef", - "8813c6dd42cabd94042f4f9e4aee3560" + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,c8bb282144d8078c0e4c809fe0878a12", + "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495" + ], + true ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T22:17:27.92555495" + "timestamp": "2024-08-11T13:47:28.150239282" }, "software_versions": { "content": [ @@ -30,6 +108,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T21:59:33.78683953" + "timestamp": "2024-08-11T13:47:28.018231429" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test b/workflows/tests/aligner/bwa.nf.test index 6d455221..b8833f01 100644 --- a/workflows/tests/aligner/bwa.nf.test +++ b/workflows/tests/aligner/bwa.nf.test @@ -28,7 +28,6 @@ nextflow_pipeline { bam("$outputDir/bwa/cd4_REP4.sorted.bam").getSamLinesMD5(), bam("$outputDir/bwa/jurkat_REP1.sorted.bam").getSamLinesMD5(), bam("$outputDir/bwa/jurkat_REP2.sorted.bam").getSamLinesMD5(), - path("$outputDir/bwa/log").list(), path("$outputDir/bwa/samtools_stats").list(), path("$outputDir/quality_control/bbsplit").list(), UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), @@ -39,10 +38,14 @@ nextflow_pipeline { path("$outputDir/coverage_graphs/").list(), path("$outputDir/transcript_identification/homer/cd4.bed"), path("$outputDir/transcript_identification/homer/jurkat.bed"), - // FIXME UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), path("$outputDir/transcript_identification/intersect/").list(), path("$outputDir/transcript_identification/filtered/").list(), - // FIXME path("$outputDir/quantification/").list(), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), path("$outputDir/multiqc/multiqc_report.html").exists(), ).match("output_files") } diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index a1ddee51..84a03068 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -10,28 +10,31 @@ "jurkat_REP1.trimmed.fastp.json:md5,329fd8e56421a196fc2ebd37ab3bc22d", "jurkat_REP2.trimmed.fastp.json:md5,8bad5b02a27e5386255b998a6a69db15" ], - [ - - ], + "c529a16c839e85e119b98354f109352d", + "9e63b682af88fa902cf92b5c485845b1", + "2aa200bbbce374ec7dedb9b46ce4aae1", + "122274730dd5386e1b26c174df886a8b", + "c2adf5327ff6d4edda2fdad00c7cb9bf", + "63fea3b1e2e08e5f6fdf3f7ba0aa7818", [ "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", - "cd4_REP1.sorted.bam.stats:md5,ba177ae2d9a5ab5a972bc056df28acc1", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", - "cd4_REP2.sorted.bam.stats:md5,8c8fc51169528132b1cca54d3689e3c0", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", "cd4_REP3.sorted.bam.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f", "cd4_REP3.sorted.bam.idxstats:md5,42de227ff397013cf288759871b0e938", - "cd4_REP3.sorted.bam.stats:md5,fe5be813bf2d55fd0e4877c650a0b266", + "cd4_REP3.sorted.bam.stats:md5,9c8a44ba139ce9a24449779f5d3c9228", "cd4_REP4.sorted.bam.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8", "cd4_REP4.sorted.bam.idxstats:md5,959dc185ae59de4cebe374026711a55e", - "cd4_REP4.sorted.bam.stats:md5,46bf6f2b140d369986027bc2f588b440", + "cd4_REP4.sorted.bam.stats:md5,edc57478278aa35b7376cee9afd634a7", "jurkat_REP1.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", "jurkat_REP1.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", - "jurkat_REP1.sorted.bam.stats:md5,3f1b0a4214daa368a307f856f7a809dc", + "jurkat_REP1.sorted.bam.stats:md5,ce9ff516908d86fb6db6ce44d5a3904b", "jurkat_REP2.sorted.bam.flagstat:md5,86ed47bd41a745ab59de473082c7742d", "jurkat_REP2.sorted.bam.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9", - "jurkat_REP2.sorted.bam.stats:md5,48732cff30d5a9a272f68fc850b0eb84" + "jurkat_REP2.sorted.bam.stats:md5,026c558e8c36136ef19bfbef6b12ce2b" ], [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", @@ -147,7 +150,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-10T12:48:55.984269469" + "timestamp": "2024-08-11T14:09:09.905409258" }, "Should work with gzipped references": { "content": [ diff --git a/workflows/tests/aligner/bwamem2.nf.test b/workflows/tests/aligner/bwamem2.nf.test index 8279effe..e8dd2d71 100644 --- a/workflows/tests/aligner/bwamem2.nf.test +++ b/workflows/tests/aligner/bwamem2.nf.test @@ -18,25 +18,23 @@ nextflow_pipeline { { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/bwamem2/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwamem2/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwamem2/jurkat.sorted.bam").getSamLinesMD5(), + path("$outputDir/bwamem2/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index ec1151b7..6d1ed380 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -2,6 +2,25 @@ "output_files": { "content": [ 77, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + "c529a16c839e85e119b98354f109352d", + "9e63b682af88fa902cf92b5c485845b1", + "c2adf5327ff6d4edda2fdad00c7cb9bf", + [ + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" + ], [ "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", @@ -10,17 +29,71 @@ "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" + ], + [ + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" + ], "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", - "c529a16c839e85e119b98354f109352d", - "9e63b682af88fa902cf92b5c485845b1", - "c2adf5327ff6d4edda2fdad00c7cb9bf" + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", + "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + ], + true ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T10:28:23.205786296" + "timestamp": "2024-08-11T12:45:38.504730102" }, "software_versions": { "content": [ diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index af2dd099..97d2c8fc 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -18,26 +18,25 @@ nextflow_pipeline { { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - // FIXME Dragmap isn't deterministic - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getHeaderMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getHeaderMD5(), - bam("$outputDir/samtools/jurkat.sorted.bam").getHeaderMD5(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/dragmap/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/dragmap/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/dragmap/jurkat.sorted.bam").getSamLinesMD5(), + // NOTE Not deterministic + // path("$outputDir/dragmap/log").list(), + path("$outputDir/dragmap/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index c77e5711..de7f38b5 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -2,6 +2,25 @@ "output_files": { "content": [ 77, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + "decb90fed362f83e7e5ace7e2e7e2884", + "24f05cf423094f251c23853e7c622c87", + "ff713596f886b6a62e5a68acc8851021", + [ + "cd4_REP1.sorted.bam.flagstat:md5,6a27aa41830e5f10a2c54c8a05611f9a", + "cd4_REP1.sorted.bam.idxstats:md5,75eaf648cea73812913344af3851ce16", + "cd4_REP1.sorted.bam.stats:md5,80bfe47bc5be703b51313a4b2fbcc57f", + "cd4_REP2.sorted.bam.flagstat:md5,0355e87e727027ee381053c49123336f", + "cd4_REP2.sorted.bam.idxstats:md5,4a68a3a04440acdced8802c29ffc634c", + "cd4_REP2.sorted.bam.stats:md5,24a85ae13a01fdbd1e6e882cf3ef55e0", + "jurkat.sorted.bam.flagstat:md5,2ac2d8fdb09b0bf5061d9e24501c41c3", + "jurkat.sorted.bam.idxstats:md5,8aebada21b179c96f888d08bb4ae1651", + "jurkat.sorted.bam.stats:md5,104f00b802be80cc252beb0d4cfd709b" + ], [ "cd4_REP1.coverage.hist.txt:md5,bff6862bc8e2015eef927b40671dec1b", "cd4_REP1.coverage.stats.txt:md5,c1e912cd0bebc51b289160ff7ab3365a", @@ -10,17 +29,71 @@ "jurkat.coverage.hist.txt:md5,468c864f655947edb3b306cb7a72633d", "jurkat.coverage.stats.txt:md5,338f3095395c8d8f172e0e27f9a5a60a" ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,a2dfb0a61cd0ada1f306aaf8c7cc7b8f", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,f5bc717609e44a4e94a1b1c626c1aaad", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,129145e5b3fa3cd8a6908bcbe75ea010" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,c53ebd47cad3f3524dafd3d0bdd2cc71", + "cd4_REP1.seq.DupRate.xls:md5,6fc39432eb1815a1aebac84c5c46aa97", + "cd4_REP2.pos.DupRate.xls:md5,96b7100c85fd83d7634ebcd199de2aea", + "cd4_REP2.seq.DupRate.xls:md5,dac033fb9e548d1e23069d9f76f9e67d", + "jurkat.pos.DupRate.xls:md5,3389108003e203614790dd835c84bd81", + "jurkat.seq.DupRate.xls:md5,0950602857db220cdf550f66e0ad69b8" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,d04a5d1a2c83c2be6dd373710d63fecf", + "cd4_REP2.DupRate_plot.r:md5,18afd2c9eb78d75dab9ac483b38111f8", + "jurkat.DupRate_plot.r:md5,2265434abacdb7130dd1643114482c8c" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,e257827c09d08e0211e6b55b78c09817", + "cd4_REP2.infer_experiment.txt:md5,cfc76745a36e9144eb03b85abb40a2bc", + "jurkat.infer_experiment.txt:md5,14af4229684e813974e4c4ac5724bd81" + ], + [ + "cd4_REP1.read_distribution.txt:md5,82bb213b23ea5a2c719c09ed993b576d", + "cd4_REP2.read_distribution.txt:md5,139a91e2f36b9c93b09fe36aff3414cd", + "jurkat.read_distribution.txt:md5,982e7cb76ca5978ff8c8bc63d17a1fbe" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,aefd2accdaf19635f5a566e6e36a578e", + "cd4_REP1.minus.bedGraph:md5,d4ddabe2599211e89c0eeb07544a2bf2", + "cd4_REP1.minus.bigWig:md5,7f0614afba6a3f37d507d1ee0ce4de2f", + "cd4_REP1.plus.bedGraph:md5,2ebf9f9cf845e8403cceda70e254be03", + "cd4_REP1.plus.bigWig:md5,de63345606909c31c3dfa2a0d57e68bc", + "cd4_REP2.dreg.bedGraph:md5,68cb12ce50649175d359aa8d7cbaae06", + "cd4_REP2.minus.bedGraph:md5,96876aaaca35003be86a25c78733c8f9", + "cd4_REP2.minus.bigWig:md5,228ed1c4fef63675c260c4f750b7c8f3", + "cd4_REP2.plus.bedGraph:md5,a6f04b8484428786a3e089ea5509240b", + "cd4_REP2.plus.bigWig:md5,cfea092121f880010f3ae652025e446b", + "jurkat.dreg.bedGraph:md5,337d974e56a047cea3ce1aa2a694b1ac", + "jurkat.minus.bedGraph:md5,c57d91865736e23f13660f9d7ecb6e5d", + "jurkat.minus.bigWig:md5,22daac83d393dcca8f1cc96580d3d4f3", + "jurkat.plus.bedGraph:md5,ddabf19e2172df4b80b7ce434035403e", + "jurkat.plus.bigWig:md5,ca73f44638c066f25261efffa1eedc7f" + ], "cd4.bed:md5,96b0e0bf77f3a04efcbfaf0fcdae926a", "jurkat.bed:md5,31454804c53975171a763d3049406598", - "9294458e8828aa4446fc6ea24f828d11", - "767cae9340255d914b40f5f0a76f9d65", - "b47414b7dada10ad11535d36af2e2cb" + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,063a59e4a2612e8eedaa443d02f6d271", + "jurkat_filtered.bed:md5,6625c2c4f2bbbf9ff2c93e587990b906" + ], + true ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T21:25:35.878072689" + "timestamp": "2024-08-11T13:56:33.006429411" }, "software_versions": { "content": [ diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 1099016a..7c65ac8a 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -21,25 +21,24 @@ nextflow_pipeline { { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/hisat2/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/hisat2/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/hisat2/jurkat.sorted.bam").getSamLinesMD5(), + path("$outputDir/hisat2/log").list(), + path("$outputDir/hisat2/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), ).match("output_files") } ) diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 00a6968a..6b3dd437 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -2,6 +2,30 @@ "output_files": { "content": [ 77, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + "e4a8dd8442a85921d5b9a7f2fd1fce1e", + "4dba3f03e302b5d4a31c50987844ced7", + "2f7a17a247d070580890c62005d261fa", + [ + "cd4_REP1.hisat2.summary.log:md5,4f8f6e777e142473bad3c3dcdab8f6d3", + "cd4_REP2.hisat2.summary.log:md5,7a95dbf6b50b5d527416232e9af55d86", + "jurkat.hisat2.summary.log:md5,3547ecf137d5c08695b29a5f78d09ddb" + ], + [ + "cd4_REP1.sorted.bam.flagstat:md5,aa26d19a689b2fe97e254f125e1f7bcb", + "cd4_REP1.sorted.bam.idxstats:md5,d523e6e25ce8659871df4104dab503b0", + "cd4_REP1.sorted.bam.stats:md5,57b98494241870644c74edda7d503232", + "cd4_REP2.sorted.bam.flagstat:md5,6235482c2c1be02a23826261e2f8a033", + "cd4_REP2.sorted.bam.idxstats:md5,89de35c9f4f1eafa6944d5d574db1675", + "cd4_REP2.sorted.bam.stats:md5,aaa17a5a0018fa03cbadb1f5e354fa49", + "jurkat.sorted.bam.flagstat:md5,8e59ad91dd9df6003cb6c3070b0aa34c", + "jurkat.sorted.bam.idxstats:md5,56608a565532fc8ae2b93a3be28d5e8d", + "jurkat.sorted.bam.stats:md5,e100d7f3a79bb29ea3a99e610245e6c8" + ], [ "cd4_REP1.coverage.hist.txt:md5,dff9783a6054f490bd106a5ea59ff323", "cd4_REP1.coverage.stats.txt:md5,bd2ae14e43e59332d62af60601f95368", @@ -10,17 +34,71 @@ "jurkat.coverage.hist.txt:md5,25ff1313ce15f2332b3b9ac5e440ad76", "jurkat.coverage.stats.txt:md5,e27a85bf418ceec8205c3ed4c9e9c0e4" ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,ef2d2279e5b4a381d98ab15088a82ada", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,52cd440c876e0036d822491bc4408d3c", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,3022ec570c7309819d53687439eea28e" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,f310a69c06f98d74ad7777f9654c6a5e", + "cd4_REP1.seq.DupRate.xls:md5,38e5d22ea87cbc72d3d193f2cfe71be6", + "cd4_REP2.pos.DupRate.xls:md5,3798988e2db44c870a96d1d6a411a7df", + "cd4_REP2.seq.DupRate.xls:md5,0446112b47237c5ced58ae84d05f4e98", + "jurkat.pos.DupRate.xls:md5,2afe47e0b733adcf27027466688b0eed", + "jurkat.seq.DupRate.xls:md5,f5fb592ddeb04e6b0cf943e192629648" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,8b5faff4bfdf9a9aea0fb70034fa490c", + "cd4_REP2.DupRate_plot.r:md5,069417fefa3372751b0d6b631f730b4b", + "jurkat.DupRate_plot.r:md5,504b1a3db273e05246389299ae6e7eb3" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,223944c6503efda309695bb51cb546f3", + "cd4_REP2.infer_experiment.txt:md5,09ddb72f44716e13c7fefba987d2343d", + "jurkat.infer_experiment.txt:md5,0a2e5683b2cc3e4b6e843979745f430f" + ], + [ + "cd4_REP1.read_distribution.txt:md5,2bdadf1ad1eea97f8d0a7f8a1e7c5934", + "cd4_REP2.read_distribution.txt:md5,392d6d311d922c75f2b75e060bac4ad2", + "jurkat.read_distribution.txt:md5,44b9aa3f1b43ecbe5303714a55cd0bc0" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,9afeff7c6ca37640e946de7c6153f77f", + "cd4_REP1.minus.bedGraph:md5,22f749f499c9a66e77d7cb4d0b05f115", + "cd4_REP1.minus.bigWig:md5,7430ec6b29bad01cc195bff48e7c3318", + "cd4_REP1.plus.bedGraph:md5,a5371fb8da790607b820b449711efda9", + "cd4_REP1.plus.bigWig:md5,051b50fa9bb4de523d54a37b2d7353f5", + "cd4_REP2.dreg.bedGraph:md5,7db28452604d25f084f5c90a844acfaa", + "cd4_REP2.minus.bedGraph:md5,ccbc07a515c079678fe9aac66943a94d", + "cd4_REP2.minus.bigWig:md5,59d6c644860efb1852d1d88f12e5328e", + "cd4_REP2.plus.bedGraph:md5,47a5ac385c35a0a12fca2fea5c060a30", + "cd4_REP2.plus.bigWig:md5,7e1f1319b32f591d6704050447317108", + "jurkat.dreg.bedGraph:md5,2263e002f2867d8c306e52cf0a5ed495", + "jurkat.minus.bedGraph:md5,b06abe7efd4e332e73fa1895e554dc06", + "jurkat.minus.bigWig:md5,8a0ca6db6626d3fefb518f0d35dd1abc", + "jurkat.plus.bedGraph:md5,835edbd98f6d5d69e56de05e1a837b7c", + "jurkat.plus.bigWig:md5,66e82005e6c6730e970f7506bf93325c" + ], "cd4.bed:md5,d8c78818eb1666575ef4c2534ea3727e", "jurkat.bed:md5,7298daa579135dfb8924067abaa2ba4e", - "e4a8dd8442a85921d5b9a7f2fd1fce1e", - "4dba3f03e302b5d4a31c50987844ced7", - "2f7a17a247d070580890c62005d261fa" + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,d2d0eea74b786692bea5a6a23046ad4a", + "jurkat_filtered.bed:md5,1341da464eab0ef94e921de514f46495" + ], + true ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T10:31:53.720198479" + "timestamp": "2024-08-10T15:44:01.194165188" }, "software_versions": { "content": [ diff --git a/workflows/tests/aligner/star.nf.test b/workflows/tests/aligner/star.nf.test index 6d2d222e..b647b57d 100644 --- a/workflows/tests/aligner/star.nf.test +++ b/workflows/tests/aligner/star.nf.test @@ -20,25 +20,25 @@ nextflow_pipeline { { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/samtools/jurkat.sorted.bam").getSamLinesMD5(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/star/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/star/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/star/jurkat.sorted.bam").getSamLinesMD5(), + // NOTE Not deterministic + // path("$outputDir/star/log").list(), + path("$outputDir/star/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), ).match("output_files") } ) @@ -58,25 +58,9 @@ nextflow_pipeline { then { assertAll( { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("gzip_software_versions") }, { assert snapshot( workflow.trace.tasks().size(), - path("$outputDir/bbmap").list(), - // BUG https://github.com/nf-core/nascent/issues/102 - // path("$outputDir/bedtools").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/bwa/featurecounts/gene").list(), - // FIXME cd4 isn't deterministic - // path("$outputDir/bwa/featurecounts/predicted").list(), - // path("$outputDir/deeptools").list(), - // path("$outputDir/fastp/*.json").list(), - // FIXME gtf2bed isn't deterministic - // path("$outputDir/gtf2bed").list(), - path("$outputDir/homer/cd4.bed"), - path("$outputDir/homer/jurkat.bed"), - // FIXME https://github.com/nf-core/nascent/issues/148 - // path("$outputDir/preseq").list(), - // path("$outputDir/rseqc").list(), - bam("$outputDir/samtools/cd4_REP1.sorted.bam").getSamLinesMD5(), ).match() } ) diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 47574113..67c0d17b 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -1,28 +1,36 @@ { "Should run with gzipped gtf": { "content": [ - 83, - [ - "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", - "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", - "cd4_REP2.coverage.hist.txt:md5,d3ba6b2e1cfa9fec1e41fc9b35bf1613", - "cd4_REP2.coverage.stats.txt:md5,bdfddb88605ba9dfcdb35988d6a8f55e", - "jurkat.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", - "jurkat.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee" - ], - "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", - "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", - "4df1ea73be642288f18fa0d84f2f2820" + 83 ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T10:38:18.050552995" + "timestamp": "2024-08-10T23:12:22.87545483" }, "output_files": { "content": [ 82, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + "4df1ea73be642288f18fa0d84f2f2820", + "32b824f32b196761243365d93065a0da", + "519b0eb7154a059df04f6a74e01c0578", + [ + "cd4_REP1.sorted.bam.flagstat:md5,6379888a79d90e28dd969e21f7b03a33", + "cd4_REP1.sorted.bam.idxstats:md5,65e8e2d1ed65620f9750f2981e997a9d", + "cd4_REP1.sorted.bam.stats:md5,bec325c0cd30bafd9758c0535f99cf49", + "cd4_REP2.sorted.bam.flagstat:md5,ab83e3fbca17cf463fc5293a82e4bb3a", + "cd4_REP2.sorted.bam.idxstats:md5,9cdf3dd50a9862a02592c3768071fe32", + "cd4_REP2.sorted.bam.stats:md5,c7a92c340bb5735414d035da30b9b53f", + "jurkat.sorted.bam.flagstat:md5,b5f1d127de493e406882aced667210c9", + "jurkat.sorted.bam.idxstats:md5,5e4a68fda75c954324d659af58d12c62", + "jurkat.sorted.bam.stats:md5,0b7a4d6e0823d159ab2d9cdc1b2c8310" + ], [ "cd4_REP1.coverage.hist.txt:md5,40fa11763ddc9cdfb2ab7d1e355a68aa", "cd4_REP1.coverage.stats.txt:md5,3a9e49ac63d4322e6bc5e38af1cb0e7f", @@ -31,17 +39,71 @@ "jurkat.coverage.hist.txt:md5,0a5b27499261b4bb70fb30aa9187802f", "jurkat.coverage.stats.txt:md5,6969d93dd3f46379662382d77448c0ee" ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,c84d218ba0a58b9ea5476ad207224162", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,9159cf4286e88b3c5740cf9c2884d4f1", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,639ea055621d77eadb836505eaf07ca8" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,251ff0f73b7a2d98894fcaaf763a9059", + "cd4_REP1.seq.DupRate.xls:md5,fb59902a9ab77c1859a48bd763578560", + "cd4_REP2.pos.DupRate.xls:md5,f784231fb3973ec46c0996d4ba2f9591", + "cd4_REP2.seq.DupRate.xls:md5,6c00870ce14b0383bdccd352d7c6012a", + "jurkat.pos.DupRate.xls:md5,0937fe59aa436407b807660978c4423e", + "jurkat.seq.DupRate.xls:md5,ef59a2a23975a1a3aa2770ca8525ac51" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,a33f83aef06fa207ac55b8002741aff7", + "cd4_REP2.DupRate_plot.r:md5,834a386b72bab13bfb9678ebb09d814e", + "jurkat.DupRate_plot.r:md5,eb8151edec9ac1e29b5a579cfdb45a0d" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,615958cef592f55bf190346b8aec2886", + "cd4_REP2.infer_experiment.txt:md5,fbe67ba4bd4ed6a1759a4ec676332e36", + "jurkat.infer_experiment.txt:md5,9accbdaac1d7d8c9e665e87a48328842" + ], + [ + "cd4_REP1.read_distribution.txt:md5,2b5ff7e11fc0e542b6cc2b175fe9e8ab", + "cd4_REP2.read_distribution.txt:md5,748d618cbb6bebc5922a89af78932f60", + "jurkat.read_distribution.txt:md5,5ec2c28ee0ff01e0fa0889b16136624f" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,6ecfb93ba1a56308ce7d3c4703e0e5e3", + "cd4_REP1.minus.bedGraph:md5,9e07f1d5637b2193f55da08d6877bd93", + "cd4_REP1.minus.bigWig:md5,fa4743c954c2d96c38d1d53511ebf647", + "cd4_REP1.plus.bedGraph:md5,c111dc157dc7ecd53e7f6b8ce8d5ccc0", + "cd4_REP1.plus.bigWig:md5,37f187a2a476cba99a00ab7683079f84", + "cd4_REP2.dreg.bedGraph:md5,949a822bee0b968f118fb4d2d0fcf251", + "cd4_REP2.minus.bedGraph:md5,d0bdd2bf54e343a00d620d41da32e2f3", + "cd4_REP2.minus.bigWig:md5,9f8cb0bdf31650b1af341b5522cf7634", + "cd4_REP2.plus.bedGraph:md5,268311481da2d62204f71a1a8bc5d43b", + "cd4_REP2.plus.bigWig:md5,4f5f27b5e3258ebf2ee7bf1f8fe17357", + "jurkat.dreg.bedGraph:md5,9a2a287e9d8e73185d5754442051055b", + "jurkat.minus.bedGraph:md5,964feef1a4988cbf900840fa572a676e", + "jurkat.minus.bigWig:md5,172ea254e30275889eb94a2f2f7f04cf", + "jurkat.plus.bedGraph:md5,198a0f027ca6799ecc74196232402c81", + "jurkat.plus.bigWig:md5,0bd721f298a8dde14ffdbda6db303f93" + ], "cd4.bed:md5,28eafdfa41f98475e5e651fd0e8f95f2", "jurkat.bed:md5,7e59345b336cc8a9c5f96bf7df7b3d06", - "4df1ea73be642288f18fa0d84f2f2820", - "32b824f32b196761243365d93065a0da", - "519b0eb7154a059df04f6a74e01c0578" + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,ae17ebd0485c6fc2648dcdb31eeb59b2", + "jurkat_filtered.bed:md5,f671cf2998b8d2422554c8cee21ee91f" + ], + true ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-03T10:35:05.994986959" + "timestamp": "2024-08-11T13:24:35.500633327" }, "software_versions": { "content": [ @@ -51,6 +113,16 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T22:14:36.419331739" + "timestamp": "2024-08-11T14:01:27.77798393" + }, + "gzip_software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GUNZIP_GTF={gunzip=1.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-10T23:12:22.858450381" } } \ No newline at end of file From ebeb0425b1cdf35821f64e4135e65dbf33649192 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Sun, 11 Aug 2024 19:57:24 -0500 Subject: [PATCH 088/255] test: Fix non-deterministic versions and bams --- workflows/nascent.nf | 2 +- workflows/tests/aligner/bowtie2.nf.test | 6 +++--- workflows/tests/aligner/bowtie2.nf.test.snap | 12 ++++++------ workflows/tests/aligner/bwa.nf.test.snap | 4 ++-- workflows/tests/aligner/bwamem2.nf.test.snap | 4 ++-- workflows/tests/aligner/dragmap.nf.test | 7 ++++--- workflows/tests/aligner/dragmap.nf.test.snap | 12 ++++++------ workflows/tests/aligner/hisat2.nf.test.snap | 4 ++-- workflows/tests/aligner/star.nf.test.snap | 8 ++++---- 9 files changed, 30 insertions(+), 29 deletions(-) diff --git a/workflows/nascent.nf b/workflows/nascent.nf index c74dbead..db08a147 100644 --- a/workflows/nascent.nf +++ b/workflows/nascent.nf @@ -84,7 +84,7 @@ workflow NASCENT { ch_bowtie2_index, ch_hisat2_index, ) - ch_versions = ch_versions.mix(PREPARE_GENOME.out.versions.first()) + ch_versions = ch_versions.mix(PREPARE_GENOME.out.versions) ch_fasta = PREPARE_GENOME.out.fasta.map{ fasta -> [ [ id:fasta.baseName ], fasta ] } // diff --git a/workflows/tests/aligner/bowtie2.nf.test b/workflows/tests/aligner/bowtie2.nf.test index daeff718..12d14359 100644 --- a/workflows/tests/aligner/bowtie2.nf.test +++ b/workflows/tests/aligner/bowtie2.nf.test @@ -22,9 +22,9 @@ nextflow_pipeline { workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), // NOTE Not deterministic - path("$outputDir/bowtie2/cd4_REP1.sorted.bam").exists(), - path("$outputDir/bowtie2/cd4_REP2.sorted.bam").exists(), - path("$outputDir/bowtie2/jurkat.sorted.bam").exists(), + bam("$outputDir/bowtie2/cd4_REP1.sorted.bam").getHeaderMD5(), + bam("$outputDir/bowtie2/cd4_REP2.sorted.bam").getHeaderMD5(), + bam("$outputDir/bowtie2/jurkat.sorted.bam").getHeaderMD5(), path("$outputDir/bowtie2/log").list(), path("$outputDir/bowtie2/samtools_stats").list(), path("$outputDir/quality_control/bbsplit").list(), diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 60005471..4535939e 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -7,9 +7,9 @@ "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" ], - true, - true, - true, + "7945f971cd63ad99ff2d9cc81e19ea39", + "43982cec9077e7030428267841cf04ef", + "8813c6dd42cabd94042f4f9e4aee3560", [ "cd4_REP1.bowtie2.log:md5,024c3b6bca27f3836cdd86c0287d2971", "cd4_REP2.bowtie2.log:md5,089af358aad637ec94c10172eb024773", @@ -98,16 +98,16 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T13:47:28.150239282" + "timestamp": "2024-08-11T20:03:14.305867126" }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, BOWTIE2_BUILD={bowtie2=2.5.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T13:47:28.018231429" + "timestamp": "2024-08-11T20:03:14.17485497" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index 84a03068..fd644009 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -164,13 +164,13 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-09T13:24:17.114505802" + "timestamp": "2024-08-11T20:05:55.979332162" }, "Should work with BWA Index": { "content": [ diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 6d1ed380..031e0397 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -97,12 +97,12 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWAMEM2_MEM={bwamem2=2.2.1, samtools=1.19.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWAMEM2_INDEX={bwamem2=2.2.1}, BWAMEM2_MEM={bwamem2=2.2.1, samtools=1.19.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T20:16:56.413251993" + "timestamp": "2024-08-11T20:10:59.639394977" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test b/workflows/tests/aligner/dragmap.nf.test index 97d2c8fc..3479fbed 100644 --- a/workflows/tests/aligner/dragmap.nf.test +++ b/workflows/tests/aligner/dragmap.nf.test @@ -19,9 +19,10 @@ nextflow_pipeline { { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/dragmap/cd4_REP1.sorted.bam").getSamLinesMD5(), - bam("$outputDir/dragmap/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/dragmap/jurkat.sorted.bam").getSamLinesMD5(), + // NOTE Not deterministic + bam("$outputDir/dragmap/cd4_REP1.sorted.bam").getHeaderMD5(), + bam("$outputDir/dragmap/cd4_REP2.sorted.bam").getHeaderMD5(), + bam("$outputDir/dragmap/jurkat.sorted.bam").getHeaderMD5(), // NOTE Not deterministic // path("$outputDir/dragmap/log").list(), path("$outputDir/dragmap/samtools_stats").list(), diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index de7f38b5..454d3150 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -7,9 +7,9 @@ "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" ], - "decb90fed362f83e7e5ace7e2e7e2884", - "24f05cf423094f251c23853e7c622c87", - "ff713596f886b6a62e5a68acc8851021", + "9294458e8828aa4446fc6ea24f828d11", + "767cae9340255d914b40f5f0a76f9d65", + "b47414b7dada10ad11535d36af2e2cb", [ "cd4_REP1.sorted.bam.flagstat:md5,6a27aa41830e5f10a2c54c8a05611f9a", "cd4_REP1.sorted.bam.idxstats:md5,75eaf648cea73812913344af3851ce16", @@ -93,16 +93,16 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T13:56:33.006429411" + "timestamp": "2024-08-11T20:13:30.191639621" }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, DRAGMAP_ALIGN={dragmap=1.2.1, samtools=1.15.1, pigz=2.3.4}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, DRAGMAP_ALIGN={dragmap=1.2.1, samtools=1.15.1, pigz=2.3.4}, DRAGMAP_HASHTABLE={dragmap=1.3.0}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T20:19:06.859222166" + "timestamp": "2024-08-11T20:13:30.140165153" } } \ No newline at end of file diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 6b3dd437..59dd928f 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -102,12 +102,12 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HISAT2_ALIGN={hisat2=2.2.1, samtools=1.16.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, UNTAR_HISAT2_INDEX={untar=1.34}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HISAT2_ALIGN={hisat2=2.2.1, samtools=1.16.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, UNTAR_HISAT2_INDEX={untar=1.34}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-04T20:20:46.356464865" + "timestamp": "2024-08-11T20:16:04.102598697" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 67c0d17b..67b63f95 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -107,22 +107,22 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T14:01:27.77798393" + "timestamp": "2024-08-11T20:19:37.161656241" }, "gzip_software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GUNZIP_GTF={gunzip=1.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, GUNZIP_GTF={gunzip=1.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-10T23:12:22.858450381" + "timestamp": "2024-08-11T20:23:02.096824195" } } \ No newline at end of file From e31b03203136dcf79f7baaf7ed9098140c2b367c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 29 Aug 2024 22:01:10 -0500 Subject: [PATCH 089/255] fix: Add fasta channel to GFFREAD --- subworkflows/local/prepare_genome.nf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subworkflows/local/prepare_genome.nf b/subworkflows/local/prepare_genome.nf index 3c0e23db..751bebfc 100644 --- a/subworkflows/local/prepare_genome.nf +++ b/subworkflows/local/prepare_genome.nf @@ -64,7 +64,7 @@ workflow PREPARE_GENOME { } else { ch_gff = Channel.value(file(gff)) } - ch_gtf = GFFREAD ( ch_gff ).gtf + ch_gtf = GFFREAD ( ch_gff, ch_fasta ).gtf ch_versions = ch_versions.mix(GFFREAD.out.versions) } } From d95e6e5ef6f410e27520c925bebb533533ef2fd0 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 29 Aug 2024 22:01:40 -0500 Subject: [PATCH 090/255] test: Add test for GFF files --- workflows/tests/inputs/gff/main.nf.test | 49 +++++++++ workflows/tests/inputs/gff/main.nf.test.snap | 108 +++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 workflows/tests/inputs/gff/main.nf.test create mode 100644 workflows/tests/inputs/gff/main.nf.test.snap diff --git a/workflows/tests/inputs/gff/main.nf.test b/workflows/tests/inputs/gff/main.nf.test new file mode 100644 index 00000000..8dfe6d06 --- /dev/null +++ b/workflows/tests/inputs/gff/main.nf.test @@ -0,0 +1,49 @@ +nextflow_pipeline { + + name "GFF" + script "../../../../main.nf" + + test("Should run with an unzipped GFF file") { + + when { + params { + outdir = "$outputDir" + gff = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gff' + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/jurkat.sorted.bam").getSamLinesMD5(), + path("$outputDir/bwa/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap new file mode 100644 index 00000000..f2d26b2e --- /dev/null +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -0,0 +1,108 @@ +{ + "output_files": { + "content": [ + 77, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + "c529a16c839e85e119b98354f109352d", + "9e63b682af88fa902cf92b5c485845b1", + "c2adf5327ff6d4edda2fdad00c7cb9bf", + [ + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" + ], + [ + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" + ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" + ], + [ + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" + ], + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", + "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + ], + true + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-29T22:00:31.371208715" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-29T21:54:31.426789231" + } +} \ No newline at end of file From 9d233a9754f862d07c9ed731ddbeeaa0c2f96fa0 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 29 Aug 2024 22:07:48 -0500 Subject: [PATCH 091/255] test: Add a test for using a gzipped gff file --- .../tests/inputs/gzipped_gff/main.nf.test | 49 ++++++++ .../inputs/gzipped_gff/main.nf.test.snap | 108 ++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 workflows/tests/inputs/gzipped_gff/main.nf.test create mode 100644 workflows/tests/inputs/gzipped_gff/main.nf.test.snap diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test b/workflows/tests/inputs/gzipped_gff/main.nf.test new file mode 100644 index 00000000..8781946a --- /dev/null +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test @@ -0,0 +1,49 @@ +nextflow_pipeline { + + name "gzipped GFF" + script "../../../../main.nf" + + test("Should run with a gzipped GFF file") { + + when { + params { + outdir = "$outputDir" + gff = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gff.gz' + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/jurkat.sorted.bam").getSamLinesMD5(), + path("$outputDir/bwa/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap new file mode 100644 index 00000000..6e193085 --- /dev/null +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -0,0 +1,108 @@ +{ + "output_files": { + "content": [ + 77, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + "c529a16c839e85e119b98354f109352d", + "9e63b682af88fa902cf92b5c485845b1", + "c2adf5327ff6d4edda2fdad00c7cb9bf", + [ + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" + ], + [ + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" + ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" + ], + [ + "cd4_REP1.read_distribution.txt:md5,1fcc6afbb63242818d446b877a832c3a", + "cd4_REP2.read_distribution.txt:md5,c2762d927c1c12d520ebee8160561189", + "jurkat.read_distribution.txt:md5,6c02a757ed379a6c19f6855e38b5d909" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" + ], + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", + "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + ], + true + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-29T22:05:38.178813579" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-29T22:05:37.46456688" + } +} \ No newline at end of file From e227436461bd81a1d906b3b47007fd8f5edb289e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 30 Aug 2024 19:11:50 -0500 Subject: [PATCH 092/255] fix: Pass meta map to fix error "Input tuple does not match tuple declaration" --- subworkflows/local/prepare_genome.nf | 4 ++-- workflows/tests/inputs/gff/main.nf.test | 2 ++ workflows/tests/inputs/gzipped_gff/main.nf.test | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/subworkflows/local/prepare_genome.nf b/subworkflows/local/prepare_genome.nf index 751bebfc..1b2f1f91 100644 --- a/subworkflows/local/prepare_genome.nf +++ b/subworkflows/local/prepare_genome.nf @@ -59,10 +59,10 @@ workflow PREPARE_GENOME { } } else if (gff) { if (gff.endsWith('.gz')) { - ch_gff = GUNZIP_GFF ( [ [:], gff ] ).gunzip.map { it[1] } + ch_gff = GUNZIP_GFF ( [ [:], gff ] ).gunzip ch_versions = ch_versions.mix(GUNZIP_GFF.out.versions) } else { - ch_gff = Channel.value(file(gff)) + ch_gff = [ [:], file(gff)] } ch_gtf = GFFREAD ( ch_gff, ch_fasta ).gtf ch_versions = ch_versions.mix(GFFREAD.out.versions) diff --git a/workflows/tests/inputs/gff/main.nf.test b/workflows/tests/inputs/gff/main.nf.test index 8dfe6d06..43090ba8 100644 --- a/workflows/tests/inputs/gff/main.nf.test +++ b/workflows/tests/inputs/gff/main.nf.test @@ -2,6 +2,8 @@ nextflow_pipeline { name "GFF" script "../../../../main.nf" + tag "input" + tag "gff" test("Should run with an unzipped GFF file") { diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test b/workflows/tests/inputs/gzipped_gff/main.nf.test index 8781946a..b8e5f8f3 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test @@ -2,6 +2,8 @@ nextflow_pipeline { name "gzipped GFF" script "../../../../main.nf" + tag "input" + tag "gff" test("Should run with a gzipped GFF file") { From 49f9b85f77383a7744aa0858f2fd6bd1f1065c83 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 30 Aug 2024 19:47:15 -0500 Subject: [PATCH 093/255] fix: Should run with only a gff file --- subworkflows/local/prepare_genome.nf | 2 +- workflows/tests/inputs/only_gff/main.nf.test | 53 +++++++++ .../tests/inputs/only_gff/main.nf.test.snap | 108 ++++++++++++++++++ 3 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 workflows/tests/inputs/only_gff/main.nf.test create mode 100644 workflows/tests/inputs/only_gff/main.nf.test.snap diff --git a/subworkflows/local/prepare_genome.nf b/subworkflows/local/prepare_genome.nf index 1b2f1f91..cc5bab21 100644 --- a/subworkflows/local/prepare_genome.nf +++ b/subworkflows/local/prepare_genome.nf @@ -64,7 +64,7 @@ workflow PREPARE_GENOME { } else { ch_gff = [ [:], file(gff)] } - ch_gtf = GFFREAD ( ch_gff, ch_fasta ).gtf + ch_gtf = GFFREAD ( ch_gff, ch_fasta ).gtf.map { it[1] } ch_versions = ch_versions.mix(GFFREAD.out.versions) } } diff --git a/workflows/tests/inputs/only_gff/main.nf.test b/workflows/tests/inputs/only_gff/main.nf.test new file mode 100644 index 00000000..e91fdf74 --- /dev/null +++ b/workflows/tests/inputs/only_gff/main.nf.test @@ -0,0 +1,53 @@ +nextflow_pipeline { + + name "GFF" + script "../../../../main.nf" + tag "input" + tag "gff" + + test("Should run with only a GFF file") { + + when { + params { + outdir = "$outputDir" + gff = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gff' + gtf = null + bed = null + } + } + + then { + assertAll( + { assert workflow.success }, + { assert snapshot(UTILS.removeNextflowVersion("$outputDir/pipeline_info/nf_core_pipeline_software_mqc_versions.yml")).match("software_versions") }, + { assert snapshot( + workflow.trace.tasks().size(), + UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), + bam("$outputDir/bwa/cd4_REP1.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/cd4_REP2.sorted.bam").getSamLinesMD5(), + bam("$outputDir/bwa/jurkat.sorted.bam").getSamLinesMD5(), + path("$outputDir/bwa/samtools_stats").list(), + path("$outputDir/quality_control/bbsplit").list(), + UTILS.getAllFilesFromDir("$outputDir/quality_control/preseq", ".txt"), + path("$outputDir/quality_control/rseqc/read_duplication/xls").list(), + path("$outputDir/quality_control/rseqc/read_duplication/rscript").list(), + path("$outputDir/quality_control/rseqc/infer_experiment").list(), + path("$outputDir/quality_control/rseqc/read_distribution").list(), + path("$outputDir/coverage_graphs/").list(), + path("$outputDir/transcript_identification/homer/cd4.bed"), + path("$outputDir/transcript_identification/homer/jurkat.bed"), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // UTILS.getAllFilesFromDir("$outputDir/transcript_identification/pints/", ".bed"), + path("$outputDir/transcript_identification/intersect/").list(), + path("$outputDir/transcript_identification/filtered/").list(), + // FIXME Not determinstic because of the order of files + // Add to the other tests when fixed + // path("$outputDir/quantification/").list(), + path("$outputDir/multiqc/multiqc_report.html").exists(), + ).match("output_files") + } + ) + } + } +} diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap new file mode 100644 index 00000000..75200046 --- /dev/null +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -0,0 +1,108 @@ +{ + "output_files": { + "content": [ + 78, + [ + "cd4_REP1.trimmed.fastp.json:md5,bd9a3344c1591d6be4d524451f9dca53", + "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", + "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" + ], + "c529a16c839e85e119b98354f109352d", + "9e63b682af88fa902cf92b5c485845b1", + "c2adf5327ff6d4edda2fdad00c7cb9bf", + [ + "cd4_REP1.sorted.bam.flagstat:md5,863e2d506d5cc4239af98a5f31bbc906", + "cd4_REP1.sorted.bam.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2", + "cd4_REP1.sorted.bam.stats:md5,1536c80bae78b2062508e1de210f6387", + "cd4_REP2.sorted.bam.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc", + "cd4_REP2.sorted.bam.idxstats:md5,53204e4c6a9f68664087e4a8123be46a", + "cd4_REP2.sorted.bam.stats:md5,561610e53fb676ac83252712dcac30d4", + "jurkat.sorted.bam.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421", + "jurkat.sorted.bam.idxstats:md5,c61af0847c1ad76c06a8de2815975b32", + "jurkat.sorted.bam.stats:md5,898c6b259ef686bf797ef15646faf29d" + ], + [ + "cd4_REP1.coverage.hist.txt:md5,7cbb473be8d3b32ff2e52fdf4e5d10d2", + "cd4_REP1.coverage.stats.txt:md5,f1471b61ac17dba283d80e08450c7e55", + "cd4_REP2.coverage.hist.txt:md5,8d5258a0882494bc4e3f1aa6aa5ed685", + "cd4_REP2.coverage.stats.txt:md5,3cdb4473211f9da44166ffa6aaa5b602", + "jurkat.coverage.hist.txt:md5,71a893d9d1d55fd47399f6d47b628d6e", + "jurkat.coverage.stats.txt:md5,381c69a30099d82066a959deab1a2569" + ], + [ + "cd4_REP1.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP1.lc_extrap.txt:md5,8633f84ccd5cc725db9af4b33edd63b0", + "cd4_REP2.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "cd4_REP2.lc_extrap.txt:md5,3ad9e4028c3711e6d46831c10ed04200", + "jurkat.c_curve.txt:md5,cf4743abdd355595d6ec1fb3f38e66e5", + "jurkat.lc_extrap.txt:md5,84faa937faa88476c942f330c5762cb5" + ], + [ + "cd4_REP1.pos.DupRate.xls:md5,a80db2d20096ca839a7847ec5b11bf75", + "cd4_REP1.seq.DupRate.xls:md5,c34531fd7578c6f62cbad53b96a7feb9", + "cd4_REP2.pos.DupRate.xls:md5,06200ab67a60bee71fd168de88c15369", + "cd4_REP2.seq.DupRate.xls:md5,c82f6d687eacabbab045db34647c3254", + "jurkat.pos.DupRate.xls:md5,0721c91ab7c640b046689095047657f8", + "jurkat.seq.DupRate.xls:md5,aba941b1bf0e93f99e39bd507d1c02de" + ], + [ + "cd4_REP1.DupRate_plot.r:md5,a6f96b5b87a142dca2e09868deb8222b", + "cd4_REP2.DupRate_plot.r:md5,a0686d22ba07f33a627c1a106d442a03", + "jurkat.DupRate_plot.r:md5,acb2fdffc578643503503bf0081eb7ae" + ], + [ + "cd4_REP1.infer_experiment.txt:md5,2d8f31fe48cfc1db9d4c46ba59c2c7f3", + "cd4_REP2.infer_experiment.txt:md5,70ac3bf0d0c50d644ab97e1698021e55", + "jurkat.infer_experiment.txt:md5,3ec36bed252146eb9cdb68db30c1855e" + ], + [ + "cd4_REP1.read_distribution.txt:md5,59ab605365c2c66c2859a24c9697a175", + "cd4_REP2.read_distribution.txt:md5,0b9cec7d382b6cca9281c41e181b623a", + "jurkat.read_distribution.txt:md5,d8c024f88177bbe002e6c17055024a03" + ], + [ + "cd4_REP1.dreg.bedGraph:md5,8948a8fa86d8f6d413b77983189ff56e", + "cd4_REP1.minus.bedGraph:md5,2a1c34f9d9ef9ff1b9da7874b9e3aaad", + "cd4_REP1.minus.bigWig:md5,5280319275c98dcce023779fa389884d", + "cd4_REP1.plus.bedGraph:md5,1509ec3a921e3109c5914e1bcef8cf33", + "cd4_REP1.plus.bigWig:md5,72ccab3173f2018a22a4b36841247ba2", + "cd4_REP2.dreg.bedGraph:md5,29f865a5668fae4a52a41589ac2b3179", + "cd4_REP2.minus.bedGraph:md5,c530bc34fa3ec7ac49e88ff65f9c2f92", + "cd4_REP2.minus.bigWig:md5,5e748c794e037f441741f7f409c8c5ad", + "cd4_REP2.plus.bedGraph:md5,a675141da2874ec08d91591e5ea8242b", + "cd4_REP2.plus.bigWig:md5,08674d52e9eeb08807c33ed3e4b3d504", + "jurkat.dreg.bedGraph:md5,c25a4fb095e9f7d6766a3ce33e08f7d8", + "jurkat.minus.bedGraph:md5,8d5d9a41df6eb6c56b1bfd3f39dc1fc6", + "jurkat.minus.bigWig:md5,d06c8015c996bf520fff17266fd01f84", + "jurkat.plus.bedGraph:md5,6ed63e5983edaa74fb3965676efdb674", + "jurkat.plus.bigWig:md5,7a02334f2c7300ffdb5a2253c0937390" + ], + "cd4.bed:md5,b55e5290d78941f36c3d1ecfef8e0062", + "jurkat.bed:md5,383cfaf10535dbe5d7f47607e345f4cb", + [ + "cd4_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e", + "jurkat_intersect.bed:md5,d41d8cd98f00b204e9800998ecf8427e" + ], + [ + "cd4_filtered.bed:md5,7596b9c555cf05614153ee4b539f6b2e", + "jurkat_filtered.bed:md5,5cc005df15b1f03d21191f0f5d37f0e1" + ], + true + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-30T19:42:31.394291729" + }, + "software_versions": { + "content": [ + "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GFFREAD={gffread=0.12.7}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + ], + "meta": { + "nf-test": "0.9.0", + "nextflow": "24.04.4" + }, + "timestamp": "2024-08-30T19:42:31.094478491" + } +} \ No newline at end of file From 531378a5932809196f4a4bd4b831c0ece9325748 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 11 Sep 2024 11:21:33 -0500 Subject: [PATCH 094/255] test: Add a note about a flaky test --- workflows/tests/aligner/hisat2.nf.test | 1 + 1 file changed, 1 insertion(+) diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 7c65ac8a..22f9c0af 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -23,6 +23,7 @@ nextflow_pipeline { workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), bam("$outputDir/hisat2/cd4_REP1.sorted.bam").getSamLinesMD5(), + // NOTE Flaky test bam("$outputDir/hisat2/cd4_REP2.sorted.bam").getSamLinesMD5(), bam("$outputDir/hisat2/jurkat.sorted.bam").getSamLinesMD5(), path("$outputDir/hisat2/log").list(), From dea83aea3dbcf06ebf75d6d45ccd0df6091837e5 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 12 Sep 2024 14:29:35 -0500 Subject: [PATCH 095/255] style: Make version snapshots pretty --- tests/lib/UTILS.groovy | 2 +- workflows/tests/aligner/bowtie2.nf.test.snap | 88 ++++++++++- workflows/tests/aligner/bwa.nf.test.snap | 76 +++++++++- workflows/tests/aligner/bwamem2.nf.test.snap | 91 ++++++++++- workflows/tests/aligner/dragmap.nf.test.snap | 92 +++++++++++- workflows/tests/aligner/hisat2.nf.test.snap | 95 +++++++++++- workflows/tests/aligner/star.nf.test.snap | 141 +++++++++++++++++- workflows/tests/inputs/gff/main.nf.test.snap | 76 +++++++++- .../inputs/gzipped_gff/main.nf.test.snap | 76 +++++++++- .../tests/inputs/only_gff/main.nf.test.snap | 79 +++++++++- 10 files changed, 793 insertions(+), 23 deletions(-) diff --git a/tests/lib/UTILS.groovy b/tests/lib/UTILS.groovy index 7bd4a9b9..9483a986 100644 --- a/tests/lib/UTILS.groovy +++ b/tests/lib/UTILS.groovy @@ -1,7 +1,7 @@ // Function to remove Nextflow version from pipeline_software_mqc_versions.yml class UTILS { - public static String removeNextflowVersion(pipeline_software_mqc_versions) { + public static Object removeNextflowVersion(pipeline_software_mqc_versions) { def softwareVersions = path(pipeline_software_mqc_versions).yaml if (softwareVersions.containsKey("Workflow")) { softwareVersions.Workflow.remove("Nextflow") diff --git a/workflows/tests/aligner/bowtie2.nf.test.snap b/workflows/tests/aligner/bowtie2.nf.test.snap index 4535939e..9903fbc7 100644 --- a/workflows/tests/aligner/bowtie2.nf.test.snap +++ b/workflows/tests/aligner/bowtie2.nf.test.snap @@ -102,12 +102,96 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BOWTIE2_ALIGN={bowtie2=2.5.2, samtools=1.18, pigz=2.6}, BOWTIE2_BUILD={bowtie2=2.5.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BOWTIE2_ALIGN": { + "bowtie2": "2.5.2", + "samtools": 1.18, + "pigz": 2.6 + }, + "BOWTIE2_BUILD": { + "bowtie2": "2.5.2" + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SAMTOOLS_FLAGSTAT": { + "samtools": 1.2 + }, + "SAMTOOLS_IDXSTATS": { + "samtools": 1.2 + }, + "SAMTOOLS_INDEX": { + "samtools": 1.2 + }, + "SAMTOOLS_SORT": { + "samtools": 1.2 + }, + "SAMTOOLS_STATS": { + "samtools": 1.2 + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T20:03:14.17485497" + "timestamp": "2024-09-12T12:45:59.17180037" } } \ No newline at end of file diff --git a/workflows/tests/aligner/bwa.nf.test.snap b/workflows/tests/aligner/bwa.nf.test.snap index fd644009..c6fadfb0 100644 --- a/workflows/tests/aligner/bwa.nf.test.snap +++ b/workflows/tests/aligner/bwa.nf.test.snap @@ -164,13 +164,85 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWA_INDEX": { + "bwa": "0.7.18-r1243-dirty" + }, + "BWA_MEM": { + "bwa": "0.7.18-r1243-dirty", + "samtools": 1.2 + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T20:05:55.979332162" + "timestamp": "2024-09-12T12:57:24.191417844" }, "Should work with BWA Index": { "content": [ diff --git a/workflows/tests/aligner/bwamem2.nf.test.snap b/workflows/tests/aligner/bwamem2.nf.test.snap index 031e0397..e297f404 100644 --- a/workflows/tests/aligner/bwamem2.nf.test.snap +++ b/workflows/tests/aligner/bwamem2.nf.test.snap @@ -97,12 +97,99 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWAMEM2_INDEX={bwamem2=2.2.1}, BWAMEM2_MEM={bwamem2=2.2.1, samtools=1.19.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWAMEM2_INDEX": { + "bwamem2": "2.2.1" + }, + "BWAMEM2_MEM": { + "bwamem2": "2.2.1", + "samtools": "1.19.2" + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SAMTOOLS_FLAGSTAT": { + "samtools": 1.2 + }, + "SAMTOOLS_IDXSTATS": { + "samtools": 1.2 + }, + "SAMTOOLS_INDEX": { + "samtools": 1.2 + }, + "SAMTOOLS_SORT": { + "samtools": 1.2 + }, + "SAMTOOLS_STATS": { + "samtools": 1.2 + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T20:10:59.639394977" + "timestamp": "2024-09-12T13:03:04.896300418" } } \ No newline at end of file diff --git a/workflows/tests/aligner/dragmap.nf.test.snap b/workflows/tests/aligner/dragmap.nf.test.snap index 454d3150..ec9a163b 100644 --- a/workflows/tests/aligner/dragmap.nf.test.snap +++ b/workflows/tests/aligner/dragmap.nf.test.snap @@ -97,12 +97,100 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, DRAGMAP_ALIGN={dragmap=1.2.1, samtools=1.15.1, pigz=2.3.4}, DRAGMAP_HASHTABLE={dragmap=1.3.0}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "DRAGMAP_ALIGN": { + "dragmap": "1.2.1", + "samtools": "1.15.1", + "pigz": "2.3.4" + }, + "DRAGMAP_HASHTABLE": { + "dragmap": "1.3.0" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SAMTOOLS_FLAGSTAT": { + "samtools": 1.2 + }, + "SAMTOOLS_IDXSTATS": { + "samtools": 1.2 + }, + "SAMTOOLS_INDEX": { + "samtools": 1.2 + }, + "SAMTOOLS_SORT": { + "samtools": 1.2 + }, + "SAMTOOLS_STATS": { + "samtools": 1.2 + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T20:13:30.140165153" + "timestamp": "2024-09-12T13:24:45.988211144" } } \ No newline at end of file diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 59dd928f..28b2fd2c 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -7,7 +7,7 @@ "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" ], - "e4a8dd8442a85921d5b9a7f2fd1fce1e", + "1d3e0f612f83428b5f435dda59851671", "4dba3f03e302b5d4a31c50987844ced7", "2f7a17a247d070580890c62005d261fa", [ @@ -98,16 +98,103 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-10T15:44:01.194165188" + "timestamp": "2024-09-12T13:31:57.928940626" }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HISAT2_ALIGN={hisat2=2.2.1, samtools=1.16.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SAMTOOLS_FLAGSTAT={samtools=1.2}, SAMTOOLS_IDXSTATS={samtools=1.2}, SAMTOOLS_INDEX={samtools=1.2}, SAMTOOLS_SORT={samtools=1.2}, SAMTOOLS_STATS={samtools=1.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, UNTAR_HISAT2_INDEX={untar=1.34}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HISAT2_ALIGN": { + "hisat2": "2.2.1", + "samtools": "1.16.1" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SAMTOOLS_FLAGSTAT": { + "samtools": 1.2 + }, + "SAMTOOLS_IDXSTATS": { + "samtools": 1.2 + }, + "SAMTOOLS_INDEX": { + "samtools": 1.2 + }, + "SAMTOOLS_SORT": { + "samtools": 1.2 + }, + "SAMTOOLS_STATS": { + "samtools": 1.2 + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "UNTAR_HISAT2_INDEX": { + "untar": 1.34 + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T20:16:04.102598697" + "timestamp": "2024-09-12T13:31:57.505925737" } } \ No newline at end of file diff --git a/workflows/tests/aligner/star.nf.test.snap b/workflows/tests/aligner/star.nf.test.snap index 67b63f95..319e65e2 100644 --- a/workflows/tests/aligner/star.nf.test.snap +++ b/workflows/tests/aligner/star.nf.test.snap @@ -107,22 +107,155 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T20:19:37.161656241" + "timestamp": "2024-09-12T13:36:46.329601446" }, "gzip_software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, GUNZIP_GTF={gunzip=1.1}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "GUNZIP_GTF": { + "gunzip": 1.1 + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-11T20:23:02.096824195" + "timestamp": "2024-09-12T13:42:56.284149051" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gff/main.nf.test.snap b/workflows/tests/inputs/gff/main.nf.test.snap index f2d26b2e..881a1903 100644 --- a/workflows/tests/inputs/gff/main.nf.test.snap +++ b/workflows/tests/inputs/gff/main.nf.test.snap @@ -97,12 +97,84 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWA_INDEX": { + "bwa": "0.7.18-r1243-dirty" + }, + "BWA_MEM": { + "bwa": "0.7.18-r1243-dirty", + "samtools": 1.2 + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-29T21:54:31.426789231" + "timestamp": "2024-09-12T13:46:36.600907422" } } \ No newline at end of file diff --git a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap index 6e193085..a5f01885 100644 --- a/workflows/tests/inputs/gzipped_gff/main.nf.test.snap +++ b/workflows/tests/inputs/gzipped_gff/main.nf.test.snap @@ -97,12 +97,84 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWA_INDEX": { + "bwa": "0.7.18-r1243-dirty" + }, + "BWA_MEM": { + "bwa": "0.7.18-r1243-dirty", + "samtools": 1.2 + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-29T22:05:37.46456688" + "timestamp": "2024-09-12T13:50:42.207513749" } } \ No newline at end of file diff --git a/workflows/tests/inputs/only_gff/main.nf.test.snap b/workflows/tests/inputs/only_gff/main.nf.test.snap index 75200046..15ffad79 100644 --- a/workflows/tests/inputs/only_gff/main.nf.test.snap +++ b/workflows/tests/inputs/only_gff/main.nf.test.snap @@ -97,12 +97,87 @@ }, "software_versions": { "content": [ - "{BBMAP_PILEUP={bbmap=39.01, samtools=1.16.1, pigz=2.6}, BEDTOOLS_GENOMECOV_MINUS={bedtools=2.31.1}, BEDTOOLS_GENOMECOV_PLUS={bedtools=2.31.1}, BEDTOOLS_INTERSECT={bedtools=2.31.1}, BEDTOOLS_INTERSECT_FILTER={bedtools=2.31.1}, BWA_INDEX={bwa=0.7.18-r1243-dirty}, BWA_MEM={bwa=0.7.18-r1243-dirty, samtools=1.2}, CUSTOM_GETCHROMSIZES={getchromsizes=1.2}, DEEPTOOLS_BAMCOVERAGE_MINUS={deeptools=3.5.1}, DEEPTOOLS_BAMCOVERAGE_PLUS={deeptools=3.5.1}, FASTP={fastp=0.23.4}, FASTQC={fastqc=0.12.1}, GFFREAD={gffread=0.12.7}, GTF2BED={perl=5.26.2}, HOMER_MAKETAGDIRECTORY={homer=4.11, samtools=1.11}, PINTS_CALLER={python=3.10.6, pints=1.1.8}, PRESEQ_CCURVE={preseq=3.1.1}, PRESEQ_LCEXTRAP={preseq=3.1.1}, RSEQC_INFEREXPERIMENT={rseqc=5.0.2}, RSEQC_READDISTRIBUTION={rseqc=5.0.2}, RSEQC_READDUPLICATION={rseqc=5.0.2}, SUBREAD_FEATURECOUNTS_GENE={subread=2.0.1}, Workflow={nf-core/nascent=v2.3.0dev}}" + { + "BBMAP_PILEUP": { + "bbmap": 39.01, + "samtools": "1.16.1", + "pigz": 2.6 + }, + "BEDTOOLS_GENOMECOV_MINUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_GENOMECOV_PLUS": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT": { + "bedtools": "2.31.1" + }, + "BEDTOOLS_INTERSECT_FILTER": { + "bedtools": "2.31.1" + }, + "BWA_INDEX": { + "bwa": "0.7.18-r1243-dirty" + }, + "BWA_MEM": { + "bwa": "0.7.18-r1243-dirty", + "samtools": 1.2 + }, + "CUSTOM_GETCHROMSIZES": { + "getchromsizes": 1.2 + }, + "DEEPTOOLS_BAMCOVERAGE_MINUS": { + "deeptools": "3.5.1" + }, + "DEEPTOOLS_BAMCOVERAGE_PLUS": { + "deeptools": "3.5.1" + }, + "FASTP": { + "fastp": "0.23.4" + }, + "FASTQC": { + "fastqc": "0.12.1" + }, + "GFFREAD": { + "gffread": "0.12.7" + }, + "GTF2BED": { + "perl": "5.26.2" + }, + "HOMER_MAKETAGDIRECTORY": { + "homer": 4.11, + "samtools": 1.11 + }, + "PINTS_CALLER": { + "python": "3.10.6", + "pints": "1.1.8" + }, + "PRESEQ_CCURVE": { + "preseq": "3.1.1" + }, + "PRESEQ_LCEXTRAP": { + "preseq": "3.1.1" + }, + "RSEQC_INFEREXPERIMENT": { + "rseqc": "5.0.2" + }, + "RSEQC_READDISTRIBUTION": { + "rseqc": "5.0.2" + }, + "RSEQC_READDUPLICATION": { + "rseqc": "5.0.2" + }, + "SUBREAD_FEATURECOUNTS_GENE": { + "subread": "2.0.1" + }, + "Workflow": { + "nf-core/nascent": "v2.3.0dev" + } + } ], "meta": { "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-08-30T19:42:31.094478491" + "timestamp": "2024-09-12T13:54:12.649672582" } } \ No newline at end of file From 3b082852a6bb0f5d7fe26199c1ee7e01d77a5c62 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 12 Sep 2024 16:37:48 -0500 Subject: [PATCH 096/255] test: Give up on flaky test --- workflows/tests/aligner/hisat2.nf.test | 8 ++++---- workflows/tests/aligner/hisat2.nf.test.snap | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/workflows/tests/aligner/hisat2.nf.test b/workflows/tests/aligner/hisat2.nf.test index 22f9c0af..7c2d9e53 100644 --- a/workflows/tests/aligner/hisat2.nf.test +++ b/workflows/tests/aligner/hisat2.nf.test @@ -22,10 +22,10 @@ nextflow_pipeline { { assert snapshot( workflow.trace.tasks().size(), UTILS.getAllFilesFromDir("$outputDir/preprocessing/fastp/", ".json"), - bam("$outputDir/hisat2/cd4_REP1.sorted.bam").getSamLinesMD5(), - // NOTE Flaky test - bam("$outputDir/hisat2/cd4_REP2.sorted.bam").getSamLinesMD5(), - bam("$outputDir/hisat2/jurkat.sorted.bam").getSamLinesMD5(), + // NOTE Flaky test. Tried getSamLinesMD5, .getHeaderMD5, .getHeader, which sets the tmp dir /tmp/38.unp + bam("$outputDir/hisat2/cd4_REP1.sorted.bam").getFileType(), + bam("$outputDir/hisat2/cd4_REP2.sorted.bam").getFileType(), + bam("$outputDir/hisat2/jurkat.sorted.bam").getFileType(), path("$outputDir/hisat2/log").list(), path("$outputDir/hisat2/samtools_stats").list(), path("$outputDir/quality_control/bbsplit").list(), diff --git a/workflows/tests/aligner/hisat2.nf.test.snap b/workflows/tests/aligner/hisat2.nf.test.snap index 28b2fd2c..7fccf211 100644 --- a/workflows/tests/aligner/hisat2.nf.test.snap +++ b/workflows/tests/aligner/hisat2.nf.test.snap @@ -7,9 +7,9 @@ "cd4_REP2.trimmed.fastp.json:md5,bc6e3f9ff7835f220535cc393b8eb25f", "jurkat.trimmed.fastp.json:md5,65f7247a87479c7157c7357d575336e2" ], - "1d3e0f612f83428b5f435dda59851671", - "4dba3f03e302b5d4a31c50987844ced7", - "2f7a17a247d070580890c62005d261fa", + "BAM", + "BAM", + "BAM", [ "cd4_REP1.hisat2.summary.log:md5,4f8f6e777e142473bad3c3dcdab8f6d3", "cd4_REP2.hisat2.summary.log:md5,7a95dbf6b50b5d527416232e9af55d86", @@ -98,7 +98,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, - "timestamp": "2024-09-12T13:31:57.928940626" + "timestamp": "2024-09-13T08:37:05.644780156" }, "software_versions": { "content": [ From aadd8c3626c3ac48cf79e42a89d20e2a1f0c09af Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 10 Sep 2024 13:05:09 -0500 Subject: [PATCH 097/255] fix: Update bwamem2 to use 28.B of memory per byte of fasta https://github.com/bwa-mem2/bwa-mem2/issues/9 --- modules.json | 3 ++- modules/nf-core/bwamem2/index/bwamem2-index.diff | 14 ++++++++++++++ modules/nf-core/bwamem2/index/main.nf | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 modules/nf-core/bwamem2/index/bwamem2-index.diff diff --git a/modules.json b/modules.json index 1a3c6102..f0872dae 100644 --- a/modules.json +++ b/modules.json @@ -58,7 +58,8 @@ "bwamem2/index": { "branch": "master", "git_sha": "7081e04c18de9480948d34513a1c1e2d0fa9126d", - "installed_by": ["modules"] + "installed_by": ["modules"], + "patch": "modules/nf-core/bwamem2/index/bwamem2-index.diff" }, "bwamem2/mem": { "branch": "master", diff --git a/modules/nf-core/bwamem2/index/bwamem2-index.diff b/modules/nf-core/bwamem2/index/bwamem2-index.diff new file mode 100644 index 00000000..baed048f --- /dev/null +++ b/modules/nf-core/bwamem2/index/bwamem2-index.diff @@ -0,0 +1,14 @@ +Changes in module 'nf-core/bwamem2/index' +--- modules/nf-core/bwamem2/index/main.nf ++++ modules/nf-core/bwamem2/index/main.nf +@@ -1,6 +1,7 @@ + process BWAMEM2_INDEX { + tag "$fasta" +- label 'process_single' ++ // NOTE Requires 28N GB memory where N is the size of the reference sequence ++ memory { 28.B * fasta.size() } + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + +************************************************************ diff --git a/modules/nf-core/bwamem2/index/main.nf b/modules/nf-core/bwamem2/index/main.nf index b7688285..8c644345 100644 --- a/modules/nf-core/bwamem2/index/main.nf +++ b/modules/nf-core/bwamem2/index/main.nf @@ -1,6 +1,7 @@ process BWAMEM2_INDEX { tag "$fasta" - label 'process_single' + // NOTE Requires 28N GB memory where N is the size of the reference sequence + memory { 28.B * fasta.size() } conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? From dfb956205a0242b44e9dcc7244fff7cb8a3de85a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 10 Sep 2024 13:41:53 -0500 Subject: [PATCH 098/255] chore: Set expected memory for bwa index --- modules.json | 3 ++- modules/nf-core/bwa/index/bwa-index.diff | 16 ++++++++++++++++ modules/nf-core/bwa/index/main.nf | 4 +++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 modules/nf-core/bwa/index/bwa-index.diff diff --git a/modules.json b/modules.json index f0872dae..a6fd2250 100644 --- a/modules.json +++ b/modules.json @@ -48,7 +48,8 @@ "bwa/index": { "branch": "master", "git_sha": "e0ff65e1fb313677de09f5f477ae3da30ce19b7b", - "installed_by": ["modules"] + "installed_by": ["modules"], + "patch": "modules/nf-core/bwa/index/bwa-index.diff" }, "bwa/mem": { "branch": "master", diff --git a/modules/nf-core/bwa/index/bwa-index.diff b/modules/nf-core/bwa/index/bwa-index.diff new file mode 100644 index 00000000..cb1045d2 --- /dev/null +++ b/modules/nf-core/bwa/index/bwa-index.diff @@ -0,0 +1,16 @@ +Changes in module 'nf-core/bwa/index' +--- modules/nf-core/bwa/index/main.nf ++++ modules/nf-core/bwa/index/main.nf +@@ -1,6 +1,9 @@ + process BWA_INDEX { + tag "$fasta" +- label 'process_single' ++ // NOTE https://bio-bwa.sourceforge.net/bwa.shtml#8 ++ // requires 5.37N memory where N is the size of the database ++ memory { 5.5.B * fasta.size() } ++ + + conda "${moduleDir}/environment.yml" + container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? + +************************************************************ diff --git a/modules/nf-core/bwa/index/main.nf b/modules/nf-core/bwa/index/main.nf index 2e48b6ca..3e811f51 100644 --- a/modules/nf-core/bwa/index/main.nf +++ b/modules/nf-core/bwa/index/main.nf @@ -1,6 +1,8 @@ process BWA_INDEX { tag "$fasta" - label 'process_single' + // NOTE https://bio-bwa.sourceforge.net/bwa.shtml#8 + // requires 5.37N memory where N is the size of the database + memory { 6.B * fasta.size() } conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? From b7e32719435f849174c28c8a4535da13b02ca057 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Thu, 12 Sep 2024 18:16:10 -0500 Subject: [PATCH 099/255] chore: Add hisat2 hg19 build --- conf/igenomes.config | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/igenomes.config b/conf/igenomes.config index 722f6720..4daa9d47 100644 --- a/conf/igenomes.config +++ b/conf/igenomes.config @@ -295,6 +295,7 @@ params { bowtie2 = "${params.igenomes_base}/Homo_sapiens/UCSC/hg19/Sequence/Bowtie2Index/" star = "${params.igenomes_base}/Homo_sapiens/UCSC/hg19/Sequence/STARIndex/" bismark = "${params.igenomes_base}/Homo_sapiens/UCSC/hg19/Sequence/BismarkIndex/" + hisat2 = "s3://genome-idx/hisat/hg19_genome.tar.gz" gtf = "${params.igenomes_base}/Homo_sapiens/UCSC/hg19/Annotation/Genes/genes.gtf" bed12 = "${params.igenomes_base}/Homo_sapiens/UCSC/hg19/Annotation/Genes/genes.bed" readme = "${params.igenomes_base}/Homo_sapiens/UCSC/hg19/Annotation/README.txt" From 5cf681dd4018aa12065afb61dd1cef6573b7fc7e Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 11 Sep 2024 13:40:16 -0500 Subject: [PATCH 100/255] style: Clean up groovy formatting --- tests/lib/UTILS.groovy | 54 ++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/tests/lib/UTILS.groovy b/tests/lib/UTILS.groovy index 9483a986..9e436d9b 100644 --- a/tests/lib/UTILS.groovy +++ b/tests/lib/UTILS.groovy @@ -1,6 +1,5 @@ -// Function to remove Nextflow version from pipeline_software_mqc_versions.yml - class UTILS { + // Function to remove Nextflow version from pipeline_software_mqc_versions.yml public static Object removeNextflowVersion(pipeline_software_mqc_versions) { def softwareVersions = path(pipeline_software_mqc_versions).yaml if (softwareVersions.containsKey("Workflow")) { @@ -9,37 +8,36 @@ class UTILS { return softwareVersions } -// Recursively list all files in a directory and its sub-directories, matching a given suffix -// TODO: use regex pattern instead of suffix? -public static getAllFilesFromDir(dir, suffix) { - def output = [] - new File(dir).eachFileRecurse() { - if (it.name.toString().endsWith(suffix)) { - output.add(it) + // Recursively list all files in a directory and its sub-directories, matching a given suffix + // TODO: use regex pattern instead of suffix? + public static getAllFilesFromDir(dir, suffix) { + def output = [] + new File(dir).eachFileRecurse() { + if (it.name.toString().endsWith(suffix)) { + output.add(it) + } } + return output.sort() } - return output.sort() -} -// Recursively list all files names in a directory and its sub-directories, matching a given suffix, return file names -public static getAllFileNamesFromDir(dir, suffix) { - def output = [] - new File(dir).eachFileRecurse() { - if (it.name.toString().endsWith(suffix)) { - output.add(it.toString().split("/")[-1]) + // Recursively list all files names in a directory and its sub-directories, matching a given suffix, return file names + public static getAllFileNamesFromDir(dir, suffix) { + def output = [] + new File(dir).eachFileRecurse() { + if (it.name.toString().endsWith(suffix)) { + output.add(it.toString().split("/")[-1]) + } } + return output.sort() } - return output.sort() -} -// Recursively list all files names in a directory and its sub-directories, matching a given suffix, return if check if given string is in file -public static checkAllFilesNamesFromDirForString(dir, suffix, string) { - def output = [] - new File(dir).eachFileRecurse() { - if (it.name.toString().endsWith(suffix)) { - output.add(it.text.contains(string)) + // Recursively list all files names in a directory and its sub-directories, matching a given suffix, return if check if given string is in file + public static checkAllFilesNamesFromDirForString(dir, suffix, string) { + def output = [] + new File(dir).eachFileRecurse() { + if (it.name.toString().endsWith(suffix)) { + output.add(it.text.contains(string)) + } } + return output.sort() } - return output.sort() -} - } From 14fdbb83fe944fc4d8d77e804f0332510d82fea4 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Tue, 8 Oct 2024 12:32:18 +0000 Subject: [PATCH 101/255] Template update for nf-core/tools version 3.0.0 --- .editorconfig | 4 + .github/CONTRIBUTING.md | 10 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/awsfulltest.yml | 23 +- .github/workflows/ci.yml | 5 +- .github/workflows/download_pipeline.yml | 53 ++- .github/workflows/linting.yml | 23 +- .github/workflows/linting_comment.yml | 2 +- .github/workflows/release-announcements.yml | 2 +- .../workflows/template_version_comment.yml | 43 ++ .gitpod.yml | 7 +- .nf-core.yml | 17 +- .pre-commit-config.yaml | 2 +- .prettierignore | 1 + CITATIONS.md | 4 +- README.md | 5 +- assets/schema_input.json | 2 +- conf/base.config | 35 +- conf/igenomes_ignored.config | 9 + conf/modules.config | 1 - conf/test.config | 13 +- docs/images/mqc_fastqc_adapter.png | Bin 23458 -> 0 bytes docs/images/mqc_fastqc_counts.png | Bin 33918 -> 0 bytes docs/images/mqc_fastqc_quality.png | Bin 55769 -> 0 bytes docs/output.md | 1 + docs/usage.md | 12 +- main.nf | 10 +- modules.json | 12 +- modules/nf-core/fastqc/environment.yml | 2 - modules/nf-core/fastqc/main.nf | 5 +- modules/nf-core/fastqc/meta.yml | 57 +-- modules/nf-core/fastqc/tests/main.nf.test | 225 ++++++++--- .../nf-core/fastqc/tests/main.nf.test.snap | 370 ++++++++++++++++-- modules/nf-core/multiqc/environment.yml | 4 +- modules/nf-core/multiqc/main.nf | 8 +- modules/nf-core/multiqc/meta.yml | 91 +++-- modules/nf-core/multiqc/tests/main.nf.test | 2 + .../nf-core/multiqc/tests/main.nf.test.snap | 8 +- modules/nf-core/multiqc/tests/nextflow.config | 5 + nextflow.config | 145 ++++--- nextflow_schema.json | 99 +---- .../utils_nfcore_nascent_pipeline/main.nf | 56 +-- .../nf-core/utils_nextflow_pipeline/main.nf | 24 +- .../tests/nextflow.config | 2 +- .../nf-core/utils_nfcore_pipeline/main.nf | 45 ++- .../nf-core/utils_nfschema_plugin/main.nf | 46 +++ .../nf-core/utils_nfschema_plugin/meta.yml | 35 ++ .../utils_nfschema_plugin/tests/main.nf.test | 117 ++++++ .../tests/nextflow.config | 8 + .../tests/nextflow_schema.json | 8 +- .../nf-core/utils_nfvalidation_plugin/main.nf | 62 --- .../utils_nfvalidation_plugin/meta.yml | 44 --- .../tests/main.nf.test | 200 ---------- .../utils_nfvalidation_plugin/tests/tags.yml | 2 - tests/nextflow.config | 2 +- workflows/nascent.nf | 15 +- 56 files changed, 1175 insertions(+), 810 deletions(-) create mode 100644 .github/workflows/template_version_comment.yml create mode 100644 conf/igenomes_ignored.config delete mode 100755 docs/images/mqc_fastqc_adapter.png delete mode 100755 docs/images/mqc_fastqc_counts.png delete mode 100755 docs/images/mqc_fastqc_quality.png create mode 100644 modules/nf-core/multiqc/tests/nextflow.config create mode 100644 subworkflows/nf-core/utils_nfschema_plugin/main.nf create mode 100644 subworkflows/nf-core/utils_nfschema_plugin/meta.yml create mode 100644 subworkflows/nf-core/utils_nfschema_plugin/tests/main.nf.test create mode 100644 subworkflows/nf-core/utils_nfschema_plugin/tests/nextflow.config rename subworkflows/nf-core/{utils_nfvalidation_plugin => utils_nfschema_plugin}/tests/nextflow_schema.json (95%) delete mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/main.nf delete mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/meta.yml delete mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/tests/main.nf.test delete mode 100644 subworkflows/nf-core/utils_nfvalidation_plugin/tests/tags.yml diff --git a/.editorconfig b/.editorconfig index 72dda289..e1058815 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,7 @@ indent_style = space [*.{md,yml,yaml,html,css,scss,js}] indent_size = 2 + # These files are edited and tested upstream in nf-core/modules [/modules/nf-core/**] charset = unset @@ -25,9 +26,12 @@ insert_final_newline = unset trim_trailing_whitespace = unset indent_style = unset + + [/assets/email*] indent_size = unset + # ignore python and markdown [*.{py,md}] indent_style = unset diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1f600c1a..0f47dcf5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -19,7 +19,7 @@ If you'd like to write some code for nf-core/nascent, the standard workflow is a 1. Check that there isn't already an issue about your idea in the [nf-core/nascent issues](https://github.com/nf-core/nascent/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this 2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/nascent repository](https://github.com/nf-core/nascent) to your GitHub account 3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions) -4. Use `nf-core schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10). +4. Use `nf-core pipelines schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10). 5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/). @@ -40,7 +40,7 @@ There are typically two types of tests that run: ### Lint tests `nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to. -To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint ` command. +To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core pipelines lint ` command. If any failures or warnings are encountered, please follow the listed URL for more documentation. @@ -75,7 +75,7 @@ If you wish to contribute a new step, please use the following coding standards: 2. Write the process block (see below). 3. Define the output channel if needed (see below). 4. Add any new parameters to `nextflow.config` with a default (see below). -5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool). +5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool). 6. Add sanity checks and validation for all relevant parameters. 7. Perform local tests to validate that the new code works as expected. 8. If applicable, add a new test command in `.github/workflow/ci.yml`. @@ -86,7 +86,7 @@ If you wish to contribute a new step, please use the following coding standards: Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope. -Once there, use `nf-core schema build` to add to `nextflow_schema.json`. +Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`. ### Default processes resource requirements @@ -103,7 +103,7 @@ Please use the following naming schemes, to make it easy to understand what is g ### Nextflow version bumping -If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core bump-version --nextflow . [min-nf-version]` +If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core pipelines bump-version --nextflow . [min-nf-version]` ### Images and figures diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e33f09a1..44a94364 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,7 +17,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/nasc - [ ] If you've fixed a bug or added code that should be tested, add tests! - [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/nascent/tree/master/.github/CONTRIBUTING.md) - [ ] If necessary, also make a PR on the nf-core/nascent _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository. -- [ ] Make sure your code lints (`nf-core lint`). +- [ ] Make sure your code lints (`nf-core pipelines lint`). - [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir `). - [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir `). - [ ] Usage Documentation in `docs/usage.md` is updated. diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml index 60464fd9..31e9142f 100644 --- a/.github/workflows/awsfulltest.yml +++ b/.github/workflows/awsfulltest.yml @@ -1,18 +1,33 @@ name: nf-core AWS full size tests -# This workflow is triggered on published releases. +# This workflow is triggered on PRs opened against the master branch. # It can be additionally triggered manually with GitHub actions workflow dispatch button. # It runs the -profile 'test_full' on AWS batch on: - release: - types: [published] + pull_request: + branches: + - master workflow_dispatch: + pull_request_review: + types: [submitted] + jobs: run-platform: name: Run AWS full tests - if: github.repository == 'nf-core/nascent' + if: github.repository == 'nf-core/nascent' && github.event.review.state == 'approved' runs-on: ubuntu-latest steps: + - uses: octokit/request-action@v2.x + id: check_approvals + with: + route: GET /repos/${{ github.repository }}/pulls/${{ github.event.review.number }}/reviews + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - id: test_variables + run: | + JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}' + CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length') + test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required - name: Launch workflow via Seqera Platform uses: seqeralabs/action-tower-launch@v2 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66d671fd..aa110bc0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: pull_request: release: types: [published] + workflow_dispatch: env: NXF_ANSI_LOG: false @@ -25,8 +26,10 @@ jobs: strategy: fail-fast: false matrix: + NXF_VER: + - "24.04.2" + - "latest-everything" shard: [1, 2, 3, 4] - NXF_VER: ["latest-stable"] # TODO Test minimum version on release profile: ["docker"] steps: - name: Check out pipeline code diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml index 2d20d644..713dc3e7 100644 --- a/.github/workflows/download_pipeline.yml +++ b/.github/workflows/download_pipeline.yml @@ -1,4 +1,4 @@ -name: Test successful pipeline download with 'nf-core download' +name: Test successful pipeline download with 'nf-core pipelines download' # Run the workflow when: # - dispatched manually @@ -8,7 +8,7 @@ on: workflow_dispatch: inputs: testbranch: - description: "The specific branch you wish to utilize for the test execution of nf-core download." + description: "The specific branch you wish to utilize for the test execution of nf-core pipelines download." required: true default: "dev" pull_request: @@ -39,9 +39,11 @@ jobs: with: python-version: "3.12" architecture: "x64" - - uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7 + + - name: Setup Apptainer + uses: eWaterCycle/setup-apptainer@4bb22c52d4f63406c49e94c804632975787312b3 # v2.0.0 with: - singularity-version: 3.8.3 + apptainer-version: 1.3.4 - name: Install dependencies run: | @@ -54,33 +56,64 @@ jobs: echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV} echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV} + - name: Make a cache directory for the container images + run: | + mkdir -p ./singularity_container_images + - name: Download the pipeline env: - NXF_SINGULARITY_CACHEDIR: ./ + NXF_SINGULARITY_CACHEDIR: ./singularity_container_images run: | - nf-core download ${{ env.REPO_LOWERCASE }} \ + nf-core pipelines download ${{ env.REPO_LOWERCASE }} \ --revision ${{ env.REPO_BRANCH }} \ --outdir ./${{ env.REPOTITLE_LOWERCASE }} \ --compress "none" \ --container-system 'singularity' \ - --container-library "quay.io" -l "docker.io" -l "ghcr.io" \ + --container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io" \ --container-cache-utilisation 'amend' \ - --download-configuration + --download-configuration 'yes' - name: Inspect download run: tree ./${{ env.REPOTITLE_LOWERCASE }} + - name: Count the downloaded number of container images + id: count_initial + run: | + image_count=$(ls -1 ./singularity_container_images | wc -l | xargs) + echo "Initial container image count: $image_count" + echo "IMAGE_COUNT_INITIAL=$image_count" >> ${GITHUB_ENV} + - name: Run the downloaded pipeline (stub) id: stub_run_pipeline continue-on-error: true env: - NXF_SINGULARITY_CACHEDIR: ./ + NXF_SINGULARITY_CACHEDIR: ./singularity_container_images NXF_SINGULARITY_HOME_MOUNT: true run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results - name: Run the downloaded pipeline (stub run not supported) id: run_pipeline if: ${{ job.steps.stub_run_pipeline.status == failure() }} env: - NXF_SINGULARITY_CACHEDIR: ./ + NXF_SINGULARITY_CACHEDIR: ./singularity_container_images NXF_SINGULARITY_HOME_MOUNT: true run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results + + - name: Count the downloaded number of container images + id: count_afterwards + run: | + image_count=$(ls -1 ./singularity_container_images | wc -l | xargs) + echo "Post-pipeline run container image count: $image_count" + echo "IMAGE_COUNT_AFTER=$image_count" >> ${GITHUB_ENV} + + - name: Compare container image counts + run: | + if [ "${{ env.IMAGE_COUNT_INITIAL }}" -ne "${{ env.IMAGE_COUNT_AFTER }}" ]; then + initial_count=${{ env.IMAGE_COUNT_INITIAL }} + final_count=${{ env.IMAGE_COUNT_AFTER }} + difference=$((final_count - initial_count)) + echo "$difference additional container images were \n downloaded at runtime . The pipeline has no support for offline runs!" + tree ./singularity_container_images + exit 1 + else + echo "The pipeline can be downloaded successfully!" + fi diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 1fcafe88..b882838a 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -1,6 +1,6 @@ name: nf-core linting # This workflow is triggered on pushes and PRs to the repository. -# It runs the `nf-core lint` and markdown lint tests to ensure +# It runs the `nf-core pipelines lint` and markdown lint tests to ensure # that the code meets the nf-core guidelines. on: push: @@ -41,17 +41,32 @@ jobs: python-version: "3.12" architecture: "x64" + - name: read .nf-core.yml + uses: pietrobolcato/action-read-yaml@1.0.0 + id: read_yml + with: + config: ${{ github.workspace }}/.nf-core.yaml + - name: Install dependencies run: | python -m pip install --upgrade pip - pip install nf-core + pip install nf-core==${{ steps.read_yml.outputs['nf_core_version'] }} + + - name: Run nf-core pipelines lint + if: ${{ github.base_ref != 'master' }} + env: + GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }} + run: nf-core -l lint_log.txt pipelines lint --dir ${GITHUB_WORKSPACE} --markdown lint_results.md - - name: Run nf-core lint + - name: Run nf-core pipelines lint --release + if: ${{ github.base_ref == 'master' }} env: GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }} - run: nf-core -l lint_log.txt lint --dir ${GITHUB_WORKSPACE} --markdown lint_results.md + run: nf-core -l lint_log.txt pipelines lint --release --dir ${GITHUB_WORKSPACE} --markdown lint_results.md - name: Save PR number if: ${{ always() }} diff --git a/.github/workflows/linting_comment.yml b/.github/workflows/linting_comment.yml index 40acc23f..42e519bf 100644 --- a/.github/workflows/linting_comment.yml +++ b/.github/workflows/linting_comment.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download lint results - uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3 + uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6 with: workflow: linting.yml workflow_conclusion: completed diff --git a/.github/workflows/release-announcements.yml b/.github/workflows/release-announcements.yml index 03ecfcf7..c6ba35df 100644 --- a/.github/workflows/release-announcements.yml +++ b/.github/workflows/release-announcements.yml @@ -12,7 +12,7 @@ jobs: - name: get topics and convert to hashtags id: get_topics run: | - echo "topics=$(curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ')" >> $GITHUB_OUTPUT + echo "topics=$(curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ')" | sed 's/-//g' >> $GITHUB_OUTPUT - uses: rzr/fediverse-action@master with: diff --git a/.github/workflows/template_version_comment.yml b/.github/workflows/template_version_comment.yml new file mode 100644 index 00000000..9dea41f0 --- /dev/null +++ b/.github/workflows/template_version_comment.yml @@ -0,0 +1,43 @@ +name: nf-core template version comment +# This workflow is triggered on PRs to check if the pipeline template version matches the latest nf-core version. +# It posts a comment to the PR, even if it comes from a fork. + +on: pull_request_target + +jobs: + template_version: + runs-on: ubuntu-latest + steps: + - name: Check out pipeline code + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + + - name: Read template version from .nf-core.yml + uses: pietrobolcato/action-read-yaml@1.0.0 + id: read_yml + with: + config: ${{ github.workspace }}/.nf-core.yml + + - name: Install nf-core + run: | + python -m pip install --upgrade pip + pip install nf-core==${{ steps.read_yml.outputs['nf_core_version'] }} + + - name: Check nf-core outdated + id: nf_core_outdated + run: pip list --outdated | grep nf-core + + - name: Post nf-core template version comment + uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2 + if: | + ${{ steps.nf_core_outdated.outputs.stdout }} =~ 'nf-core' + with: + repo-token: ${{ secrets.NF_CORE_BOT_AUTH_TOKEN }} + allow-repeats: false + message: | + ## :warning: Newer version of the nf-core template is available. + + Your pipeline is using an old version of the nf-core template: ${{ steps.read_yml.outputs['nf_core_version'] }}. + Please update your pipeline to the latest version. + + For more documentation on how to update your pipeline, please see the [nf-core documentation](https://github.com/nf-core/tools?tab=readme-ov-file#sync-a-pipeline-with-the-template) and [Synchronisation documentation](https://nf-co.re/docs/contributing/sync). + # diff --git a/.gitpod.yml b/.gitpod.yml index 105a1821..46118637 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,17 +4,14 @@ tasks: command: | pre-commit install --install-hooks nextflow self-update - - name: unset JAVA_TOOL_OPTIONS - command: | - unset JAVA_TOOL_OPTIONS vscode: extensions: # based on nf-core.nf-core-extensionpack - - esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code + #- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code - EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files - Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar - mechatroner.rainbow-csv # Highlight columns in csv files in different colors - # - nextflow.nextflow # Nextflow syntax highlighting + - nextflow.nextflow # Nextflow syntax highlighting - oderwat.indent-rainbow # Highlight indentation level - streetsidesoftware.code-spell-checker # Spelling checker for source code - charliermarsh.ruff # Code linter Ruff diff --git a/.nf-core.yml b/.nf-core.yml index 65fbb6a0..44001c7a 100644 --- a/.nf-core.yml +++ b/.nf-core.yml @@ -1,8 +1,21 @@ -repository_type: pipeline -nf_core_version: "2.14.1" +bump_version: null lint: actions_ci: false files_unchanged: - .github/workflows/linting.yml - LICENSE - assets/email_template.html +nf_core_version: 3.0.0 +org_path: null +repository_type: pipeline +template: + author: Edmund Miller, Ignacio Tripodi, Margaret Gruca + description: Global Run-On sequencing analysis pipeline + force: false + is_nfcore: true + name: nascent + org: nf-core + outdir: . + skip_features: null + version: 2.3.0dev +update: null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4dc0f1dc..9e9f0e1c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: - prettier@3.2.5 - repo: https://github.com/editorconfig-checker/editorconfig-checker.python - rev: "2.7.3" + rev: "3.0.3" hooks: - id: editorconfig-checker alias: ec diff --git a/.prettierignore b/.prettierignore index 437d763d..610e5069 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ + email_template.html adaptivecard.json slackreport.json diff --git a/CITATIONS.md b/CITATIONS.md index a49733e5..14068893 100644 --- a/CITATIONS.md +++ b/CITATIONS.md @@ -40,7 +40,7 @@ - [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/) - > Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. +> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. - [featureCounts](https://pubmed.ncbi.nlm.nih.gov/24227677/) @@ -60,7 +60,7 @@ - [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/) - > Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924. +> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924. - [PINTS](https://pints.yulab.org/) diff --git a/README.md b/README.md index f7fab470..4b734d66 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![GitHub Actions Linting Status](https://github.com/nf-core/nascent/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/nascent/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/nascent/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.7245273-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.7245273) [![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com) -[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A523.04.0-23aa62.svg)](https://www.nextflow.io/) +[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-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/) @@ -80,8 +80,7 @@ nextflow run nf-core/nascent \ ``` > [!WARNING] -> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; -> see [docs](https://nf-co.re/usage/configuration#custom-configuration-files). +> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files). For more details and further functionality, please refer to the [usage documentation](https://nf-co.re/nascent/usage) and the [parameter documentation](https://nf-co.re/nascent/parameters). diff --git a/assets/schema_input.json b/assets/schema_input.json index cefed569..fbea14ce 100644 --- a/assets/schema_input.json +++ b/assets/schema_input.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema", + "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "https://raw.githubusercontent.com/nf-core/nascent/master/assets/schema_input.json", "title": "nf-core/nascent pipeline - params.input schema", "description": "Schema for the file provided with params.input", diff --git a/conf/base.config b/conf/base.config index a043b531..6085da58 100644 --- a/conf/base.config +++ b/conf/base.config @@ -10,9 +10,10 @@ process { - cpus = { check_max( 1 * task.attempt, 'cpus' ) } - memory = { check_max( 6.GB * task.attempt, 'memory' ) } - time = { check_max( 4.h * task.attempt, 'time' ) } + // TODO nf-core: Check the defaults for all processes + cpus = { 1 * task.attempt } + memory = { 6.GB * task.attempt } + time = { 4.h * task.attempt } errorStrategy = { task.exitStatus in ((130..145) + 104) ? 'retry' : 'finish' } maxRetries = 1 @@ -25,30 +26,30 @@ process { // adding in your local modules too. // See https://www.nextflow.io/docs/latest/config.html#config-process-selectors withLabel:process_single { - cpus = { check_max( 1 , 'cpus' ) } - memory = { check_max( 6.GB * task.attempt, 'memory' ) } - time = { check_max( 4.h * task.attempt, 'time' ) } + cpus = { 1 } + memory = { 6.GB * task.attempt } + time = { 4.h * task.attempt } } withLabel:process_low { - cpus = { check_max( 2 * task.attempt, 'cpus' ) } - memory = { check_max( 12.GB * task.attempt, 'memory' ) } - time = { check_max( 4.h * task.attempt, 'time' ) } + cpus = { 2 * task.attempt } + memory = { 12.GB * task.attempt } + time = { 4.h * task.attempt } } withLabel:process_medium { - cpus = { check_max( 6 * task.attempt, 'cpus' ) } - memory = { check_max( 36.GB * task.attempt, 'memory' ) } - time = { check_max( 8.h * task.attempt, 'time' ) } + cpus = { 6 * task.attempt } + memory = { 36.GB * task.attempt } + time = { 8.h * task.attempt } } withLabel:process_high { - cpus = { check_max( 12 * task.attempt, 'cpus' ) } - memory = { check_max( 72.GB * task.attempt, 'memory' ) } - time = { check_max( 16.h * task.attempt, 'time' ) } + cpus = { 12 * task.attempt } + memory = { 72.GB * task.attempt } + time = { 16.h * task.attempt } } withLabel:process_long { - time = { check_max( 20.h * task.attempt, 'time' ) } + time = { 20.h * task.attempt } } withLabel:process_high_memory { - memory = { check_max( 200.GB * task.attempt, 'memory' ) } + memory = { 200.GB * task.attempt } } withLabel:error_ignore { errorStrategy = 'ignore' diff --git a/conf/igenomes_ignored.config b/conf/igenomes_ignored.config new file mode 100644 index 00000000..b4034d82 --- /dev/null +++ b/conf/igenomes_ignored.config @@ -0,0 +1,9 @@ +/* +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Nextflow config file for iGenomes paths +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Empty genomes dictionary to use when igenomes is ignored. +---------------------------------------------------------------------------------------- +*/ + +params.genomes = [:] diff --git a/conf/modules.config b/conf/modules.config index e254bb62..ebb6cbe1 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -26,7 +26,6 @@ process { saveAs: { filename -> filename.equals('versions.yml') ? null : filename } ] } - withName: 'MULTIQC' { ext.args = { params.multiqc_title ? "--title \"$params.multiqc_title\"" : '' } publishDir = [ diff --git a/conf/test.config b/conf/test.config index cc5193aa..dd68aa6a 100644 --- a/conf/test.config +++ b/conf/test.config @@ -10,15 +10,18 @@ ---------------------------------------------------------------------------------------- */ +process { + resourceLimits = [ + cpus: 4, + memory: '15.GB', + time: '1.h' + ] +} + params { config_profile_name = 'Test profile' config_profile_description = 'Minimal test dataset to check pipeline function' - // Limit resources so that this can run on GitHub Actions - max_cpus = 2 - max_memory = '6.GB' - max_time = '6.h' - // Input data // TODO params.pipelines_testdata_base_path + 'viralrecon/samplesheet/samplesheet_test_illumina_amplicon.csv' input = "${projectDir}/assets/samplesheet.csv" diff --git a/docs/images/mqc_fastqc_adapter.png b/docs/images/mqc_fastqc_adapter.png deleted file mode 100755 index 361d0e47acfb424dea1f326590d1eb2f6dfa26b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23458 zcmeFZ2UJtryD!S#x<#o93es(Ww4k)maRbte0-+a?-g^xY-3myTE`8G_KvA54)F1tn})nJ5u%TA4Y;^!^{48eL_}p#q-Umo0M|F1 z74+PQh^X8N|9_jcWbq~ zzn+tZC9B75nKdz=gQ8wo9GJ$P{D~3knlI_`-PRhCw34f1oYDLr^;oEbgxa#A^J%*2 z>FfDE*(~JzKFs$t_oeLz))qDU?s}%Q?7b~3Y;lUi^Oy-2@3g?joA4Wkgb6-2=ih*jub)~7yZ`T=L=Z`B`{1jhkB-iSjea94&Eo9A zxN59pv1p_}RO1>EC^q}Z2)ZI;b7JV_x4lMr=Bker2+EK;8~!;JO7re*@ZkDmoV878S*N^yX(F@U1yqt?Is3nnV>7}#(5pk`V3C) zWhB8;CwWIwsVIjH+`<9=YA(j&3DgQdFOOGU~*`36wNC&QDv8> zr?h2PQgnHkp&t^S)q^K!68h~`$PjZW&-Wns;Zlw$M2sc z1xR!u{m|Kih*|Hht#M@eOMM#8O*={^6b9k5B5^eBsrnhVHD7XZ5BWO&F?q(>Y=QFl z`f>yQ9NCoxZCH-1F{#mz_j{QeyY~4h*VeyYZ#S@Z(Pnb7G=ud!RW)5svqM*&GI_za zzn;8LkOTT?``1Ygt6w!2;5arK*o5k15cdIJnMg)IQhF_zVK%!ma$z&jL zZt>Q{!PqKl^`Qw?nJUOEm@@qX(y(TwSJ~dqW&M@7-N4Wk_wC4izx(xJMrmNjsl$XR zCyK&INt}7@FzNAbbg-nW)sJ>3->I1+2~YdlPsaS}^X-H0GR_CEsw`PGjpq`uX}8VP zJ)HC34>D(z{KR9;E&z=@?@q_|I{NPOj~g>w!$gR?Tlu~F+L$Mk%}xQEm+{&T(5zkH zacVy0k3w!T9r*p2sgX@V;^+PfUYUrEde07XSV=KSDbkIZU!j!Rk3MQV=h-!y@kWVB zdYkmu^fiU~pp#ixe4hBEMx7^LdHa z_L*14aVIHtrsR)SO?=&kQS&JR#^AVvln=P=bUXEIy$QB&!s34znCV@y(C%j9V=}SU zoYLHn+-Lalm0$-=QQ}a(+2dR*{DPF+)J4y!ukiA_T%dF zVKEk;c?LWheG#A5{A20}CKjMw5G%2}cT5@Oce=wqdobHC70=kY7}dxt3diH9(Zcwr zCabx8yObHQ@#e_wjl%wp8s_!Wvxe5f-Duin@obgt>qOcqN$$@{X^C_rEDh3fmM;|X z$zu4;D`{YRbaJ?o!KkazII&|th9v5MG2Mao$ytOHtW+wo;XJJdtLuGjg;d020qT++ zpD}e&o?SeKSqR`}4`OdkWNC7K)Wltn zbwBrWGM;bBGm8uP_RiqfwvDD1f+uRX>b=nTH9Y%vpg{ka0e*E>%<+3!G3#s*-1D>q zHg~1@BT52a*L>mVcP>6y*0iX8@!3tDFJLE+sRlnU(cl``hF`0Q>e4i6P8|wKmqIqI zoY+a0V*Bib0`F9nG#sR(8$^!IWLR)cE8@7XZTN%L-ucJ{9yijy)w5Pom%XG7V<^PX z$Z$U82w0qgcGmld-O6*e)?pm$g@!6`Pps5SPKccjDf(|vX9zcLs7t!7cyyckZI#R* z#lj(HqfVeqyZ+Va{)>65sAb3IQ%a{9W^_F!5!;w=XD}ZUHFH$8=Xjw+VE)s$q(nt> zE2^aDYki5`e73RQ=DxaBNZ6CK?XKCv@V}=y(g?YHnFaHfXnl}Lo;36@?471W;&#Se z>pE*@M{Y?CevLG8il9#HXG#W3>;o$1``EYBY5i<;JlBqj2M8Y2!+6bPj1(S_bOksY z<34UQE;=Z>KiL``pYd}5fpOOT)GJQnXfNiAc5wgJ>F|$Eqw&D*Vmz+#mM0oFD^`-^ zB~SXe{T+5hd$gnKd7Afo9cy&Lii@syPDFDK)^V{iWEAEO@?xzx1bd`ta z;$(vG+=i3~9|D=GX%f~<>eOVjy~-yRAhLf2dR8V<@M_`C^ev(yOTg{uf=L3uyDb-w z&)l7KXS_HTo87BxI}fXF{ge&5p&IHk9M1}eNAwqw)`eZSOPFhqjS70{hyE@C{oSN$ zam*`-UH3RF-RWEP`^Su1q#n_J{AncekkV4m7YITf%QHBo60h@pk4N4O}hhf%rxuIZGiQpprVMal%h7?8+cY#L>pYnx6v!EnuIgInW` z)w!NuTp;fz9md^}*x@K9+`^2LO*bZp1^?BG#iS@(4i%AB6YP023T8Eb?M5K7ElSpe z9-wA22Mm}VwDkmECLd*}a=7bCf(}@SHs6UBe)Xvk(+hQ^^unj5JBeo$=><{4PBI%P z4_9XQ=XnE``;1Daa6f`~rGwNj9{YXY)eIw3G90Ip+QEWg0%?g=i$UHuQ?Qc0OR0!w zv?BvlQa!QMyI*IP!0>goBt$xo2^hlD&wRp?$=}}#?q~Yw z{**_|5&yL*Epz|4V#SJjg-lNaIx_{sCL3R=_VH&_;oOn5J2P=h!0enu-i%FAZ- zw`Hm*u6N*}&A7pAqr>-?%0(lveb{r8>hpDmex?Yo*8!-%1?YV0R~VEPBFp>)ba=mv+2(#>WEy0yxHZX=Cr2 zKmew%=^>HsD3BtRR*#H!@!TTGcI&fHrVh)P&|X;>)OHML+uWDn(dlsDjXa;5uBM$r zdt!r~ig?5iGbx!GpH+kdG8k0%;~)Q#0L6wFROJ}^Z%DvO3x#yNk13^&ccd&l)BP9h zD5cU-qZg-rV3Sg&?)`x}cI3`zw#zq{-eN4pNf(+?QuOG4oZ7zMGSVqOUe>`u=GfKM z{xPCciJFw9%Pk+uDSoormR&c=fS#hGOk=RGUtizBOoY^8P(>!Si|I9i=1ZCQbcc)5 zgE6UED;+b$4u&#dhZjdXwO3tpG0QaQwXrLOx5YP#TOaS@FP!h|G!z!Pbv?hTp0eQL zoUsiv4d@*Ck#ID9-ua|zPbQepcC4a>>9-bJApd()Wg%}hj#%A4pO-q{jIJ$f-SL7- zo&=keG_jhq$Ty4e|J^l6j6TQ=W)|~&Ei6gRn<{*^cFG*tS19#kHpMD7Y;wb~!3_%X zS_-3NQoGiWCX!M-Id;Nsg7oSi4VJ=Hi{bYNfjnmTq?IyK@@&_uacfb&8h@DIe70-Q zZ^KaT(4UX*vf7@A7CY;P!IVGIuXPRIe^&71Z1EyHO5&^=jUUKHF+h&m!4!dOA+!Ed zfA#uQ&p6vD7|O8(?5`bf8^gK)6p`>+$c*yG?Sw29;OD+tp}kDD9augDAEXWbSVoie zpHF1Wj8lWfIZ}mx%(2XREqF9!{fNd&iurAaoQDMCSNo!vRHE8wH%QLLZf9u;ADqnxOaAD#VE%Yg z?Gb?EmGbY}a0|vSZPlF3z6;Kf669Bf%h zlSGiY-}E4LFurm_CJN)(*l?=uX);o&R&qLuzENz?9I%S&YQ2>rVhx#c!hbvWLL!CI zA8mXM$zjnnJ#Me@-99}hjxCE!w8|9w{SBlj%Miq#dvS5GHP!DxO$sDx^4PF^#`;A! zb=bZ1pyj{R#9h$r7svB$QlJqeF1cp*ubT12UZ!deKFG%1N<@S2x&2UtqsVz zn=gF&$D4i3x7&vdoa#^cS?bQuP69OpspVPxm*%@DSWf!NG`o`y^R~o1Hvta;#!r%i zvEB~Jsi~sJ7Y35P!bf?OQin->fAk+TpU$Ow1st|l9|i2rrOneBP3&aDyoUj3K{a7! zOYpnJyYD#nr4GNJ;@$ce2dSN=eS7f-VptzM(|Ek^ze)mPVrpAEgrFs3mL>f(ZwriH zCZ65HdO0|W@2<+v9t?J=-4U9>bvM@@Ew4uVZy@c^Ovw9`k|$!+CTAn(u#4kC7TVTB zXuy#d+GC@RIMaPyp|Y2jS%RJkktCracCaLqfs^i^XFqK#3z+d}n02*VDF&My)vp)lNzWx<< zGB7hEAH?7_joYR?>+&+JIas*%Oiux%kr*X*B=8N8Ulowx0MkRK?pR)K1F_m8>dSe54 z)48k>#|F!OV#yOs7xQNQ@1iun5pl;py{tx+o044?r{W2O{f}3r{#QS#4bf(|f9R3y#6*0YY) z5Ey{M`dj)yHl)B{sdmvti^b0IE5xFx%jJM&5w69;`PGy0vGk2ztSW|5H3~zhXO?mn z+4mo>;Y7=4&gC}HifyMO`#70u3H6;0|| z!l=0lP|zVF`bfxm{%i98943^7y4Iz};Z9F$oY3iUI*FIsYa=o=nS^d`;3?*wDxi&| z=?oqs6uDcd1e_e5z7M5q(+I^PilSRE(T6%z<=U8%sq63V!wELY9Rj%#Y@2Y+TEJ8(f_Kh0ih?l6E6~wDl3~?-5%7>d{ zKs0XHUeORoi5+U#M{kE!Ae%|)^dabh1DsJI9N~LVXp*8$XlOfc6J+Cc?}SM zsc3N~L7hzcpXn2>b(_YN=J*C0N}$f_NINTiV!~L}nA{wn^XfBogd5hu!G?*THg^mF zFJm@9m{X~X3t5{7 z#lWIO++R8;BTByGl7U;fz|JBB^*4R|bLvm18x;DF*U`=kyxbH2nD*RIH5AWfJ4^5o z&Nr;*|NreNKo$fUI5}~n#Xcbjr0T-7MV;wZXA(QPt^`x;=ZK)5^`AFgQM?7ry_(Tm z0|EhWs&cYJW?|uvc3af(tfuyDf$28~R=HOa#}3Edru##Wwm0a$Vnk=_8+eQ; zfyq+GVt0Twr^QS*HtI+&&>_<%-Gq-!{iQr-3LYn-6bqW0VW)>%iat!2IP)Jd+LgnS zgI+jJ-I9HMJ8Z*$2FjwK1T0RpF%U`&x)S{3HqRJ z5^;r?VoA(k7*aP@tzB`O5Y26jv#x54xNH;E`KzzLxC)FEnQ<}IR#w*>9sq|zFzZq< zdM1%ynXvcLfZ{Xm=l(Op?=XGV8`BwRiQ%@@A-GnjD+y3K zN2Pm011b!s`3368%P&MapW-PDulXKfpeyRXNjN`lKKgC%CplwE#GrRw#0FE#Q4>R+ z23B4CmO%uy8Y@;F$hCHU6+oJ}_cKgm|4Amr{$`38ue-?+GX1T!hd$w@x=z{w30Z*W za@$MLl^=f#*oR+8(&a&`E@Bj{{1O;DPjj$g9U7~{m*?^Tj}Rrc^wc=(SycXVT?bW{ zUus*6{74fo{nOh@zQyv0g{)t}Qekl*>KXQYCI9m2jqge|&Ntj{V?gLs*_GkeODYhf zW39Q1L1~vk+#E^S!nCyO&z9Wh}2=K}`9#{=`j&)^}8=U|lz}DqgAteVsos){s zDhK`>&pK%cVuhO7tPu7@Y4|yXAdHs!(uKDuLL@i$Okc6Gs;2456Br??ZNZiONAe!~ zvY5w1(C)E9fRmpWgWU2Su0u6~9{@wIm<-lha;uuEN>&C^FJ#^|oopkg``l#i0&{OX z%rI6Q>l^9J++K19D;HrFU#V9o0M`MBTT#-(q&A{|n-`T~CgAFET=$E_&pIQTPE;J#&nrwf2N^I*d zH)ev~7d=Sy8<@syK<`PFvNtyfa#8^JceG^ua^o%!fl6R&j--jGkz8wS`EgfEZouOD zr97H059Dj(#$*$-!UQLvb92wS40!wJc!4K~lq-K2h2rXunCs?SjQERnvv9Fs?tF;y zWUTcQ&PtDMbsUY6_&np`UGMS0ZZIhnDh~p{`Bryj7XS~*R}%z6 zUO^hJn$_-CW(;$)hHu0ej1BNqv^o%*D2gR6zUvCZyw)ddNB6JE$;okhf7PEEz|dRN z$sP&o`MU(L_I8mDW33;)3!U*;HRm$zVV%%zaDn^*Qj~RdWdFNb;^fRhnF&{oeY-tv zq$p~pZw)Ls$EWKsEZubtx_9bpdCfsjdy*<8_Io8VtCIC+8kk@Qxdti>xnu}nRYJ-y zp8$3YP7u;u+YlPQ2`o_>S?mpXvd0-x!Z3=}>ceWDg*e)+#wQLE)Uwhneo z;*y`VfoY<#lwT^k4BP(ytfI;M`FoYsedi}L{1V|Ho}ciBs=`@vtgnieHdpWz%Vyy$ zlnn?k0KJWOnlJD9>6y64*X=G{lyl&%pV8Uo&>tXw%1za!6*YYVB$jR$Y0XhB#1mVx zvjd8N4X~{Dd&28RVEkCw9TLN9*Ng!?9F88l2Bl)w%7!97mtx5(Qx%1u6h+$OGa4#qGGGI{Pj4d)5yg8F4O2sfu61u0uM}?$_nH8=0St?`ogZ@1LAr@*uC4Z9(|dIQ z?OH<_%?PD56K*Kty@PQT;W#)tazY~|I7-aq)tQ($$#Q?{gEbJwJK3mnk)|l>XgmJQ z_POHzee+4NEWu0i0zUFmLTF(zvD3B%sp1_F7 z<|O7{-oZ2>t9k~zX0MDQ(4&(YZ#~baV{$ah?o_K1p$Ad`PAvgtuhW(xO{@bMjNb>Y z-k>lsDx?xX;x5*9RSpJe~BwLtb79%{p~+JTs5HZ&#({u>j3kAOLx*Y zW{7^+`OD%vhcxVW39F$jZ;I@H`3X?>Wwt@269f1o{V4-t-|dX4x7L3j zUHltoa@jqToWvn&=0CF%6%D0h50m^)qaXkRMC&Owv8iG~$}1PBgld3nBE#Rg(5)8n zga7!2@yjoBBoF_e3M$ongy7N1L_hT@!LUaCXX6QLZFKcq1r;;Z$sca}zfwaCji7PcbfW7H9p`7Eh$-j*7-=%{5f&}TidFWiMr=NYvc}Q@gh_z)<;^d&F zd@za3ugvK(BbprUX|)`Rk0&+6)#sm5S8a7;dzrqn*f)iXpvW$BVu6u)bR+ywtGne@B61Om=Q)yvb`45S}|LKt&5@)wSOfk;LhZ^UofjlQz0h zm)>a9f&40n$;-ndr=xntY3nOFGmA5POfiIsfgTzT*Cl zU{P;It;qo}n}IeEA1&?GRONCJp3=_!ce2$kKRZonNV+tS_uFPWzeS zhqSPws(Jp?TsgNT7yGtphSz=h2-}y#HTWNE#@LHFs^pseT#RfN*P8yLUm`jG1N5s* zfU25qv2akmjD=Q`s4SJxi@i`xIOCdT5B%W6wj1Fz8)Kuv*iB`}b^(em~z zz4~VcUB9M5@W}s3-SOWXu+*?)Al7p)Bw?jh8_#s)>lYp{{b%_vCY00=iC@I3$FcpY zYuOjg948l-C~}cDxL!%j&X1(H6ZC7U5?oVLQ<)zh*qg)k6HdNPB;PQcbVRXucl7>@ zE`Ga=^8RPrIRE!3E#e-v8MTy%%a1yk_k{s|V-=5ML7(Mg#S@LA3;rEyjF&X1w*^R&VJ>2%B@{=W9BD)oa@0!_Gl{G8Oe+Vki1QQWd~<<~Et zEV_YlJ=t8VXv>#L|FKXIJ)GZ1(d6xUoSPZVFOzMhM$6tgyhWq=@}=HzWm&b4o8R}L zQd7<0PV(LqaHYNNcXtTN4rc2ov$)VeRm&}XS-vamGB^G4tspa#HrPa5#22^pb?s&W zS%!p!fba6R+WLMjkeUo!qpKob}#cMpU4(`C+U6R8i>qlJ&Hbh52enW<`FmyjlhwlfIlxyu$Pg z3uS-Qau7K~%A$hBFocIe2<$LBIbEI!uddh9(JX=++R9aM|DO2#5*qKh#Zq^~O40f6 z0#s@~v{DPy=4^A}ieKe(Idu22Ex4~>p=#u?w_Lx>bHE@Z4Dh%iKrDJj2IJ+qNDIxj&WPRXRSaNz$JyFkpFK#gLAB6G;4KKql{+5w z{2yWKln-fjDCc()q_W&mmIx?JvpXPb{)hR&ok40*!M7lC!&?b|=efwVb@r0;FeD2( z*x!h~5OA8DEVr>6PS6o_oYt+7HY+d${lh@ruB?hP=`vq;@uLNGIb%@~*X54+`NY0- z35nZLFQArwtL~;t?sb(T6k;wi@v0FFLV}%b1@;p|R%u%8ROV= zRWO3*fG33>>}We#nQ5Vk3gY2ODY5fL+-E@ zvWG%=(;1n3UEEjqSDn9V_C*FMSXjR{uYKa`>$>D#@FacqRX4qmy{)y4&Gf)@V_BVr zvNEa@r<%e5HW?jhEb!SY6v|~N%22Y0992I>~ud8In`Lf`QStH3E)x@G=`2&AraN&V){PF%a=v)Pu{I zuQ7a;TZAlAgDiVUO+`B+z-8%M0kCiylcazP7I(w|^h*D4Sn6R#-jd7ZMN@iJo=6v2GyL zo;~Df{e7CCta*U4B1pD0lfi=EwI3CTf2}#(`mwSD-u-%XLU(&V?BTG?P-Fx}R5*E5 zcvSdpxqh`s3e`yRJ6%Efp|NYd2}SjJ)h@$9391YRLSU!qq4E=W9yx#}_KqRcG)(~r z!+&i&OckDJQ2El}fI8mdeCHPcJ2=byp-dT&ZFDzLuqc{lvh)^vKB2 zL}g}~j~QUN0Fo{!0BTTKwrDjx#j6KVb>MsCz=!G& z0?uz!q)+3>Q|KAM0zy>+^zjMt4}XE)t2HIfc*Tmi?$;KdI7B#Aw9_O-Zg>98L}4}% zna0Es9syWr5+f5RGVqawtNUt}*r|Zy#6ay+mEGaSGMmMOW%88u6mXzDD_wlGT6!zy zpLOrO442P{0J&IYJjqwrVrEF87ZDTT<9iz5xv)C#pUTTj+d73+z7GI`Ehx*q&zxS(F>^b?4*udLeSbU~XBKKi_PI+| z`R!s3tpv7gX^R3~Cce0vX(P9@UCS)XwG6mNX_eM`6X(`UW>OMp*nTlrcUU?`gCzDr zKR0P?yj9z#ME0=e!>GupM|%&t{Qcx)sN)wVzW*5E>yxt5g6NEc!GR+F(!Nysd6n&^ zN?K|Q@t>y$%H^ z1}}eMB%-GY`CK5%Pj}AkUNRem1zBUE6y}0KA;6;dZu&VyB`KCwPfdQ5Xri>Osl*$@qxi zNUlL!r3OOxC4C`xXPqL4Ec)b`ajpfaw12E4xMZ6=Yyb-WN0LL2RUzLj zAKS$6X%>ekm|3yQ$#-`3N8ah|B+0f4bxDc4nfJcHZ{dlBeXYRL5bY2afSAF|vcc%G!HPxGS8==1)_U|T zNvWWGt}f~OGmCtqW8>q3f@5Go0Rce)p>g@dgop$3UUF3))$Wn6gRX7M3GQ}?tC)i6 z5#2fg?U#)GsvTF-;w zY-Nw9hPGMC9F9(W5F-PUEmiuS(F06nlcE{I)}b=%A7_~A6cEH$BClS~DB|X6Z*IT2 zIpOX|#S?qiLR2Osk#^=DtNG&ym+&FR*Kv8P<@ep!ZLZtJSjcEO2t@V!3dE-*!yhNO z<`xWq;JT2z{)iLD9MQ;&^p<*B%Gv z9;zH_>TGtlGO@9MT_xDkFS4=QaZA)){{?|_B)8Hw-q)H3IPzKPiHM2|2?0GNX^+EI zRf5>q`4yE?GgaPuK8|(quyuVfv-aF(wlXs_w}4}Na=7tnIA2P*pcwxEhcBp%Q-6rI3Rc0j@jnbz>h=|(@M6C7U>fx%lJG+#q2Q4af?@H7>c`6Fw&JpwfW1WFvJ!J#H z%4DH$Nww@r6h6K-1K$M;1QOi8g)GMGRywKGssy2=E7s%k;ESt|W)#O-pRtb)vf8-D zxR2gI3De!E>)xMZTl>m(C!Tx|_c}u7mC!FmY~hT4&*t)mO76L0VQ$Zm)=+l7>+9FH zfQZjFC%h{enbPhuNz~lx(beZsjm#JG@8B$iw_cTSX-?0fRc}lkFJafCcF=wqJsUd8 zMn~$&N!wK2xp3mXuom2=TlzBdg~W^u`*x0IxUuITUpwpCCpIqO47DsRfB}i?8mn+k zO?VOK*oa)bFN6F7oN04eyGiZR6q#;01`nk`g-ro<5USFo8#dEMz{N z)FLtwpl>inBl;{0syyqD<@D`l$#Jfl)EJHXIv_2TJFdCbB1tJq2^~2}iq9XvxA^o{ zn0YLREmF;vJ(gM2^u>gGlpZOM>hd=@e@%v3L4CC$gdajz11>;t>9B37u4gN+c2EaN z7N{PzCO`Ov_B8QVS#5&Tgk_TYRF@xdXvUjab#=&lP?prpL~g4|3*W;OC@JF8+0RZoP6YS5=9t%X5j<@=9s zJZx5j1kEdx-027b#7vEm4TRT9soiaOv=y$Y#MT=^nhP%|fDdU^7Ez#Ft2I{)2fQ7` zW7SkW?%wkBWnL)w_~|{}hkUWMk@uEt@uS1%?(3-dK@CnX)?b$25^pIgnsh^HS!eiB z?gK|C)llrf;ga;b^r9EOF`p3yYRe*y*MIBz1Bd-qR8TlBdJn2ur@`?phF`DfaY8;D zCwmvCvRQoWVlI$tetKk}o?MNTX9H3!Y@C`PXWV>S%$VZ{%|p4jHr#UH_Ryyow;{{;KtygLxrG7(#ca)wTYK z-Y0sN6h;=V$f!GPone8y(zPnL+1N>PyLSs(y=`1y*FQ1lR8e`3s=cW#m$+c=3)Tb3 zN7!8_R~a%Ek8tTvTN6~|O}BoxmiKrt8Mkh0)vSD{hV=%yVvnL*%!|m2!23pSnTfsT zwQ-^GnI8{pLlWXKtGU!5h-Pk2LFIGB{oj=);~!Nlji{=PmP~Mqtb8I%bKzXfV~y`v zhZpp~H7qb%5D%?Sa5$&Vmvl)54qk6v;W{B~UlL4_ z81zf;L5bb3SJPuc^~%Ua_>tB)$VLK>FZvy&b%*eB+g)qdbU(k_R*eJS(gX< zJxL0apH$ji6sKDr)n`3{aNlN^Qwkhtd8DRdnV96&?L&8b5Co{7; zvmmb;3CdwVs8W1GMY~|zn1^&RO1t0hBt(ULtGJTf^IAMxRpD7HU;6{ij?XXdjHv`a zw9!c(a5cYpR_vk~eKYL+k6gM+5023LHvMEY_p}y=4k&Q!!C<*zC^2Ia3C3Ji zL1sbM+*p_j602gKXP|mF$s?~%_vnUv zj52~Vd_MWnLq+!(*+*-Lw~%K)_w>^_onjFhcBsl-1z4eAVzf$ZoD9yB+;Sysedi;%NXg8B1{e-#F_eG|zvUc4YC2OlIpARjmdsP@u05 zr*U3jsq00uHQh{r5KWSeeT?KjD!)FjzCJInzFM??L^jL9NcW`?Lr-^4X;Bzlu&Q?y z02M)ULBT=3$s#1Y9wAzg8-+0n||g$cI`eH$?LAzF9rpS6h3c^3UB*o~o`&^2bx~YDhrzULrno%G+^r zq3*RFmK+#R^m@8?svWLq){v0z;Az zxet5`c$dkiO>9f|6fbU>MAIx-Kjc(r4SckyK$1&9Ug3)mVCA8Y1>GV0bcjayWKU?1 z;d6`Ui1G&YLMmdtb&4SB(ffffFqD_1Okq%F3-y=7Xr$+V_G^RS{QgC zXKOBBq9L5K2Qnz3y##l~^f-q^dVo0JTO6ysmtjFF?tQ4=Mh9FhB)1vUcK2(Quo8ja4+LSJ)Y<8ba zuA}O{%Nltg%FD9=r+$Zri;I)XEgq8j;?A9Ap0;b5j5DIM+@eRt2of>UaXBan>ZY7* zVXIJgT25e+vU`n3vm9;wD-XX>S5Izts;k7?q0ifUbXFZ ztu890yFSO?daUUr!gp4FD4cm`X`a_ImZ)oY+O^`2sgS=Z-sfHvxbI807yFk_pf??D z)@elHpxFmUW>0G7ey-bx)DpdGO}*NS(z-#}PYqNxLg1@YN}fvhUtBLqKc+GUT;OW% zO_B<`R#rcqET`udx*1pLFro0I)_p#G&G^C(J)_;ph87-;WP@^*-yrWnJiD`bUJP4q znYR1%sd_A6GDQ|qpc%2A)KEGs;Y;857S{2jmRaCehP?GUgH%@%HTz-B?uYLBrVgP} zH@h;%V${F6+&AJkBG1T_xqmSr-oU0c++uF-EFD zir8XIv!Ke#t=O)W|8PyRa?ZUc=)2$4uI5;dauysN?Iuy7nk&-rwtj_ zbqWwtQli>QcMkpbLD<<#ef^2AtKAu7XV^+t%ng>C+4%Wb9$F58#E^h`#n9f!Ps zj#E`k*Ev&FK`3R|?l*-YBQmL)w`1e~thLbiWK69X#vg3g_b_#aGcF(hyvqEk72SD; zu~^e}9oE2m94b1C2NhicobMMlg}U1!FA|mJle8de9Xe&=-H(MvA(68kA0+z|@_;-# z&(b*W+h^U$FizY_L_j1L?db`Rywq|kJ8nKA;QjfTaq4P?Nw-t8PTt*s02E}f>sbOX zogFNsq@})oI`S|>iHp=g?5*Ri>{ zfB@dk5v}dqihux<=+%{)tOw&-*p;K#;k0?3?5LDv#-^~Bshk-i29xz)oSMVH0{UfE_@k=$Td6mLADmA5HCS>H;8Elg7$zuRGQ_PzI@ zO7f{m&I)ngat~(Q!A^05yQ_P6@m+rB1*YFo4Y=~o+^59v4+%;&=jKhGbUydp4sH`1 zy;I`gK$wj(W`yp3Yj2)F9^2eqVW8uZJUv^BWHR7|G0X^Vuta6p*nh6WK_UPW?g|4H zCB73}#_XrDiYLG?L;{a;A`xflU$&e61X|e>FFS;FXT~~Nej^;8D;T+(JOGZ)-YCl! zDic2c`~DhIAgQ(OXEkNRICxKJ<<&$(86$}P>l1x?yCEt=imFk`Pe$TW&4$L37fnx4(%*=smL>0uH114m_}1+sdfuU!A0Zqzr@~p)h_Rae)3fnObHlP6C?me#TrO zCzi%;E6iC);zLiV*o22GEXIF{NL2tM-wS{K&aCtKGNF+iOQ+JaXYw|H4%FRB?7R&T z1KbAY2p!11zb8icU0Q6TPkZCL#ztpG;uZYw`xg!FyJfa%ZgI;OhQyI`fsLCle_S+t z4uqjjj%#Gy0#Ipt92R{W{euP*jXIOxh~qaUFM9L1FgE=XM~3_=Bba|6C*-;_c4HdFiehcxh0 z3i5W02=DV{(OsRR{NTp{O}%1D0O?=QOrHWG;?)^(Uyagt?*2oVuw0Pnoh8{=0EzL^H|PjFP(dF&|L7WETT0GcVgY_ zx1oq}^k1#{aimB=*)HzvnsDIHm*|-4-oMfmwO_ThrZR-9o)Q(i2K8OOn)fj<5|I>i zrMN-NYx$b70)BeTtJLb1l@(5>DzdL{44E$Db`c|6v{j8rk`njaT(d`!Q+zvdV+~uc zwOi(`abOznKOr4><!y3?&Pn`#_&3l#Gef?)=p3_f^Ui;vfzaAOR#H0C- zC_m1^677NRcZrEQlhb%^AG}2eIicl$V9+BoV;Y&B{w1=n5~3`>l3tCJ_iei91O5sJ zlfRNrKdWsWxAWWhrxQmbuci*ftO7n7Oc}WO%lj>uVaUiDKPF^(#js~|dl-WEB(b%;R&%wBZo4s*Feg>11~T!zk!KqRO#H>GQupBCvQnt=r+5tC~|_jcwZextGmQ=bxnE*pJAI!;`6FR9y=}o5@Ho683hnm=2#mq1!K9 z;~t#M?%xqQa&ju$A*O`A5Y;)3bM=^-yRtSfb`+m*&?NHD1^&k_^1V`zUUp zBQjO}+aSl}wx4UqTg2FEd)wQlHv^*CRVd!3FhGRo(ku4))jpO12ugP&rZjKiwWfRW zYw>!=HK|cBWxk2w*r^o8&xo`u5~q#7C$1%JvzI7GnjkBxN}y~)MsK5FzthqT)I+i9 zLQUJe#tLyOp$}IIr$A@HkBqga9H3%Ak12)kQ{#!2%+*+9#70XhbyV%2UkvY~D0|mM zOicCza3cpNf8-DDqMQ{MkW2mhk21pBOx#yO@k>+nz1ZeIc+LzQXaBES&Mc^@EREx+ zqiBmVE)B9tyJ8C(1%!qWVxu&JY>L`J5QAF>)IcL^2uZMMRMdci4TdEsixgYJCJ-=e z(Lp2&ix5o$VGm(RSON)Tn;Yzh>4%xBd6>6bx9&ano^!tXf8ROv|DAg`e-7-iRZ8cm z=ml-2W49d)ss}v#)i{V&<{UK+J~DWlkr^ixT(|EP4_lGEv+7l6mX7 z`rnoA>yKLGlLdp#ymRS3uTeX~bc`pDe>eR8u{uRKGM^xch?2hX5Bxxz6(kXw^chB# z#7h9KbJ}H`x6PI{mOk`b>sfNpaaH^>y|DfmqK}?)K;U6OD{UDN0WtzaUnVZ#(spqZ zVUr8UHtKKJjt*vN1d8xgpq!jad2C3(uDSb@6AQqAzw;SdN2f_9m=Y%6(PT^t2e zg=!ibR|V#v11NDo)>*m?5o>hTQnM~G5obZpgu!tGj(YQzF70x0uAV}pwc8nXX9bNO zbd)kXD!8@U4%A|o<87&s*`|`dnky@hr;;ZAo2~Bu2g7qn%3zfDbCVL7wu5 zo6Tn~<`BAK((ct9AG1D;F6BcA^^r>vEU%LrOxsOA%-~5M z#X&|sFPm7+R$g01eYw6pxAtP}a&bw{TPi%16;?Qf0?g2_F$#<3}XnXEmOcm0X z!{Mfdfq*I2fU-a1TZs929@5Rg{4M{z@?9Cko|M^ReIRLnw|jnGRaL}G1ibFOa|A7s z+co|6Dsuoxs)B@lW!!Fy@jnb5RF(!^gPXPin?1IG|04fYi3yRqp(DWls)4f1ZERc>4-}4==@QsXQg#VCX`Pjnxeb({{Mj4zJ&j-1gzqTJ&ZexJiN=qXShYkaMiouM$* zihdgSA>BBh>UG8sz{fP)%#B>6)ZZ=Zve3ylD#}%J_s_FUjp|p?zS5nme$D^s9D%?1 zd2a%1f&hF>jr5)w_Qg&=>>L|+n_ZGJ{}HuB-aWy6I|{a6W`Hnb;cfm6{HJ~AA5ZV+ zO^P4X_D8eT5KMzCi0L0n3XE^`Xqp2~J~>=whP^9u!!3KaNy^5JOLz)Qwu7R8tf2ks zjisRN+T82EvVNsTX1X}xJ+r&E1Ana8Qpn2QD&fVB#c4QXwtxn8H8-fA^k_PfU1K3X z>IqazcZf<=_}R)j8P@aQ7;I*x%o;+#m133p4|1XdRsx)DWgq8qRCq~o16CxrvV~U` z$2#Ub_snsmq87&UH8fBu1S$k8W-@S#nO1mvLoQ#oa#qzo1j5WsbiT7n#x9E6xctup zJJ%*Op$=MhR$JZqbv_dwGf|=jmqw4H=Qe2mw@dI%LXLx+E_G`7=_yvYv(qNF3xrZR3f^9WzweTrZ7WqEQ>&+*-xiy?FBw3-ZWJN4Th}bQmbtp<+ZqlYjQPJ zzNJfa4MuhJC8X&CS?MdFHTA9?=isQw$nkr*(2+Po!G*E?U$K}~)F4_CUzSe8@O3kZ^Er5IyP;Rw( z35J!UL`-m9!A;qPy7nr*dZ@-uSCrN8P)B_V9{n(?zi#F`+gKxs#*j zIH*Icy{ipTSyFy2@?sB~?5qc-cE2IAHt=n!gOV&jwpC}hxH_Kx% ztE2W0xmBmGr@cJg0cyO-?r1X(kr9xzu3+5V>1YzBtuK6Ra+RToix@7>2?<#qlBORE zbPI%~d_ybB0wTJa@)1vVt^ENOxF^N8TUJ5l82Ua|j9w5GM!ns$6;8y2MsryfV`-qN zEznw|%v2>{C)I{qY-dkz`?}Fkw&fQ zBN#PretyOeaJs1{;WawCpt=$SI;XBPp7InnGa1cDG>a+B>Gj%*6DIE9rWl)H8{q`X zVd*sdD=SM1z|Vy6zDVL-OqDUa_)7$Y%8SwTNc$fK$`(EpOnd?|qD%^KF$$pzZLs>; zv5g|58uwUn(Y{xXl&jn#G4$KyOX%KD$tr1&*MWVUnx;mKg3#9O_l|8-Q|n3o{>>eu z!`5^oYumbF>)9rC1!*L0!jnc)RWy#I)ou2c_^7-jK29i+|GW6{gJ3&?o*?PGQU4@` z$7-B=gU6FGBh1l6I?5Y{G*rvYh!1zuM?w70^DH5@`^PXicUM2_WGwV*Cy$rqr&KUs z;}joZDc2XLy+|3^isfRqI4kTS5mliCSf3Z_X+6tS(ggtRztKx~?*aru3zmUEkLmby!sE-ZloZO_Y`t>6Y$Ly1P@lk?ycSK)R&6OFD*7$sq=57)m6D?#^$`jN9!w z$Ftw}yzlq@^{wmjQf8PnYd!0E?%(f@$3O)+@w>P1Z=s-|+?A9NQ9?mM?L$Gi>i)-7 z;FZH#{oBA_R~(hZpP`gM2$z8$uA4oTeTsro7IypWIV$k;%@-1yjwmP?PVhfhrcFuQ zP*C1rN{T#HanoBrM|UIK_dfItqc6S?i^K#wb=ab?`wf!gEn-xkev5WY+aryTcai40c^)|>K>E+ec<8oTH!6Jvz?Pot=)BPAz*Z5>N7QUnkVti;^*btsSu9JUB@m~FS*n@cgXc6=9G3|4JYC@2aKBbRSEYonlO za7Xp=p9IuQxwVwM&PZnCJ#%x~OjH`hZAy4prD3VfDMm6~t%mQtl1`0vY z*HSSM%jBKyrWm|{+j6?LEI}Y3GvqKEDtH)kdJrmQRpWguolR0j=(SSeI_c4Jel05F zE(*$y81yR2r!Hccg3dmurS^Q(HErm&J9Lcb19agHm=hjsYU3Xc8JP81a5~KKILPL7JFyC z^*y&LQk#x%OoY^&&%X9NV8Xxp!e{Yo1&Fv(yp%lKzl_l9%%8x6n5Y`}aGHU!@%d=C z%jwtMQ?X)wPTTQXsI6($fxrBiWKUnp@$!V6r|EpIV72dz`))g5bBFxBNjs7q0h_?| z+eB8$4^{il7xeGQr?`&Hv+-V>O$Tf^Z*KOwdfAV%mO|c1H&BWl2sj+taB>rPpM2Ks zBTjfYnw03!%t6XgR&N&9DCQ*5^#-(%(Jz$S5s>P!v_TB(teM{aHrGek#kJFI=zD-| zcF#h8!oH(eZMS`5FU^Vlw!V6P zQzEMlGS7gS9xjcGDfav+vr-4~BAJaDGUC(`T{j2v{X^#xw?pNF?_27&6{QB-d@81T z-jvQ!gz*74P}1rns(}HmjXUJydQr5B-n6IgyBo%&<#RShWtQss{dV*2*RaN!muBb} zZBwb|QQl@PVS=EU>8^+Z)QZ_ATzx_hx8TNFo3PrwHnftOgs4nG#~VdD!^6)nyJlbO z60GZ^q1Vss__}XBJROZK>0Z}AUiyRIlw@c7XzjF`2{syyG6|e@>Q88&&ncr@ zyL*nFhnc(7S6a{Y@q4H*1@~P-uU$@Y??fFAT^^bIgMnpt^lYt6P)Fa+jKb4p zZ?a(y9I-9h^0XbT>Ehd`CI8bVkHh_97f{nGrvBL(!@$zC_yMt0=!XydN3CR@_mZc# zzSR&{_SqO)=z+GUr^3#2Z|8}7`RJTNUqcfKh?g2YU$bK6U3AHNE#Iz@u-ounY9?{0 z-hv)})tBIH+I?|E1_`mA!fP^WBqy3Y4a;XR(;wR(FXiVP^nw}5Q*d-Ej6L8FeIGK` z%;B=&-IU%>;#5Q2qwWxVl-YB)%VX;np!}q(Hrr5%~#e840K*K^J zXcHTx3)+WF6rWzaCOLOne!#;jc)rSiKz3TfJ8HH{jDli7`g34i??`x8>?ZHGakeMr ztT#S{d9E&*&kEl+Jr9sDc9uJ{rKTST%iDCs3SLZK9zkHq@v^LBWkl&IM4ozkJwiOb zFJ@BFr3c!#LQ)h73OTLoo<_E(o`IQKgW`QBL8B`n1TD=mdM|4BpF!RqRe0{f z!}sj9;oIzeC<8$;nc#j@&rR`xcC?El2&4SX+3Fm*)tPOw4vf0Cqe0)YKCS5&Gt~@r zw0Ch`M8b9}Ac`y5Jh^pQ;}Om0p;gUQhyK-E=%sI<`?H{G4fJCE8Bg0~Yw`eyyzlZ$ z0{*b26E)cV%nm-^VM5cm%T8daTZY4zIv?Z-=4^S0c1e}bT|tl0Q2xF!2)*JqxoqPu zzwg1BW^PPsEACOnTf)3YM2VZz=W7+7O@!6*ZcbkFflHf{n<}Jb=R0k%wKvp8K{95! z$pt;c_|DCr`-q29D}0Jo1$0`sIRo}!YjT$oixKNbi+kz)J?`?l;~g>YNifUW=0DG- zYBrDfcnL$m0;t6Onbp&hY^G8DV;IwC;Q3l8RRB%qZ4@Cjcp0VdUOW2yl8X4`m3NTNM5AZhNpzK~ z&uW>?=+MOHR+1U}-QJq1&EjV(W>ck82ABBmrymA;NF&-Rd0H%aM(Q(##X91M6JK1h zncX~}GIHf%?%Gl(hQdac_|HqCK*lo7_1hODTyeKpJCZ``dDdph+Zf*EjY@iNgKfUEl!h{(dmX0U zNbz!;kR{sBr3x_OwFRwzHcMjq+Qd^|;_NSb_QkcJeIirtLHIsFi9?W?mw5}-ntn@w zp8ke;z?rkP`_|2xrp?dKrxG{l6MPoj=vB_NSmHOjeCA(FV=LXNeov;i7%CAVc28G9 z@mmb6hyFD8B|rL1Rd%Mk%g!+s02W^9s-9O+^623Mj%Ds*tiBicI(O9ew4&MLXpmsU z^r71~MeXK;ldWsM2Wu6V=byFJqzATP#3zt}Dvptv`red+?eANkC&_Tz^}X6lIz4QT z=4|gqkA#pk4_}<`Z8htj)rv+ko*pr928n7rCSsBi*6(HW;cM+m29P2} z!v`B^9BA)Z01N_^hi#`)S9UH|+jgs0bD&Dk5vERZb3*!ZH>T|x0ZVYP*VcijfX(_@ zUGo`;5LO${U%N>I@>!{7n%wXrt*M;e83%!iq%TYl2Q6T%O|_HmG6MnCTs1}_o}a12 zmX_+frrnPAIVWAZxGn5czTuRDpLn{lWgd>$xrCl&94NcW4WeSC4<8m=z>K0w~a56+P1wDksK7nRmdn4Ee zq=bJC5eDh$Rl;@wG!s7z9W8A>EKEHl7uX-2KHbtCX+rmz6ZCCyq+AJ}JL=rJ9XaG> zc0_4LFR^}Nqu(@GPlJ{U<%~RiBSj!!U+O(`X~9)oy?SiFzO8#ni7%Pq)>~AwwRPmE ze_7!j-)1dPzAo*;;{0NBCUkzAQ$uN$Dg)j2qs!sZXqAq8_glj4a-dQO+U3WY9(o@K zpZe4dRjqQ`o(k4zxSoPv&Q{9ykqo5Z$7Yp)1U;p{WA(VZs*`H@nl$cjcABq(>)V z4s?5N_!w`pHsiSp$B%E%>iSm8TTbt6;YQAcua^$WT|6m2^lZuSvvmlU-t|Yju5Ca5Cb>mVJixq34`PMiwUGtt}AZ4}nLGr6Kod{&6Y zL23K+JOusXTZFb&$KkZ^W+s%0(kz*mg_oJfTo7q5DSX1X@*xE5(7!Q*j*vk2PPuCYwgK zvyhqQUV+>`k?(d+J}#z)d*3Qfo3=a9DO}4r_BxH4XV_0)Gl?0IWpq%Yub)OOVcJzs z@5FQn_}c7jruw>Kr>!mumWzMqYjm9{gbh+4*yAQFA z`s72sHv3!!_uuPgnCw$EZFA~3wt-&mR~@(I9$pBYf-i)lQkcnfn=dui!fKp`f=qMf zGFt>Mv~3KG=W#P_DMC)VM_j%4>g6vMd$p@|Mu$n8G62@#JE88MO+eyvu>Dd0q4p}r z*_wDCKkHd0uK2x1i}li`xrDIGkxl>2S{v!n?{=e@WS*C+Df7D1Zgah99)mCAHRME+#PX!(3lN1tyq=wT z4A#BN&r~(!hl?8D-(8q?pbPBoHJJs7`@|k~muzS?`<%BY3SNMFYl-# zSpNE*;$dCwjgys>^i6)kf_KLvz&kOo>VZ$g4^g2h;ERF7FZdOpHo%Xx4-x>mh95zJ z|G&Qk*S3oEGcz-Fb#*srb?`S+5oBUZl{ ztFc@4{$KCIbmON+V<1@XIkP&EV_d%Z0;RhHk5Kd@szVHg4sn+t6ke?YtZ=e*eNt@7uFX{LH`VP z^yuQ?DeNfC5hYr{6eFhO_!#y4>pYskSNdV*DC%HvK6rS&(8|h66ttI=%Cy&vI|72Om90UCr7>1mT5s8(#7L*CZeotBrN>eyyZ1y+y3kbcz4m? z-vfEW9v<~|b#Ecyu9c+N*w~Yk;0f+g-I}NLF)?J~p&BI4_yh!^1j|KeVf%`?#l^Cf zv(LTd?p?oHTwI)S7k&r8o%W^hPxSYbLb=HYu?J!Y7IGNu8gRMHF{b0PPqda(o9krR zfCnMf6Qi!TJs-u~PfeG_a3P`Xb)Ooz&ok_V>L=2FGr426Yed6D4eK>rI!RThXoL4Z zf2^+%$BEOJta5P6g<@7tw5Ju^!y9>3s}{sORA`w4DiS%(2m&pAJtZrv1$}_V7~jip zOlV{Z8)9#aa}htS_B@PZG!k5PB|W?gp&jRqcTImZWJBXR1eZCp-`6w51l2PLP|JP? zM$46ErF!W+LZau+=Gv}Q_oJR`^%63KCl{3lVv+O3mipCrU+{*qhztYzH!4Ls@KlV9 zp08Tsu#;Of1_r<4-;nw|U0ANUrWLkt`PuyYD>oUUo_8iJG~f_f*>(A;6&+44G*3=T zbFcz(rmCcU8N}ho36_>(W3DtVOQVP$Bs#|Z* zzeLHps63DlHS0g@i0LH|%|vN`Za4Nohl=1@0dJZp$=57}*hGUn2NtW5n!(AZ*Vktm zgb#drNEu4r#HCy(|6t@_DQD^g*UbT-8!9iDXT%o1zFtNZxGX%fxzTzQd37vPC2Qk_ zLtZd{996+m**lZV_Ps!9M#nrmp<4kB0ZJL(mKp;pt304=i3{bIYumgICnbo}q3k%= zLnN_OI8Z6hEj$$h`9sW&(#zf|)4A$uDQX)jgtU_L@|SfKiabuqpk*}sBu(z^6IGS& zVGu<$C;=?*AyPZ`c)55`TYzyxjnXG3D*#(2~YjfQBB=%Uc-N3od4ttKbpexVfi(dnjDP% zP)qx|aoO*D;_YcU(mOdDB9Dz$&}67?NX@m<*)uSEN{rrkFB&Lw@4G-`4dPsWuNcfI zBg&^zY{;aN#>#Us4ou&w3Nr6q^XFxvA=R`H4b%#FA1tlnsitVzCpKBH6?-hTqo#US zQmfRH!n0Ebx<;b*87&`E?4wSGru(E;y7_a1h~btRvq^RYgfcZD<`*=R~q$@dq?Wh%Bt%nbs1AI*a|w7 zm4RUOm;mts1-ZOP?fOaDIt19VbY`!y%b%Z7U9MYY0PibYEos;ZqDp-qD5jY%RU%k0 zf0A~;2pBOERR`qNsA0f|6F7vJ;leEZz{33b5<`tt32|_%Q`uU$a6!E)&g$#u&Sqis zjAgY}3tMtkROU4yPgRMY6rtJ|V;SYC56ie}1|EoFyY{CaiW}OyGFQ=o36(tAJ@tw6 ztvs04Ll0~YH<)zWeFiq4Z4e~I?>kj@U+>ZbVPZ^wLel_o!6A8pQE#O`*m*xGm2yt|-dK zogz9zqRwH56>=3Xpz*o*i)8CNc^iH>-a=8&G;LookL4Cin=-g;U{(gya0yHQBN*#V z-+9Djl$3?2p?)jnMYMI&ZTFvgu1Ol6gztlRnVYgu4ydv7d6NiN4Eq)WX+7u-$D5hG zzejcxt`LNOA>B-m&f|^isE63nL>{UhSZ^hY8QNd z%9wY=@rL0}Gm4O^7DVQ;35b6}ESjs#M4n=;_g0~g;S$;%PlI=3#T5TN(1vIx?RG|& ze?9D=$d!>9Kz$#HT;vNmrq7>$K4ItKfesHZloYtZd!?*Cneqz4G95ori}yN13AMYs zw@=c+oYS`n+4=%iskM8R1uwzArwQi34YnZPTKkws->Nji~nkb z-JKxW#*N=)Wo1kCrt}!YlB73}wlQU8L+;+ai|AZCw&yw$6A}pUS40VjfesufM~jO% zJXCarj#^q;E2~VlFdf&a8)YhLd6BDOKe4HUJCHUYvD(XAw|k|Uvh3E)k+~7JUI;{P zbwQ};*;OQkIPt1B?M0N7QYl{P~Z32{(ltt)fva$`&O@I;js25et z^u|d}?fNZ&B|_gU27y1YynqVGMFqIb!0}1ymy(7o9!I`}yT|?LvRaAB@yV_=Xo%l4 zc?lGXp&^M;o&Jqo$9=ST3k1{%9j8m#E;|&?kFc>5r;=f58-FfQ9GaYLD5&n?feBtL zqZQx9J?999Xtt42MeV`4%QxS zvSxn6oF~cKdM|UzA~2LWuf6@t$S}R7#DE7TE~@8b%&SIqlZvq_;??0-{jI3mA9y}I z=r&f0BuGqvrgGJCXGuOdyt*1G`gG9nz;-B{QxrMhhcmV+MZ?;@M`Fm{VbG+f?v6~q zn|1Z3w}^WEF8(a3T?nOX;hQhz#`u9l?S!oJvOxp}ol}Vpn3zN12FD^2R@LN#~aAA#Z%DCzEEK4h?B5E47AWNEtgHd_*&qz=gnKjQADb(QFEGm z=k_MMV*S*9_G1JV*GIwaek=EA`_b5Fq8BLfUVB69jYkY&0#7~Ny2Beu93_J3W-B$N zeR`OMwW!P{pnPjYKU$V>TTNAmijMm<|E2)R3pki=YaH0gq}I-}1f1N+deP}gO##jI zr;x2Gsn8DMs(8O+7&a3z=t_b2I)M>89E!MRKTF4dtw7I%e^Y_L8MHScesK~fXOvdL z`=2Ozb0TD9L-K^B?@HSb5*`W#=Sp!`IlRVIIznnIDh(#t4B%IkuaXtBaMNNuZPnMb z>gxG@b3a8e0FAuo#Ut0rE=Zo?x_hqjEly%-I#sJMF)*P+#$m_aMjrpI_IxdZd-zaW zGc`q9xfmU*O%H4Pguzr9TjZp60LB_Y5@O>;=?#C+5|j%@{;B>rwE^`fWpT_*B#5rR za!?D|4jL=|Re#)ZjA4XA0c+?@7 zrL9%1YoxjaPml%ZLv8RuCq9{T0U2^&Cu3QoB*ty~svl6uS&zTQ^{lWSmUmzUI0I`G zH4RXH$_lev+b9b73#qHj$ZT~Py1gje3k&?oi$@zH`Hd-UTq2oFK&+{qbykpzK|3{Q zB@Ob#(f>ppxZ7+8%_td4ch)l=2>hNm9J8jV&3Mf@_XB6hV@W+xIl8U?E~wpsh}$8n zv9YnNOtCV;7EmmztE&-O1T#B3_8-@^w6zfs-W)|GpTh51otY_I=_rvyH~gVG`u0F< z5TcwEJhbSh5Q2VxE%X^!-=$wG7rrN50kSc`k*4*V2KYBG*~?`NETlx4Ygux6eYqg` zZ1q&@Lt=9A?dxj8(VB*NzL$mj&g>cX{XG!KjjJyc5`ulwSSp|J@`?jgA~CVBShvbj zwHQeqI61YowaxZJ5kEa|d_Fwf&pobc2|I(9Is;!59O8&^{H>A~UK5h8)H~E#bO(%7 z71>&06own{+sY2Et*uq+-D{;K2P(=U3|8D{W;Ie&CeR$DD&e}f)DI{*i;Jd6fydDB z%gKw8zgWun$ukL#+w$k;=Hx&pCRSJS z7UIDkZ9wVOYpidSA>oeuv^__akbqBsk1v9##B&{Cob2qJY(v2ud_Vyj931TJWdLfV z8mzLia%fcD09lwTb%t!V#iwvcqA9n5(vvA=yYON#_RlsZ534sy@DzM`j+{*Rz-0R1 zh@or!v&7~_A{)eyk$}!zc1e*j9Dh(HxYmnS2 zQ?TOqoZ+2SHlA=}foXlWR3%eEZScKDL5yHfaK5hOVmP#L{B%b`chJ+qwbBmc>buNx z5aoj#$vGD3UQxcaCugdTD8y0-6G)(9oV+V>Vq(T`rTEv1l(+=1Nbhl&{ZmF_ z%pZ4@l_tyRMfXl^JQIk1AraetCnEB?X9k#F@@By6NbZfeRO*SSr;(G6pvUn6js2L2 z^_XXkn#*wVj$e^_4L8NQJTu76fiJj8u*7?Eza&)LEAw_IN0vR2%Af*hI`-BQ|-sIu32GbNaWR!8W# z(^e18lCO$alRw7TJbpcCPsf`XR0T_xqnUK0FIFk$$ER@Y44ftz1ZBF6J;!ZUZFwp@ z(J1m+D_5$d%9X#Gt9MzRlGFW3fC!h!5R#C@(EP6}mRH|`b?R-&TlvSRtcdGQ%fJ$- z77Y{wt#4CZm_4n=d~o`o6fe-5t_%@MG$sGvHWgjoZV{Y1uvitC!9`TPX-tCpIJbYN{& zxKz6lvqs8lQ4!_EZDx-XA6ap^ml(rgL;Jc(kdfQOFf#U54)Wom=4)zbeDnzk4RvvL zt}CQXQC{QlHdUIAu^XhvpC!YsqTDz;d*x%k6LNSJt=G{In^tspzRzdJ*H;%VP!+W2 z3SeJ+!Oh4h(-99Pw6L?Yv$n>v$x2K~DJd?tv9iLnag&jiMZNlRWJC>t-JA2^D6_tl z^`)iz>x7ZZQtUYl3$H4(U%_jW---y-;b!>%f=Yd@j~%v=HN?g!>L|8INKQ_EDfE-U zTy#c|0Tm^`un@B_d}FCUlYxPux3?EboLXB&00%-D(@sMZC_hD`^MHm2@FpZ)DN>B0 zy*2O#ILvPW)}*Z`DP{MP+uZ{KUF%tE0P!Qnmil%U1D)yfryl#om;!>Ojprp}Sco^G z(E-hDa0FxNVqY$m#H3NzJGU&Q8A*;7-Z)~!Fdim}3@WwEVjj%=p?7=W%jBB1?xT+d z{%o|EfKjuaB;@TKqC%!dI<+=wU2O8B{yuk>OCIKQlH)+QFad+y&V_2*wkfE|b9Nh( zIsi!=7R}H_Z5O+^I7$Sv22GIho?vb+DH zJP6)BFnqZ)?mN;%hrh7QnpziCncZrC1I~ef=N9u9yERF!25LrxL^Gonyj(03v50h! zf6BQRZ>TD_7`|e=Dz)BfdMD`i@YBr|oxKkrXYyE=ImB6nu=Cc+7##W_O-*@^wcHgl zyh8zrqkyU-qNd>OTIX~KexxXJWvF19VwhyV5iVyloo5Y2`YfM!Xti09UN5ic1$l+Z3$%;>iTx!rb0 zULiG>g|rJ?byj@y33+{3zf&#nGG-MrT*_i!F-RHBhZoo~KrJ$1Fx)-ir~nwgo`;!Q z5#l#@-E`3!h0yS9#HP$_e=X8n7AOD zg^kMw-{3pMo77am+Wy6SH4i&4Ec+>N*E3`X)7JSQh2N(!li3Q8L7+hgnp615{MiP1 zHL#zx)Qz*UvlrqQ^*o>>=-xLOOMNQW@6ri!2U(>p{lEdJYE2fz89qVi=EyTW+zU zR>$w{Baxi7K>9eBVOu2xOPZchP5(Y%8FtSqTu}~p_zH-&_uevjA=h7;PW12BY}Z1$ z3l1wF?C*aG=tNwKU-@U53^uu#$-KwQWqZm**gXO*5mDp!s}S!hm`G^jC}${&26Y&A z_W>GtDdpRtXAuAEh<9nPTS#+Au|aKc?KJhK;k?*@>r38`E5!g7H=s_gf1!Je#&~j3 zOCF!FqT*+-^NAWr$pMFg?LXM~1wm%;ewq~j9)%^Y70p-%n;4^|>?G0#pRMzcn~ujW zgn#Z)O`Pjx?%}kjJez`mz-~P6W*y8iqwE>rd|!PjWMx%oPB!(A-t-S85)L|kufnUN zX#lTU-5mP2`&=??rI#I6tCMcAHTtXptNIP9#dBMiYR3B-s=|gJ0wLS8E^=v2O=1NP z3d3z(Y^z7g3)Cv%Yvm(PE@Xv(hl&6h7+6lKS1oko?0W^--mdWW6H)WHtH zqena(0y+4QqT_Fuhe=z5r={)Lm_;gy(N1O6c-`*q#sT~Rprp}TXfE>^1em^ z@ZuQlS6JF)dAM=;7+>@Ycc9k`C=mi=fXog2_$^WE;;~`&_aKY#(XAu|Xwm?$@w?cH zm$F1GZ3Rg^q{CAqG0?zXJQ-a)X?EYk{`1B2-dbgwZ|ro1btIzv72A5W9xd!w8ZM zfhDYjv{3U57gDQR|Ea2K<~(``s9Q9%^9nyc?F9UmQ?L?UiFu7iBVR^?jZDx%KL67) z7BHU5@JoZrG$|wlNb7nMMg2>m#c34GARf!YKrU1i{VaxHn*O}UZAR0W=nr38(wB(1 z9z1#d2jUWs$ZWu3@Fx5_!(%&UKzzGH^&0WmP&BUoS%X{e>AXL>LZ&&;mVVFSN6!+j z+xz9qt9>gcr^>>@Ze7*wB*PjD`@r&suA0Xok`clMS`CBPy?sne0hH){>kQiOs&4f*+X>FIii<^3Tg z#n#p~9Z?~(v$LC0AmEHIJh1vzj(6FQXOlz(xYptM9uhOZlAr6?`IlCEr28dcIP-LL zoSmITkcp2JX)3FC4AO#tvaFS=pO~14^dtfUZ?3jzDl13*(1|Fu_5WB-Dk_5fNgm*C z`OhSc{f(t^W=9XmC2W3~+p1!B*M$&itpNT@caWw=xSsdwo4!6PyXIAEczzW)gt$p< zG?{G}UT)}b?j0+ROprydSpH=&Pbk$-)-&W@l`SRVWl~f9h%f1Ywq1+;vUp+sl}Ug3 zer@=L6*88L-G$C)SZ5PNA?(>uDW4Sy55SRPauXINCgw z3`mG1^w{^1$_CZqYQ!y-QC!7s^u07KtHO_Ei$S)$ewJTkGKzjtNVH8{`|HW!_|kkP zGM;kBZ61iOfcYBcKOr?s1!ka+X6?9Rk(~5Sqv2M!+~4;Gu{09!42cvM_mIiWdJcom z^cPng;}I7u6i;_qnXMhIWiJY9TUmIpU}L0IDZhR*C`J-)7GBRhR(n-;yWs<=YA9eS6R?za z39lg~N7|b|+lL44!Q4Zf23!wi^!6@35dUJ5KDGfvxPvQn-9+Qa$$UOZ#5&pMy%sR@ z8vz_o@Q_MbaT~7`ag78RA%Z6-KI*9J zdk=3+U5c^=8UKe`GftW@f}3YNvZ-rD7S&s_+VIdQ{P@+*{Efr;^Q9kE($d;@CPI1F z5IYiQE$A!2z6&iS@8G68detTm4m4N}qdG%oYo_(s1s>zaEd2276sQm@1fUc3>FG@+ zp%5_8aoDd6<@@{J04O?7hxl7(h_0&*ru08l*k70f*yrzxrEusY4Frs56ICC;4QHC^LBg3uSO9cY?v)Fk{Rve4!L zIh|cfrhD932NcF)3`VmyM#wcjS$_T%A)Qm*fi4piK zNG%{dRY^vB&qq}ox7X-PXfGaT_BTq3h=O@zLPlyHW;iPKEFtw9g}ec2Z85`x%CuH% zAf+M{GB!YYy{_!t_@<6wH;-;7o`+UkeG539QTjzk_nVy*Zsbx4S8xD?=TQpfRe~PE zzzl0wx`MrYQdS(rfCk4`-^4gk1*g47muU8QIs zbl)W83cI?bw!0NMAzS5@zP71;k+-;YFc(o4^rd`yu`to0Yl%Z%892f4{75|UZgeM- z5q9d+jMxBjilqc(mGD_)mbHpQTt!vk`pVRCte>R9+7=~oH*5(x10G5-+mv-`51ZFy zbqtu@sdJKLO%89%wpLSO4I5ag0Q}R0e34y(;YhJS9&su=B#NQ}&R$!FwfZ`c7~J>+ z*C=l^KhH35S!yU{J<6cwRfbaDeegE1vQB(?TXq_e%VT&k5}EpsyeT}Odqv(#e}WNSLsXX|#4qM^5(OCX zv0;GRx4ym}5)zUT;sp3DRaI3sHZ~b|!+=b)(4((VC@maT&XW1uch<%$h=_r=(pqJ+(64TIjLi_UZ7fNiR_W; z>c*i^oPpsDQ99}sQO8zVF_p3r;=PjUJVH&c3 ztXlM}{=d>lkVy9ckz)RtX2_IcL_DD1Bsczw{lOr8pb13v^D7sEmPg8^B zu+-4tv2m-LI*y{CzP@3S%2lo5;T=xI+Dl7%fwUo){=}==4{E7Lha~3I@Lc`PV7F6lk0Dch*+& zLTjd`-XfCK71T6fA~P5v@ zwe}q)3=_{C|8D*ox=44fnHIz_`t7I(Sp-j)TCQfe%Z!yhoXf$Q%pzBcNqXOcDoVBZ zfwVX(j`Lb)cauBf8`Bb^^`I;m6}hMsrq|pbUbAeC-^kXGO!RcfD>FW6O^Vr6Pt_TL8bS*QSUbok1spKPn97(M zu`f@B3AS`5iDa>)>{qi0zbb3KCl1a-u z`W2{TSOklXmq1zlJ*FNo0<}+Bu?=G|CXauD>a#7X=oMW%Zydm|;bIMpEH~lg<}$N~ zIJ(K+@b=Y-l<94J8hRU#0@*Nj$^H`^eGf!YB@#WOiD%|*6!CvCV*YN4{NI2+9Ygpk zN;3?vR$(2$Awhbdm7+>PzrT=s?3)zTiIzJB*IeiB ze1%82N*XPlz0-g!_pAL{cG-%Gia`(VpRwo~fz)EnikyxsA zfiE#JTHH&z>;n%vj+nw=>s)sb6B8cTz^?fCsPSavW@_r_w9n}Hd*nVRKZj>XX=$o? zdU-dqs79Rn7f@8F$#$x9)|Nv}&=YjgE21}yIuB(p{Exzf_k;k z@|I*~`Sei{ovr|#!+zqSYAj%HWj*tCCQW4eSsW5ep2sepN89 zc8}AB`%lfQ>t%j^X0sQ<67;*}&_UEJ4pquW@K$8wp&|Jbn*XwjvQ=u@fIxMX0T3=Q zwgAG>8k3rv$Y^%RdudRn_r#PgB7eXW92q%j?*f^<(;uE?pfNQb#plPIS8(n7muwf~ zendM75555+qcUQ{i%>S8aiV5Ao~g=A;qWiY>Jd6ftV?&k*J}Tg-z_rq7?7zdg^Pk+ zs4(vfN~u_vXv};##Y{{TPQbEf`p5`25(ffo3M)7n1#I31$r=c3RmmQZ(SDyk{o$d~ zE zP~2h+p&5sT(E2>ry&!a>$>>*!(IN$rQTDZIeyxP8SZysRVW(Iab} zWu98km0)kVV2Txmyb1|rpl!vdTJ6TaW?3RtxicccWo~{gB^Z<$cqWVpfnW2W4emEW z(B;&;w(r1>5|^BgND2qcJs(%`AK?5+{+~Nfr3Gu&@nM(!4KL|W@AScWH;PI)@5WK1#JpZVwXm|XGO!w}s#Fnb+wUDa8fC;f$y3QckY`UL7=2`i?%yvE*DGCSWCqz=|Hr_5R5yxxG)E9x0Ig zF$Bn#KVz|_g@8-;r+=3Y_;*1F--_39QAW0x7J&!rC7|lSY!(qx4WyW@^3$aId#e3^ z&!qdEevXj!H->BEj?Nkm4nP0|LzI8P*~sZpjIC3PoD$^vSO}o4%kD0Y1i9Eu#5=MZ zV)IevQmWUK0=Wh3^;4=N?9$uGQ8B~ZK-ge^-$@SGRnr_FA5~RV$f&1zxLPvtD7Nc9 zGF!k!r3epuwK(2oYGkETOXtzS;mY>re+*v>Lg3oD(3xN)1S9AOkl99p%J25PDANqv zF#oTZdhLsRBF$gh-vS)?|A2*}kdQZ_^cg^QY-L~zqk9xC5FtCoV9AUvd$GdupbAjr zDA(_=W=sLQ>Nx)->DIRQER58zWRQLa2o(rW9rPj>`f%3& z3~7zmB?z9(D{!SU^B^8Z8cVbeG^4{AJalq{RXl@w0yA6T83JsCqqnmQBdBeUAaoCUQCy4(yz%qwVj~CIj|`+;wBz z2&LRXuaWDz!XMKH>_r6j3MR-88QK@jYw->mfidcCdNhMF&oXcvC7f9aGJcqrGXH%5 z?mg6j9Ndh_;wwBu5{oV+fLMr57l?r<_+tf(I>rt0i2KQtV!wU+_DE@ee}72{qw8=Ge2VrekHh((m8dC;yac0QM;ZTR;%GrGWi}$&nE;n6Zho9I#i~$S4!x zsvvi=Sn<~Z0>Xd2Veda>?q*see=&DJx`Wr9pB@=X?VIVdRi=k?Mu;tYlmaLHVSEQ; zHKJs8$XykPsqkCU{!3@5NTCkjDuIOvrj~VmFNta49ZpFDwd1X*vJdLUDorE`Tb7#E z(h)gGsMd7BMSVAQ?Pzm-l?UC+EH05gMv)+g!?lv0-o}O4$$;)_zz#tJ6NJneO;#|k zcV|I|Vw5k9DheyOY33$9Mh_`_20)v=C3&+19$1cH^-^67btEHpCk9sJ-lXw_$W%O3XhRC$M_ZTzqZTW1rMQrh;#tCrYJsL`$&n$ zV4xJnZ7Q*9ES8HLx@R$8Wikv7DY?15J5Q3iSH+tqInTZtJxF(@Hj)Vf_SH$wzPQkY zM_dg*Fh*Yy2&9J(r@+O%%eHY z{fdsKWLh=Vfau|*|J=&_@HZh0A!rggMZJi1)D#fHxR<{&l99~e@sAxG$|s7wMSWi| z9tkE~EN9v75A&HX>u6%YcL(y_KQ@JhI03PIKF~5#=u9;Mdjb&2 zi+Mx%rZ4$^ZUMO@uKuwxgo8W0o;-TlSj@aXgMlE)8II+=K4)&q%8tUqjR+KA=I5W9 zoP34=2Vjq{H-B;zJPl~NXbfnLh%9|aPtW^(?vMCCT;2vigC~KJ7yJ+G-D9s~ zHhJvs>WP?|3OInj0&IYB>cw6c5LEa5nqr}8Wb>!asOlgcr%h2)cJ3`M$J}5NfeJ!4 z!v7|;#uMad=D5uRtAbso<_Ni)t^R&<7%=$2rJF&L^7A#@#+%ALHXB)iF0SDJly{zC zO{H7kcg9g%ac%cTYalgN&8m;+>7;sRAQzKcsL! z9pdSp-)^vD46y^}ZSo8jw7~|G+H&sxaLztL2KDbbZ0?mi)ClgWC9UwIH- z17CgkS`JW8#g)EVwxU^5+l4f*{DI-wYZ4s7KrOL2cH>;^Xnc(=#Kr}~2eBT{{rL|d z+T{I0lC7_u7L1*@nrq^;#*J{QMywSe;GdeohQ!z2&9Usb4zV2je%+=8FuN-Wo4osyaw zOG%I|3KuP~O(nBoAZKvJ6A99jOgB+t0cj4+Lo|*^>p>a>K0)hdeQ;2Wa;}St#?YC# zjqH^IvcbLR39D`;M=8&11eM|>vtMMy>F8U)yuzWf&YxuZ`#?v2-hm>X!;}?Q@tB8` z!fOmsT#}Re+TGXCMhEnH$C*(=;_j?TzK#I@Ha!F&iI-)cfvO?E8!?-H!PX~Qs5H>v`6bfxFdo14N~kp_>vNA47z9PSn7%X5y^mcq};(@5$Yu`t-EWoV}Nke?`&98vC<*d=66R>Ot`8# z&|CP-8zazRrzcgs{y+q9pK1zgX=wp%_ij|<3-f&wm;7*oWDp6(W09gQ^?%W3)zQ`@ zzb#zM(6}c2hLvGwM~6Y$Vc`5p7&xHw=!*Y~s(2_abuNrPxCD|&3ZLl?0n1h_W93W6 zFEtnb*4Fnm5r3wf;R3RsCNFa5`GaNrx3MNj=_*sq%2s7biEbNm29*0`N+J z?>wQ`W|IhmA&~T7V>k%FP@5# zIm6X<<~=8J)gLm7G<$|s_klLm>pVM&mt!%X>V{ z8OkVf2)fqC1ux?`7>>0(P8yDl9eONSW-J802x>U_D7SKUVN8OdWk4J=8-pFp!QLzd zQ%7n6R@!8d(e^m}AW)q8#|XNO65@Hx-2Y3)5!FR3g(cfI~Sf_55# z2s+Q)#^7fO;5k~N$-(_(>659=$+0#FiLsZUhdqwx`I<~ zHJ^Q!4_~#&g-4JXVg8$PBEVpu$lIAT^{I`@OmXtS5TUWE%kBwo!4fhe^S4{{(awhkNpg=`Jfxt7In5W3@)d7Pu!C9DL?p53ulWm`KA<$hwy zq|f8_?1?44Zy54Vm(HE2uSTB_I+peknNFArf~kp+JZ9*00w|{PTT3>oo<;tUdKP;E zy3bp;%Lhlg%MoWZ%*s8ohb!q*bw_O%fZ<+mo_x_QS2Ig97-(r{b~x1dX;w(Ahb3P@ zhB;Alm@+MXF1aLp@Qm?jd?)fPdg$v)W)C_WnY`pBO^y}|gCZsZQvLGB&i0}7jVtQ4 zJF#^&B;?E?-DxY9y?KP`1a+kHKbQ(h?p5%cI-ETT&0w^qwUaaj4qjZ2f1|$t&3}D0 z=~Qp!^=;k*bN=5r0H|vh{?%{)sc*Hc?H`6{zFYe$%gej})i-mCY?U-p=O-g_;x;c1 z`5Tfk0{;XE5c;eAZ%apj{E;*OJV&qN{r!zUqns`1R*`?yMtRU__9FUccfm@=5%t>o z?GxnE^u3F+rkLTd{Cg(8CbL<;l{g`}i)|vBn-57K zgG0xIe}6tAb`OVR+#5H$A-{lbmRKc1&N^fc4GkH!=M5*buiqLGE^I;Tj{?kcbTdyxjot~Y4)i{T@hjy<+1ZtZ6PrYMk#S__K>z!*sk7$GKuvkx z?Djz=T;wW-XPZA})EM)jR{O|pP}9628^AQ~KT|3*P(rZ--w8P$(%*a3&ZNbbSHVA= zSSGuu62hoS|SV#5o~d8Ie%3Kn`pAEv$wGmycK$6 ze2tBqH2Gep-~V1)3x<$uYp13^YwHA1TXQJD*?-6^4+O%+rmG?xOed7*-k1l0A%y=; zo+&mm`J)$+vXlK+AJ>@J-q3;xcxli~dtfOboSmlY92GpecZHh?CF9sl(lAfhRNWWM zS%{$~_s|hk3?4am*~o(9T@QU=P`KarDm_!i*_LDL%FD<{HfKPzgzMUSJ74=1`@zxV z$zvx=tug__=U0JRc+R9+5pkQ|S1`rD&hp@UF6ZZePd%IOY?4w>Go}>l*@NnwtOf?l zNfmKVC=2@BGUqJ4=s;c|>1}a3!>md^EtYnIogbdvoH@It#ZV)P(E0qw*=GJP)G$AF zNo#UDhNK1p>`?3tho8JH$#>;i7FThZyp{;Wn8=TSgW-^4?RQ#+;u0n4ORbwuGN?V& zW*`w|wo(VHzF8mtAtkMN&W-w^n(tU5k-g#!ov#Xj2@Cn>({ds{Y)Z@PWUO1W*0RWrMHS< znBh&n?wo%r=RcECC0y5m1D&HcJ|^j#>#_g;G++H4`2p&|1&=PJPlJSdw(L1z3E~^1 zeF2=%`h77B`~ZyTCXt=x*T*ByS<{=XHUM5n7UgQL)Z)5`>Yjm-b_L13+3FNOZ{DL` zN~Q*m$Ayp(+}AlOWUh8LBO~K{aslYufSv+iH+}-SC^;|1)(1xG0n+WW|Ji(Gz9$%e zKS#nT0^CdknSN%p)XG8T=afjZ8w<3PWlG=~KQOWyC_OpwKK>PIY5DNrYbq-WF88}D z=%5>{>1wlm&Gt2LAjGU0B^}<~|2DW|_Mct+|NU>}{s0=fkxOzeVt898QykPk8WzyC zN)(a`?^2$3WL45|84$tLP3Fx&)eG4o=bgqD%<~KP!{u4iFP#)~J`LgE7=y)&f*=9#d);a7Q8)-D$BoJ^VS zw)A8ajO299nwOo#LNTv>@nxfy+|-&&Y|Juq+c=H=RaWNdxL^ExT-==3J-$u%NR<0|q1J2|-=;+~ zZvV89e1rUh!wxsG3>03jkj!n}M;a9p+h!V#*OkUI-{2e1C3qKF))`H`pwXSmRZI8m zN!63M$~>)KK?NJ27VWY*W zQ)DezvXGXox+lf_XG3Y=;j-Q;AX9Fpc3lBjt^GyOe9CK!=1*F6+I%S)mnNLzBgdiW z5wRFv3J(0jCurDdnG4<#Se5veK#DPYDG#lEbGMmv-sbX81BaIQ6tv<-UF~T@P{n4x zdqIkQA zOodNJUK(13$SPhA9L3h7bd3rL{ z1}>QfUr6?f$HV>3vIIu>u_zfUYk3sixQ{=dyjyP)*-<>Rl-WpN;Dk@-#=pbd%1u;3 zI}77;buE^c4VC9g#%G%EG`Ky6xkT|SFxAOSJyz1}vVNK+j@;#k@1UGcsw;Np7(&b#e*M}=eAT-#<-voHLR(k94qFB!M`88NHLy&+9NzwOjvB}Dc^j3w*(SZ! z$>r%KIZ-I3PZ}Bm!Q#}d$##p4_|J~8xGT$(l(aiTeGJQ`=l@vfn_jb#F&cHx#281d zTV%aw&vzZvj?=#Pz9;X6=dy%dptg@S3bVx_!D5ioU43vZt5prXDPW-JTi^nY1 zduhn)cB})E7hrmc9eMY`%JodPjoov$CC*+P+7*}y&>@`DE7s{&`FQyYe25|qj*sh9 z`FJE?gKs#H-I-fS?fs&SLeXwLh5ls;$cD%L*3U**Whf>~YD1+`W=9V*;xM(IzwO*e z5MUNS69f8NQ{#1e#Q3Xh6%5qWu9#MPj#Ad)f=maFvUlyYhEMJz?Iq`e5U>r05PT={ zY;$ziZ&6YieT26!PTJ8DTg}E9DJf`ZDi)aZ|ImzJ-&8H8OCe&{N{F(&_|`l68AV9K z`~xF-A~F}$=&>=4Ma;DphRLhaC{9z&_a8s{jIhivFePR;dFWJ_8IM9Zz|%DwRQ82> zCe+sOMnYGIms+(lz9Zl|Sa;r}br;K=ZJ0JD-|iR3+2yX$xlGI`GTSN8mrKM~RL|3X zG_wFXTFzjlE>t6VXMfQK`6U;3x__y~qE~{gTXQ!hR#rM?njmwN_Z2jIP4C2BjheDf zalH&D&klP1KAXgJF~~+CJg&m&o}=_;*qPijdrEQ7hcGCywgBAV$TK6Sw>h7P=gNk% z#D$2sT8pYK`jcq*lw`tuvb?1HFJMKX*X<@bK2UUBR@ee3AC=bTM_FA2tCz0^D~h8n zsy7B*rI`Q5Y|MjxWxFU%rvEqlmp#5&#T3nOLuCGlU_i;MYLE!O`|@%;cLx>55t=*F z+@g(5+4YKAzx8%8V?-)@s_?{a?dL(3TLtE+C1+^cG50=E0P$`2?F%HXIh1-29v^_q zj9;xJ(r~x;A_M8}__gSs*rOSlQn#wL2)l6EuZJJqaCQs}m^$LnQyPn6@6YLprz!j< za9!FrVMslV2|VmfHJ*7mA}bAvQj!Ffw$~> z+aXTVb@q9_-aO<6ux|$DeWb~l;!U;xqWp%Qmg{M48sE^Bb!>@J1j0( znVzA#l=qu0x16mf!IOJL2%$BYL0u9h^BQ-RcTXNbY{Pokw}^jmrd{%i+D;ioXf6as zeF*`8h>S;x7i0qNZ0&Y*sA!Z2-$70HnrdRKelU?9)CqTQaP-o)kaPj?`n$1??|{_* zOkn+g^jmK&{duW1DX6-u<$$m5@lp(vzdVKw=p6S*o}D;aAgjr-;;Zedm*W?oavRyS zkxd4}w%V0#mO$C&k|hZk>BpO`iZ^Preg+8VGqsXjpc#<!dv!hWLF=PxZdsvP zxxdjp(oJ3Btv>~>HJNW8_X1;AW_8enh_2;GL)Qg_}dl$aoik?y6oCZzkgwBS*tGN zWq+e*&En@~`5T(W>VhE4hw~R=61r!`UueU#prxGCMG;es6dM89yOkjb&yJZH7VozX zVLHwAe~4XeGZPTi^}Wh17IOhOGCjMjKw)u&4C%B{QR?7qyNcjq6a!|;a;*%xrrnoE z1R+Y;N?E#XR^d2E!kOh_OiW#%WJ2jY=zV-3Pk?Y)SxRfFw#Qd8OgD#7X&simU$O}k ztavikwkFOkJb}D(UL+LR{l9Tfa<9Xskn%CEpK<|yb z%cMqs@~)iOIKvItCbOF!ze=7RLYtlAbcCqF6C_>QTRWvKC+4o)xaId{{bn_ZG!=^P zQXiZ4>vslir3*HSg}h)<98;`<#-iudnoVrEV}&l}KBd$H)By4W%;gCtY2xILTO{(G z9V!@4%}`SUgPL-~&e%&+$%f&=yG0(qIrl{3NbXKur)g?Kp-3=zf>Z9a=H_d(DS zW{09il11yfqvVbxD5jM)p55zRGO=cs@-E$WRZAkyq?Qj)jt)IJ23P}UGJhzH4yw0n zFTkb~RtJjie>}l_V9)#iXa|Ts%no$j^;Rcysx-s_n7VHaF)|0PPY_l2Cx4I&vp#G{p!F-iaeM|p}i^0f+VJ;eAR^MA{7~hUf+n)w> zh%sR>=|pTNdh`MV6sAw#d=>!&pErXCTY{uBricm=D+SU5939lkdQBS;liLVrnqB$~ zzKbZf-|0#iTIkJ|ml#9Ku;9lgs3Jh!{H34?MzMCMmKb@AaslO7un~1lx=N72_QfSF-e(t>6VS4+W?n1q(M(FE1yW)@S&9g@Z(#V-pv60ZT`MAxOH1}X9w(ma~ltK zkz#Rj)1Mh_edt51gJ#ui4Qe}LO7xfO^nbb8e|5bktt7}8veHbS7PmFrPDwMYzg#oD z{Lwx7k}B9bM2~mY!bil`bjC!SAJR1_Dk+ZHH)|V*jx}sXbcqXgjzbeuA6Y9<>z#z+ z7MqccdbWm3uQA?w{w!jxr?2)TC@k+@Q$y0t3O?O=FdV#OyJ8_AAnBj9XV8gf_yQd@ z%R_=3DvPA=X_y+F`_&ig=$vy}g}w=g!@oUhZ<;9NF6$rY)g8RbvX5A=)2Uuc{bJ)| z3R4)pNbC2EX-CC2v$4V$QHj`DHBOdY4wP0&XB&K^m@Lrevl@k5ZUhYnzRMnI_(uU_ z@tD_)%qc|;D#R?BLMOi&*m64}_$~f?P?)!mPk2_=r-6aW%F3{tgnpmdy~IoCj9N^lB3VLA*FFw0(l*lnVV+3&PuyJ2b3Y6J5D3U-^fXYjp#seSEaJ3C4sJw-vVrNw4Te&sQ3yZO^Uu;)9 zAkoki_0WebPq)Mm zw+dv!g$ix$!6Ns)bY*BcT7ZM_{lF+b{i`78Eb8@*2I$7x&9J_L``(FQCsZ~pt=&-8 zG3lSxqc|&->?wL5IhbRcDU0iflJtJaQj!lH%($2=@U{waSqxXb4(*mqoC)0Kv$IT_ zH42b{pfk^m2oIPrpCCrr%~aU;QZ;NEUyZo=Q;d*}OY7w|xnBguX2i_6SF^j4cVcUC zv0Jt5!Qceh(W-p@r{;o=&uqS_n}>nW4lJtR_ALgm8xVgJ41(Ks+NeR zFZ%UML6MR>1F+!~eh~zeOWoDxRGOcFEhzbap?;!mA_I)N(-f*5Wa#spDGU z3Fh>CdOyuNEHay*mGr@ibE_<_HH|RnnIE%xeQVGbp`_E%d85PA&_le>1J6Q4qFrlO z!Jy`liFaRU{Z2CxW_RXVTxvObOq4^VXYFw!B#RgsBjQ~TIFn&jR?QX;zqz@Wl1F1YlWBeEWsWBJj=nNkCOvK(k4cYPWYD_ot+aYV;7X+7 zI7P6x_gGy+_g3`nI=j7Lw=`%1U8VKSmuoph_9!QjQ8bFKc-wOX<~lSTM5Q+9W4wZ7mwpdC{~$5n#h%3)AK*U6)o} zdv&9DlP<~!DQE7Cq`u!{4>sRzV+;O50eO70dc@yf?>A4@&M&v|J)0Wz{s=8dMZ5Sli6wZCTqbg1 z?BgTW7>b_5IMlM(w#gCOTmjKko*bhE9Ko4htrr(dK@$AH!&{6=he+0th5;bg-KOZ98*t1i7d(5%nP=ag3FOAMZl+T8U$4nc->{a?L;C>flNRi zplitg`cJtJq_-!%{+56LU%uB5P9$3L+j40a9^aH9M%4`By43^kv@=3>r~GEIdz;(n zz;r8t0AeUIenpCf&ek_ zno^0AIi3)fg&{*e~y@EJqFwi!ipU__DEJ#qQ-16{S z|DA|a*G?q5O0iV7i(~(D6kl4E{cEYy_BBE@==cV8lj#gjFUXbf@>n=b zEJMbnZqy}v!6f+6%(8<2Y$UwDAFi~=Q&>wt8FfXri$1iOoABPdws zqp4Fuq@c@$;J8b5){re~y#^Ji-qxefjCD`a#-j2dMgkCus)7Z(^5Cq6TAati zYguGLr0DXY_ihR{LPF?m(?y&>3v5>+k&z4QeFnt0fC_ghUBafT%Md?QuNKo zai}G~GY-WHamRcpCBiEB4Trm4q!Nr~*^ zn{_>80{RM3`+JWeo5c%fb2krHP5;I@y)#h8>^)rSvV5H%^C7XhAmhoBj5M!dO?hl$ zBhL6Wfz5breR5*QV5vhDWmnw!$bGnYcIl3ZV_e{T-vLP3{=%$yj=& z!hNZ)8~fzwbtamRjIC`6b?s-EeiS)RguQhYmDf~jz_070-W;*v0~f)4uGx0kp^UC( zaV1p7ZL9Avn-3J>yfU*yk<412vaUdwZ9eQmInrKOwXeEw=uU<1nQMO#CX6;7sFxUt z)8iQE_Z#0y9AJzaDR?kku5*h$-zv*Ogs2TwOZ{9C6Ukjz7SmxEw^}zuoBQPlZl9PuT?ut@#>I4jtKjOCkMqHdziOPd>sSE(3jidh}P9 z&>ODr9aGYG!0lOlqs;yTgX-HLYii(20Dr>&;*%fYezh diff --git a/docs/images/mqc_fastqc_quality.png b/docs/images/mqc_fastqc_quality.png deleted file mode 100755 index a4b89bf56ab2ba88cab87841916eb680a816deae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55769 zcmeFZRal$t)-Fn+z*nS{Vx>rm6qiDAOL2F1cMtAuDNvx0;#Q!zyE_zjcbDMqmSlzR zn{)pEI@tSUUwdu2)&Y>bJb7fuJ?=5a1EER^lGqq;F_4guu%)HMRFIHRN0E?_z5hZ+ zJaJ}X&O!Wm=At4gf>b&}x`%l4+)`Lx7zwEYjQMDcig^FRNlM!V3F)=#)7P^V3xFpQ z(!7JTn6R3s!6EcTteK|QPPjx@DDOv5T2*CXB}Z%z@|SP-DsObzPh`FaVcdV&m0)j; zcZ>LN@}*RhsyUw6to^1IV&KrBgSL*D84<+V=b92tLUGmkCzrla{Dr!*h^X~IGAQjM zyD9lfz=>mTe@ql{QdCq_QdAt=(BA&2YBUsY=dfzD{{p(Xxaz)h;YCF8?Ul%1e}5}@ zO@0yZuh)nND%kn8|Na%lH#NLM=KqYOnC|MbCw}whr}=*yP7H-Y`-r9qwQ2rq9Dz|0 zBdN65Kl4A$DgS>m=QkV7|7=EzGh^Yu&HaDh$NCi3wnS$c$@$FVUp#HFss7?l0LJ~{ z!`SL7tNPPP=8^Kq8)3(i@(qbit!IaRj$Duu3h(VXaI4Sdu3~_@H&ak|A1shtFJP;$ z&Ff|ziaT$FS{aiU@Te#m;Cp!+I*IbJ@XxAqIeeeH<$>FQ&-YdyTH@a_&X?%>7*prF zp2!e%;=M(CLssc(k6U1h(+Z6N7fk4b1$pU zx+k}@k}uu*?&UWT+g}Y#gV?3_XQkIe!hs%Suq9Q))|Tlh`Wr-J#)v6)bNt9IQZ-?zd%Hw*=ZrCzD^f-D3r^0KBi$+ip$`A6Mk<3rtrZFNxAf zKk90T99Gb#t7ndaGJ(*jcpaOR-2zFV|0MH`0H4>cX|8kH-A>yB@PzO5QPgAAeG<9~ z(7IdVikhJ^RFhx&6*~Cd*30U>;FKs>ES%nYuI$%8RM=1({ChUX}X7!Wu zAA=&In$O5ezi+pM8LtJ8`oW`oa28+E!&*f>9{W97;k4XXkIS^H4+UAGvZx7D{UOIK zH$}ZEkpj2NC%)GxA>My-R{)`xdTyO1fcg{J)!T^@lJhkw=vrQzj&$^Qa(I7Cu2xl- zg5af(2k=sEQGeBmBNF1c9B_MFCIG7eR|`T^)>Jws({-d$>S9rNoIs$o1qKW1U(s7gPai5(qrX(&Um zwy;AI@AZ}{%d9#&PBP>zwc8=%jgWWGH2jQp`DWYPw4k^T`^Nvelzg_m4tOygvshAx zSic)*_56B2$iwR{sdtKA-$NW8Cffewvz4#abf1JwCg*y2X*Lu~6edkmydt&um&!Yh;0Fgz!I z8S zXW#cIlDgIR7Kgd*mV>IL1+VdR*KujmVe6Bnrwi2`nyj5h(N`umHB#h26X zt}BBFa)TAfq5C^R?mPC5nk4!GljuO$+PG#|*B4a_2>^!?m-qb{I`I10^!40&Ah?Xo z5pt;rAZdrM_}>Q86li@(J8)D#f?(9Br`@U}FA1>Jx%%}~}bmH|q8K|Y!jaNAu?dYM~6 zRZJc^eBV;Y!Mnx?kn&2<<#2q|Pp)+P>ZBPmqA2KkX?Et2s&9LqBzZimIWVsmGYatA zRXt~RY=fjB;A5x~rSrZ2e#S!_7>vCGqC{9lj*|V8LTb}g!H@mpp{+Rn_v>x&(6H+J z7}nKf@B4Ld%Z-a7|M0=og<;D>XSx@Y&lV$4Ekin}o2SXK^<>^M{r+%K-I&?XE$nJSn(xJK4qrH|bnqfPU>4jm=e=x!oc#?Jke&g(g- zUucQtw<$SVY?d~P}!t-c2Lo8mx6d`@70 zvP5TBSUX%%C7-WOwciMN4WbKqP5B%ow3f{Z-jx6kgNKYV|^tpbL^<*qZ-A^30n?FBY*Hn_q~jp%0Mg-<>UCF!!;rL{!Y{b z*3Cv>f1?;licgf`G`bG-zLl-3R|wc#Q538g0z$S#C86oCbHSjNy?ANChiOIVH2rMI zG5nGlT3Axtm$CYA3AoOV^jpuMy|ROZ?T(T^1UI_*!$t2I@DM>^@!2%tQ*2Px;zGGh z02fo5-BK-N3cz|cST76mXYkO_egPK}#MwY7cUixalk{5k7n=LGIBj3hTJKhyeXzl~ zGo3fkBcT7$3Q6oSx65M@pbZ+YC;(b=HY>1%!!mZp6Fqznq0rpI#0pXZU|dVnIlk9-%u>~`h}VhYjz zmPod{6t5ndj-zKD=!WOo(!>9dq!*2ld8_8dca!LG1x9m|yPCUXkoxbbV)V`B^QlP* z2QLUMxOI2m3%(x6c>7K);Oa-%C(!K#N~N9Ef%3qRq9J)~x4KpV>itdW?%7A43LDIa z8X^^jrZk!ojDyDSMXww70zLApJntoe%=xcBD#D>RDy64nfaU_M6Z)d7V4v3O7+UfM zI23&xL2-PqOi$oj<6nQBorePGYWBHH+x}3PF;m>1({p~`Te}(*tYP8JcKw|ZaIa3W z5|KeaW+a1}*~V9jOh9(L$~YKYYcNd}*`l$FOU6yA(HR-(cSZ&9*~&v1R}oErionDF zkmE|SIb~(H=VJ$DZ4b&-CQ)fO@a_a4)*zSnmv493+6k&S(%z0p_QJ>psX^O_V9lhrb>BAr9 z#!w93wGILaXkvaRP39@H;n)|GB8ih{1e-l>kB{FBn1qGHL%+#NzbvY3$Xf&5Ir5z2 zPG9!I*3-qPiSN%$8O#PHBV)1VD}P1)O~7Dhj2?72@pBcduzphsN8H)`k=p3Wh%;_$ zOeXLMp7o@Qaw@rwstN}`?{)X08s5C`DQlRw*eDrX7{@P}7d8#NUz6uvKJSkcQF?Ne z6pViyWiT|=e=Doa?LjcWpUG)555Bnx)chgcgWJ97&2EQZf!xal z)p2nI02nbGF^RF>u>$hlk&33=WQ-^JoI>Si0u8 zV07Zbz#>r^qAXD{lBu!00RKml^p=Cv64=~UMF`M+kogAK za9tvbFb_5Czmu~*!Wcf7X4}nlOhFn>z@2UYs5e8zXiDYQ=Ox))S3>&zy2o(u2h5!JvYvSsLq$lAJ%%c;J%Lb@e5mEkCW z?eZ|Dux0i&Si?wGLD+e^#G`KKbCx{u6gsr?6jUM?pE*3wAGiPuHc1MIvY4|WVosn|)%172v_ zuJ9qyLTdW=-$|n#8!G@V$$7Z3oifYzxs!m`vv;S}RV*&e|L#YrvkJalcR(jP&|ivp zdX?VXKmoSP&tSH<4&P*Xc=vJz77}8-1B8!d0cW#BxWLd8o=iJfUfU`0+(QVsx$4{8 zM%dD+!cq1`U^-K(q~!|)T~eLAZia5FB+I+)`mCM=ATeKEa>FyeeU0P0N(2$?H5_a% z1c?1K;t}s!d86fx%Dsml&FIN>)%>u!tJSay-_BD*KV3b8rOY0MRDF}8&W3rMO8Cvd zq4No{`UQOiAyeW&=;8TZg&{D6<%2^Z z!|qE6iY8+BPguq9y#O>n~H+h-giBAsF%%~f&;2z zHSJ9+elB|j$&@GebI=dtreMMQ&ghri{%!G?7SS%=%2G0KqHH#RkD(za3ny=Hi$(=p zLGvS3B|d!WGOoC}J8#If=~Y0uQMxBB0Dao47Ri8W79ysyRyY66Fcmx+Tm-DB zhy25cx=95+#qc?ToUlOnSSf2{HM2o=*VzYQSjU+-RrVoQq-g{FF4Zg zE~D2d*8doXY~?Q)$%+d%R^R5T*Ja|j(efj$qMbfNU$|`D4f(?#^kdi{t)k*vJRUdL zlxcwb4m#}66CTp`2n9CPSQhv#x;!Mn5l~6yO6GGaT9+UCvj-#Cg^PfUgy(9?6bFXL zpNb`ZMW&HB#=RloUUl{4T*WAYN0#{>9S=giO>#Fy+5dV^K*r~FnE~_`y9;cG`R|Z< zoOm=C`0i!|j9q)!?A~%82Uz7BM!4{L-9s2&lDz;lp6G%f*Hh2|EjuF*ZTdWkb~fij z6_P^E5528|&KH1y9o-vpP$5xCn_I}+iK{MC;6&BY+8Fs=m!-n;b%SD?b{UHjMD=vl z=|HehRp36=l!l{Nb=j)%E)c-p>$yu+7f<0NCv?~F0Cqtaf)`7bVV&u>BhZse9N&i(A3$x{)K4e9C)`q;|M{`52%Ol-Fg#F@RhIVC{{nI!7gqddBASWD!btp-(BBw zy3b`l5s_nR2<)6q^Y+vd*eWbZ{zSIO{;S}l*pU8|lJn$|PvBuKUqx7+=-R09e`&ej zfx{|HP3Z%AGj5jsR!`dCO19@yQ~>yvW;*!(X7#4zWHpB}1(BEfJf?t!{10!5-z-JJ zQX-eGqE>l9_7%!}cZXT{YORv&H@6?!P^VBI%uu6V6=U2bfK z-nUhXzIRgAtSRD^1sRqBr@J>`*yP8cp7G0o-9a4q`1%ZFqkHR25(W(nc!>F8Rev?+ z2p#E#0X>$-*t{U__3WWm|LRC(^ku5R)_I#q+`)twhDXu$zH2tK)}SV;F#zE0@2 zg?0JR?v@D90Hrb{11&%10Dztc$r&o2>~^QX>Hg!vk;( z#!o$oW+d2aJ3E!HTRLmi#ku04&fiTkl>~TQ=DSMO6nU&V@0^f&T|`G#xX*^A`Jd~q zJ}%Ne)$q(Ccl0IwAN0|Wt_{zb<)PfG{R#-xbxpIXTB^TSg|zin6u zSh5q{v1O+fzBxjo@#?QW1SARF$04v2_)CFv*=aWK_yOuc#x(QJ=Ett;&FUqs;sfxq zCIB|&O^N=5HrZJJV02Sr(xjsQLk19jeTIiI@V|PQ~{$B-zwT*x3pGviT$60%8 zCF!>divF-$D){m87X$&aRcy6G_WdbycC+L(o9?%>1B5-W24q|AHU&J)RiTV0+o^D# zT@WW6EHpXfOd)pp&5q{s?`;3C`S)0Y*FJT?+vbC9;6s04-B?QK(}F_(bAgv9`a9z3 z6M28iWc~@r|2+7AU-9?vZT>GSHUD2*%^6Xwe{?i5`rX!MSZEWDhZAtQj+cwo7%6a? zSLc=zv`#AoZy(3i_dRGaga;nDKI!IPS|BN(j!XSr`)E`qYOKB0Wf*X2oba7V#{I5) zk=%1laIo%)G5j-l9>dPfyf>2it=GmbYZG{h1;(^o*K*Rh-V5gQHTu_th|#qnsfD#z z@N=S0eaEKKL8ivW8}}v!0nvu1qUJx#E)FXw=}JTjohk=?^dIb7E2n>IU)7z^yXKN5>F_agCUG}=!;#J&CZeBX*c`T6-#zh=YC zndemokzv74zo3(!G~OKC6xP?%!8h!~ZNg_vh8nM8JRn4`F)hCQXDep(R~_D}48xI{ zy4B6+;dRhGlsf5MLde2Kp_-kt&0xj4>3R zhquhEz2pj?@1^q#2>W9fj)Lo|e>Qu;f1NoyY^u>Q{MwRUOwH>_4=8z=h;cgr9=^=* z?xGoVzo&BQKig6XySlGE%#IRELH|3M`R8%$1||7_>z7ob{BH;Pi(>l!kOxD5aw~vz80WD^z{{}CSKKBaMsdz*X zg6)>mlPEl1p-B3iKpQu{PzB-uPdhWO{u5Cs7TY70bf2c^q^bito#+l%nrww;wH*q9 z9^AY$9%^s&xgT$p@9X{}TC>IZXEuYUIBot@Zd+L=dt8Ib>xM9s`UCq}w*sdfH-c>$0J>4`lZ*J!KJWf!Y{KJ18 zO*eu+eRMMb1qB7s`&Lme!UCS%p^vnj9Q2HvZ-t@@!T%j}87W(a>}+UdXigJcB$4Fw!o$e+tk>*3^i~SJOF4C(3^hQo`+k zUHc7b-*l>D~O}$@DWtwNsB+WB=I-1wY3B z)aL(26^f6bcMLQ!gU#$v8OoT`dO;}%ZkQ@+oL)F*{Gtk~zA0_h*@O(Wo!zyFkK)04I`B2uMsXC_I zU!z7c!RhYhJk8D~`gE!0=iP>pQ1&?a zB!)_?vR+2ekCH#{3X(;%F)T=$KuNw;e-z^P__rCKy7~zHo4Nd6PA>hsiCK;Rkg$~!x* z1oZ}mhF_&o*#{n_Gl6O4`E5MaZ`8*?L(y-2KH65;x&P}1M}c~Nt(r)Z&EUbuGWgb` zq7h*-WJ2sQ%Gao%mg#yU&%gCFZGLyHw3wSiqxS1=ra7 zhfVM<(E_q=xL(ERoMH|F6v6KtK8Lk~#`=qi2h8)gZN zpyUxJ+PA&F!GFW~&t>#~6y)_7(HpW8GA#0Jj)JnO8cp|o$d$>=w7`eLBf~3W4w@?I z3W{(h>8dd`6ru&FGa6{(H&J8WF#<6i9@Pa!~XE?j?N_|er(s~ zoQnPL+2qvYPfp!VWX_=|XJ`LT_K`)B)Hpg6`5Jj1h*XuWGaakV^^5GAL8 z1<+W`_)7+Y9;rgWz7UMAb3^H0$qF~P}9YX$|(l68N)eOTs+-Qe#c_pox#H>9Hd=PVCb?037 zc_zYv+uwJQsXssy&e|r6osX(3gtZO%F+;}1ED_{DN(OKVGEW(OEgOHy`z;Y7edqUg zys_WA|GWh3p==edvj;U(>@0s)K za$RXeodzH`gT9(d)4eY`^}kKtGx+twpn!(!VK&>E+`yXpuh(v|Wpi(xTH=d7h;v5M zR!OVLI0!YPL@|EdV)~92GWb13R$pt`GEOT?Qb3x8FL#*Qs?^3PjDp30bwiH;|K&TnmI{XS_VTuIA^Xnk) zsnw>~BEwGBj$xwjGp_8r=GxpTbLY>4v$JC!E~~?Hz8N?^Ndu^6cq%-o7f>+JKkXTPIu#nTp1%Bf8oJEn+~#k zN$lGfo=h(}gTm<=NmRx#HWubhurWa9!z_j0mirhQKozcX)o-MCKS+U+)JmbYr=O&@ zqxm_+j`#c2m5$2FzBZCB1j*|si#Xvy3^!Fg04#vUxMh?he_JB87X1Pu^@Js}Al%lvRC}tTS?07wM`*eC|2fyacbu0nu1^PZ>k4AuS6p2pa8h}3!lXb z7r_gjW1#8@siJi4P7|_X)OLVfrXKQ1D=O4MjItz#=B=8o?40SD-1vq-P6EOgSr>U~Z9S?C>u(HvJCbLw4qC ztop8mY8GXcZ~_~n((s%NJy11JVUEbad`sQH;>i#eZ%GutbswFi`1%Pt)KH$zcr%DNDbV>DfG#DbOi8HOuFJpN&gT2;Iw>eOv}O#o z4R?4w{O&%K5Vb8@eB}{yeS>?T6RABQWkJM`{;QZIfGnGhyGq@IV*-6knvpw|-p9>L z8_Al3s`00QS`2aOB3S!KJ6PoClJHk*^e<9Ad|2h$i@?&-W7MU;?%kal^yz-r<+G^1 z3ePEaFu4kt4B8S>_b4Tog*3~bz8YIp2aKD9eM`&~kMoKBWiRy9>3*ex{3JikcJ}Fb z%F|>X-1Il#2ykyN?PknmKS5VQ>R)oG6|@i!HKt@e_*{`e6InENts%!y^}F{k;`8W< zOrqN3znhy>Y9D=`Y^b~%VAL%YTfa)04G_FL@T75=u?EDHHkKYcahGyN8oqe$#fkN- zL8ZX;gEHG~1>0NUj1-Y$rY3Fo=O%*5W=W@_?&iwRXu`HWXo{>Xyp@Hhxe!iZ?z&aD z4#nffwZ_Qzzrns#X;7I)Zjo{zoMhLa+xqy$Lg_DE<4d}V4`)a2&!Cd8UrIb`$7hQ~ z=rk3pL_>uShe-#nDQLLow4nimpL(^LXX95){J{Vs+#}lAx7hhMZKMAmM z@F@}Uj3|<`r$;{V-DHE@vA-qpGrh)EZ5nLHWL(KsXXqLi6M2tSeldQ*-*^A#+2(TN zh$e0D&p8p<0o2}CZ?Hhg*9_EEM8poNPOG1Aa2MN4ah2O+F;TTtw>uGr!H)Gh>J2rH zXFLlZh85r9yE4=+UxGnHePi3;6^A7(&UUa7E_@yVU?4Y_-Fl<@d%Quv-C`T%DQ|3``&(L^MPUn-q&sCZ zIsW1CvgOQcUB>3?@6N76^$4n~f@AH|@$r9Ikk}0E6n$%+>4bIhw}NC?o0k^zHGQCq zxp%a2gBW2V&eD+hK-KcNgv_rD{9j9$3M3nTudV&qOyVhqdTQ*bNTlgAZR#YREPi=I zfkqQU1+uZ!r~ zapTZw$fVK7r9vJg-B@Ml62+w5DO-4xdbOHw%~CT+&0R2hKK6+*aN;}#xCcXC8`-rj z#;6lm-Bt>#;*zI)V_WakvCNkFRBe|M;i6nIt8_Sqf)GD$y4Ebet;_EQ-h36+-}Hwi z*G}Fgdp~G<3==(#xp-|EIBy&Mupf-xtXVY1eM0f9a^eqffibJ*| zFeh(6S1byR5ldEw}h82UX3!s5W0g3eUd%q+f2x+?Q9?AJ$OF(NzRM^O0ul)+F&srRw4rpP9NNM zC+6g5Exi}AgJU;t`_6WH(mrCoZ3b*c%ri})d9Ihd2^NoS7gwNk za5jd{cQ*6X&O$wBl|Mpu%G zfG|V3AiCEMp;(0hIdu;xI$DRF-Q+5CzoEklgGPL8%wa`qXo-C(ae{e2;oprIn(;Y@Rg$=FML#BVB8#k+Rsl+tItuyeq~L*%@f2v&d2@{8TD zM4U=vKs?;y0D1T4AlMAjt@pZ4y~b5b@2%c%N=e{S-}#nshr*)&pdIT`hWpYx&!zQe zjQd!}?*!y1TmKrsOhSFkV0&vQpSUeJ3^??Yn_vhJE!C@OqdrT8p(8U?oK zh4%j8J@{vmM&n5g*a{t_Z9=H#&%@^O?8k?dY_{BgDp+AGs7eel>=}gdqYj%0RVi$( zsT+LAc6Q%axVf$PzQhzC+57B3hfK@;tUU~41cfVo{!Kj}NUffe)J3ZeQ!*z(w z>Yf&dPaI1$fq6}(4-q#NuR(Tjuk+8QT?>!Z%}?WO-j#B?w@`gzPQ`$y$X_?XzFGTR zq4hP-)!S%(Z9A9kK-iSIk7=8q-+i=TuFWi-ym*_>eUoPt=U@$W&Du0xolIbxFcuds z4|Sb9PnETL$71WkID^fx}bZ->Qs>AzZ!# z)c%0bGRnt2(({R^w`7S zQ7`JPVihS~JElzLcg&Jdd}{iZFO;O*+4PfZg117qLHd0iCL@#g)Gf`g%DXKUr@=Yy zaQwqceMb;fi5;K|T|B z`ANT$P7xM#`E`EtzTje-z>i*~rOcq&w0y=+5+UNB=7_ZR+xavh$!gMiy9+D2V)I5) zXmTO4S339dDqho((|)vpY7L~`^o1fNL?K(C>SAW7+0tP}5O6WnD~RdrArPuwYBrFn z0t9YDTYbmUanM0m#&K`|H1tT-76<{b^1V|*ZWLDqsJ;U0k+kIi?txp3rqAApczcKB zo-dSweIHV#%4W#2=aTn${B1Sv+UK<<0kN}qKR$ZB4bCuBx0k6_9x~vVoKV+ z&(}WQ=Jfd5nXXxN3SCvQlpXd}JoI-|b2eC!WgJd}PGeu$0!A_7d^#zIInYxi2_?*Ae@&^G z$PDnH`PPs*7BM*M79tWQTA8;<+CjnjahNS z)TAw}dr@;mwFV9luiSC7%1XKG3xtoE5sB2~ygqfPHmK?D`3S&-UbuAZDCpu%&f(5$ zZ=tm6>C+h!4NRlD7~_9!xK|Rw7kh7$EdN8&O|Q*;*ZCaD z4jJd=S~Xv{DiBm!zi9n!b0}i$`%OoeZgb9z_M07f<{%w$=I`(F7_&6GM`$zITB8MB8N6Ln8`vU|&v^H% zzlI7CK3Iehb#r8caRv?DU*F)1A3F@2*T^{A{zQd`>S=|uUQsZ&KA$%6(}JuU$Osz{88r^rp+Wi2e{`0T9QV1?p4 za~L#5T~1-Vhe|5^Tiu~ICc2J`73V*Tefm#B~4=bveHUwyMjMBL|;cX%8)=8 zoFo#i&)!T+)w-21=sR3;km9s1*flcnP%RDC*F=Tm+O94aEg_pD%leF8vta2*Az+P5 zADCIRacf?WQ5yN&B7R1q%5=w5DPM1NI*8FkNSjOkOD-biO1n=>Yb5tgEnr6RP3U8p z5Y3K}dS=;@c)-P$KCeSaK>{xIyvtA`@hFg}FUHmS*FTS48)2aw_y`Ge$ znPdOp^4YsOOpB;eHiXpO*`L}sIyT{J3b~>{{`Hm*>q&-6fwqLN*}Hm*SJZr0npYDr z?=PMOu;BO2GP-?w@jR;0&XjsqFWugHNL(Ya_7gUH7>j4_c5%P9E#H1=OZjV-#{l0u_)~I>-0fUVyiYkdf9XWUa zM1Xd3e6i;hJ1jx+30m4J7u2Est`0T%J8*(f$K%%KjgCZsHvMO3bvqCnPh3H|?xQma z4rSbdWu=z(`9a-Vy*y?Xf&ekh=h1@{dte9L4d-_~uQ60YMb*`Oc8Afv+%Yp?VF6=U zBVxaZSM8}7nHB{T5Ec5;B(df4+%q?_-G3OE5S=3EkUl8VV4L_ckv;LF(c9jrKJ0u# zcUAY~BU|YBk+VVlfiscRFj_~_Mj8R6yWmfL^BTYEytrmUr|}&luY{yq2gBhj`^c5Z z^S(cSkrU0?2?&(}>)0c{^rSVWrQMSY%$yc?UR!hrcSNmq+0&B!svJ0?5C~GA8}c>6 zj3N{*t4OCfKpu_^evK+tV7fprL3p;sL9(|iBI7Pia)v6MwpCc}&x=Mz?g403Xl<e;viOll%5G z0F13z2bFa2Hzg%Djq*8s(f={4DAR z_VYbC*mT3k8^YwXI%jshm2GBx>{5ieUdx1_gq9OvdT$5b@dmgLq=((RU{ZK6<-f+T zm}DK>i(S6*_7hf2xOTX|1-7HO4%Lop@E&^79{! z@9zg?%&B$Nbb{u$4&`iUl7ECne{W^Zt*<`qAxIkdiPu5@9OKNSobC�)v~C(0C)c zgd3@mu<_@wnt>uVJydQ~oz|jKOy0;^`Z?+o2D0^+hp!@j_=nH5zG^AYBuV|wimv<8 zJ-BGiO^XI}T+0%OK+mPa+&L+!)PYa5H}wL${$XzJBCc;XV=Co{g^!)F^tz?jpNo4b zH_VuCMYaCaZVyd48bC?#x#Q0K4CK%<=X&Zv)V@IQ!g5ZVK?zTp+C(vj*rq zre0*ZTR%sn9`4BUqa`iQwuwP$!iTu9y z*^Aa8nvPt{NV`}cy5l$vTGknczicBgdPa#+$B~_lxB0^l39bW-wL`u?WXo>LbCrxs zHO}TPn@o1wSYvVPGZi62B3}9ADk9<9rEQFD-?ViCJHyk~ulRlQ*z07+ zmqT0+dAd*&o$#ah@3U!@BqPvJ}Ns=MjBuIqf9PCEedGznEA@4tG^@#xdHP z5}hhW*p9vTm8p^F2zoA2iJy%YoUT99TiNM^!6xPDkXY%@^R6F7n4GGx+4V!RemOu` z=Bso5M|O}5LA6BSOdLB#UmR7s1}UL!yoSsl_4aP{66T2X(LM*|9)bk2fjUQG@;XV5 za7g2iD)Klhxr?NUp}g%l7S(du@pSRzjsod24a*3J?<_x#8}8QdV|kf7grum zMHRS^M;MRa{Q64RKHpz0W`#~YUyQ#oG(l?D10Z|E)=~C)c9e1bRQzl_KE8L*d#S4H zGq*7)2eRPeh6YhjH3bvBj1tQl|SyY`C6lvas01T(9PNZJK6 zP3wxPDqmT-KbA4>ntJkBD=r{uh>P2dKe_5iem*i@&Qi7(JIJESfjBKGU&VlMgWXOZ z+grrgAg-ko&vt-qp3qk_{Jyj{S5C8tp_aWI-lcFeqdCorB>t+{;r}X*a{YZ_D7jsx@3ZLF5~Y0 zEmA^FHl-=O@oYTk=b{3)f#6wrVMR^aAFkWt`K!X;*hkOEJ}h?qih1@jUzl5Auc6L~ zxmKdYX`}A(wIiw@Nvhre3EN-J<9T?KI85Pa#lXhN0pxf~!g)YyRJC$%aOPVO z1|N}Vm(EBijEx+5zwlamO7S~iGl_`D(3_AYNv=Tp-B zLfLb!LWW&-P|dCrm$Sp?uU4-Z9Z(L)Y`Z^8vKv;BwSQutkP{9P7Ks==4@J%CYWj*9 zM}5&B_xX$_jmo8fH#TZaygRjP#vD;JIFLu_3CL=zp!gk|koyVmeEXBMat*taN>zb& zg&Kq-YKy~J*#7QCz^h^O!Y`}mn!;bvx)sw2>M`%V$C^-PmWPOs%LdR>R9a zjk<;fPnjUHaeQF}hq2MN56#UAxS3c@3Q9#gOvfR69IJ)f)#IIsnP!H1MzFJ+M~v3H zm2atRwZuz(u=p#QW$W$iOXDKnfSyYt`5~>Wm|Mz|({I|E$#NdL=fer>#3u1y5dSj4 zhbTlcNm<$ZXDm5+&{w;^Vnmq)aShdk!HJ)q1*3!J?c7eue z4Ayl-cd=DH3Kr87G6hlUw+4yt%YStriba0x#%6h8yWB{-wpg`bEXk>vAuT`8CMCZ= z-ET)=GS~U_weHAuj!N8$QxriRCC_$2*OZ)z1s7+y0Y=tKL9QtIwdQO;E))*V`;X)q z!yVh(pIlUb7qE?K#Tiudee6%#>#9!n7viM7$pyuCMEsl%le^k_Q@40@a~s%d)S`(E zEoa4Rt!`>1A*l{oFdqaZ%8$Gp!HH!0fyIoqj-0fBJZJCd=cuTUbI%~>YWI-?Xf_iU z;p(r4yd|!ntJP(HtQYRCvJmF3CM-fcN?4UOu~xNlO#K4l9UutOL;i*TcD40HZNfNZ z48=KpV`9#O&p~l1lqXnxeu_{R(_Fy18x?Do2vyIpfsMNi==h3*DeaW9KFeGKVIEUk zFA=1Sbsa>aOw&?cN(-LAsQGLQI*QKv_J(QxZW9@`w79A$t3iTm_8RU}= zPk1~jn1_ubHVP*Y=ty%DSKZCk_LL+S4BZt3ps?hcWV7U@v&+g|tce!uuT zoaf$auXWTi2^OKA6T^5VDK+&=LRZ zh}nwN4f|Wi2H;M29qxDsS1;ds?$L2%vs&=*`}(}x?fu@t5*h?7mkz7o7{o ziz|$({9mgQP|Q^QNr%LsNmqXDY%h(Z4D5=5G#s8mXc;bGXjqNhviHGjue>Uo%4SRF z*bqwj7Nod}m)P&L4UmIEG5T06`^F6ydHyGsz7w|bSdf}FmmV{OAIoAn zvSLZ+%SiQOM*3+%Bp+W1Lg$l}=r{Uk#**4isDECH=%jX5K&c!$Byp5BG?w8J;=YkIeXoqkj znKUFjOl-m^nECRn!;La!Lg$gJIgh_m;Fm}zxFr*;hzA!C9k~v(P>w8rpF(hXh1ovr zzA%Rm`6u4?vDUSNLT~;c9KJVF;WP;$)M+Y!vNGWDe8gda@!UuX;bF}B<-Nf*2T4sj z3>#r!`)cWpK08bL@-hHE@LQROyQGIdK{mv!k;3mAV~Y*& zSx9%5c6=H`R2c<5TZom~S)T3I8*R!KE9Z zGy!Hum?_Ifj#-ah^FhR$lt)QpLd z4Z=r(dZzP@l^;2su|VZMmnmOEH~2N&6&pO_5y1FY{2%~AEy}vnB0qX?;I+BeKcB&f z|5-n=5l=bT!BIq+;RyxX6beD)7x>UAtobc61SA?P_ozwGiB-Aj_c@!Lx0)r0&$Q*; z7-Q3p>Q8fJ@t8ETi=ab%YjAt}qA~>G@Vs;N-`I%rADs}msjm0>eWY*01Gn@It7Gr) zvfk|JHY~V9eI(H5^?}anqY4?%?)Xku8F<& z>_)a|3WD-J7>6{IyHJ7Ny`sr%kPEeFA5=8sz8I;*LW|uf$ijVCB$3K8y`x{FJORg-`CT zC}*oRScJZ^5!az4e_~k*L8Kie5o|%0U=n+}6MSoXJV^q{avZhx_N7Rh6~0qzf$Y&r zdu6)*)REIY#^T(0%7wuvlqQEMvE;#rG+58^o-`ukh`jLP##HQy1~6-E4c@rB3Pqh8 zDUnBX7mjDFaBO-{#bn&eWY$}&K#}-hW>rwhHS7<%)64c=7yoZj1-pKq1+iGlPBJuV zKWWI?fcdcbKl5WJrm2fffh~(~uvkVjp*vVr(~|$L=|8=URvWRpUf6Lsh5vzbQvm?> zx`zl(i*xr!4lxhdG3~Y`Q1gGiOqdro9<4s_DQ8>s)cb318F(RE9jSx=U_oa)!&<@6 zW>xI-V$Y4~$-l&cpIC)?eD<+JdcA$LeW$*9XCE(FnjzJSg_7=*jN^W1@WeUBcjDH4 zDPL7o!srDPfz9aXRG;qPXHjo@CM^=WfXt`E4qzoma*pJ40+uSL4biBj23qPqe)@#A-O+O882J9sS zx^ICqC-ENXg873a)hiL?Yz@}dc-2eO3P(wUqi2Mlig-`}Xn^2<>c-!c)nYA2ANpSM zuX$`hTok?gLtX^Ds38~f)saMV)hGjY49J#-6JXcd)fmPuT>MU&!;gXb^H(>&Zpei{ zD6$?;nhRf>Cl)J|l?%H+@7`H_THjT#q2NZFv}4$jI?{y^AFw)t(<3NOQOC{@uK$`a zoPZm>!1K=HBz(h-CC8)qCeFF)q=Y?4W0+Y>aYM_;Ck3GXj6bx#QiT@aGiN1BTVkl{ z$_soMv^o*z|IS*ibD=5ke1x4mH+90p^=6jL+vCqdmy>bpw>AThce8)=@3y`C^n)S` z2As*5mQq-ZofZMgl3aFv4EY~!kc=DVgPk4%_|XB9(t z&pkSvEgC-Fd2cJ<#I~D^+)wy<2|Dc}KteTsyumg~<4T`RTwO73uT1x6b7?Nz2m-zv zqyOe#?uynui^nat&s)saS#K051fD3HM8_dfRsv_4@!qD$rGwLBE5@Z2j9$ta(Iy%Q zyI?(ek&`*!o}zI)2_mMe+s^6{Ncvh8eAY-1@6{vYFcn>k8*Sfm zy$cr$g*55TbyE3$Y-}MsJmS0A>(>=$`3LA|Pq1!y36T*z%Y;3sBPxQ9<3LzLbMRC2 z^lI6cc)`I^f-xhbbhyc!6GZwVIRv`9)wSdf+(mLG-yGJyMG40l%UHu-3#%X;qlpQ4 zI#_zNF=lp0{;4(>6BbnpqPK82Py0fT!H1JSM(`6+d>88_BgyPd;`e|gGv!)&v8f|h zKFe}=GlJEsk%FxPR7!jXRBNR>!wcL`rav1Gca&M6@ZFqE% z`4Mh^%VfTB>88(OnS}XjA%!~1TgzdO3p7|7|926;mpc4??7wq26+B<|^nJ2fDzywu zFo?l1EdtXHOpk5ff@z1DS-<$rG(ZFiXuFs|}Y34Kpxiz9w9v)SYh`Qlsa!LK_OFPk$W_-wQcU; zqnMAG5Q$Prs$WQkS8`znPLX==kuQ7CiAW{Rl1k9zUL&)gL2Ky%RI6%ljx`3Lym78HOG_r#NWZ`h;UmT; z8Q;NB(OjT-ypxw`C{7rz=Ah6?Ilf*d)0!r@p+-^-rj8xi z_6SQ&${Rp@207;QK;#<376gviKcGm_O;|y6$pBqF&Tj(sX+L)PBhju%zN5&)Py{q84S1 z!u8GCK6^gp(|xu;h?PPKnUh7Lmhp+RzfjWm!UtOhw9(KveIW^uIn_ z_4XfElclN`*ZUd3r=6|g_*_mCYn{^noi)emliSaY^fz<49-|%;zdlvkVbJWlK+ewK zY*{HA(P$@!lXVkSTpg#-w&~WQVm=nA@QV~tjbwOd-7zb2C?(IOw{6?D(sBB$ncUFf zOE(5xIKJ9Pt&il#NG9BsH`1^QjnQt{9LJsje&!xuc&TL(@ zAuXdsJ#S?ulhXa4ohB~W21ju2HEmn9;Ale><}Dj~ZAt1pw2jd+HpPP}W)J-w1RDseHl7A;l`H-f zBR?QsBau>#e*U!E>9Dp@ArRa{F&#eiGa?C9X0D*u+HD^SnppyBly#h5H*jF%%7=!sw59c9vD zehhfcSO<-^K!2XtS}}-6ld)lbeq<@ttMA$#^BVn6O>T$3LxpcObE-NtEn)SH3DAgsjf%Hy@L@o z>)9|}Njhf6u=~m;LtCH0meC4`1j`X@*Usz5Oj(WAi)jVKP9?vMg6!#`W_aJeyzA9E z8Et=&jhAK;rplBlx~kENNni)V)@4o#6iK~r3DI>TTeDky--t|0k4HK@%pgO9xQ%UD zyh!gX7B7xtM3{)5K!6}U%CGpooZ#bwfJBA8TNJ|w2h=#+HMy)2qAkKu)x~cv^MTR5 zgRFZprT~ARVEa$0VJl_teYh6S_m})2e(B2S7D%gA2}!UY_BEL%&Tpl&tiC2nrB;xd z>BKo49MIQG#xbHH@XVM6HDxXHxI_x8HLWh^aO2<0Q|I4KOH9SCksvdzy{{R;Q_qkt zt6QqxbuiwIc%>4LsbH_z77CuZ(N3Eh{Hjl*tq**sjUxsbL00hB%O`K$_t@x|s{n4T zNd=a$$ae5z7;Rcbu!eQO`0qOBG$j8>tyuBKRunfzdwqI*M)DkXw4BTY9#k;h5lpSc zQ`n|Bngm4zP!!TzK$%?Z-G;AmCHO7HG zJ4a(MJnx8jrjb>P`5nQ+l}d5)GCk*Icu;gi*^oOINvafMb|ZIakvKmN9Bc9!zuX@| z8c!6fcJBtgI}cj%Z*hu}cIGcMT*eEDaRt3viG8Pz`YPlFCsx%E3 ze|0qp+oBM@_a-zIsY9^~(nq26QCP#uvzBLITT-Fz1pxTVGcnL9>X6Hfuvh0pCi`ERa%Md2+UxG~gfM-;9Wc)ekf>K{tXe9Mtf!(RFbeqz0o?=Tkh6Nvrj3gQ`mk*o^N zm!-*o=#C|``9cYa3e9*JN%R@qkelPrEPd#e)szjS?u45l-g~tSiv;RefFk~@$ll69Yelw0B?`5LzC;tmCJSyx_+HqT%Gc-2 zhqa7V;q8X$f6QtH%hylOT@X$Mzo#h71A{SUK$?cZ-d!_6boCTtWx6T|zRb+Ik5lZx zC5dG%G$-g=G*YM6F_`aAlH>GIDIqE;_y7oJh498JT}+&LXR4d;+c`H(r3h&!=?z9x z4Q9TKSxmY$n+qmpaZ(L5^RA7HmY@KNAqINP#5>dVozR%cDNn*ch4az#C??EvxggEz zsSOE4zWxw3&F#htFngbgdsT{RM~3V7uK!%; zSN!T%2CcRzG~5cBOfItKldRJy+p^9QA@i?}dZ znE+cDmfM=j?ciR(FH$XL?toJf-0P#?``x(7+V%+5_T&Q}4ryu>>On>|O2>w&hEpt* z5)Q%Yc&uncx(~56ht=CiOPu^_jEY%zk8Kpx8pu5Vbwy1^yuRo6Z{#hTke{V6p)&Tv=g`ZHv@IDp| z9-YRIOoK7?Vhu_H48|kcl8_9){<@Y7i_RF`qbV6-7s>n$_Pk7Q+O8Ny@3HclM47Ac z6zq|t>*>*jzQ1Q3l^j2@k0ZK+I`N0qp{^YV!oBYzZE5 zSvR>;F(^9oMiSA@_%a>wFdl#lN12STlFn`{Qmaf}rDn#9RS6j!Q3~}X zj=UMxLXAIWT*~kt-mDJCc)Cpz=ibFBQnyK#3pFG)Am4l|0PbQn#eT`Vij|AEU5G%h z$?8@IdZ=eNwR^{eh9<;Pjkqg_&CZ`Hvor z^fGvd$l6WXOdtBDp6J#m__((+#YK7r9MVZZf^jwc^VldYv>MnCwxEHmjCA-@!jTj?aPs5l^liizJ(^&FE1FpZ{Ym2#`r~ z3$WnCaEA?+aPxO%`B{1|`gSd*Ka{eb%NZ?ZKVE^@Xr40xBKY^cL=YK*9#^7FK>)h( zQSI76fgkV{B@bpHxC!faVCy9_0+fD8)Zyl>Oz5wZTeI&x21V>$btPM->8wm90k^yf zdoyGD<+a&Jz#pF3h!1alyPUX(tHDr~S87UyD+l>$24NU?oQO9D4|DnM<<{P-5v z0EfE~)@KAjemmaKTCM0`k3tG8krF!R2_~LbrBR2%teCVPh=veVmQB9mWCw` zRBgo9P5Zjdo9INN96~`85TLimeAWEwn27-7gW?#U5e%o(cE$*1-b}L?*H}@0i!8#D z>Uo|PP&r6F`v|C&?si$#j^150fj%x~5ONvfry{1>s%V^z?BIVI6%;awoqIAAE+1r% zr%okZN!tCI+p9joS~>M{6SzZ;3?!2Dhs9X!)6EG?W`;1=K2r-_=(Wi~M!Bb|OgmT_ z`2VC)SopD@PttM9_!%^JN0ir>nt%q^UFnwBe^6%XTT+3YDSb?Ycreb%B%%D&Nya3+ z2w8xJsD7FRj?pAvgW`tTb`Y4^yWJDg1&-?3wn>%6BsC2_CNkshL&e|3s0g6 zCp}stZhun&7%~}K)l7`s*HIU=ZT@Ig^~ciyxVAo{|#log(TGcqhFz2n>YD}PfA{!SqL*%27i3L zVt~5xwo(|dpyWNbTT%Xq90l-OjX0{cQ19gm4a+43;MeNTZ=^*pQErF466HVSl3n+B>}KhjI4M{vNuAyFoXS1WABDQ=ro#C9LHsinW@c$u zat7*s0VfDf|5M;;M0)rQl0tU8yk)AY$&F5i9w5cuIvS^~N4`8Er&8j=LloSD zIB@a!n7j^ZL*-A|ES~z_uESM3XAG>{e-s_b5@Y`0H<8?2V(vtNLcG>P#L70QDc=)3S59YTUZanCyxMgJ9IkJd@Js*GAR@QbFvEkyRt*ihX00jFbI`A{T@Hi7a>$ z9dv>9Zj5Nb)QrZRk2L02K06WlI?fU!y<7-R6wIRSDQm0??g)lKHj%zN!@_9%(a0V@-q0Y8JIgQw0k zW7KL3JY)7Dk5n5?r)jU5j0mN7vF}HdGu<)aLXMCHNd@t)OBd>dOcSQhVqu3=2eTsJ zgNs889adQocnYQEJQ%-no23VQ4pIz4bPKzPwc4-DLBR#uam?%N00hJ1njr|mOjTE{ zuR*ca{PW6n35vM9iK!*t8#DOOToBZaHj4?8k)~387a3NBLhj#R<;uK?z!bpJAS{wMPPYv6QFvJ; z1pm(5kCd0#WeWoFpwEhy?MR{TpwFJvXUtWgmeSGOP~>%i;$uC8L4s7CRaGSMz)fV7 zUH@X6>SJwD$y@wy2ft<@D9oe0{#fa=1O4+V;?Bu0XBj9@M&lTPmY1jKr%$u)t-%0H z3-xW%={G`|GW$M+@#1R2?cK`Es+e7a%3W&Y1={ajI{pp38a*BZf*cLMk@lcca%YXg zlb1((z53>tdl)5ewLO~{@W(aPGbV;*m_@yq z!qTY3JAN1dwSq6%J#P}Te0+5klVk5cW$!ppnl4pN5rBxnk}NjD;mr^O8WxI(tuyk`0_N-ZINriG=?|u0V*1~khV8VY1|dGfHsb!! z+(Ui-?Et=|dkl0Y1P6cph=LaS8TfA9T!yz?PpqW;y^36HLg)!o#r+qiEHMP~Vi977 z$7(}MP96Xy$AJ4j@)5S$ z2snd)MC1dM)y=FAI%aa~((I9!l;V~J2~%)Ps1pnWdtN_h)#4y1#Z|)Fy9R6MzFoTe zsG`5SF9Og>19#F$6A!2U5?$CmJUloKIWH2K!Pd!8Gl`-1B`tWbEj% zwiRkjD6ZDTM|sd?csJIOZSX&P3A_*kqq5%5i_x!yzuk!p2uJdXg!FMp@@_6aB7IoK zTfZ~n1_C0XsCgX-MJnqGCJnx&_GY%K+A@wwo}wu?zoJ5#%SCTshjddm*NlVOA60_o!t^8= zI0W__5IW`8Nk&UmI_i37>*#cFxlw+_lofMOq0LpPidbt%JRf+;51US0iZ2wkzhXBU z{sXo$ZRM!4y-fB)6GIa>mYK;(pHg%hKn`sr{vXS;Aw-_P)O1OwGV)Fmp4(3wz9Z;JL^LazLgBqs3c>31Ete zkvJ1G`mg2RFVoXBnbHFFXWG}DO5nA2ddz$^Q8rNcLw=sroH}ESu(vXg%7D4dr20c9 zVNbh2>kz^V5OkSK&mtMk#;7y~;;>bHPfBU~h1=K)Dez%9_oT_M9oq@hXPaCI-KAEa zu{h^qo^D~8_;yJU*(bQ2%Oy5pYPXS<8wW+^w*v_EnVFo=7Mxz0CO69%AvIkDua;ml zz0U!d&tone{&(zC2X!Ary4j(iv_c8}woL+hqX_34lAb%E5GR|RK3+PiU)tc&EO!lKt<)6Q?q{01?$TSpi z38`d+Wo9~JQFS7;L2m6=S4)!eGXEzn&)k-^*? zd1y`4oT}4%G%!z%}xCXHc>M$mhmTVAT336kckoBel%Bj z)&g8&jvAf@O!Xhv1y`%@vuHDzBU2eIKJHE-d^ihaG#+dinEZ??qTvKcSlIFl81&S% zoHEM=3Op{yn%GAlOe-^MQu7mA{UvC{^itXKzvVGn(In#i#7D#%-g`5-t%^txqr;ss zRa0U@3P+4G!CJk))@m4Yv!C;=t6-d2%gT=&k-LlU|HZLBjegiyu>*aHJ!<&T@twR$ z^k4HAr3$u8`D~&vUEwT~q%_-kU^k{QgYV^l6xU@aP~?)2R7Ni$;PRB>bq>wO4x z2Q47emNCk?Js?qGe-5jolGaEsMPNIPaN$dtXL$dp|N+K@#;;e$!}L;e9} z9|)HU8%z}N04-t!fy*cV-| z&}2yI^chFepYwSOh4h{7N6VIfD{fU8et0cv8q!pPWz}4dDhN9|6I4wEbU6S->l0aK z?`%!J%XqGI<%f9I^uH^v<41c29XWsR#SV7|oO?9xCy>;&NqxDJX*3)v0PF5mQe}Es z@{;McY=s=QsWN-j8l0i~VYxwu_RW_Ls(MO$M{F8D_^*6~WTdgNv!&mSpEEAgV7HKY zTz%Wg9D9(mFuZm&NL&x$k&5rqgW!Yx@a3u(zOIv;Ue;XgsP!R%QYvY);a(757zH9- zc4Ud;32BE97bj;-a`!?>KVi0llNL>XV{9ku{Qmt2^8w^JR*d2BdNFU}#jr1+?>tXidnE0BuK=S-> z=h>P=fbRnz5T;}T#2o|*n;igrz#sHq*Bq9%ys)H0F?pyPCv1_YM@pkxZGk0jT@WbQ z5KDokY=z2KTuDMU4aqZi^4=l86&mO^S~CWqFJ#i%2anIL^fydaUH znXJV@%IYSNofgsOQP}Cg&4d09K3VJd-5y#GZ}o0}XOvHnK&sdphlZ&~#{|6}+ePr)l?$_|NKwLRKN(BdZ3 zo#DJ@U=>sU752Y!1jPp&lbVL#t1ET51sA7t1e0$u;%X|Ct*=X&mew+NwOB)Prz=`#`&@WnIu3xwe)a~C4 zL3v7x3@n3V8V#$U@_G!`_`vmnCMluP{oO7rK%lLl3x8yU+u<%d=vI7RcD(rIYmub< zT~sKdn`Pe^#RKp{qrZlIH+Iz?rGH+&5V9Psbt{^s~I1Ml@4D2Us9a; zf4SJtwo@OBo~(qNojBF^%Gy!d?!UHHei#89mXzm%#QE2`WDj{{{~$+0LOqi*%6P%0 z%3*@i?u*OGyVk3B*A@ywsLuGBl2XYGDBy!kJtwQF*UaS`^K4pW=iof1FET}khs3Pk z`NJ&y!b>98;h~${_Too$)x{x$R6!8lWcpKg1iM0@TPL@5L~j{1C5nuVnU4R5xHDw3 zqy^a<2LKeQ&$;g-_YXS^u5A2l7-&=BGi7NvGn(RPbh&U4IM@v9x)hMm*~+kBFCBdP zu4W6LX$?j_MX-4Jo@9aOZxENUak7i;55J?NPMBy`KM7T5ki?o8-nY?+u$qaWER8=g zX0`0P5AGVR99*~Hw`{`*p!!-^knJK}Mz1=QZU%3}(R)yvgcrj?|fbhq#uk$67 zMp4}MhtDq#SrBar_6ynA{zL$l`8iMX#AmJRP2+R3}^5MRaqpmbj8GW4!Z$hLkza1`zr z@k1u&zx9zVlB`!`#B2Lg5tCAMDrTA+UfcW6Nk5kMr}E;uAB)ID3+Z}V$xKiXWLCGu zb&@@Pb=!WfDCLy2e{fUTg0SW%7c@zmHGmJkn5=1dILIl&6ZLKPV0MRz{m^T^tnU0UCMJ`aMmWMX6AQLqmL;?q?P zsbsx@f@LdX-&7D>Q*qjpw6tK(m1T$qYAVZXr#d;VCrG*3N1uYBJ$*>h8d-xGYpn=o zUXj?>QLCMN@Z(K7T^8!Pfq%bg=|gHJDV*VtQ|Rre}=?E(~;cSh>N0a!&!`UV$bA_ zrNERQ=kmQr#)YKfW1eZN?^ZaROvEf+Yg$8b;+I~$(Pc$u*9{X-G#3IEkEt*`$QSVIog6J# zA`y-Qp5M6VpbaKYFu}LMRK3jUvBOu0mF2z1`>m?1rp5!TB?KT<)b`${2^}{Z=Kap0 z{@V3UP2Cu&xngy8UO?MRAL3Ui;OO2=NV3gbgfYwkP86@NxCxSNd?D*Z;Zxl1p2TPq zrfV*YYx>zPG-*J6HTk{i<}%v5b&p^5)+`-ncA=7+ncNZE0?ZkE3V~-}!vX1E{LVMpgh3KmU##d}~-$~?0L z!|)PA9W6o#giPgsU|Bd3WY?@A&mz2kBdC8gH59E4D;y?C1g*@8X)44>)LvUB+KSRrZn=Pa@>glXfFN%iKv9F#NG)hABKjwmrQf`7$ zE^WH##}=w5_T5xu{lMbWSxb-&^K6pkh!Q&d0xdri^MFOgdH#*LE+|n)iWM|pweW{VTV9CFXr9w? zT@lQL5&`5YX#i=(c#8(v!80ed^u*m4}!_GKMeCmXy@wwvgds+K#6l{NU|Do5{(O1B!Z{bv(e>!|OAEauS zFeCzQ!T5<^)IA>Yesp68z2Lp{xE_t0@12s0l`&0uW2#aSd@}jt+iIPR$@|wAI{##s zO~&Eqz$0ku7AcgPbRy%=czUPh9_h?#Y7j1-_uwi+$vayFT~X+LPFx#MV3UgN7xq*W zdRE@0<>|@hX2qG>alJKa2Lf$fQ{-%T4DfS`J5Uf9P!LYt8I`KK-+Y^67+c?upqH?A zbu+jCX>IsTy&Mr$c#Z{Qw{IN)7_C$@ll$C^JjFaM4UaBV3d+sjB%0sMUs6dF*N}-xms`V{CaT%m*h#p@O z>BQbq6`f=qyyS0ry8-B=tf6jBpPis4XrLe+l{eb)ECZnKA49`I8v$CsCnT;z#CU*a z3rJ6pN9ZOU#7HD0wcJsit~-$nq-<+5xq1!z^C_`6szx(sQ!bfJfwoLDM^!hV!6YSJ z+0L#W|7eCMNd}#2)Rrn)R4P|t<_mHSDlSf8mDcyxcR%pilbomaJVaG_erwu*dH6n; zqfkc$7&t{y139)h%fUV|pyCnKR07)+)&mzNl~E!yFB_feQ(|~4lV8CVewB`IK~pJV z&M*5ev^{b(giYFsq`_n9ZtN>{C@9!j#P?p^RxU&>uHm3yb=kO%=F>&qmOf-m(WdU_ z|GyTDdlZ_dFE9Y<2rhwQ#LPA(L4NcFlH`}C(gvI9b*L6E0yhqi4ydqdDEI}QbYJ#w z6s3BOr4oJ1EEBU=s*~`r&>xDG?ao@fK z-5cUhSAgf=s%@m1wL)&1?g>1;v`GxC45skT;j)yN7-vDMotdI z3OSDKnsivlGMbhGKdZ2B)r5|NC4od58dXW%bW&>Fm^=Eey|!iZb?s;alW-ume{ME6 z^-@gBV6DY|joezuIF0uoWhvV7FGr*jd;7XXF#8r@)E{3E0EdqiKw}A+tfszOT1xAM zI@Yp=1WjEk8mu1Q_};EU1QG6i8p@7^)KpTH<|>_KzF@VKS?)}5?*^>Muh{Dbomv}C zZ)MM%Wl3xss_PQ69Hptk8=e64H@5$<)w6K{ka$v-q*jkReP%Hpze^vX@;;S^oiF#p zP^ZC<|BZbn$a_rk_ND!%!^nzsbP&HxMfr4&>`&zRfbmN4n7}mH0brX_P`(N#XNl#< zmlf3~Eab19m+!$p{M;v`C0hYbGa_hx+LXnSpxzr-XRM%bQN=*EL!~-s>=JoHgqoiD zmVUtXU2Q0#koE<;u(ea_d7+7=)KNo`nZe3H+js%Zapby%dzMdg8Q?dPc>0LC=XW%$ zA&94IY=F+HD-W#y=xdOp2alN6y9Fl0=p-sQ1-ZEslOzb)HC zFhk+y8%GUGuIY{$8=Ly=tk*N+t09D{jR&g)Q+MN9*#U%VFjBCoYKH{i_rn4lrfa>o z|Ip`>IH&N+O+v3&tywmNYXlqo#0uK=MYXTRWm&c7fih5AWF1K^{7`h}&tQ%WMSXlH zROqnOkl9@Ep_(hq0c+Lm%78cqD5!7Hhd0}Sm(MfNEQPfILeGVu3nP>A1{j(9C!*9% ze%Y-f92R*nz*5!ps^FtUL*f%R2QFQZ?qg>85EhKo2PkKZ?fG5MUQ(OS#3l1T7ru+F zj{*hHy1JjQSmy((?D|kgxB4pGy3VpoV$y(Rb%Ou@QQXk+LK+jk1>2b~=1%HZh4Dy`vziB=x^Yls~C#>020lv-;?LpQ~-2kH;EQQ~}+TdG)vi3@3};f$5i3CQ3^ zYuR*OoV=rykE7K;8F2*>kUmk|ppqG+Wg5r&D9;dTq!bzT=#>%e^-IZIqXezVLBrT& z@UWkNe@2~93z#=99oN6=eT_z!x91M{2FA`8&61U;EHu_+{`Z+zQ}A4Ix8FtM{{Ptf z%BU*4w@*+36#)eWk$R*XrKLqWr8}j&J5&UuyG!Xt>KwYeI}aeufkSuCMxXyXGi%M4 zS!>pOdOykWu6^(O>iAtNOJpgMtw<0u=ihwTrl^KTyoGbW!|`F5VD^;|{;*Ck`6BwK z;R!>C7GoQZuIm}L!o>aW6XTd5)NV}ssjS7%Bne6|c$O3=(!|DcO2obc5h<%vtQa7IKA^Y(eaz^nI_J}jXD6Qbc0+zw*m zGAIlpF_r2+duF^JU?lZXDB#CXv2-iSNV9zV=2n^iF}4MD^%w0|x+=}D5%*+(Z+p)n zGcHG)kIj}gk@-va5Iz_UmCi7B(sM-TG9gZ}QMBu+aG7*L>S^TK`ae}ldtf4`t3`*4 zS+Go=c!Y$kP>Ok=f!pk;I~OzWHnjn_M&IKy?9^)CuV?9YyHgdXu4(;7Bd5 zQBNYajdS@nDLd2>L`LZ_uqL%P^s?e#6x`!(UOu7E#8ZB2dT(B!9;#i)q>$wuuwA^h z1As!TH~iTQ%?dE+i+}q5Ts+rXiQ4Zbt;Os7rw1K@bJs%jRGxR}QP$xyB(hl|UGzI{ z_&}Bl{<|`5m=#psfJY=E?{IQ)LLo3%Td_LJuKal7>!>LA_aF(-0WAGk`b#2n8oQuR zBXSrK%_V)B-RXe|Lo6jl_-`$PR(VcOtlCKd8NuQV~m%VsU#5A;sxAif^%f2W!v zV6na%<#KXl>0(A?!t>d|Xs6GdrDS?=5%hQbgnWqO&}rE3oN3R2{281Vn#d2EoVz@B zFNsQTDcvkO^}5C)G@p3%M-UpQ=)qV!vgOej0_~u zxVm?()qPlQu+IR^jSYtx)EOOxcHyV4N>Mx8W1m86nCC2Aq}jL3u;Zzt0>tq%$*_Zg z&GV8S1T?JU?YpbxzgXO#7f|@|2zNjV06!N&KF*F8sq|(Fg7m&tlTDpz=v;hi6_F}?!{@{|?Ly{}xL_P%Q^5Mf!3Uv<6(a-(z0BoMwi+9SaqTkg#>?mqAtcx z7Vh2pH*2+T)_C~?zp_=^DTZ1|e#lm#W1_Vlgs`z7dTFc5)y!=)yBXI-q93sE$jN)W zci(K*?77VK`%s(xh#R+Q~3K z_SwGZ*lrDT=#Mw+#TV5Lh&{A|&l%X$hAv(%Jbc;)oh`WA`CHg`HO0zn^yJ?xXia%> zY$BfiLyFS#=9dCN5Pa)_=e%*kN9L;KaGTbp9fi%{(1NmOTlM$WOpd2na~su$2FzP8YrqpiD@lmitMf1)uah)UIlDowLgx;4CIVWA`=~L--eODx>>w0 zq42Eoza~BAJ$%bJ8Q@=ev~=X5hW6KsUuq+grCk-ylG{ChyStG|2W^?vp5IkS1!|R| zJSPJ+XDyG$!`L6Bm17Q=bH6bt)CN0vhdsU=$w}W%*ORs^itINANY8Cb2CVGrJspQ` zb)d7%O^4T_1pw(B^m`ENeE5N!-7XZc0m)L83yNq5Ii!L#^uAxITrXC#pbdEI`eu*v z#E0BJaTx@Uo~e9t8hIOS_`46)_Yv|b{mzas8ou{kUhRy)ro0!yLl7r4i6TRolRV}n zz-b$y`%$$Iokcs&O|=MfK(P&vM=x10xL%c2mnubaFlTN1%ctRr)FX*W-I!^U`wo+i zI-^egAkap=9LUdqa}}h(l>NB8Yf;Z7cl&ARwr@Ayo=ud*FQ^{V<~}t`@2c&7K7)kz zyBVdYim}v8y6~A}!9RB7>w@1h#(aCtmq=hdK;2j1FUGnr_YR@HWSDx=ZKq)<6Hr6Q_OlXKN8P8$@+TzJM)aIEAUWv3 zRqdt7&kapo0e$O~MVW5fCL9lD+K$`%mK__~j;r%g3SKioa1-)p~6CIl7WCx&<1X52k`&E#vUN_LjxZ=#tYs}e7C}f@Xbwd?wN6I)TQcH2O z@5phbWfo`MPTKAqrfOkfq9=v|)5=zU=+cfCgud1f%5fmbfuHk`W((P-W)v1iwI)-# zTTw^evY{)a)4mqLo2YoA7YM3Gxm#068=i-tQ=<$RvO;o68E$ctQBJ1Sa@yiRVIdk} zL=b9xV0Un+?$XP$2Q1o(0S4>|1Npxj?(l%Ge|wek#Dct)dyLE%#oYoGJE@PoZ|C<; z@)J&;GVmBE7WbN<@i=`{Eg{7Dbq{hzio)Y-6WX=!z)WCDZV)D?Ctnk;_MI}L>ZwtX zq3*g$rM9E=EZfxURP~agWyVx(C)$<#uvSu-H&`7L~=IWbY`erWU!GmxK~32z&7iUb+4*)M{62<(fbyUL}X z;gLm}Me|4C>eTss;;XQP>xoXUeV5lBizj>0%{g1R)I0IYWtBK63}X;0EhH7hLQ8V% z&Om<@Nl(RSGmZ4NM3d2HhT)ech{7#I(Uv79d#if5Ql5nb4U;ciMlm(CS+y)@o4N&_ z{#9|!`p$5O@O?)9JeGu3iqbtzYq7Wpi&>&;f(%-8*3}2kD_Px)daZ;a znk{{2M~%;IcIhlz@B$u?f|ir$Ee}Uwu6A6X!*;bG+>FQSp%Jg5dz~>OjdfER!Hgc2 zT^048Zs#3gx&VRG(F35LS%gfHvX}iqLC+*XDfZHS&(dK__!}bD{u5%5pkn z7n#LZcQwzs7b~;B)y6MFzNeECGlF>$ce|L_o+43@7eQsrt6(qxD|?McH8|!+ zi~&PUPFv{vaG(@l1+Ui{n-B=zCyWgUsRQv~->GuKGC1xZjYvO^bI=im)K{aT(C@qA z#}k2~RC=rwBn4zh)Cy?h$VQQ>9B05SnMGgDWEh*k-}&|hnc&GufLcy76!=D+pO()y zOV6e(>{dC4K*$4dzk9CM>Y`JxWx|WBFFz^D&<{W;$)#;>9HC)^Y0^bktoQ4W>w!j6(8#7d2(>HFoYbWxPa;=9VaWbohWgh0wIqJUyA;R;LdJ;Q%B>TbjyysI8lR36tBt z*F(=XO&(Q%$)4OFQXseJpCeeXN$>+qW61gL^>!B8eBL!fr#{c7gZUD!vgLgBYtI!S zXjja|Ll6cT2_qA}pijQTowea`BG`{%3k?X@5@b$NY`xD?3ST+0FjMxUZ$JJg8^G?S zw~Ia13HUvWu(o;x88d}GgT)xtGEhbJ3XN_Og2@`3`$~T3kNiRX{E+Q^ne~<{-`lqr z{HS=iS}K7}2@P4>3@Yq8rqv9HtLpvr)HJtwVkF;*rWtefVj9t?7M#iwaZ`?h@=sv4 zwfFU}Ei5Trm~;xVn}N$)fwy;pv`aaXfTUMiW{s*NVx5xmAPT3tJHUh9NSUd%+&HY# zxTMlL&3Kp3e3wt5wzgX|WBPF24sXDiDOohs$f4-v{q{2Yiuo^+g*TFgl8lZVV-vqJ z7Tfl^6QX?fo4Z#GSaGz9l`X#EdP{n1-QLt(U$$Iw`J@aC(U!xf4@(c%m)9e7zU!zC z4}7VdAlTeSKR)(VGCPJQzMyDAKe6#Rvp^scd|8b3jk6U-jeLDjbz0~5vRKWi&9lSw=8yHd5Ypk-r=N=*>&*L`*@5vnFxto1Bx7H98)pfdGR2n=eWjXGX?eq@pEG%q4pLag@G(l6N7amC4vea^al|i&J zo8DR}R@#f7i!z1mpj9l$6W7y3u_#7*Ctk;1O@MHwe38G#PD zXK4WD6J!+7$M8do`F=p4;H%MORtoN>AL4I6m)cIUrudR*Z*#v^Lk%)SC<6O8lf z=qF5psNO-g+DoF4qNl#1s1Lt+F2)K-O6F$0n}TiVFnd0FZQuw7DND&}`x&?2VW+be zzom_~X4GoV_&^Em=ntJ`SqcO3YRfQCKr@#(V3pLi*Rls#8-&yhpP@}JOnGZ{I=Vbv zd}nWmSOJEUkv$!{Z0u}J-TA?XZU4QlmL)iRbc%RTHQM_$e?g0-YfP9o(q!~+csQI$ zK)aoBALEJpAlRWN8Ja5%5zs;@9Z@%L=!8y9IRmRQ-hL{9+*0rKv)e7a!eJVPt$%h8 zvxlwXPV%n=toc+k6kgGB)4uzZ16)oi(Els1D|9?|dNg+I;Kvyr2u66}yDMNz{W9!-8T&0< z9`tLV5LKyQC`jb%NvOiU<7S9Zx%z-+2|nS_vTw@MU-zVdrvN5Yxqn*2m`yO0H5hc< zo?Mjk8+8TMg;C2?Dz5B1Aqd_vuUx41yZq#^ROedQSyiDr%6|oXUUOqQldf`eBe+=* z1TPO#@lWWV%VIh;asl>;g0>-AZY#M92GUD^P`#CM{+3l=v?B??h9y~ zMbgEK3L|ktg{6D<(H}cSKkutKzK<>;y{_P=omYFkncFbMmzW3essXsRB-@|bErFiYvPPVZ!)vc1PQ;Jo_0&@kl0D?z9*FXtQcPj ztMzyy*Xeb2Z>yFNa}rRlp@L4rW1|zNHFNrboj@s2ULkLv-tte{ciH$CTWz48mk9vt z>3;gh*>45~RB=G?or>l4@9C)bya_rZli4?X!4%^{8G0Xra}r?vb}LqHx4`-lEfi1u z*B0crsH33Mi*5^f(#Zkxv0M=zRWJ)NKuSM`p!~TuZ)JF-ZpEN_Mx$H@R^oUJwq&PF zXqpF@7wo>n&Vy0BRkahDEeT^h_1*B*3BF1nqd!9mt0btk=9%&sqL0g78^dK&I$Un0 z)}&%VO>sHP=(L831;_M%{%hVcQo`WDr-<*=OcL+ER{NuA&u}OEo}J0LFz=b4z>`&#jB*MLq2J&h!&9@o{VO zwYu({G*vbgPE=Qxu5zJ}!VmFiJOnOx$?15~i*MoiUoSoRKq;xb{iFVkFColaGzrqN z@>(D)dGes>A7c6{*LM4&*F#VDg(nJR*}x2?IR?4DvV@+1ON zfuGxXg4k8DO-p573F@$PwK^6%qc6$Ol*>RS%d^KeDH`{ncFrpoa#ww_LfVm-dbo)! zN}KX_*Qg-eJhvCZzLrP|Y|~@X&Xq*6>Jb)Mo#-kBQwo)OzFd&Ne^R?l_YJ8F!jZ!` z7u8U~7G8(S~@urM;F z7b4B;``hMIlP^ua4Uc16d>O9n8Jv5w0y1}`4c~8jHO&SJHBd24L8k6Hn4Rr{AV|=S3HYCloaak< z`wC}VdCjdWA7_6SXq0pqgE?Y@A$+F?N4>(LU#-ufDpwli9}@v=&6tBABSl$mx6eSm zYym_5K>|URD$7U9KPr9aJq8;WH-ac_UusZI!9EqfaS+c$7YR^V5$QyFWeg$jR{B*H z4a?hwrRGJqS|j>0NanjXQn4K*Pu6f{_|1i_xjrH?!!ws9Lj9w`_=A z@pXIADP9D)JMFL(*+HgIoweJ3Hw*{pgB4)VKkK zdwNC9X6lE|b^zGsSGab(>>#KT*`tn^kqRQ~OSE#1W7Bc^u#Qo{gLZI!WnNyALdg9t z=FQ>IVr*mnYCcH#iPx>m$foh}*%2;;9_(sg*SPIRPiq)yx{(?5Y%xorkii72G zv$3bKYY4;r{q~+Yw0drlXJiJaPo;(TrJ7Pe-(pJ?vLR0#;$v0IykGro{+7<-2}dv8m)YC4 zsesa{czQQjDu9Ldmh99J%9}1_5ulTe#mTnV;5*2{f=w9Wn*A+_xGPUfk`r4GB;`aEQkpd)ZSj8EYN`#wd6z05IlD;7Z|)jhM^WA ztus>Vv$o>r%7U#>)(htR(8rRRcRmV^{mk*()>Zd;3{J*--*OC~DdMH*YW91nUu$@P zY3I@%DnXG!TGKa7Q{{)wyDpS`Z@6vP-JITVZ3N>4f7*HIjIf4zi!W0YT*=5h%tP6G zevw9YYww^pMsHrTRb!24C}pXeA&L8W{u3Av1j!`P!q8dIANx%jT=QRzea8yLL-H7O zg)YnEQE+IX6Mv1Rr)9RV=|VQvMQ)BwUXCSh{`?g`#N!jE`E{jFp(jq8Z$-5dcG%X>nL1+YPd`8n>(p}-c@!<}9T(=L#1zT=fIv`13~G>80;F0BH6%20Ep=KO z0GZ3ZQBrTNe&fA}fKA)muLqLW{dQM!iR-v7NV5DEzKtTAdi(B*e^7KV$q>Wpkf7E| zb50UPwrE`>jhn@}gT7YNGlI_}pRK~_pY0h14X1m5V~>LQq1Za8oiPYIDa-f;sd#Y zcDUVzqhptwmjsumY>2I*T{fjxgzSjoa(m+-%2-VIR*7s=SYwXYpqp_z#WxF#s#Rd< zcmwlq{S(??Ak?uDAm$*K*I~PSOeW-Zb-SpbcjKMsE~&Ebf96|>O94G0T`GR?Co%9X zoT16tY0BM7k%kE`yzlA7YUZW8;uPL99k*HO?e?$6l$-oT9@^m_*(*^F_^g*M=v=>eI2o^n9%Pr5?lmlmp>E{s5Nj~x!};_dDqpH0koFDG0kXL zOWPnD#(!R|Bc>!zdfifZ0}bhnRv_su>9P?TJUn@xx&A&>MiT@u~uqLW{da5j3+G9YU>3JeCn1OS>p0UCopmL8 z3)Va5{Yq;o;M3uCTO0t}RY&%wMoh~Sh?-)n+8XMApiyATWal=`dP8w(gb=MsFVnoT zyPj>(f0(eoiiNac<1>?3RvTWUwe8gK{6LVn$3CVkXcye|KCU}O{9@BW9FhXOr@k92 z$DPX>kV3QT=cdV|v-k;`e6-VCJzeysOfh3f5$LtUOm+$KsZ4Lu_Fgr*(a(bkX&MW& z3X`J>3-`@I8^j(6nA*G)9+5S!viDxTQ!GibBAY}ZA^OYq_C2zqW>#B`MNA`9hJs>6 zU#L0`aR$>~az_kgNyiXVAFZ8m=*&88qt1<*S&_>P2MZ-82E|DJjZ|l5+vKpI>~DZ=Kxi@a-b-h5%ME5J4XTS`&6 zZoq&RFO}Z-dwWjt-9z>F7N3>6E$oEZazGU>9TTV+`7({1d45!fbtSnpsc-`1EC1JqGzR>|7byEk!PP2vt36DJ<{bj?GRJu-Ds4qfdx1-m^^NoE`-XN2CT6~CW{)68e>}wpg-DpXx=y;3)#Prr zT?F!FlC3wq&qTT@3`8Rb*LA=^E4-!hi~CT z-&zk1$K0(dGS9I03{T=eGr=1MEJS;SNgMh)qtDWPFfIo|U5w&fjHgyMTYI*0Nyn<)KQ&tm=LitCT53i%K7fgfu<3Wf@sP2)f1t* zMJYz^w2-9yd&E#<*)YPk4EL-j=I2 zp{YK3I)Bny-&{u7csL1VgBG)wR{T;j>y`KvU}i=5tm*Iwk>8Vs|k+7eXO0ndvY&uPPR?yvQV4#3s%v-inRcYoC_suE5G3pt*+;hn$H zUP&!JAzC@W8O-vFiXzLSiHW3@U7<~Gdgub%`9&4qzrIwxBv2PSJ4#?u0{uE{apj@^ zwyKYp7pg^U6s;-fMC;QXaLcvNuN{V!VA$VW)3C7H&`%$o-Qa4SnWgNZG4^B#^g0ut zjn39cPK=@ctIinZ5ArI+us~YqRc}Z!Az|An>^FQ%xd;7#SBo)ivT$l~WqmCManNy& zX!1q)K2z9gBHGiqbT7K^UU)55pY62%CMtnMS~}=~&pi<2&`+t-D*n-#X1^L0nkQw! zb=}{k;epXO=~*xa0J<2L;R#e!Vf_5JeritDJ6o3mvOmV@qkm+B$RL*Y(Z+oG&ktt0 z!_{P!Yjgjmtqh!X+v1vsVJO?@%x~+zt_O8)!%dXRBz58{{hr&O1_%#~T7aO2s(yX8a?l*)v6m#lqT zDX6HNHn|CZ(<7;KDvZ5H5jTh#YJi3sGuS)bd?jf66en(W8*X(PcwqNqP^(eFCnh*6 zTPHBZ-E|Qrpidq*m@tD~HB2F8`%H3BJbFCsI-{NhaRA*g6YSdgN)|x-^{*HH5P+?C zXp^t?t{mAd&k{X0TNMs_H#56kT>DZ#d#!^qWye=gyiIiR@haS)Jc=Ys#TFSR^5OQGeh)Gwp3p0MdYBY7OnJZB0jKGQeSC zNcN<0+8LknO^1iTe#OM*nFr4bb`@uxjKvZm|JCkK%VZ7$6i>!k;5rTAu5d?%tWw6g zt=b*h-Jd>Ijf09>^zqdp15Zd-73lirKx>XCbE{klcSS4ZxEBN8*+EP7Xz5`_o~eRT z)AET}A0FWCGV}k10K~FZJ_Q_g$1yj0=ygBu&-E{Ra{O+|K_d|j^yd7TjDFJYZ+ZGBG0$k9r!7sDI7{D8-G?mk-p+JcU(&G z!QapOtm(dwXu}N}8*Y{FzXUM-rn)=fsJwB2=TzUyXh3n%mz(fN+kMD+E(Qn=vw@_b zXUSDXb-Ch|af_yA;SXyiT;Uchm29$HX|4?HE?iDGljz24%o1`JV+~l9myD4}yx+nd z3^ zuvtE%$N_pOfkL z=U^?Ts`-NT6!z?2f>=qXit4W0OMHwt*u>A-_zk#3%QUpP9B zBT#hpp_x_2jrPJ%Ivy?Vj&@(IL-Bd{tf1qKqMf7lFrp{%Jwb`WtE+t|Ig?=_Ia$M_v!=(6YVI{W z?lmyvMz!}3U(ZU12zQTf2GZc!o@_f~#$m^Qs6{*?l}_b&u{r5$SpyXz%DuVOtz1u%iCx0XpHy*s>u=Yz`Y6ztlGP zP#8gf893Kf%1AwWn}P%>vHCu zf@Snh=Wv6Gv{AYLHTxA6XNW|G2x z!x&&kMEPoT@6`rN#ph?aBoag)jEutJ!t;w(!SOHfcwJSjB!YlIEXNbE`;bA0>S0?w zmkKe;k~(&RCoiGD&g>b>y(^pHzu03^`gwVRM(iSMDcq&>pS!aOSh?_U^TZM)bYX_9 z`gI(lzb)6N*|GVE!V2F$a&T6yCrUlRE!W2jPl_MF2r(QCGZ@6m2$wA;Z}@KiG||L5 z%-EXa@g2MvZ5HJiZdOs%&h-UJylPb|zsK({o#+u7W(qbx|D=>b9xu$p;Wal;s)DK1 zi;ir~>SVR`rtMQ8_t*}^^4_Er)l$#wv?)5-up0B+2|^fO+AEt1Xy?qV<@T1X=w{zz z!G|K`@y($20XwMgiMTG{06`lW;-NzRlTDCNpm0 zYznetu>CM{(X4iP63P%pvt??2qFrEsXCB6xzDvohwz_BMMV@mMw+LGa&U5})TF}quF=FDk_9~}1H!*++63B)oqR6uKBMi^jtx;&0q5a!%L z)9^DTb;1vsL&x<&$PVTpN%3d5SJEldB#gCP80E0I$Lq3$t1l%fxT~ZboJi5zGZUeG|2~}-vVCAX*hvN3qS~h zMehJS4r3iR-s>y6={U6H#IM{Nr`onn?#G4`FVHx@ib%H?`4M6CT8L&(tUjK*zC9s^ zwL9Uwu6>!$@Z$YnKjs^P`2g;4vWiSmTX*Efw`#Mx=T;xLd#G(+eVQ)`dwpR`U1scG zw(e)=^Qjr@s>FmuLGt0WG$?y~_#a_58QE>5?L~HYMVAn#ql2w9xm=2gi0BT6MQ|yI zgEfP3OaJw>a0~Xs9(?euGxeL>h57pS4#)LVWd6DhtC?7aX_j;;joJpwIz}gf5`+;> z#v?nL4Iu}1VYv+PFA(Z(l)#gp+mdqM$bJZa{2}YQfjOR&ju{}8v_6cVtk+#RUx zmRN|<8#@_jD9!>gkYu-1!;2iXH^TJ)AW=cFD%=0_=v)A4&~UBK=7x*KzTxWD`<96@ zli-t<++b7ad?)edwFZ{6HJd224P7Ke6VDVK38^B%b87=}>u!J2pT-!Vm7eR~$y?8V z_`9Z)I2dn48VUM2G>0K(#3V10vBUt*Bdqq1B{I_I-u_AB1y?5c_CW{t@nBqE1gzfD ze0LeE^VaQRSDFJER#(hs3AZY~kAy@&IX8Z}cb~xfP{r!fd1034;B=DrxTtuRo#V7G zjn95x7Axhl{`TbD`-%yV^44PK+RUCCsZ@zrT#+WE;bNsttbk0i&TFH)(9t3QK6?)d zNyT_)V}E)wO!J~!<5-qYl7r1*!PR|ccJ+n`PWd^hz4F8oPJJdnfu!98X-05cRc5OB&^lXja+EC#W7c^H>wi%$U2Lz zfGaZBsW6t2p|r&a2}u_N4sUdBExCckdLM^Duadl9F;zUS>PtI6TDm>oufDzF=f9jA z@xAtDc0O{6KFUF>@+~x*i6rP!>Rm{)AZS)g@z^hr*Z}WrE^!Je+VbAd>%U!sT3{Z%lE!-mbJ#Mc^u55O4I@4XN(QPDEuWK0M`aec5DA4mo z$*M35&fy{omtLyG4rY@Rd1iWTd^X4$DG^)I$k@xZ<;yjFBoCC78yy1+T7-n_86kmYk+H5-72Z}ir-B<=&(2iZeqiNL;rD)B-+blaxpsISMKVzDcrX(p0r{mq0s9yb;o}a5Mf_L1wG4rdzcyi#FUt{Vlsj=)l?Y4FH=DHDf zP;%Ryy+Eve8zg(|wY;U}3^|T$WaW0Qb28ne!t1%c)P$e%U#2WvUOAt7?(5wCZn?c^ zEVr&>xgDN9GD6~jZHAIx>~%KYQmv<+abt;!YI~hWiF#iL6n8IqyPcOe8{baru2Ftr zk9>%PRF-Gno4w<{v*T%_I|pqjy;)EDetXP!AmDskKL=fy7@yO+UGiY%U#K&@zVba+ zFkTBKPP^`Hjl*nkg8x23M4YbipHT-|ms@E~W{31AA!`;$g^-(tQm9YFQSjG6Iin?2 z%38!ok&sj~HjmF0NCs78+0aP(mG}$257cVR^NOVjYMtk2N7Jsh<`cFWwhEY%krK-| z?mJkPacaxZtujhUMZfz)LTco^nxWoroJr3)yz3w%;pxR8TeZ8rr-(iZHaB0UrnsK} z(D`plC4O()8zIZ$h(-^!voco&S#RvxOkN$xeCiHTm+H(&VidL3Amg3Xg}sX0TXnfR zlYFtaGcA)lR-z>?MH~_NjcK2M5gj(e90RG4y-K$Hvjz%^*3fxtUnY{iG_}_r(-o!b zUv5Gcu2+j^ttB~-p^?EMHJD*0AQAx&!@c%%qqMl{<;rs$aM?NQ-0&|r z^yG-|#-`>TOoEvs(quYV2xGbcO!o$ok1^^S(=JtMFYI!>*s-4A7L=b%9A{sC*66Ox zW|-@DL_$J}h0j!!o-U$I+_pp|-3*r#q+PPfq1(jt0Sp>z@JdL(?s)=kM?&I)qbhbY zsEo$oI^O;M%tof*sgWPG(8yy3o`h7DP;`+jB)4`^su^%c&`3>>na817dn>v%55O;* zAk{hAYTt;`T*c(VtOD>qNF4RQ$pRvWKg2k=Qsl1y34~D5uTSj#CsNe0LX)^6~hn zT=`cFp75@pEvn27)RKMTcgrvQhs+-PZZ)uUZe}|)=6`VEXYMy5$dAzdJCNd7sGqZC3$#y8`^$&>> zX274XAfxfY6wHQgOk7}rA^PRHOC4YzKlQ+8#C-z5)t@nYy<%Y5naWm{vZZHI>g3Qe z>k5bTdXt?40?j11`ipsUI5Rj;AW0fJXTJ`)9Epjk9Eqt6hm27MEw93+gbKb&7P|dV zO`fTbhiJmtCw09VE}GH)y=XpY9lCHkUfTUiLPL3@BC?H6q4pHlKQT)qQbTx>2tw|u zftiT>3Ou0d>ntkj1*%m({tw9**xttKvX9+|R-f^M8zU{)=1NeEviRM%`i$A*vJjiu z+cOg2_t=t1H9u;(-OfHWy}2|XqVfGy`d@BaI z{-KzM;&=KC>1kvI3i#(A@;_$@h~4oV(&z9yMnXb*E&hk71tTGMzrK>RQ)@v5_Dg`ufZviPSX%1&>B?v&`<+Pgu47RqDZjZR`I_<_;2tLBUS2mlH#ZK3hD8pBMcE7? zE{0~O^GhGg!Gvj6^}u3o3-OWINo~ovJ7G6tQL~=Py<5wqr8Yeys}YI+g8;c#tgeXb zUFwko4WGSlKzfNpy*97Qo4+@=pKTIYXcDL?D^sp1^Vtl{k`}7^?@>F3bN>xf-KNc6W!Fa|*OeI{8D1d27rki`TN*e*RIUS}^Wt z>*C43`W0|&crRQ2;N$}5fnJSZtY*Hmv*>YZ@rpOi^jnSH&?Ez`Nsk&Cqqc2qsEq7n z9W}3cU6SF1Ca)LM)`4HFv`n%^;A|FMpj!&tG!93%W<9r6V%3+f#Et-k-DAJlx8=uG z;>9QCP1%malZ{T+e>qcmG*+aJxzgR*Hdn1C3s^hClLQcP$w;BT}X=w$Mm+Z%xTLvOmRww&?h!p7Y38yLZ8p60diT$X}+62y(V7n-P9fWSb zuNGAtMPY1Y1hqh@?Y4Et4>rUHmAvAxK4SaF-e`R*&4b!1nD?5w#xnY)1J3l`h3sIPwc+dzEWS7j zpCpA>hxfXjg9Mfc7U}J{vYc{iRlRkB0q2_D+u4_$JU)TN%|?PV*9Qh0T#pb?;_6x| zxR(%w@ZAY~Erj>_l+(5>%k2Wzw;o5_a2x8t`|VE7WmL9^*`5iRvdYn)h6SkKkrTb@ zC{e<}2X`uYajZXf%>awV6L8@F&K42Oc64^kl584>&(<+&kxEXSUNrR=A8%F2h*)Ya zL@^?(bWS35g%-Qj6W?;W9c>hA)g~r^ryx}+7dZ&e2>K~vJrBAp*cbG=GyWQ?OYyo`5ss3_VGD*ZV_mbtXwQTA6Jy zd#YnjpXy=ivEqzLKi5xNKz!y^ARGx%H3^Q-h8J#r*$?pTP@Q1iFOJy1Ki*-d!D8z} zu`XPAJvPKjY+b+6y*{us z4ptt$GOq2iidT{HUNXtFdy@^SK&SQgV*;W;ra`rP7vG99sA=_2eL5c|o@(-t1)X9{%$!Bf5wnAB<&)?;)41Iew<|Ie(j}@j>7L}M2>34Yp7#VrO%BV9;4+se zC*-d>V?i1`S5fWcR+T1?QslWOHougZmSvWeD5_m)mJlXd-A=>|o{Em=1!5f%&^0(| z)={ecFlCkmi#Rr5=-FmuEfI(v0*~W;Be!E+Ut*dVDye-ak;j?f!D0SDZ;<^^LV8pW zNIV_Hl>lG9Qk2mMEB?sC_8C6sNTYm0GtC}y6;_`h@2RC4v)A(F4 zPW?Se;W38>;0=uSn}ZFL!x9Y#?Zd&wNyU#L1Qh%gP}dQu;N!TUB1yM0-5Q6D+5Qe1 z%yrtV6VBi#-%DO*@MgdtJ}mnQoGZ@C+ISC+g4j;cppHxfp$uJHNAFU6VvEU%g|G~`=rPM9as(*y&Vi++ENO&a$J#4ne8d41GsHj$DnvW2UN78N5gd-+ue zbL^3Y^v#JpEUIKDP3&eT-Ly=1aaXUjl&EtFRZJc1tN2K1u2#mnoRw%@>9Ag-)=0^! z+W~N>65{9(14=pB8giZ^)5VrmWE_IW0=A3Gbs^c^#Vt`j+iVVz|Ijzq+H9vi(@cX{ ztCpS}yyeiexEf={&oHFP*s$ULJ^k^Kl!tq)<`fd@4%-P50%>_(L#KNl-HA0 z+K)U(%AGBC1tD&nBE}b)okXFDO{ao;`FI4k%v$`*My6GlKFvp~?*_?E$7T9yZvnei zcFPwG+Q@TzzTKup;19^gjeZf9?8zV1OQhs}<(rEu>1m#b8PvGM82ipddp2j($s}<= za&t*%5sNl4yZqID&r&dZ$kIRPlY!uZM4V!V=RAOXBMDv+Yi_)pKZBX}SJpVxY z2tL|0A5|)uTqY3>Bc7`?SFy)&P|RXYjE>b*-u)r>HuHR;{w-!%X?srG^VwQI(?l6{kK>ZP3$Q+O^AzCBPCPjUZzLBo znE2u`)HHD*UmCZw7kyzQ*6Z02Ys%P(mD4$gf%NFJ?q2O$1WJiaC|+;>p852;j61iM zlkLT-Iy~^NZ~IxfM*pu*@c-Gp70?~OpVh5i_Hmkni;GXq(xT2RW~4!)<{?s{G;p;4 z(a1*&%#e&O=6BDP?&wtCztL$ptpP$Y?~5R#R;`oo;>|&B6AIGAoeLlS-nTR$yHrq- zM$7&*90iEg<);`iBO50B0<#gZ2#hRw+Ht=|j%Znx649H4#TEw|k0%e1VAOZd>3!Vl zejvB4`bl%()kofs#Vby?7+ermibluP_O1SSq|Y)@z{58e{e&3&N|C}p(@DbMq^m|q zr%1!*rF=@oA!+@~gIsRp-0*#=noE}H&nt;7RJvpCJmu{C^EuyDA`RTMlO;U@Sx&xz zB_9Y0YaN3V^==&$s(GSm0g;w_s6MDwlHhxk?rGzv~s}vT<7f6k#!$Pyr zN@9W*!bAxCi3kc~J7>dQ@tYjR?~|?3WkJ4E0WUGX)4>Y)bLE|{YM=t*$mzMfrltuFev!U8<`6GHijVw!)&De8So2^o7;`?4a>x1fhe|5@$d?j?;mO z+|(~{x8RSL$wDewZ$|2DD|z_bSftW43ntQgQ7Mp-%)bGeR>fi5vKWcaGcgsPA1L{*R_Z=pk5kU7ucPZ%>U!a{-r#U1D<447=)Na`FF~eFg%5S|*TatjGp@5B*BEU9R7%jwSX9z3V@IDVlbo(R76 zyC787atv<4HhaNH#YoC#_sodKJtXshyG4=NeQ2+5mHYH~UDdSa4Z9qn+1fMHggBux z&!4p0^5;KyG1kpj&u)SggqX~p7pBOBDZofDcI!9gq%0%HjHdhgeLiIj3mxXJnw08W zeb7V9`oF48Y?RqTrdz!pH?q`4(q-7ppWNCH%McCQnW-$OeuVUSO9kY~IDfG!Re#<5 zqMw1f_kuLVU@~AaAi^BW9qDtZSr**|AixJoFX?vpAervHm3h&^3`oB^?tJNcz5Fb( zn6@>Cn9<%fd{|L>w+|9iyYPe@eGpX#*UuC99Objq6NG-bPg zb=>|e%QL1(JTo?C4}-(3v|N*s*83bU`NuDj+Q%o^?< zncUo8ASQ_u0kymrgVYxoJ!9Xz6Bb^9t(SE8pJudq-Hr zd)39HpZH#qG+Nt}d7HqNeHeVO*svOZ!MDRQf`*9}zVD7tC4b-5 z_TrzMiiB-$uVoOX!cH@)n``I2ZW?b5=6-(|9`WZqJ#nxc%e9NBQvOavW;pF$ILz&U=hg#^G!(p`jrmEV7o+YyB(~ zLIp*<)@QL+jLhLYI0}u5p*yCiKFkxmIFcbL?0e#|y;&1%AxpAe8?sQp`nY6#PUF&O zpiPwjYNxy5l0+@>M3d!Dv=?^d^nBza8NQGGL5%1B*hcZV`7b0aukwwq0Er}f<#pt=s&-;&I!&RFpNhjn=13e}f^lf1lE%(44X zb1U%a%egOgr+NQsTe5Cd!kcfqC)X)0x9fUW|Ky_Er=lN^XUfL!o>g79(p~@AV&=?R~j!`T6hP`EI3K;1p0={86)cK~BzX=kN3X zf8?K(wPoXyS8o@W$5vFox|;I$(pzi0s`OQXOUiElVXy!Acx4*r?Z$TYbN>GWtNM@K zJIlPYRkyg-+HUWTOwXxzj%?fcDqiMhz>ljx949-=-i-Kh_1KBUKX&esw4a``^RJ>* zXwhtT%ei{n#FzEH|C;yZ>+$!u_x#*+`=L8{b9SH^9&27u3G_Gxqxe`L2UJtdxghk z&-wzDFvLvW{chK5u3{n6GSKKy!P&C6w^IFpbD0bcp^A{{2lcLh_DXj@ybtYvc^;(2 M)78&qol`;+0Fu7JivR!s diff --git a/docs/output.md b/docs/output.md index 4b251dbe..dd20f74a 100644 --- a/docs/output.md +++ b/docs/output.md @@ -38,6 +38,7 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d - [Quantification](#quantification) - [featureCounts](#featurecounts) - Read counting relative to gene biotype - [MultiQC](#multiqc) - Aggregate report describing results and QC from the whole pipeline + - [Pipeline information](#pipeline-information) - Report metrics generated during the workflow execution ## Preprocessing diff --git a/docs/usage.md b/docs/usage.md index e96d2626..214ecea8 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -114,9 +114,9 @@ The above pipeline run specified with a params file in yaml format: nextflow run nf-core/nascent -profile docker -params-file params.yaml ``` -with `params.yaml` containing: +with: -```yaml +```yaml title="params.yaml" input: './samplesheet.csv' outdir: './results/' genome: 'GRCh37' @@ -228,14 +228,6 @@ See the main [Nextflow documentation](https://www.nextflow.io/docs/latest/config If you have any questions or issues please send us a message on [Slack](https://nf-co.re/join/slack) on the [`#configs` channel](https://nfcore.slack.com/channels/configs). -## Azure Resource Requests - -To be used with the `azurebatch` profile by specifying the `-profile azurebatch`. -We recommend providing a compute `params.vm_type` of `Standard_D16_v3` VMs by default but these options can be changed if required. - -Note that the choice of VM size depends on your quota and the overall workload during the analysis. -For a thorough list, please refer the [Azure Sizes for virtual machines in Azure](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes). - ## Running in the background Nextflow handles job submissions and supervises the running jobs. The Nextflow process must run until the pipeline is finished. diff --git a/main.nf b/main.nf index 1d7ee4fa..dccfc8ae 100644 --- a/main.nf +++ b/main.nf @@ -9,8 +9,6 @@ ---------------------------------------------------------------------------------------- */ -nextflow.enable.dsl = 2 - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT FUNCTIONS / MODULES / SUBWORKFLOWS / WORKFLOWS @@ -20,7 +18,6 @@ nextflow.enable.dsl = 2 include { NASCENT } from './workflows/nascent' include { PIPELINE_INITIALISATION } from './subworkflows/local/utils_nfcore_nascent_pipeline' include { PIPELINE_COMPLETION } from './subworkflows/local/utils_nfcore_nascent_pipeline' - include { getGenomeAttribute } from './subworkflows/local/utils_nfcore_nascent_pipeline' /* @@ -72,10 +69,8 @@ workflow NFCORE_NASCENT { params.hisat2_index, params.star_index, ) - emit: multiqc_report = NASCENT.out.multiqc_report // channel: /path/to/multiqc_report.html - } /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -86,27 +81,24 @@ workflow NFCORE_NASCENT { workflow { main: - // // SUBWORKFLOW: Run initialisation tasks // PIPELINE_INITIALISATION ( params.version, - params.help, params.validate_params, params.monochrome_logs, args, params.outdir, params.input ) - + // // WORKFLOW: Run main workflow // NFCORE_NASCENT ( PIPELINE_INITIALISATION.out.samplesheet ) - // // SUBWORKFLOW: Run completion tasks // diff --git a/modules.json b/modules.json index 1a3c6102..823421fe 100644 --- a/modules.json +++ b/modules.json @@ -103,7 +103,7 @@ }, "fastqc": { "branch": "master", - "git_sha": "285a50500f9e02578d90b3ce6382ea3c30216acd", + "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", "installed_by": ["modules"] }, "gffread": { @@ -249,7 +249,7 @@ }, "untar": { "branch": "master", - "git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d", + "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1", "installed_by": ["modules"] } } @@ -308,17 +308,17 @@ }, "utils_nextflow_pipeline": { "branch": "master", - "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa", + "git_sha": "d20fb2a9cc3e2835e9d067d1046a63252eb17352", "installed_by": ["subworkflows"] }, "utils_nfcore_pipeline": { "branch": "master", - "git_sha": "92de218a329bfc9a9033116eb5f65fd270e72ba3", + "git_sha": "2fdce49d30c0254f76bc0f13c55c17455c1251ab", "installed_by": ["subworkflows"] }, - "utils_nfvalidation_plugin": { + "utils_nfschema_plugin": { "branch": "master", - "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa", + "git_sha": "bbd5a41f4535a8defafe6080e00ea74c45f4f96c", "installed_by": ["subworkflows"] } } diff --git a/modules/nf-core/fastqc/environment.yml b/modules/nf-core/fastqc/environment.yml index 1787b38a..691d4c76 100644 --- a/modules/nf-core/fastqc/environment.yml +++ b/modules/nf-core/fastqc/environment.yml @@ -1,7 +1,5 @@ -name: fastqc channels: - conda-forge - bioconda - - defaults dependencies: - bioconda::fastqc=0.12.1 diff --git a/modules/nf-core/fastqc/main.nf b/modules/nf-core/fastqc/main.nf index d79f1c86..d8989f48 100644 --- a/modules/nf-core/fastqc/main.nf +++ b/modules/nf-core/fastqc/main.nf @@ -26,7 +26,10 @@ process FASTQC { def rename_to = old_new_pairs*.join(' ').join(' ') def renamed_files = old_new_pairs.collect{ old_name, new_name -> new_name }.join(' ') - def memory_in_mb = MemoryUnit.of("${task.memory}").toUnit('MB') + // The total amount of allocated RAM by FastQC is equal to the number of threads defined (--threads) time the amount of RAM defined (--memory) + // https://github.com/s-andrews/FastQC/blob/1faeea0412093224d7f6a07f777fad60a5650795/fastqc#L211-L222 + // Dividing the task.memory by task.cpu allows to stick to requested amount of RAM in the label + def memory_in_mb = MemoryUnit.of("${task.memory}").toUnit('MB') / task.cpus // FastQC memory value allowed range (100 - 10000) def fastqc_memory = memory_in_mb > 10000 ? 10000 : (memory_in_mb < 100 ? 100 : memory_in_mb) diff --git a/modules/nf-core/fastqc/meta.yml b/modules/nf-core/fastqc/meta.yml index ee5507e0..4827da7a 100644 --- a/modules/nf-core/fastqc/meta.yml +++ b/modules/nf-core/fastqc/meta.yml @@ -16,35 +16,44 @@ tools: homepage: https://www.bioinformatics.babraham.ac.uk/projects/fastqc/ documentation: https://www.bioinformatics.babraham.ac.uk/projects/fastqc/Help/ licence: ["GPL-2.0-only"] + identifier: biotools:fastqc input: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - - reads: - type: file - description: | - List of input FastQ files of size 1 and 2 for single-end and paired-end data, - respectively. + - - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - reads: + type: file + description: | + List of input FastQ files of size 1 and 2 for single-end and paired-end data, + respectively. output: - - meta: - type: map - description: | - Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] - html: - type: file - description: FastQC report - pattern: "*_{fastqc.html}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.html": + type: file + description: FastQC report + pattern: "*_{fastqc.html}" - zip: - type: file - description: FastQC report archive - pattern: "*_{fastqc.zip}" + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - "*.zip": + type: file + description: FastQC report archive + pattern: "*_{fastqc.zip}" - versions: - type: file - description: File containing software versions - pattern: "versions.yml" + - versions.yml: + type: file + description: File containing software versions + pattern: "versions.yml" authors: - "@drpatelh" - "@grst" diff --git a/modules/nf-core/fastqc/tests/main.nf.test b/modules/nf-core/fastqc/tests/main.nf.test index 70edae4d..e9d79a07 100644 --- a/modules/nf-core/fastqc/tests/main.nf.test +++ b/modules/nf-core/fastqc/tests/main.nf.test @@ -23,17 +23,14 @@ nextflow_process { then { assertAll ( - { assert process.success }, - - // NOTE The report contains the date inside it, which means that the md5sum is stable per day, but not longer than that. So you can't md5sum it. - // looks like this:
    Mon 2 Oct 2023
    test.gz
    - // https://github.com/nf-core/modules/pull/3903#issuecomment-1743620039 - - { assert process.out.html[0][1] ==~ ".*/test_fastqc.html" }, - { assert process.out.zip[0][1] ==~ ".*/test_fastqc.zip" }, - { assert path(process.out.html[0][1]).text.contains("
    • File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls
    File typeConventional base calls