Bump Samtools to v1.24

modules/nf-core/leehom/tests/main.nf.test

@@ -43,7 +43,10 @@ nextflow_process {
         then {
             assertAll(
                 { assert process.success },
-                { assert snapshot(sanitizeOutput(process.out)).match() }
+                { assert snapshot(
+                    process.out.bam.collect{meta, bam_ ->  file(bam_).name + ':readsMD5,' + bam(bam_).getReadsMD5()},
+                    sanitizeOutput(process.out, unstableKeys:["bam"])
+                ).match() }
             )
         }
     }

modules/nf-core/leehom/tests/main.nf.test.snap

@@ -229,14 +229,17 @@
     },
     "homo_sapiens - bam": {
         "content": [
+            [
+                "test.bam:readsMD5,ef014d5b0cd0903595da255cdce79662"
+            ],
             {
                 "bam": [
                     [
                         {
                             "id": "test",
                             "single_end": false
                         },
-                        "test.bam:md5,0e930ebbfaf81be6b04aa3d9e37c875f"
+                        "test.bam"
                     ]
                 ],
                 "fq_fail": [
@@ -275,10 +278,10 @@
                 ]
             }
         ],
-        "timestamp": "2026-06-08T17:36:05.760003668",
+        "timestamp": "2026-07-10T14:34:56.225495163",
         "meta": {
-            "nf-test": "0.9.4",
-            "nextflow": "26.03.0"
+            "nf-test": "0.9.5",
+            "nextflow": "26.04.4"
         }
     },
     "sarscov2 - fastq single end - stub": {

modules/nf-core/poolsnp/main.nf

@@ -1,30 +1,30 @@
 process POOLSNP {
-    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 in ['singularity', 'apptainer'] && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/poolsnp:1.0.1--py312h7e72e81_0':
-        'quay.io/biocontainers/poolsnp:1.0.1--py312h7e72e81_0' }"
+    container "${workflow.containerEngine in ['singularity', 'apptainer'] && !task.ext.singularity_pull_docker_container
+        ? 'https://depot.galaxyproject.org/singularity/poolsnp:1.0.1--py312h7e72e81_0'
+        : 'quay.io/biocontainers/poolsnp:1.0.1--py312h7e72e81_0'}"
 
     input:
-    tuple val(meta) , path(mpileup)
+    tuple val(meta), path(mpileup)
     tuple val(meta2), path(reference)
     tuple val(meta3), val(max_cov), path(max_cov_file)
 
     output:
-    tuple val(meta), path("*.vcf.gz")  , emit: vcf
-    tuple val(meta), path("*cov-*.txt"), emit: max_cov  , optional: true
+    tuple val(meta), path("*.vcf.gz"), emit: vcf
+    tuple val(meta), path("*cov-*.txt"), emit: max_cov, optional: true
     tuple val(meta), path("*BS.txt.gz"), emit: bad_sites, optional: true
-    path "versions.yml"                , emit: versions
+    // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions.
+    tuple val("${task.process}"), val('poolsnp'), eval("echo 1.0.1"), topic: versions, emit: versions_poolsnp
 
     when:
     task.ext.when == null || task.ext.when
 
     script:
-    def args    = task.ext.args ?: ''
-    def prefix  = task.ext.prefix ?: "${meta.id}"
-    def VERSION = '1.0.1' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions.
+    def args = task.ext.args ?: ''
+    def prefix = task.ext.prefix ?: "${meta.id}"
     assert (!max_cov && max_cov_file) || (max_cov && !max_cov_file)
 
     """
@@ -35,28 +35,18 @@ process POOLSNP {
         reference=\$PWD/${reference} \\
         jobs=${task.cpus} \\
         max-cov=${max_cov ? "${max_cov}" : "\$PWD/${max_cov_file}"} \\
-        $args
-
-    cat <<-END_VERSIONS > versions.yml
-    ${task.process}:
-        poolsnp: "${VERSION}"
-    END_VERSIONS
+        ${args}
     """
 
     stub:
     def prefix = task.ext.prefix ?: "${meta.id}"
-    def VERSION = '1.0.1' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions.
+    assert (!max_cov && max_cov_file) || (max_cov && !max_cov_file)
 
     """
     echo "##fileformat=VCFv4.2" > ${prefix}.vcf
     echo "#CHROM\tPOS\tID\tREF\tALT\tQUAL\tFILTER\tINFO" >> ${prefix}.vcf
     gzip ${prefix}.vcf
     ${max_cov ? "touch ${prefix}_cov-${max_cov}.txt" : ""}
     echo "" | gzip > ${prefix}_BS.txt.gz
-
-    cat <<-END_VERSIONS > versions.yml
-    ${task.process}:
-        poolsnp: "${VERSION}"
-    END_VERSIONS
     """
 }

modules/nf-core/poolsnp/meta.yml

@@ -1,7 +1,6 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/meta-schema.json
 name: "poolsnp"
-description: PoolSNP is a heuristic SNP caller, which uses an MPILEUP file and a reference
-  genome in FASTA format as inputs.
+description: PoolSNP is a heuristic SNP caller, which uses an MPILEUP file and a
+  reference genome in FASTA format as inputs.
 keywords:
   - poolseq
   - mpileup
@@ -12,9 +11,9 @@ tools:
         a reference genome in FASTA format as inputs."
       homepage: "https://github.com/capoony/PoolSNP"
       documentation: "https://github.com/capoony/PoolSNP/blob/master/README.md"
-      licence: ["Apache-2.0"]
+      licence:
+        - "Apache-2.0"
       args_id: "$args"
-
       identifier: ""
 input:
   - - meta:
@@ -77,11 +76,11 @@ output:
             e.g. `[ id:'sample1', single_end:false ]`
       - "*.vcf.gz":
           type: file
-          description: Gzipped VCF file containing allele counts and frequencies for
-            every position and library
+          description: Gzipped VCF file containing allele counts and frequencies
+            for every position and library
           pattern: "*.vcf.gz"
           ontologies:
-            - edam: http://edamontology.org/format_3989 # GZIP format
+            - edam: http://edamontology.org/format_3989
   max_cov:
     - - meta:
           type: map
@@ -90,8 +89,8 @@ output:
             e.g. `[ id:'sample1', single_end:false ]`
       - "*cov-*.txt":
           type: file
-          description: File containing the maximum coverage thresholds for all chromosomal
-            arms and libraries
+          description: File containing the maximum coverage thresholds for all
+            chromosomal arms and libraries
           pattern: "*cov-*.txt"
           ontologies: []
   bad_sites:
@@ -102,19 +101,33 @@ output:
             e.g. `[ id:'sample1', single_end:false ]`
       - "*BS.txt.gz":
           type: file
-          description: File containing a list of sites (variable and invariable) that
-            did not pass the SNP calling criteria
+          description: File containing a list of sites (variable and invariable)
+            that did not pass the SNP calling criteria
           pattern: "*BS.txt.gz"
           optional: true
           ontologies:
-            - edam: http://edamontology.org/format_3989 # GZIP format
+            - edam: http://edamontology.org/format_3989
+  versions_poolsnp:
+    - - ${task.process}:
+          type: string
+          description: The name of the process
+      - poolsnp:
+          type: string
+          description: The name of the tool
+      - echo 1.0.1:
+          type: eval
+          description: The expression to obtain the version of the tool
+topics:
   versions:
-    - versions.yml:
-        type: file
-        description: File containing software versions
-        pattern: "versions.yml"
-        ontologies:
-          - edam: http://edamontology.org/format_3750 # YAML
+    - - ${task.process}:
+          type: string
+          description: The name of the process
+      - poolsnp:
+          type: string
+          description: The name of the tool
+      - echo 1.0.1:
+          type: eval
+          description: The expression to obtain the version of the tool
 authors:
   - "@abhilesh"
 maintainers:

modules/nf-core/poolsnp/tests/main.nf.test

@@ -41,11 +41,7 @@ nextflow_process {
                     [ id:'test' ],
                     file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)
                 ]
-                input[2] = [
-                    [ id:'test' ],
-                    0.7,
-                    []
-                ]
+                input[2] = [ [ id:'test' ], 0.7, [] ]
                 """
             }
         }
@@ -54,11 +50,10 @@ nextflow_process {
             assertAll(
                 { assert process.success },
                 { assert snapshot(
-                    process.out.versions,
-                    path(process.out.vcf[0][1]).vcf.variantsMD5,
-                    process.out.max_cov
-                    ).match()
-                }
+                    process.out.vcf.collect{meta, vcf ->  file(vcf).name + ':variantsMD5,' + path(vcf).vcf.variantsMD5},
+                    process.out.max_cov,
+                    process.out.findAll { key, val -> key.startsWith("versions")}
+                ).match() }
             )
         }
     }
@@ -73,10 +68,10 @@ nextflow_process {
                     [ id:'test' ],
                     file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)
                 ]
-                input[2] = Channel.of([
+                input[2] = channel.of([
                     [ id:'test' ],
                     '',
-                ]).combine( Channel.of("MT192765.1\t98").collectFile( name:'max_cov.tsv', newLine: true ))
+                ]).combine(channel.of("MT192765.1\t98").collectFile( name:'max_cov.tsv', newLine: true ))
                 """
             }
         }
@@ -85,10 +80,9 @@ nextflow_process {
             assertAll(
                 { assert process.success },
                 { assert snapshot(
-                    process.out.versions,
-                    path(process.out.vcf[0][1]).vcf.variantsMD5
-                    ).match()
-                }
+                    process.out.vcf.collect{meta, vcf ->  file(vcf).name + ':variantsMD5,' + path(vcf).vcf.variantsMD5},
+                    process.out.findAll { key, val -> key.startsWith("versions")}
+                ).match() }
             )
         }
     }
@@ -105,24 +99,15 @@ nextflow_process {
                     [ id:'test' ],
                     file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)
                 ]
-                input[2] = [
-                    [ id:'test' ], // meta map
-                    0.7,
-                    []
-                ]
+                input[2] = [ [ id:'test' ], 0.7, [] ]
                 """
             }
         }
 
         then {
             assertAll(
                 { assert process.success },
-                { assert snapshot(
-                    process.out.versions,
-                    path(process.out.vcf[0][1]).vcf.variantsMD5,
-                    process.out.max_cov
-                    ).match()
-                }
+                { assert snapshot(sanitizeOutput(process.out)).match() }
             )
         }
     }
@@ -139,22 +124,18 @@ nextflow_process {
                     [ id:'test' ],
                     file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/genome.fasta', checkIfExists: true)
                 ]
-                input[2] = Channel.of([
+                input[2] = channel.of([
                     [ id:'test' ],
                     '',
-                ]).combine( Channel.of("MT192765.1\t98").collectFile( name:'max_cov.tsv', newLine: true ))
+                ]).combine(channel.of("MT192765.1\t98").collectFile( name:'max_cov.tsv', newLine: true ))
                 """
             }
         }
 
         then {
             assertAll(
                 { assert process.success },
-                { assert snapshot(
-                    process.out.versions,
-                    path(process.out.vcf[0][1]).vcf.variantsMD5
-                    ).match()
-                }
+                { assert snapshot(sanitizeOutput(process.out)).match() }
             )
         }
     }