diff --git a/modules/nf-core/trgt/genotype/environment.yml b/modules/nf-core/trgt/genotype/environment.yml index 8174b1f6505c..5ff336d40646 100644 --- a/modules/nf-core/trgt/genotype/environment.yml +++ b/modules/nf-core/trgt/genotype/environment.yml @@ -4,4 +4,4 @@ channels: - conda-forge - bioconda dependencies: - - bioconda::trgt=4.0.0 + - bioconda::trgt=4.1.0 diff --git a/modules/nf-core/trgt/genotype/main.nf b/modules/nf-core/trgt/genotype/main.nf index c58f67af1cee..1fe75f7d60de 100644 --- a/modules/nf-core/trgt/genotype/main.nf +++ b/modules/nf-core/trgt/genotype/main.nf @@ -4,8 +4,8 @@ process TRGT_GENOTYPE { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/trgt:4.0.0--h9ee0642_0': - 'biocontainers/trgt:4.0.0--h9ee0642_0' }" + 'https://depot.galaxyproject.org/singularity/trgt:4.1.0--h9ee0642_0': + 'biocontainers/trgt:4.1.0--h9ee0642_0' }" input: tuple val(meta) , path(bam), path(bai), val(karyotype) @@ -15,8 +15,8 @@ process TRGT_GENOTYPE { output: tuple val(meta), path("*.vcf.gz") , emit: vcf - tuple val(meta), path("*.spanning.bam"), emit: bam , optional: true - path "versions.yml" , emit: versions + tuple val(meta), path("*.spanning.bam"), emit: bam, optional: true + tuple val("${task.process}"), val('trgt'), eval("trgt --version | sed 's/.* //g'"), emit: versions_trgt, topic: versions when: task.ext.when == null || task.ext.when diff --git a/modules/nf-core/trgt/genotype/meta.yml b/modules/nf-core/trgt/genotype/meta.yml index 29b5e046fa3c..fef18e236b9d 100644 --- a/modules/nf-core/trgt/genotype/meta.yml +++ b/modules/nf-core/trgt/genotype/meta.yml @@ -94,14 +94,28 @@ output: description: BAM file with pieces of reads aligning to repeats pattern: "*.spanning.bam" ontologies: [] - versions: - - versions.yml: - type: file - description: File containing software versions - pattern: "versions.yml" + versions_trgt: + - - ${task.process}: + type: string + description: The name of the process + - trgt: + type: string + description: The name of the tool + - trgt --version | sed 's/.* //g': + type: eval + description: The expression to obtain the version of the tool - ontologies: - - edam: http://edamontology.org/format_3750 # YAML +topics: + versions: + - - ${task.process}: + type: string + description: The name of the process + - trgt: + type: string + description: The name of the tool + - trgt --version | sed 's/.* //g': + type: eval + description: The expression to obtain the version authors: - "@Schmytzi" - "@fellen31" diff --git a/modules/nf-core/trgt/genotype/tests/main.nf.test b/modules/nf-core/trgt/genotype/tests/main.nf.test index 12fd8335c3b6..6f2c663d23d4 100644 --- a/modules/nf-core/trgt/genotype/tests/main.nf.test +++ b/modules/nf-core/trgt/genotype/tests/main.nf.test @@ -59,7 +59,9 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out, + ).match() } ) } diff --git a/modules/nf-core/trgt/genotype/tests/main.nf.test.snap b/modules/nf-core/trgt/genotype/tests/main.nf.test.snap index b5a6591e3cd1..70dd85f39bbd 100644 --- a/modules/nf-core/trgt/genotype/tests/main.nf.test.snap +++ b/modules/nf-core/trgt/genotype/tests/main.nf.test.snap @@ -7,7 +7,7 @@ { "id": "test" }, - "test.vcf.gz:md5,9d5f7877193d0c8a6fbce7c9f82ab05b" + "test.vcf.gz:md5,cb694061956ddcd63772baf9a0720624" ] ], "1": [ @@ -15,18 +15,22 @@ { "id": "test" }, - "test.spanning.bam:md5,22cb334e5936fa940c3a78c89ba7477c" + "test.spanning.bam:md5,47da98a17e3bc7b4b234c59a435a38ca" ] ], "2": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ], "bam": [ [ { "id": "test" }, - "test.spanning.bam:md5,22cb334e5936fa940c3a78c89ba7477c" + "test.spanning.bam:md5,47da98a17e3bc7b4b234c59a435a38ca" ] ], "vcf": [ @@ -34,11 +38,15 @@ { "id": "test" }, - "test.vcf.gz:md5,9d5f7877193d0c8a6fbce7c9f82ab05b" + "test.vcf.gz:md5,cb694061956ddcd63772baf9a0720624" ] ], - "versions": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + "versions_trgt": [ + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ] } ], @@ -46,7 +54,7 @@ "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:06.149363798" + "timestamp": "2025-12-09T16:16:00.489435938" }, "homo sapiens - [bam,bai,[]], [fa,fai], bed - stub": { "content": [ @@ -56,7 +64,7 @@ { "id": "test" }, - "test.vcf.gz:md5,03899fb4a8ca115e54a1db46800096cb" + "test.vcf.gz:md5,2015f1ef3d10bf8ce99882099b61b185" ] ], "1": [ @@ -64,18 +72,22 @@ { "id": "test" }, - "test.spanning.bam:md5,0f1755fd47e7c942fda2282c5da2e8e8" + "test.spanning.bam:md5,1370db3a5d025cdde50676fab4235c5f" ] ], "2": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ], "bam": [ [ { "id": "test" }, - "test.spanning.bam:md5,0f1755fd47e7c942fda2282c5da2e8e8" + "test.spanning.bam:md5,1370db3a5d025cdde50676fab4235c5f" ] ], "vcf": [ @@ -83,11 +95,15 @@ { "id": "test" }, - "test.vcf.gz:md5,03899fb4a8ca115e54a1db46800096cb" + "test.vcf.gz:md5,2015f1ef3d10bf8ce99882099b61b185" ] ], - "versions": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + "versions_trgt": [ + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ] } ], @@ -95,7 +111,7 @@ "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:21.404862883" + "timestamp": "2025-12-09T16:16:15.759484541" }, "homo sapiens - [bam,bai,XX], [fa,fai], bed - stub": { "content": [ @@ -117,7 +133,11 @@ ] ], "2": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ], "bam": [ [ @@ -135,8 +155,12 @@ "test.vcf.gz:md5,68b329da9893e34099c7d8ad5cb9c940" ] ], - "versions": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + "versions_trgt": [ + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ] } ], @@ -144,7 +168,7 @@ "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:16.057879354" + "timestamp": "2025-12-09T16:16:10.709433028" }, "homo sapiens - [bam,bai,[]], [fa,fai], bed": { "content": [ @@ -154,7 +178,7 @@ { "id": "test" }, - "test.vcf.gz:md5,03899fb4a8ca115e54a1db46800096cb" + "test.vcf.gz:md5,2015f1ef3d10bf8ce99882099b61b185" ] ], "1": [ @@ -162,18 +186,22 @@ { "id": "test" }, - "test.spanning.bam:md5,0f1755fd47e7c942fda2282c5da2e8e8" + "test.spanning.bam:md5,1370db3a5d025cdde50676fab4235c5f" ] ], "2": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ], "bam": [ [ { "id": "test" }, - "test.spanning.bam:md5,0f1755fd47e7c942fda2282c5da2e8e8" + "test.spanning.bam:md5,1370db3a5d025cdde50676fab4235c5f" ] ], "vcf": [ @@ -181,11 +209,15 @@ { "id": "test" }, - "test.vcf.gz:md5,03899fb4a8ca115e54a1db46800096cb" + "test.vcf.gz:md5,2015f1ef3d10bf8ce99882099b61b185" ] ], - "versions": [ - "versions.yml:md5,cf70c46a111ed5f7a9bdd432b6f579b6" + "versions_trgt": [ + [ + "TRGT_GENOTYPE", + "trgt", + "4.1.0-39fa24c" + ] ] } ], @@ -193,6 +225,6 @@ "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:10.595588655" + "timestamp": "2025-12-09T16:16:05.648952742" } } \ No newline at end of file diff --git a/modules/nf-core/trgt/merge/environment.yml b/modules/nf-core/trgt/merge/environment.yml index 8174b1f6505c..5ff336d40646 100644 --- a/modules/nf-core/trgt/merge/environment.yml +++ b/modules/nf-core/trgt/merge/environment.yml @@ -4,4 +4,4 @@ channels: - conda-forge - bioconda dependencies: - - bioconda::trgt=4.0.0 + - bioconda::trgt=4.1.0 diff --git a/modules/nf-core/trgt/merge/main.nf b/modules/nf-core/trgt/merge/main.nf index 815d291c0365..07cf2d9c640f 100644 --- a/modules/nf-core/trgt/merge/main.nf +++ b/modules/nf-core/trgt/merge/main.nf @@ -4,8 +4,8 @@ process TRGT_MERGE { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/trgt:4.0.0--h9ee0642_0': - 'biocontainers/trgt:4.0.0--h9ee0642_0' }" + 'https://depot.galaxyproject.org/singularity/trgt:4.1.0--h9ee0642_0': + 'biocontainers/trgt:4.1.0--h9ee0642_0' }" input: tuple val(meta) , path(vcfs), path(tbis) @@ -14,7 +14,7 @@ process TRGT_MERGE { output: tuple val(meta), path("*.{vcf,vcf.gz,bcf,bcf.gz}"), emit: vcf - path "versions.yml" , emit: versions + tuple val("${task.process}"), val('trgt'), eval("trgt --version | sed 's/.* //g'"), emit: versions_trgt, topic: versions when: task.ext.when == null || task.ext.when diff --git a/modules/nf-core/trgt/merge/meta.yml b/modules/nf-core/trgt/merge/meta.yml index 3020ea10976e..72ed57d50a93 100644 --- a/modules/nf-core/trgt/merge/meta.yml +++ b/modules/nf-core/trgt/merge/meta.yml @@ -72,14 +72,28 @@ output: description: "Merged output file" pattern: "*.{vcf,vcf.gz,bcf,bcf.gz}" ontologies: [] - versions: - - versions.yml: - type: file - description: File containing software versions - pattern: "versions.yml" + versions_trgt: + - - ${task.process}: + type: string + description: The name of the process + - trgt: + type: string + description: The name of the tool + - trgt --version | sed 's/.* //g': + type: eval + description: The expression to obtain the version of the tool - ontologies: - - edam: http://edamontology.org/format_3750 # YAML +topics: + versions: + - - ${task.process}: + type: string + description: The name of the process + - trgt: + type: string + description: The name of the tool + - trgt --version | sed 's/.* //g': + type: eval + description: The expression to obtain the version authors: - "@Schmytzi" maintainers: diff --git a/modules/nf-core/trgt/merge/tests/main.nf.test b/modules/nf-core/trgt/merge/tests/main.nf.test index d25e871ed28a..5b3697a1e233 100644 --- a/modules/nf-core/trgt/merge/tests/main.nf.test +++ b/modules/nf-core/trgt/merge/tests/main.nf.test @@ -95,7 +95,7 @@ nextflow_process { path(process.out.vcf.get(0).get(1)).vcf.variantsMD5, path(process.out.vcf.get(0).get(1)).vcf.summary, path(process.out.vcf.get(0).get(1)).vcf.sampleCount, - process.out.versions + process.out.findAll { key, val -> key.startsWith("versions")} ).match() } ) } @@ -120,7 +120,7 @@ nextflow_process { path(process.out.vcf.get(0).get(1)).vcf.variantsMD5, path(process.out.vcf.get(0).get(1)).vcf.summary, path(process.out.vcf.get(0).get(1)).vcf.sampleCount, - process.out.versions + process.out.findAll { key, val -> key.startsWith("versions")} ).match() } ) } @@ -165,7 +165,7 @@ nextflow_process { path(process.out.vcf.get(0).get(1)).vcf.variantsMD5, path(process.out.vcf.get(0).get(1)).vcf.summary, path(process.out.vcf.get(0).get(1)).vcf.sampleCount, - process.out.versions + process.out.findAll { key, val -> key.startsWith("versions")} ).match() } ) } @@ -187,7 +187,10 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out, + process.out.findAll { key, val -> key.startsWith("versions")} + ).match() } ) } } diff --git a/modules/nf-core/trgt/merge/tests/main.nf.test.snap b/modules/nf-core/trgt/merge/tests/main.nf.test.snap index b299852bb314..147860e39619 100644 --- a/modules/nf-core/trgt/merge/tests/main.nf.test.snap +++ b/modules/nf-core/trgt/merge/tests/main.nf.test.snap @@ -4,30 +4,42 @@ "ec69cbc40d4a9766d87a62ba4835ae52", "VcfFile [chromosomes=[chr22], sampleCount=2, variantCount=1, phased=false, phasedAutodetect=false]", 2, - [ - "versions.yml:md5,32d0e033481d117ce09ad340b854ac07" - ] + { + "versions_trgt": [ + [ + "TRGT_MERGE", + "trgt", + "4.1.0-39fa24c" + ] + ] + } ], "meta": { "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:32.225480759" + "timestamp": "2025-12-06T13:08:24.392230593" }, "homo sapiens - 2 VCFs": { "content": [ "ec69cbc40d4a9766d87a62ba4835ae52", "VcfFile [chromosomes=[chr22], sampleCount=2, variantCount=1, phased=false, phasedAutodetect=false]", 2, - [ - "versions.yml:md5,32d0e033481d117ce09ad340b854ac07" - ] + { + "versions_trgt": [ + [ + "TRGT_MERGE", + "trgt", + "4.1.0-39fa24c" + ] + ] + } ], "meta": { "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:26.833626863" + "timestamp": "2025-12-06T13:08:18.192678929" }, "homo sapiens - 2 VCFs - stub": { "content": [ @@ -41,7 +53,11 @@ ] ], "1": [ - "versions.yml:md5,32d0e033481d117ce09ad340b854ac07" + [ + "TRGT_MERGE", + "trgt", + "4.1.0-39fa24c" + ] ], "vcf": [ [ @@ -51,8 +67,21 @@ "test.vcf:md5,d41d8cd98f00b204e9800998ecf8427e" ] ], - "versions": [ - "versions.yml:md5,32d0e033481d117ce09ad340b854ac07" + "versions_trgt": [ + [ + "TRGT_MERGE", + "trgt", + "4.1.0-39fa24c" + ] + ] + }, + { + "versions_trgt": [ + [ + "TRGT_MERGE", + "trgt", + "4.1.0-39fa24c" + ] ] } ], @@ -60,21 +89,27 @@ "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:48.710491165" + "timestamp": "2025-12-06T13:08:42.242325427" }, "homo sapiens - 1 VCF - --force-single": { "content": [ "57131f453c695cbea40812f6c246d0f", "VcfFile [chromosomes=[chr22], sampleCount=1, variantCount=1, phased=false, phasedAutodetect=false]", 1, - [ - "versions.yml:md5,32d0e033481d117ce09ad340b854ac07" - ] + { + "versions_trgt": [ + [ + "TRGT_MERGE", + "trgt", + "4.1.0-39fa24c" + ] + ] + } ], "meta": { "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:42.468465675" + "timestamp": "2025-12-06T13:08:36.269439614" } } \ No newline at end of file diff --git a/modules/nf-core/trgt/plot/environment.yml b/modules/nf-core/trgt/plot/environment.yml index 8174b1f6505c..5ff336d40646 100644 --- a/modules/nf-core/trgt/plot/environment.yml +++ b/modules/nf-core/trgt/plot/environment.yml @@ -4,4 +4,4 @@ channels: - conda-forge - bioconda dependencies: - - bioconda::trgt=4.0.0 + - bioconda::trgt=4.1.0 diff --git a/modules/nf-core/trgt/plot/main.nf b/modules/nf-core/trgt/plot/main.nf index e252fd25efe9..c0d70507e2e9 100644 --- a/modules/nf-core/trgt/plot/main.nf +++ b/modules/nf-core/trgt/plot/main.nf @@ -4,8 +4,8 @@ process TRGT_PLOT { conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/trgt:4.0.0--h9ee0642_0': - 'biocontainers/trgt:4.0.0--h9ee0642_0' }" + 'https://depot.galaxyproject.org/singularity/trgt:4.1.0--h9ee0642_0': + 'biocontainers/trgt:4.1.0--h9ee0642_0' }" input: tuple val(meta) , path(bam), path(bai), path(vcf), path(tbi), val(repeat_id) @@ -15,7 +15,7 @@ process TRGT_PLOT { output: tuple val(meta), path("*.{png,pdf,svg}"), emit: plot - path "versions.yml" , emit: versions + tuple val("${task.process}"), val('trgt'), eval("trgt --version | sed 's/.* //g'"), emit: versions_trgt, topic: versions when: task.ext.when == null || task.ext.when diff --git a/modules/nf-core/trgt/plot/meta.yml b/modules/nf-core/trgt/plot/meta.yml index 00a06ac000a5..8435c7aecd5d 100644 --- a/modules/nf-core/trgt/plot/meta.yml +++ b/modules/nf-core/trgt/plot/meta.yml @@ -91,14 +91,28 @@ output: description: "Plot of region and reads spanning tandem repeat" pattern: "*.{png,pdf,svg}" ontologies: [] - versions: - - versions.yml: - type: file - description: File containing software versions - pattern: "versions.yml" + versions_trgt: + - - ${task.process}: + type: string + description: The name of the process + - trgt: + type: string + description: The name of the tool + - trgt --version | sed 's/.* //g': + type: eval + description: The expression to obtain the version of the tool - ontologies: - - edam: http://edamontology.org/format_3750 # YAML +topics: + versions: + - - ${task.process}: + type: string + description: The name of the process + - trgt: + type: string + description: The name of the tool + - trgt --version | sed 's/.* //g': + type: eval + description: The expression to obtain the version authors: - "@Schmytzi" maintainers: diff --git a/modules/nf-core/trgt/plot/tests/main.nf.test b/modules/nf-core/trgt/plot/tests/main.nf.test index 175da2e4c946..a7fd516b3a3e 100644 --- a/modules/nf-core/trgt/plot/tests/main.nf.test +++ b/modules/nf-core/trgt/plot/tests/main.nf.test @@ -107,7 +107,7 @@ nextflow_process { { assert process.success }, { assert snapshot( file(process.out.plot.get(0).get(1)).name, //unstable - process.out.versions + process.out.findAll { key, val -> key.startsWith("versions")} ).match() } ) } @@ -136,7 +136,7 @@ nextflow_process { { assert process.success }, { assert snapshot( file(process.out.plot.get(0).get(1)).name, //unstable - process.out.versions + process.out.findAll { key, val -> key.startsWith("versions")} ).match() } ) } diff --git a/modules/nf-core/trgt/plot/tests/main.nf.test.snap b/modules/nf-core/trgt/plot/tests/main.nf.test.snap index 18d41e94c0ee..4590da7275fb 100644 --- a/modules/nf-core/trgt/plot/tests/main.nf.test.snap +++ b/modules/nf-core/trgt/plot/tests/main.nf.test.snap @@ -2,27 +2,39 @@ "homo sapiens - [bam, bai, vcf, TEST], fasta, fai, bed - stub": { "content": [ "test.png", - [ - "versions.yml:md5,011b1667b12181926498f87d148ee365" - ] + { + "versions_trgt": [ + [ + "TRGT_PLOT", + "trgt", + "4.1.0-39fa24c" + ] + ] + } ], "meta": { "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:20:01.293786322" + "timestamp": "2025-12-06T13:08:55.463192387" }, "homo sapiens - [bam, bai, vcf, TEST], fasta, fai, bed": { "content": [ "test_TEST.png", - [ - "versions.yml:md5,011b1667b12181926498f87d148ee365" - ] + { + "versions_trgt": [ + [ + "TRGT_PLOT", + "trgt", + "4.1.0-39fa24c" + ] + ] + } ], "meta": { "nf-test": "0.9.2", "nextflow": "25.04.6" }, - "timestamp": "2025-10-23T11:19:54.583487786" + "timestamp": "2025-12-06T13:08:48.783944144" } } \ No newline at end of file