Skip to content

Commit

Permalink
Merge branch 'master' into test-skip-step
Browse files Browse the repository at this point in the history
  • Loading branch information
mashehu authored Jan 16, 2025
2 parents 7100921 + 070b1ad commit 3cd3e60
Show file tree
Hide file tree
Showing 166 changed files with 4,649 additions and 1,941 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nf-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
echo ${{ steps.set-shards.outputs.total_shards }}
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.total_shards != '0' }}
Expand Down
7 changes: 7 additions & 0 deletions modules/nf-core/agat/convertbed2gff/environment.yml
Original file line number Diff line number Diff line change
@@ -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"
45 changes: 45 additions & 0 deletions modules/nf-core/agat/convertbed2gff/main.nf
Original file line number Diff line number Diff line change
@@ -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
"""
}
49 changes: 49 additions & 0 deletions modules/nf-core/agat/convertbed2gff/meta.yml
Original file line number Diff line number Diff line change
@@ -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"
58 changes: 58 additions & 0 deletions modules/nf-core/agat/convertbed2gff/tests/main.nf.test
Original file line number Diff line number Diff line change
@@ -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() }
)
}

}

}
70 changes: 70 additions & 0 deletions modules/nf-core/agat/convertbed2gff/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion modules/nf-core/agat/convertspgff2gtf/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ channels:
- conda-forge
- bioconda
dependencies:
- bioconda::agat=1.4.0
- bioconda::agat=1.4.2
5 changes: 2 additions & 3 deletions modules/nf-core/agat/convertspgff2gtf/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -34,7 +34,6 @@ process AGAT_CONVERTSPGFF2GTF {
"""

stub:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
"""
touch ${prefix}.agat.gtf
Expand Down
16 changes: 8 additions & 8 deletions modules/nf-core/agat/convertspgff2gtf/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion modules/nf-core/agat/convertspgff2tsv/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ channels:
- conda-forge
- bioconda
dependencies:
- bioconda::agat=1.4.0
- bioconda::agat=1.4.2
5 changes: 2 additions & 3 deletions modules/nf-core/agat/convertspgff2tsv/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -33,7 +33,6 @@ process AGAT_CONVERTSPGFF2TSV {
"""

stub:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
"""
touch ${prefix}.tsv
Expand Down
18 changes: 9 additions & 9 deletions modules/nf-core/agat/convertspgff2tsv/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"content": [
[
"test.tsv",
"versions.yml:md5,b81565a6ff8911848806128b3bec8508"
"versions.yml:md5,1866660991c9d87acc28236b9d026438"
]
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
"nf-test": "0.9.0",
"nextflow": "24.10.3"
},
"timestamp": "2024-05-08T10:06:55.853319"
"timestamp": "2025-01-15T13:13:51.099041"
},
"sarscov2 - genome [gff3]": {
"content": [
Expand All @@ -24,7 +24,7 @@
]
],
"1": [
"versions.yml:md5,b81565a6ff8911848806128b3bec8508"
"versions.yml:md5,1866660991c9d87acc28236b9d026438"
],
"tsv": [
[
Expand All @@ -35,14 +35,14 @@
]
],
"versions": [
"versions.yml:md5,b81565a6ff8911848806128b3bec8508"
"versions.yml:md5,1866660991c9d87acc28236b9d026438"
]
}
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
"nf-test": "0.9.0",
"nextflow": "24.10.3"
},
"timestamp": "2024-05-08T10:06:51.415395"
"timestamp": "2025-01-15T13:13:44.904263"
}
}
2 changes: 1 addition & 1 deletion modules/nf-core/agat/convertspgxf2gxf/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ channels:
- conda-forge
- bioconda
dependencies:
- bioconda::agat=1.4.0
- bioconda::agat=1.4.2
Loading

0 comments on commit 3cd3e60

Please sign in to comment.