Skip to content

Commit fed36ff

Browse files
tetedange13felix.vandermeeren@chu-montpellier.fr
andauthored
[module knotAnnotSV] FIX: Merge mutually exclusive outputs into 1 (#11432)
FIX: Mutually exclusive outputs -> merge into 1 Co-authored-by: felix.vandermeeren@chu-montpellier.fr <felix@zazienew.bio2m.local>
1 parent 4c13886 commit fed36ff

5 files changed

Lines changed: 29 additions & 46 deletions

File tree

modules/nf-core/knotannotsv/main.nf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ process KNOTANNOTSV {
1111
tuple val(meta), path(annotsv_tsv), val(knot_out_xl)
1212

1313
output:
14-
tuple val(meta), path("*.html"), emit: html, optional: true
15-
tuple val(meta), path("*.xlsm"), emit: xl, optional: true
14+
tuple val(meta), path("*.{html,xlsm}"), emit: output_file
1615
// CHANGE bellow when UPDATE
1716
tuple val("${task.process}"), val('knotannotsv'), val('1.1.5'), emit: versions_knotannotsv, topic: versions
1817

modules/nf-core/knotannotsv/meta.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/meta-schema.json
12
name: "knotannotsv"
23
description: Simple tool to create a customizable html file (to be displayed on
34
a web browser) from an AnnotSV output
@@ -32,29 +33,18 @@ input:
3233
type: boolean
3334
description: Specify 'true' to output as XLSM (rather than HTML by default)
3435
output:
35-
html:
36+
output_file:
3637
- - meta:
3738
type: map
3839
description: |
3940
Groovy Map containing sample information
4041
e.g. `[ id:'sample1' ]`
41-
- "*.html":
42+
- "*.{html,xlsm}":
4243
type: file
43-
description: HTML annotated file
44-
pattern: "*.html"
44+
description: HTML (or XLSM if 'knot_out_xl=true') annotated file
45+
pattern: "*.{html,xlsm}"
4546
ontologies:
4647
- edam: "http://edamontology.org/format_2331" # HTML
47-
xl:
48-
- - meta:
49-
type: map
50-
description: |
51-
Groovy Map containing sample information
52-
e.g. `[ id:'sample1' ]`
53-
- "*.xlsm":
54-
type: file
55-
description: Alternative XLSM annotated file (if 'knot_out_xl=true')
56-
pattern: "*.xlsm"
57-
ontologies:
5848
- edam: "http://edamontology.org/format_3620" # XLSX
5949
versions_knotannotsv:
6050
- - ${task.process}:

modules/nf-core/knotannotsv/tests/main.nf.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ nextflow_process {
3333
{ assert process.success },
3434
{ assert snapshot(
3535
process.out.findAll { key, val -> key.startsWith('versions') },
36-
"test_HTML_output_lines_count: ${path(process.out.html[0][1]).readLines().size()}"
36+
"test_HTML_output_lines_count: ${path(process.out.output_file[0][1]).readLines().size()}"
3737
).match()
3838
}
3939
)
@@ -63,7 +63,7 @@ nextflow_process {
6363
{ assert process.success },
6464
{ assert snapshot(
6565
process.out.findAll { key, val -> key.startsWith('versions') },
66-
"test_Excel_output_min_size: ${file(process.out.xl[0][1]).length() >= 89000}"
66+
"test_Excel_output_min_size: ${file(process.out.output_file[0][1]).length() >= 89000}"
6767
).match()
6868
}
6969
)

modules/nf-core/knotannotsv/tests/main.nf.test.snap

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,27 @@
22
"homo_sapiens - annotsv_tsv, knot_out_xl - stub - XLSM output": {
33
"content": [
44
{
5-
"html": [
6-
5+
"output_file": [
6+
[
7+
{
8+
"id": "test"
9+
},
10+
"test.xlsm:md5,d41d8cd98f00b204e9800998ecf8427e"
11+
]
712
],
813
"versions_knotannotsv": [
914
[
1015
"KNOTANNOTSV",
1116
"knotannotsv",
1217
"1.1.5"
1318
]
14-
],
15-
"xl": [
16-
[
17-
{
18-
"id": "test"
19-
},
20-
"test.xlsm:md5,d41d8cd98f00b204e9800998ecf8427e"
21-
]
2219
]
2320
}
2421
],
25-
"timestamp": "2026-04-09T10:42:35.523232226",
22+
"timestamp": "2026-04-30T11:58:24.702285389",
2623
"meta": {
27-
"nf-test": "0.9.4",
28-
"nextflow": "26.03.0"
24+
"nf-test": "0.9.5",
25+
"nextflow": "26.03.2"
2926
}
3027
},
3128
"homo_sapiens - annotsv_tsv, knot_out_xl - XLSM output": {
@@ -41,10 +38,10 @@
4138
},
4239
"test_Excel_output_min_size: true"
4340
],
44-
"timestamp": "2026-04-08T16:46:37.607548934",
41+
"timestamp": "2026-04-30T11:58:04.22923394",
4542
"meta": {
46-
"nf-test": "0.9.4",
47-
"nextflow": "26.03.0"
43+
"nf-test": "0.9.5",
44+
"nextflow": "26.03.2"
4845
}
4946
},
5047
"homo_sapiens - annotsv_tsv, knot_out_xl - HTML output": {
@@ -60,16 +57,16 @@
6057
},
6158
"test_HTML_output_lines_count: 5249"
6259
],
63-
"timestamp": "2026-04-08T16:46:25.466379551",
60+
"timestamp": "2026-04-30T11:57:52.944222502",
6461
"meta": {
65-
"nf-test": "0.9.4",
66-
"nextflow": "26.03.0"
62+
"nf-test": "0.9.5",
63+
"nextflow": "26.03.2"
6764
}
6865
},
6966
"homo_sapiens - annotsv_tsv, knot_out_xl - stub - HTML output": {
7067
"content": [
7168
{
72-
"html": [
69+
"output_file": [
7370
[
7471
{
7572
"id": "test"
@@ -83,16 +80,13 @@
8380
"knotannotsv",
8481
"1.1.5"
8582
]
86-
],
87-
"xl": [
88-
8983
]
9084
}
9185
],
92-
"timestamp": "2026-04-09T10:42:24.714283695",
86+
"timestamp": "2026-04-30T11:58:14.502123897",
9387
"meta": {
94-
"nf-test": "0.9.4",
95-
"nextflow": "26.03.0"
88+
"nf-test": "0.9.5",
89+
"nextflow": "26.03.2"
9690
}
9791
}
9892
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
process {
22
withName: KNOTANNOTSV {
3-
ext.args = params.module_args
3+
ext.args = params.module_args
44
}
55
}

0 commit comments

Comments
 (0)