Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken Quast module and bump MultiQC version in dumpsoftwareversions #2108

Merged
merged 1 commit into from
Sep 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/custom/dumpsoftwareversions/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ process CUSTOM_DUMPSOFTWAREVERSIONS {
label 'process_single'

// Requires `pyyaml` which does not have a dedicated container but is in the MultiQC container
conda (params.enable_conda ? 'bioconda::multiqc=1.13a' : null)
conda (params.enable_conda ? 'bioconda::multiqc=1.13' : null)
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/multiqc:1.13a--pyhdfd78af_1' :
'quay.io/biocontainers/multiqc:1.13a--pyhdfd78af_1' }"
'https://depot.galaxyproject.org/singularity/multiqc:1.13--pyhdfd78af_0' :
'quay.io/biocontainers/multiqc:1.13--pyhdfd78af_0' }"

input:
path versions
Expand Down
4 changes: 2 additions & 2 deletions modules/qualimap/rnaseq/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ process QUALIMAP_RNASEQ {

script:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
prefix = task.ext.prefix ?: "${meta.id}"
def paired_end = meta.single_end ? '' : '-pe'
def memory = task.memory.toGiga() + "G"

Expand Down Expand Up @@ -51,7 +51,7 @@ process QUALIMAP_RNASEQ {
"""

stub:
def prefix = task.ext.prefix ?: "${meta.id}"
prefix = task.ext.prefix ?: "${meta.id}"
"""
mkdir ${prefix}

Expand Down
4 changes: 0 additions & 4 deletions tests/config/pytest_modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2363,10 +2363,6 @@ tbprofiler/profile:
- modules/tbprofiler/profile/**
- tests/modules/tbprofiler/profile/**

test/template:
- modules/test/template/**
- tests/modules/test/template/**

tiddit/cov:
- modules/tiddit/cov/**
- tests/modules/tiddit/cov/**
Expand Down
23 changes: 0 additions & 23 deletions tests/config/pytest_modules_test.yml

This file was deleted.