diff --git a/modules.json b/modules.json index 9a81633a..7129a5a9 100644 --- a/modules.json +++ b/modules.json @@ -38,7 +38,7 @@ }, "busco/busco": { "branch": "master", - "git_sha": "9a19690b0a3fae05fa1a6ad90a0720d681429e31", + "git_sha": "d34caf3c0d3cf5b9bae0fae6107bab0933c96f37", "installed_by": ["modules"] }, "cat/fastq": { diff --git a/modules/nf-core/busco/busco/main.nf b/modules/nf-core/busco/busco/main.nf index e2da7363..609cae95 100644 --- a/modules/nf-core/busco/busco/main.nf +++ b/modules/nf-core/busco/busco/main.nf @@ -24,6 +24,8 @@ process BUSCO_BUSCO { tuple val(meta), path("*-busco/*/run_*/busco_sequences") , emit: seq_dir , optional: true tuple val(meta), path("*-busco/*/translated_proteins") , emit: translated_dir , optional: true tuple val(meta), path("*-busco") , emit: busco_dir + tuple val(meta), path("busco_downloads/lineages/*") , emit: downloaded_lineages , optional: true + path "versions.yml" , emit: versions when: diff --git a/modules/nf-core/busco/busco/meta.yml b/modules/nf-core/busco/busco/meta.yml index 9076b8c4..8f719e08 100644 --- a/modules/nf-core/busco/busco/meta.yml +++ b/modules/nf-core/busco/busco/meta.yml @@ -46,7 +46,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - "*-busco.batch_summary.txt": type: file description: Summary of all sequence files analyzed @@ -56,7 +56,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - short_summary.*.txt: type: file description: Short Busco summary in plain text format @@ -66,7 +66,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - short_summary.*.json: type: file description: Short Busco summary in JSON format @@ -76,7 +76,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - "*-busco/*/run_*/full_table.tsv": type: file description: Full BUSCO results table @@ -86,7 +86,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - "*-busco/*/run_*/missing_busco_list.tsv": type: file description: List of missing BUSCOs @@ -96,7 +96,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - "*-busco/*/run_*/single_copy_proteins.faa": type: file description: Fasta file of single copy proteins (transcriptome mode) @@ -106,7 +106,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - "*-busco/*/run_*/busco_sequences": type: directory description: BUSCO sequence directory @@ -116,7 +116,7 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - "*-busco/*/translated_proteins": type: directory description: Six frame translations of each transcript made by the transcriptome @@ -127,11 +127,21 @@ output: type: map description: | Groovy Map containing sample information - e.g. [ id:'test', single_end:false ] + e.g. [ id:'test' ] - "*-busco": type: directory description: BUSCO lineage specific output pattern: "*-busco" + - downloaded_lineages: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test' ] + - "busco_downloads/lineages/*": + type: directory + description: Lineages downloaded by BUSCO when running the analysis, for example bacteria_odb12 + pattern: "busco_downloads/lineages/*" - versions: - versions.yml: type: file diff --git a/modules/nf-core/busco/busco/tests/main.nf.test b/modules/nf-core/busco/busco/tests/main.nf.test index 7aa131fc..55954a73 100644 --- a/modules/nf-core/busco/busco/tests/main.nf.test +++ b/modules/nf-core/busco/busco/tests/main.nf.test @@ -406,7 +406,10 @@ nextflow_process { then { assertAll( { assert process.success }, - { assert snapshot(process.out).match() } + { assert snapshot( + process.out.batch_summary, + process.out.versions + ).match() } ) } } diff --git a/modules/nf-core/busco/busco/tests/main.nf.test.snap b/modules/nf-core/busco/busco/tests/main.nf.test.snap index a177c48e..0f44373f 100644 --- a/modules/nf-core/busco/busco/tests/main.nf.test.snap +++ b/modules/nf-core/busco/busco/tests/main.nf.test.snap @@ -1,124 +1,23 @@ { "minimal-stub": { "content": [ - { - "0": [ - [ - { - "id": "test" - }, - "test-bacteria_odb12-busco.batch_summary.txt:md5,d41d8cd98f00b204e9800998ecf8427e" - ] - ], - "1": [ - - ], - "2": [ - - ], - "3": [ - - ], - "4": [ - - ], - "5": [ - - ], - "6": [ - [ - { - "id": "test" - }, - [ - - ] - ] - ], - "7": [ - - ], - "8": [ - [ - { - "id": "test" - }, - [ - [ - [ - [ - - ] - ] - ] - ] - ] - ], - "9": [ - "versions.yml:md5,c6e638f981761c13cd9ff7663cf707e6" - ], - "batch_summary": [ - [ - { - "id": "test" - }, - "test-bacteria_odb12-busco.batch_summary.txt:md5,d41d8cd98f00b204e9800998ecf8427e" - ] - ], - "busco_dir": [ - [ - { - "id": "test" - }, - [ - [ - [ - [ - - ] - ] - ] - ] - ] - ], - "full_table": [ - - ], - "missing_busco_list": [ - - ], - "seq_dir": [ - [ - { - "id": "test" - }, - [ - - ] - ] - ], - "short_summaries_json": [ - - ], - "short_summaries_txt": [ - - ], - "single_copy_proteins": [ - - ], - "translated_dir": [ - - ], - "versions": [ - "versions.yml:md5,c6e638f981761c13cd9ff7663cf707e6" + [ + [ + { + "id": "test" + }, + "test-bacteria_odb12-busco.batch_summary.txt:md5,d41d8cd98f00b204e9800998ecf8427e" ] - } + ], + [ + "versions.yml:md5,c6e638f981761c13cd9ff7663cf707e6" + ] ], "meta": { "nf-test": "0.9.2", - "nextflow": "24.10.1" + "nextflow": "24.10.2" }, - "timestamp": "2024-12-11T12:45:52.045550047" + "timestamp": "2024-12-13T15:30:45.505241761" }, "test_busco_eukaryote_augustus": { "content": [