Skip to content

Commit

Permalink
Merge branch 'master' into catpack-prepare
Browse files Browse the repository at this point in the history
  • Loading branch information
jfy133 authored Jan 17, 2025
2 parents f52ae50 + e9b59c8 commit 5597803
Show file tree
Hide file tree
Showing 82 changed files with 1,918 additions and 686 deletions.
2 changes: 2 additions & 0 deletions .github/skip_nf_test.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nf-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 != '[]' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 != '[]'
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"
}
}
22 changes: 8 additions & 14 deletions modules/nf-core/deepvariant/rundeepvariant/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ process DEEPVARIANT_RUNDEEPVARIANT {
// FIXME Conda is not supported at the moment
// BUG https://github.com/nf-core/modules/issues/1754
// BUG https://github.com/bioconda/bioconda-recipes/issues/30310
container "nf-core/deepvariant:1.6.1"
container "docker.io/google/deepvariant:1.8.0"

input:
tuple val(meta), path(input), path(index), path(intervals)
Expand All @@ -15,11 +15,11 @@ process DEEPVARIANT_RUNDEEPVARIANT {
tuple val(meta5), path(par_bed)

output:
tuple val(meta), path("${prefix}.vcf.gz") , emit: vcf
tuple val(meta), path("${prefix}.vcf.gz.tbi") , emit: vcf_tbi
tuple val(meta), path("${prefix}.g.vcf.gz") , emit: gvcf
tuple val(meta), path("${prefix}.g.vcf.gz.tbi"), emit: gvcf_tbi
path "versions.yml" , emit: versions
tuple val(meta), path("${prefix}.vcf.gz") , emit: vcf
tuple val(meta), path("${prefix}.vcf.gz.tbi") , emit: vcf_tbi
tuple val(meta), path("${prefix}.g.vcf.gz") , emit: gvcf
tuple val(meta), path("${prefix}.g.vcf.gz.tbi"), emit: gvcf_tbi
path "versions.yml" , emit: versions

when:
task.ext.when == null || task.ext.when
Expand All @@ -33,9 +33,6 @@ process DEEPVARIANT_RUNDEEPVARIANT {
prefix = task.ext.prefix ?: "${meta.id}"
def regions = intervals ? "--regions=${intervals}" : ""
def par_regions = par_bed ? "--par_regions_bed=${par_bed}" : ""
// WARN https://github.com/nf-core/modules/pull/5801#issuecomment-2194293755
// FIXME Revert this on next version bump
def VERSION = '1.6.1'

"""
/opt/deepvariant/bin/run_deepvariant \\
Expand All @@ -51,7 +48,7 @@ process DEEPVARIANT_RUNDEEPVARIANT {
cat <<-END_VERSIONS > versions.yml
"${task.process}":
deepvariant: $VERSION
deepvariant: \$(echo \$(/opt/deepvariant/bin/run_deepvariant --version) | sed 's/^.*version //; s/ .*\$//' )
END_VERSIONS
"""

Expand All @@ -61,9 +58,6 @@ process DEEPVARIANT_RUNDEEPVARIANT {
error "DEEPVARIANT module does not support Conda. Please use Docker / Singularity / Podman instead."
}
prefix = task.ext.prefix ?: "${meta.id}"
// WARN https://github.com/nf-core/modules/pull/5801#issuecomment-2194293755
// FIXME Revert this on next version bump
def VERSION = '1.6.1'
"""
touch ${prefix}.vcf.gz
touch ${prefix}.vcf.gz.tbi
Expand All @@ -72,7 +66,7 @@ process DEEPVARIANT_RUNDEEPVARIANT {
cat <<-END_VERSIONS > versions.yml
"${task.process}":
deepvariant: $VERSION
deepvariant: \$(echo \$(/opt/deepvariant/bin/run_deepvariant --version) | sed 's/^.*version //; s/ .*\$//' )
END_VERSIONS
"""
}
Loading

0 comments on commit 5597803

Please sign in to comment.