Merge branch 'master' into master

nf-core · Jan 18, 2025 · d19a459 · d19a459
2 parents 2b86a96 + 60645c2
commit d19a459
Show file tree

Hide file tree

Showing 255 changed files with 5,532 additions and 2,290 deletions.
diff --git a/.github/skip_nf_test.json b/.github/skip_nf_test.json
@@ -86,6 +86,8 @@
     "docker_self_hosted": ["modules/nf-core/parabricks"],
     "singularity": [
         "modules/nf-core/bases2fastq",
+        "modules/nf-core/deepvariant/rundeepvariant",
+        "modules/nf-core/deepvariant/vcfstatsreport",
         "modules/nf-core/deepsomatic",
         "modules/nf-core/parabricks",
         "modules/nf-core/universc"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -93,7 +93,7 @@ jobs:
           echo ${{ steps.module_names.outputs.result }}
 
   nf-core-lint-modules:
-    runs-on: ${{ github.event.inputs.runners  || 'self-hosted' }}
+    runs-on: ${{ github.event.inputs.runners  || 'ubuntu-latest' }}
     name: nf-core lint modules
     needs: nf-core-changes
     if: ${{ (needs.nf-core-changes.outputs.modules == 'true') }}

diff --git a/.github/workflows/nf-test.yml b/.github/workflows/nf-test.yml
@@ -75,7 +75,7 @@ jobs:
           echo ${{ steps.outputs.outputs.modules }}
           echo ${{ steps.outputs.outputs.subworkflows }}
   nf-test:
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    runs-on: ${{ github.event.inputs.runners || 'ubuntu-latest' }}
     name: "Test | ${{ matrix.profile }} | ${{ matrix.shard }}"
     needs: nf-test-changes
     if: ${{ needs.nf-test-changes.outputs.modules != '[]' || needs.nf-test-changes.outputs.subworkflows != '[]' }}

diff --git a/.github/workflows/pytest-workflow.yml b/.github/workflows/pytest-workflow.yml
@@ -62,7 +62,7 @@ jobs:
           echo ${{ steps.tags.outputs.subworkflows }}
 
   pytest:
-    runs-on: ${{ github.event.inputs.runners  || 'self-hosted' }}
+    runs-on: ${{ github.event.inputs.runners  || 'ubuntu-latest' }}
     name: pytest
     needs: [pytest-changes]
     if: needs.pytest-changes.outputs.tags != '[]'

diff --git a/modules/nf-core/agat/convertbed2gff/environment.yml b/modules/nf-core/agat/convertbed2gff/environment.yml
@@ -0,0 +1,7 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json
+channels:
+  - conda-forge
+  - bioconda
+dependencies:
+  - "bioconda::agat=1.4.2"
diff --git a/modules/nf-core/agat/convertbed2gff/main.nf b/modules/nf-core/agat/convertbed2gff/main.nf
@@ -0,0 +1,45 @@
+process AGAT_CONVERTBED2GFF {
+    tag "$meta.id"
+    label 'process_single'
+
+    conda "${moduleDir}/environment.yml"
+    container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
+        'https://depot.galaxyproject.org/singularity/agat:1.4.2--pl5321hdfd78af_0' :
+        'biocontainers/agat:1.4.2--pl5321hdfd78af_0' }"
+
+    input:
+    tuple val(meta), path(bed)
+
+    output:
+    tuple val(meta), path("*.gff")  , emit: gff
+    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}"
+    """
+    agat_convert_bed2gff.pl \\
+        --bed $bed \\
+        --output ${prefix}.gff \\
+        $args
+
+    cat <<-END_VERSIONS > versions.yml
+    "${task.process}":
+        agat: \$(agat_convert_bed2gff.pl --help | sed -n 's/.*(AGAT) - Version: \\(.*\\) .*/\\1/p')
+    END_VERSIONS
+    """
+
+    stub:
+    def prefix = task.ext.prefix ?: "${meta.id}"
+    """
+    touch ${prefix}.gff
+
+    cat <<-END_VERSIONS > versions.yml
+    "${task.process}":
+        agat: \$(agat_convert_bed2gff.pl --help | sed -n 's/.*(AGAT) - Version: \\(.*\\) .*/\\1/p')
+    END_VERSIONS
+    """
+}
diff --git a/modules/nf-core/agat/convertbed2gff/meta.yml b/modules/nf-core/agat/convertbed2gff/meta.yml
@@ -0,0 +1,49 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/meta-schema.json
+name: agat_convertbed2gff
+description: |
+  Takes a bed12 file and converts to a GFF3 file
+keywords:
+  - genome
+  - bed
+  - gff
+  - conversion
+tools:
+  - agat:
+      description: "AGAT is a toolkit for manipulation and getting information from
+        GFF/GTF files"
+      homepage: "https://github.com/NBISweden/AGAT"
+      documentation: "https://agat.readthedocs.io/"
+      tool_dev_url: "https://github.com/NBISweden/AGAT"
+      doi: "10.5281/zenodo.3552717"
+      licence: ["GPL v3"]
+      identifier: biotools:AGAT
+input:
+  - - meta:
+        type: map
+        description: |
+          Groovy Map containing sample information
+          e.g. [ id:'test', single_end:false ]
+    - bed:
+        type: file
+        description: Input bed12 file
+        pattern: "*.bed"
+output:
+  - gff:
+      - meta:
+          type: map
+          description: Groovy Map containing sample information
+      - "*.gff":
+          type: file
+          description: Output GFF3 file
+          pattern: "*.{gff}"
+  - versions:
+      - versions.yml:
+          type: file
+          description: File containing software versions
+          pattern: "versions.yml"
+
+authors:
+  - "@GallVp"
+maintainers:
+  - "@GallVp"
diff --git a/modules/nf-core/agat/convertbed2gff/tests/main.nf.test b/modules/nf-core/agat/convertbed2gff/tests/main.nf.test
@@ -0,0 +1,58 @@
+nextflow_process {
+
+    name "Test Process AGAT_CONVERTBED2GFF"
+    script "../main.nf"
+    process "AGAT_CONVERTBED2GFF"
+
+    tag "modules"
+    tag "modules_nfcore"
+    tag "agat"
+    tag "agat/convertbed2gff"
+
+    test("sarscov2 - bed12") {
+
+        when {
+            process {
+                """
+                input[0] = [
+                    [ id:'test' ], // meta map
+                    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 - bam - stub") {
+
+        options "-stub"
+
+        when {
+            process {
+                """
+                input[0] = [
+                    [ id:'test', single_end:false ], // meta map
+                    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/agat/convertbed2gff/tests/main.nf.test.snap b/modules/nf-core/agat/convertbed2gff/tests/main.nf.test.snap
@@ -0,0 +1,70 @@
+{
+    "sarscov2 - bam - stub": {
+        "content": [
+            {
+                "0": [
+                    [
+                        {
+                            "id": "test",
+                            "single_end": false
+                        },
+                        "test.gff:md5,d41d8cd98f00b204e9800998ecf8427e"
+                    ]
+                ],
+                "1": [
+                    "versions.yml:md5,ccfb13a5b261f660922e1ed845e68cbc"
+                ],
+                "gff": [
+                    [
+                        {
+                            "id": "test",
+                            "single_end": false
+                        },
+                        "test.gff:md5,d41d8cd98f00b204e9800998ecf8427e"
+                    ]
+                ],
+                "versions": [
+                    "versions.yml:md5,ccfb13a5b261f660922e1ed845e68cbc"
+                ]
+            }
+        ],
+        "meta": {
+            "nf-test": "0.9.0",
+            "nextflow": "24.10.3"
+        },
+        "timestamp": "2025-01-15T14:02:09.48826"
+    },
+    "sarscov2 - bed12": {
+        "content": [
+            {
+                "0": [
+                    [
+                        {
+                            "id": "test"
+                        },
+                        "test.gff:md5,4e5a23a6babac6d5b1bcfa06c5b12518"
+                    ]
+                ],
+                "1": [
+                    "versions.yml:md5,ccfb13a5b261f660922e1ed845e68cbc"
+                ],
+                "gff": [
+                    [
+                        {
+                            "id": "test"
+                        },
+                        "test.gff:md5,4e5a23a6babac6d5b1bcfa06c5b12518"
+                    ]
+                ],
+                "versions": [
+                    "versions.yml:md5,ccfb13a5b261f660922e1ed845e68cbc"
+                ]
+            }
+        ],
+        "meta": {
+            "nf-test": "0.9.0",
+            "nextflow": "24.10.3"
+        },
+        "timestamp": "2025-01-15T14:02:03.549345"
+    }
+}
diff --git a/modules/nf-core/agat/convertspgff2gtf/environment.yml b/modules/nf-core/agat/convertspgff2gtf/environment.yml
@@ -2,4 +2,4 @@ channels:
   - conda-forge
   - bioconda
 dependencies:
-  - bioconda::agat=1.4.0
+  - bioconda::agat=1.4.2
diff --git a/modules/nf-core/agat/convertspgff2gtf/main.nf b/modules/nf-core/agat/convertspgff2gtf/main.nf
@@ -4,8 +4,8 @@ process AGAT_CONVERTSPGFF2GTF {
 
     conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/agat:1.4.0--pl5321hdfd78af_0' :
-        'biocontainers/agat:1.4.0--pl5321hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/agat:1.4.2--pl5321hdfd78af_0' :
+        'biocontainers/agat:1.4.2--pl5321hdfd78af_0' }"
 
     input:
     tuple val(meta), path(gff)
@@ -34,7 +34,6 @@ process AGAT_CONVERTSPGFF2GTF {
     """
 
     stub:
-    def args = task.ext.args ?: ''
     def prefix = task.ext.prefix ?: "${meta.id}"
     """
     touch ${prefix}.agat.gtf

diff --git a/modules/nf-core/agat/convertspgff2gtf/tests/main.nf.test.snap b/modules/nf-core/agat/convertspgff2gtf/tests/main.nf.test.snap
@@ -4,14 +4,14 @@
             [
                 "test.agat.gtf",
                 "genome.gff3.agat.log",
-                "versions.yml:md5,dcc621fac77aa683287f6a0d61e10395"
+                "versions.yml:md5,8a5591085d36637f9378c24a7607d623"
             ]
         ],
         "meta": {
-            "nf-test": "0.8.4",
-            "nextflow": "23.10.1"
+            "nf-test": "0.9.0",
+            "nextflow": "24.10.3"
         },
-        "timestamp": "2024-05-08T10:05:11.177573"
+        "timestamp": "2025-01-15T13:13:37.584076"
     },
     "sarscov2 - genome [gff3]": {
         "content": [
@@ -24,13 +24,13 @@
                 ]
             ],
             [
-                "versions.yml:md5,dcc621fac77aa683287f6a0d61e10395"
+                "versions.yml:md5,8a5591085d36637f9378c24a7607d623"
             ]
         ],
         "meta": {
-            "nf-test": "0.8.4",
-            "nextflow": "23.10.1"
+            "nf-test": "0.9.0",
+            "nextflow": "24.10.3"
         },
-        "timestamp": "2024-05-08T10:05:06.695419"
+        "timestamp": "2025-01-15T13:13:31.491648"
     }
 }
diff --git a/modules/nf-core/agat/convertspgff2tsv/environment.yml b/modules/nf-core/agat/convertspgff2tsv/environment.yml
@@ -2,4 +2,4 @@ channels:
   - conda-forge
   - bioconda
 dependencies:
-  - bioconda::agat=1.4.0
+  - bioconda::agat=1.4.2
diff --git a/modules/nf-core/agat/convertspgff2tsv/main.nf b/modules/nf-core/agat/convertspgff2tsv/main.nf
@@ -4,8 +4,8 @@ process AGAT_CONVERTSPGFF2TSV {
 
     conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/agat:1.4.0--pl5321hdfd78af_0' :
-        'biocontainers/agat:1.4.0--pl5321hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/agat:1.4.2--pl5321hdfd78af_0' :
+        'biocontainers/agat:1.4.2--pl5321hdfd78af_0' }"
 
     input:
     tuple val(meta), path(gff)
@@ -33,7 +33,6 @@ process AGAT_CONVERTSPGFF2TSV {
     """
 
     stub:
-    def args = task.ext.args ?: ''
     def prefix = task.ext.prefix ?: "${meta.id}"
     """
     touch ${prefix}.tsv