diff --git a/modules/nf-core/bowtie2/align/environment.yml b/modules/nf-core/bowtie2/align/environment.yml index 9090f218834..5fd59cd2918 100644 --- a/modules/nf-core/bowtie2/align/environment.yml +++ b/modules/nf-core/bowtie2/align/environment.yml @@ -2,6 +2,6 @@ channels: - conda-forge - bioconda dependencies: - - bioconda::bowtie2=2.5.2 + - bioconda::bowtie2=2.5.4 - bioconda::samtools=1.18 - conda-forge::pigz=2.6 diff --git a/modules/nf-core/bowtie2/align/main.nf b/modules/nf-core/bowtie2/align/main.nf index 809525ad36c..f683eb79c85 100644 --- a/modules/nf-core/bowtie2/align/main.nf +++ b/modules/nf-core/bowtie2/align/main.nf @@ -4,8 +4,8 @@ process BOWTIE2_ALIGN { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/mulled-v2-ac74a7f02cebcfcc07d8e8d1d750af9c83b4d45a:f70b31a2db15c023d641c32f433fb02cd04df5a6-0' : - 'biocontainers/mulled-v2-ac74a7f02cebcfcc07d8e8d1d750af9c83b4d45a:f70b31a2db15c023d641c32f433fb02cd04df5a6-0' }" + 'oras://community.wave.seqera.io/library/bowtie2_samtools_pigz:19e9ad812f803021' : + 'community.wave.seqera.io/library/bowtie2_samtools_pigz:8bde63944b003030' }" input: tuple val(meta) , path(reads) diff --git a/modules/nf-core/bowtie2/align/tests/main.nf.test b/modules/nf-core/bowtie2/align/tests/main.nf.test index 0de5950fee6..89efa5c4b9b 100644 --- a/modules/nf-core/bowtie2/align/tests/main.nf.test +++ b/modules/nf-core/bowtie2/align/tests/main.nf.test @@ -35,7 +35,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -81,7 +81,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -90,7 +90,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.sam[0][1]).readLines()[0..4], + file(process.out.sam[0][1]).readLines()[4..10], process.out.log, process.out.fastq, process.out.versions @@ -127,7 +127,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -136,7 +136,7 @@ nextflow_process { assertAll ( { assert process.success }, { assert snapshot( - file(process.out.sam[0][1]).readLines()[0..4], + file(process.out.sam[0][1]).readLines()[4..10], process.out.log, process.out.fastq, process.out.versions @@ -172,7 +172,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -220,7 +220,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -268,7 +268,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -314,7 +314,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -363,7 +363,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -411,7 +411,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -456,7 +456,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -553,7 +553,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } @@ -600,7 +600,7 @@ nextflow_process { input[1] = BOWTIE2_BUILD.out.index input[2] = [[ id:'test'], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)] input[3] = false //save_unaligned - input[4] = false //sort + input[4] = true //sort """ } } 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 028e7da6898..ea804909964 100644 --- a/modules/nf-core/bowtie2/align/tests/main.nf.test.snap +++ b/modules/nf-core/bowtie2/align/tests/main.nf.test.snap @@ -15,23 +15,25 @@ ], [ - "versions.yml:md5,01d18ab035146ea790e9a0f70adb758f" + "versions.yml:md5,0034ff5d2b1c356b2208601e9647e055" ] ], "meta": { - "nf-test": "0.8.4", - "nextflow": "23.10.1" + "nf-test": "0.9.1", + "nextflow": "24.04.4" }, - "timestamp": "2024-03-18T13:19:25.337323" + "timestamp": "2024-10-28T12:48:20.606057273" }, "sarscov2 - fastq, index, fasta, false, false - sam2": { "content": [ [ - "ERR5069949.2151832\t16\tMT192765.1\t17453\t42\t150M\t*\t0\t0\tACGCACATTGCTAACTAAGGGCACACTAGAACCAGAATATTTCAATTCAGTGTGTAGACTTATGAAAACTATAGGTCCAGACATGTTCCTCGGAACTTGTCGGCGTTGTCCTGCTGAAATTGTTGACACTGTGAGTGCTTTGGTTTATGA\tAAAA