Skip to content

Commit 9b7b083

Browse files
jfy133SPPearce
andauthored
Update all hAMRonization modules to latest version (#9171)
* Add new input channel for premade seqid2map file * Add extra tests for using custom seqid2map file * Apply suggestions from code review * Update modules/nf-core/kraken2/build/tests/main.nf.test Co-authored-by: Simon Pearce <24893913+SPPearce@users.noreply.github.com> * update all hAMRonization modules to latest version --------- Co-authored-by: Simon Pearce <24893913+SPPearce@users.noreply.github.com>
1 parent a621003 commit 9b7b083

19 files changed

Lines changed: 137 additions & 137 deletions

File tree

modules/nf-core/hamronization/abricate/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ channels:
44
- conda-forge
55
- bioconda
66
dependencies:
7-
- bioconda::hamronization=1.1.4
7+
- bioconda::hamronization=1.1.9

modules/nf-core/hamronization/abricate/main.nf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
process HAMRONIZATION_ABRICATE {
2-
tag "$meta.id"
2+
tag "${meta.id}"
33
label 'process_single'
44

55
conda "${moduleDir}/environment.yml"
6-
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
7-
'https://depot.galaxyproject.org/singularity/hamronization:1.1.4--pyhdfd78af_0':
8-
'biocontainers/hamronization:1.1.4--pyhdfd78af_0' }"
6+
container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container
7+
? 'https://depot.galaxyproject.org/singularity/hamronization:1.1.9--pyhdfd78af_0'
8+
: 'biocontainers/hamronization:1.1.9--pyhdfd78af_0'}"
99

1010
input:
1111
tuple val(meta), path(report)
12-
val(format)
13-
val(software_version)
14-
val(reference_db_version)
12+
val format
13+
val software_version
14+
val reference_db_version
1515

1616
output:
1717
tuple val(meta), path("*.json"), optional: true, emit: json
18-
tuple val(meta), path("*.tsv") , optional: true, emit: tsv
19-
path "versions.yml" , emit: versions
18+
tuple val(meta), path("*.tsv"), optional: true, emit: tsv
19+
path "versions.yml", emit: versions
2020

2121
when:
2222
task.ext.when == null || task.ext.when
@@ -28,7 +28,7 @@ process HAMRONIZATION_ABRICATE {
2828
hamronize \\
2929
abricate \\
3030
${report} \\
31-
$args \\
31+
${args} \\
3232
--format ${format} \\
3333
--analysis_software_version ${software_version} \\
3434
--reference_database_version ${reference_db_version} \\

modules/nf-core/hamronization/abricate/tests/main.nf.test.snap

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
]
1515
],
1616
"2": [
17-
"versions.yml:md5,c826615ee7b88b615cae5bded792b790"
17+
"versions.yml:md5,113fee72fb15d06692b7fc29ee477aff"
1818
],
1919
"json": [
2020

@@ -28,15 +28,15 @@
2828
]
2929
],
3030
"versions": [
31-
"versions.yml:md5,c826615ee7b88b615cae5bded792b790"
31+
"versions.yml:md5,113fee72fb15d06692b7fc29ee477aff"
3232
]
3333
}
3434
],
3535
"meta": {
36-
"nf-test": "0.8.4",
37-
"nextflow": "23.10.1"
36+
"nf-test": "0.9.2",
37+
"nextflow": "25.04.7"
3838
},
39-
"timestamp": "2024-02-07T22:16:18.968989666"
39+
"timestamp": "2025-10-04T06:44:38.664437882"
4040
},
4141
"hamronization/abricate - bacteroides_fragilis - genome_abricate_tsv - stub": {
4242
"content": [
@@ -53,7 +53,7 @@
5353
]
5454
],
5555
"2": [
56-
"versions.yml:md5,c826615ee7b88b615cae5bded792b790"
56+
"versions.yml:md5,113fee72fb15d06692b7fc29ee477aff"
5757
],
5858
"json": [
5959

@@ -67,14 +67,14 @@
6767
]
6868
],
6969
"versions": [
70-
"versions.yml:md5,c826615ee7b88b615cae5bded792b790"
70+
"versions.yml:md5,113fee72fb15d06692b7fc29ee477aff"
7171
]
7272
}
7373
],
7474
"meta": {
75-
"nf-test": "0.8.4",
76-
"nextflow": "23.10.1"
75+
"nf-test": "0.9.2",
76+
"nextflow": "25.04.7"
7777
},
78-
"timestamp": "2024-02-07T22:25:57.524839789"
78+
"timestamp": "2025-10-04T06:44:45.131612041"
7979
}
8080
}

modules/nf-core/hamronization/amrfinderplus/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ channels:
44
- conda-forge
55
- bioconda
66
dependencies:
7-
- bioconda::hamronization=1.1.4
7+
- bioconda::hamronization=1.1.9

modules/nf-core/hamronization/amrfinderplus/main.nf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
process HAMRONIZATION_AMRFINDERPLUS {
2-
tag "$meta.id"
2+
tag "${meta.id}"
33
label 'process_single'
44

55
conda "${moduleDir}/environment.yml"
6-
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
7-
'https://depot.galaxyproject.org/singularity/hamronization:1.1.4--pyhdfd78af_0':
8-
'biocontainers/hamronization:1.1.4--pyhdfd78af_0' }"
6+
container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container
7+
? 'https://depot.galaxyproject.org/singularity/hamronization:1.1.9--pyhdfd78af_0'
8+
: 'biocontainers/hamronization:1.1.9--pyhdfd78af_0'}"
99

1010
input:
1111
tuple val(meta), path(report)
12-
val(format)
13-
val(software_version)
14-
val(reference_db_version)
12+
val format
13+
val software_version
14+
val reference_db_version
1515

1616
output:
17-
tuple val(meta), path("*.json") , optional: true, emit: json
18-
tuple val(meta), path("*.tsv") , optional: true, emit: tsv
19-
path "versions.yml" , emit: versions
17+
tuple val(meta), path("*.json"), optional: true, emit: json
18+
tuple val(meta), path("*.tsv"), optional: true, emit: tsv
19+
path "versions.yml", emit: versions
2020

2121
when:
2222
task.ext.when == null || task.ext.when
@@ -28,7 +28,7 @@ process HAMRONIZATION_AMRFINDERPLUS {
2828
hamronize \\
2929
amrfinderplus \\
3030
${report} \\
31-
$args \\
31+
${args} \\
3232
--format ${format} \\
3333
--analysis_software_version ${software_version} \\
3434
--reference_database_version ${reference_db_version} \\

modules/nf-core/hamronization/amrfinderplus/tests/main.nf.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ nextflow_process {
1616
"""
1717
input[0] = [
1818
[ id:'test', single_end:false ], // meta map
19-
file("https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/delete_me/amrfinderplus/test_output.tsv", checkIfExists: true)
19+
file("https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/delete_me/amrfinderplus/test_output_prot.tsv", checkIfExists: true)
2020
]
2121
input[1] = 'tsv'
22-
input[2] = '3.10.30'
23-
input[3] = '2022-05-26.1'
22+
input[2] = '4.0.23'
23+
input[3] = '2025-07-16.1'
2424
"""
2525
}
2626
}
@@ -43,11 +43,11 @@ nextflow_process {
4343
"""
4444
input[0] = [
4545
[ id:'test', single_end:false ], // meta map
46-
file("https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/delete_me/amrfinderplus/test_output.tsv", checkIfExists: true)
46+
file("https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/delete_me/amrfinderplus/test_output_prot.tsv", checkIfExists: true)
4747
]
4848
input[1] = 'tsv'
49-
input[2] = '3.10.30'
50-
input[3] = '2022-05-26.1'
49+
input[2] = '4.0.23'
50+
input[3] = '2025-07-16.1'
5151
"""
5252
}
5353
}

modules/nf-core/hamronization/amrfinderplus/tests/main.nf.test.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
],
1717
"2": [
18-
"versions.yml:md5,8a2099aeaf76a6cacfca285faa389257"
18+
"versions.yml:md5,bb043ef684cba407b418320169e43fca"
1919
],
2020
"json": [
2121

@@ -30,15 +30,15 @@
3030
]
3131
],
3232
"versions": [
33-
"versions.yml:md5,8a2099aeaf76a6cacfca285faa389257"
33+
"versions.yml:md5,bb043ef684cba407b418320169e43fca"
3434
]
3535
}
3636
],
3737
"meta": {
38-
"nf-test": "0.8.4",
39-
"nextflow": "23.10.1"
38+
"nf-test": "0.9.2",
39+
"nextflow": "25.04.7"
4040
},
41-
"timestamp": "2024-02-07T10:47:35.965140591"
41+
"timestamp": "2025-10-04T06:44:58.153879797"
4242
},
4343
"hamronization/amrfinderplus - delete_me/amrfinderplus - tsv": {
4444
"content": [
@@ -52,11 +52,11 @@
5252
"id": "test",
5353
"single_end": false
5454
},
55-
"test.tsv:md5,cde9a32a5b0a8902c4a76ebd2a820d4d"
55+
"test.tsv:md5,129da2f25d4d68ab106990f1ae31d999"
5656
]
5757
],
5858
"2": [
59-
"versions.yml:md5,8a2099aeaf76a6cacfca285faa389257"
59+
"versions.yml:md5,bb043ef684cba407b418320169e43fca"
6060
],
6161
"json": [
6262

@@ -67,18 +67,18 @@
6767
"id": "test",
6868
"single_end": false
6969
},
70-
"test.tsv:md5,cde9a32a5b0a8902c4a76ebd2a820d4d"
70+
"test.tsv:md5,129da2f25d4d68ab106990f1ae31d999"
7171
]
7272
],
7373
"versions": [
74-
"versions.yml:md5,8a2099aeaf76a6cacfca285faa389257"
74+
"versions.yml:md5,bb043ef684cba407b418320169e43fca"
7575
]
7676
}
7777
],
7878
"meta": {
79-
"nf-test": "0.8.4",
80-
"nextflow": "23.10.1"
79+
"nf-test": "0.9.2",
80+
"nextflow": "25.04.7"
8181
},
82-
"timestamp": "2024-02-07T10:47:30.194755603"
82+
"timestamp": "2025-10-04T07:43:32.220753935"
8383
}
8484
}

modules/nf-core/hamronization/deeparg/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ channels:
44
- conda-forge
55
- bioconda
66
dependencies:
7-
- bioconda::hamronization=1.1.4
7+
- bioconda::hamronization=1.1.9

modules/nf-core/hamronization/deeparg/main.nf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
process HAMRONIZATION_DEEPARG {
2-
tag "$meta.id"
2+
tag "${meta.id}"
33
label 'process_single'
44

55
conda "${moduleDir}/environment.yml"
6-
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
7-
'https://depot.galaxyproject.org/singularity/hamronization:1.1.4--pyhdfd78af_0':
8-
'biocontainers/hamronization:1.1.4--pyhdfd78af_0' }"
6+
container "${workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container
7+
? 'https://depot.galaxyproject.org/singularity/hamronization:1.1.9--pyhdfd78af_0'
8+
: 'biocontainers/hamronization:1.1.9--pyhdfd78af_0'}"
99

1010
input:
1111
tuple val(meta), path(report)
12-
val(format)
13-
val(software_version)
14-
val(reference_db_version)
12+
val format
13+
val software_version
14+
val reference_db_version
1515

1616
output:
1717
tuple val(meta), path("*.json"), optional: true, emit: json
18-
tuple val(meta), path("*.tsv") , optional: true, emit: tsv
19-
path "versions.yml" , emit: versions
18+
tuple val(meta), path("*.tsv"), optional: true, emit: tsv
19+
path "versions.yml", emit: versions
2020

2121
when:
2222
task.ext.when == null || task.ext.when
@@ -28,7 +28,7 @@ process HAMRONIZATION_DEEPARG {
2828
hamronize \\
2929
deeparg \\
3030
${report} \\
31-
$args \\
31+
${args} \\
3232
--format ${format} \\
3333
--analysis_software_version ${software_version} \\
3434
--reference_database_version ${reference_db_version} \\

modules/nf-core/hamronization/deeparg/tests/main.nf.test.snap

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
],
1717
"2": [
18-
"versions.yml:md5,2f75284447982578412e05eb09c5367f"
18+
"versions.yml:md5,e574e91477c7753e96c2e8411419cec1"
1919
],
2020
"json": [
2121

@@ -30,15 +30,15 @@
3030
]
3131
],
3232
"versions": [
33-
"versions.yml:md5,2f75284447982578412e05eb09c5367f"
33+
"versions.yml:md5,e574e91477c7753e96c2e8411419cec1"
3434
]
3535
}
3636
],
3737
"meta": {
38-
"nf-test": "0.8.4",
39-
"nextflow": "23.10.1"
38+
"nf-test": "0.9.2",
39+
"nextflow": "25.04.7"
4040
},
41-
"timestamp": "2024-02-08T00:43:44.834346159"
41+
"timestamp": "2025-10-04T06:45:13.092217921"
4242
},
4343
"hamronization/deeparg - bacteroides_fragilis - genome_mapping_potential_arg": {
4444
"content": [
@@ -56,7 +56,7 @@
5656
]
5757
],
5858
"2": [
59-
"versions.yml:md5,2f75284447982578412e05eb09c5367f"
59+
"versions.yml:md5,e574e91477c7753e96c2e8411419cec1"
6060
],
6161
"json": [
6262

@@ -71,14 +71,14 @@
7171
]
7272
],
7373
"versions": [
74-
"versions.yml:md5,2f75284447982578412e05eb09c5367f"
74+
"versions.yml:md5,e574e91477c7753e96c2e8411419cec1"
7575
]
7676
}
7777
],
7878
"meta": {
79-
"nf-test": "0.8.4",
80-
"nextflow": "23.10.1"
79+
"nf-test": "0.9.2",
80+
"nextflow": "25.04.7"
8181
},
82-
"timestamp": "2024-02-07T10:32:36.722182719"
82+
"timestamp": "2025-10-04T06:45:06.201275925"
8383
}
8484
}

0 commit comments

Comments
 (0)