Skip to content

Commit 5909fc0

Browse files
LouisLeNezetLouis Le Nezetmashehu
authored
Remove echo usage in topic evaluation (#12112)
* Update ataqv version * Update leafcutter version * Update authentict version * Update links version * Update arcashla * Update bamcmp * Update busco/phylogenomics * Update vafe * Update clusty * Update hlala * Update merquryfk * Update arcashla * Update mitohifi * Update rapidnj * Update slimfastq * Update telseq * Fix ataqv * Fix errors * Update links * Update bamcmp * Update hlala * Update hlala * Add registry * Update .nf-core.yml Co-authored-by: Matthias Hörtenhuber <mashehu@users.noreply.github.com> * Add missing registry --------- Co-authored-by: Louis Le Nezet <louis.le-nezet@inserm.fr> Co-authored-by: Matthias Hörtenhuber <mashehu@users.noreply.github.com>
1 parent 8a34a4c commit 5909fc0

44 files changed

Lines changed: 321 additions & 350 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.nf-core.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
repository_type: modules
22
org_path: nf-core
3+
container-registry:
4+
- ghcr.io/marcelauliano/
5+
- ghcr.io/schapirolabor
6+
- ghcr.io/nbisweden
7+
- ghcr.io/scverse
38
bump-versions:
49
rseqc/junctionannotation: False
510
rseqc/bamstat: False

modules/nf-core/arcashla/extract/main.nf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ process ARCASHLA_EXTRACT {
1616
tuple val(meta), path("temp_files/**.sam") , emit: intermediate_sam , optional: true
1717
tuple val(meta), path("temp_files/**.bam") , emit: intermediate_bam , optional: true
1818
tuple val(meta), path("temp_files/**.sorted.bam"), emit: intermediate_sorted_bam, optional: true
19-
tuple val("${task.process}"), val('arcashla'), eval('echo 0.5.0'), emit: versions_arcashla, topic: versions
19+
// WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions.
20+
tuple val("${task.process}"), val('arcashla'), val('0.5.0'), emit: versions_arcashla, topic: versions
2021

2122
when:
2223
task.ext.when == null || task.ext.when

modules/nf-core/arcashla/extract/meta.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "arcashla_extract"
2-
description: Extracts reads mapped to chromosome 6 and any HLA decoys or chromosome
3-
6 alternates.
2+
description: Extracts reads mapped to chromosome 6 and any HLA decoys or
3+
chromosome 6 alternates.
44
keywords:
55
- HLA
66
- genotype
@@ -13,7 +13,8 @@ tools:
1313
documentation: "https://github.com/RabadanLab/arcasHLA"
1414
tool_dev_url: "https://github.com/RabadanLab/arcasHLA"
1515
doi: "10.1093/bioinformatics/btz474"
16-
licence: ["GPL v3"]
16+
licence:
17+
- "GPL v3"
1718
identifier: ""
1819
input:
1920
- - meta:
@@ -23,8 +24,8 @@ input:
2324
e.g. [ id:'test', single_end:false ]
2425
- bam:
2526
type: file
26-
description: BAM file. If the BAM file is not indexed, this tool will run samtools
27-
index before extracting reads.
27+
description: BAM file. If the BAM file is not indexed, this tool will run
28+
samtools index before extracting reads.
2829
pattern: "*.bam"
2930
ontologies:
3031
- edam: "http://edamontology.org/format_2572" # BAM
@@ -37,7 +38,8 @@ output:
3738
e.g. [ id:'test', single_end:false ]
3839
- "*.fq.gz":
3940
type: file
40-
description: FASTQ file(s) containing chromosome 6 reads and related HLA sequences
41+
description: FASTQ file(s) containing chromosome 6 reads and related HLA
42+
sequences
4143
pattern: "*.fq.gz"
4244
ontologies:
4345
- edam: "http://edamontology.org/format_1930" # FASTQ
@@ -85,26 +87,28 @@ output:
8587
ontologies:
8688
- edam: "http://edamontology.org/format_2572" # BAM
8789
versions_arcashla:
88-
- - "${task.process}":
90+
- - ${task.process}:
8991
type: string
9092
description: The name of the process
91-
- "arcashla":
93+
- arcashla:
9294
type: string
9395
description: The name of the tool
94-
- "echo 0.5.0":
95-
type: eval
96-
description: The expression to obtain the version of the tool
96+
- 0.5.0:
97+
type: string
98+
description: The version of the tool
99+
97100
topics:
98101
versions:
99-
- - "${task.process}":
102+
- - ${task.process}:
100103
type: string
101104
description: The name of the process
102-
- "arcashla":
105+
- arcashla:
103106
type: string
104107
description: The name of the tool
105-
- "echo 0.5.0":
106-
type: eval
107-
description: The expression to obtain the version of the tool
108+
- 0.5.0:
109+
type: string
110+
description: The version of the tool
111+
108112
authors:
109113
- "@christopher-mohr"
110114
maintainers:

modules/nf-core/ataqv/ataqv/main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ process ATAQV_ATAQV {
1818
output:
1919
tuple val(meta), path("*.ataqv.json"), emit: json
2020
tuple val(meta), path("*.problems") , emit: problems, optional: true
21-
tuple val("${task.process}"), val('ataqv'), eval("echo \$(ataqv --version)"), emit: versions_ataqv, topic: versions
21+
tuple val("${task.process}"), val('ataqv'), eval("ataqv --version 2>&1 || true"), emit: versions_ataqv, topic: versions
2222

2323
when:
2424
task.ext.when == null || task.ext.when

modules/nf-core/ataqv/ataqv/meta.yml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ keywords:
66
- ataqv
77
tools:
88
- ataqv:
9-
description: ataqv is a toolkit for measuring and comparing ATAC-seq results.
10-
It was written to help understand how well ATAC-seq assays have worked, and
11-
to make it easier to spot differences that might be caused by library prep or
12-
sequencing.
9+
description: ataqv is a toolkit for measuring and comparing ATAC-seq
10+
results. It was written to help understand how well ATAC-seq assays have
11+
worked, and to make it easier to spot differences that might be caused by
12+
library prep or sequencing.
1313
homepage: https://github.com/ParkerLab/ataqv/blob/master/README.rst
1414
documentation: https://github.com/ParkerLab/ataqv/blob/master/README.rst
1515
tool_dev_url: https://github.com/ParkerLab/ataqv
@@ -30,8 +30,8 @@ input:
3030
ontologies: []
3131
- bai:
3232
type: file
33-
description: BAM index file with the same prefix as bam file. Required if tss_file
34-
input is provided.
33+
description: BAM index file with the same prefix as bam file. Required if
34+
tss_file input is provided.
3535
pattern: "*.bam.bai"
3636
ontologies: []
3737
- peak_file:
@@ -41,30 +41,31 @@ input:
4141
ontologies: []
4242
- organism:
4343
type: string
44-
description: The subject of the experiment, which determines the list of autosomes
45-
(see "Reference Genome Configuration" section at https://github.com/ParkerLab/ataqv).
44+
description: The subject of the experiment, which determines the list of
45+
autosomes (see "Reference Genome Configuration" section at
46+
https://github.com/ParkerLab/ataqv).
4647
- mito_name:
4748
type: string
4849
description: Name of the mitochondrial sequence.
4950
- tss_file:
5051
type: file
51-
description: A BED file of transcription start sites for the experiment organism.
52-
If supplied, a TSS enrichment score will be calculated according to the ENCODE
53-
data standards. This calculation requires that the BAM file of alignments be
54-
indexed.
52+
description: A BED file of transcription start sites for the experiment
53+
organism. If supplied, a TSS enrichment score will be calculated according
54+
to the ENCODE data standards. This calculation requires that the BAM file
55+
of alignments be indexed.
5556
pattern: "*.bed"
5657
ontologies: []
5758
- excl_regs_file:
5859
type: file
59-
description: A BED file containing excluded regions. Peaks or TSS overlapping
60-
these will be ignored.
60+
description: A BED file containing excluded regions. Peaks or TSS
61+
overlapping these will be ignored.
6162
pattern: "*.bed"
6263
ontologies: []
6364
- autosom_ref_file:
6465
type: file
65-
description: A file containing autosomal reference names, one per line. The names
66-
must match the reference names in the alignment file exactly, or the metrics
67-
based on counts of autosomal alignments will be wrong.
66+
description: A file containing autosomal reference names, one per line. The
67+
names must match the reference names in the alignment file exactly, or the
68+
metrics based on counts of autosomal alignments will be wrong.
6869
ontologies: []
6970
output:
7071
json:
@@ -85,10 +86,10 @@ output:
8586
e.g. [ id:'test', single_end:false ]
8687
- "*.problems":
8788
type: file
88-
description: If given, problematic reads will be logged to a file per read
89-
group, with names derived from the read group IDs, with ".problems" appended.
90-
If no read groups are found, the reads will be written to one file named
91-
after the BAM file.
89+
description: If given, problematic reads will be logged to a file per
90+
read group, with names derived from the read group IDs, with
91+
".problems" appended. If no read groups are found, the reads will be
92+
written to one file named after the BAM file.
9293
pattern: "*.problems"
9394
ontologies: []
9495
versions_ataqv:
@@ -98,9 +99,10 @@ output:
9899
- ataqv:
99100
type: string
100101
description: The name of the tool
101-
- echo \$(ataqv --version):
102+
- ataqv --version 2>&1 || true:
102103
type: eval
103104
description: The expression to obtain the version of the tool
105+
104106
topics:
105107
versions:
106108
- - ${task.process}:
@@ -109,9 +111,10 @@ topics:
109111
- ataqv:
110112
type: string
111113
description: The name of the tool
112-
- echo \$(ataqv --version):
114+
- ataqv --version 2>&1 || true:
113115
type: eval
114116
description: The expression to obtain the version of the tool
117+
115118
authors:
116119
- "@i-pletenev"
117120
maintainers:

modules/nf-core/ataqv/mkarv/main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ process ATAQV_MKARV {
1111

1212
output:
1313
path "html" , emit: html
14-
tuple val("${task.process}"), val('ataqv'), eval('echo \$(ataqv --version)'), emit: versions_ataqv, topic: versions
14+
tuple val("${task.process}"), val('ataqv'), eval("ataqv --version 2>&1 || true"), emit: versions_ataqv, topic: versions
1515
// tuple val("${task.process}"), val('mkarv'), eval('mkarv --version'), emit: versions_mkarv, topic: versions //Use this when version string has been fixed
1616
when:
1717
task.ext.when == null || task.ext.when

modules/nf-core/ataqv/mkarv/meta.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ keywords:
77
- mkarv
88
tools:
99
- "ataqv":
10-
description: "ataqv is a toolkit for measuring and comparing ATAC-seq results.\
11-
\ It was written to help understand how well ATAC-seq assays have worked, and\
12-
\ to make it easier to spot differences that might be caused by library prep\
13-
\ or sequencing."
10+
description: "ataqv is a toolkit for measuring and comparing ATAC-seq results.
11+
It was written to help understand how well ATAC-seq assays have worked, and
12+
to make it easier to spot differences that might be caused by library prep or
13+
sequencing."
1414
homepage: "https://github.com/ParkerLab/ataqv/blob/master/README.rst"
1515
documentation: "https://github.com/ParkerLab/ataqv/blob/master/README.rst"
1616
tool_dev_url: "https://github.com/ParkerLab/ataqv"
@@ -23,7 +23,7 @@ input:
2323
description: JSON files
2424
pattern: "*.json"
2525
ontologies:
26-
- edam: http://edamontology.org/format_3464
26+
- edam: http://edamontology.org/format_3464 # JSON
2727
output:
2828
html:
2929
- html:
@@ -37,9 +37,10 @@ output:
3737
- ataqv:
3838
type: string
3939
description: The name of the tool
40-
- echo \$(ataqv --version):
40+
- ataqv --version 2>&1 || true:
4141
type: eval
4242
description: The expression to obtain the version of the tool
43+
4344
versions_mkarv:
4445
- - ${task.process}:
4546
type: string
@@ -58,9 +59,10 @@ topics:
5859
- ataqv:
5960
type: string
6061
description: The name of the tool
61-
- echo \$(ataqv --version):
62+
- ataqv --version 2>&1 || true:
6263
type: eval
6364
description: The expression to obtain the version of the tool
65+
6466
- - ${task.process}:
6567
type: string
6668
description: The name of the process

modules/nf-core/authentict/deam2cont/main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ process AUTHENTICT_DEAM2CONT {
1414

1515
output:
1616
tuple val(meta), path("*.txt"), emit: txt
17-
tuple val("${task.process}"), val('authentict'), eval("echo \$(AuthentiCT --version 2>&1)"), emit: versions_authentict, topic: versions
17+
tuple val("${task.process}"), val('authentict'), eval("AuthentiCT --version"), emit: versions_authentict, topic: versions
1818
tuple val("${task.process}"), val('samtools'), eval("samtools --version 2>&1 | head -n1 | sed 's/^.*samtools //'"), emit: versions_samtools, topic: versions
1919

2020
when:

modules/nf-core/authentict/deam2cont/meta.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ output:
7171
- authentict:
7272
type: string
7373
description: The name of the tool
74-
- echo \$(AuthentiCT --version 2>&1):
74+
- AuthentiCT --version:
7575
type: eval
7676
description: The expression to obtain the version of the tool
77+
7778
versions_samtools:
7879
- - ${task.process}:
7980
type: string
@@ -92,9 +93,10 @@ topics:
9293
- authentict:
9394
type: string
9495
description: The name of the tool
95-
- echo \$(AuthentiCT --version 2>&1):
96+
- AuthentiCT --version:
9697
type: eval
9798
description: The expression to obtain the version of the tool
99+
98100
- - ${task.process}:
99101
type: string
100102
description: The name of the process

modules/nf-core/bamcmp/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ channels:
55
- bioconda
66
dependencies:
77
- bioconda::bamcmp=2.2
8-
- bioconda::samtools=1.23
8+
- bioconda::samtools=1.23.1

0 commit comments

Comments
 (0)