Skip to content

Commit a6f6df0

Browse files
committed
fix qdnaseq env
1 parent adf3b3e commit a6f6df0

5 files changed

Lines changed: 32 additions & 14 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
channels:
2+
- conda-forge
3+
- bioconda
4+
dependencies:
5+
- bioconda::bioconductor-qdnaseq=1.42.0
6+
- conda-forge::r-base=4.4.3
7+
- conda-forge::r-lsr=0.5.2

modules/local/qdnaseq/main.nf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ process QDNASEQ {
22
tag "$meta.id"
33
label 'process_low'
44

5-
container "quay.io/cmgg/qdnaseq:0.0.4"
5+
conda "${moduleDir}/environment.yml"
6+
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
7+
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/77/77b057272e6af69070dc1ee73d0a39d144e6641c0f4e625673de979b21b7bfd0/data':
8+
'community.wave.seqera.io/library/bioconductor-qdnaseq_r-base_r-lsr:0304e1e0cbed3eab' }"
69

710
input:
811
tuple val(meta), path(bam), path(bai)
@@ -13,7 +16,7 @@ process QDNASEQ {
1316
tuple val(meta), path("*.cna") , emit: cna
1417
tuple val(meta), path("*_segments.txt") , emit: segments
1518
tuple val(meta), path("statistics.out") , emit: statistics
16-
path "versions.yml" , emit: versions
19+
path "versions.yml" , emit: versions, topic: versions
1720

1821
script:
1922
template "qDNAseq.R"

modules/local/qdnaseq/templates/qDNAseq.R

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,12 @@ write.table(std, file="statistics.out", append = TRUE, col.names = FALSE, row.na
122122
write.table(mad, file="statistics.out", append = TRUE, col.names = FALSE, row.names=c("mad"), dec = ",")
123123
write.table(aad, file="statistics.out", append = TRUE, col.names = FALSE, row.names=c("aad"), dec = ",")
124124

125-
126-
sink("versions.yml")
127-
cat("\\"task.process\\":\n")
128-
cat(" bioconductor-qdnaseq: 1.34.0\n")
129-
cat(" r-lsr: 0.5.2\n")
125+
## VERSIONS FILE
126+
writeLines(
127+
c(
128+
'"${task.process}":',
129+
paste(' r-base:', strsplit(version[['version.string']], ' ')[[1]][3]),
130+
paste(' r-lsr:', as.character(packageVersion('lsr'))),
131+
paste(' bioconductor-qdnaseq:', as.character(packageVersion('QDNAseq')))
132+
),
133+
'versions.yml')

subworkflows/local/bam_variant_calling_qdnaseq/main.nf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@ workflow BAM_VARIANT_CALLING_QDNASEQ {
4545
ch_qdnaseq_input.male,
4646
ch_qdnaseq_male
4747
)
48-
ch_versions = ch_versions.mix(QDNASEQ_MALE.out.versions.first())
4948

5049
QDNASEQ_FEMALE(
5150
ch_qdnaseq_input.female,
5251
ch_qdnaseq_female
5352
)
54-
ch_versions = ch_versions.mix(QDNASEQ_FEMALE.out.versions.first())
5553

5654
def ch_qdnaseq_beds = QDNASEQ_MALE.out.bed
5755
.mix(QDNASEQ_FEMALE.out.bed)

tests/default.nf.test.snap

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@
4646
"PREPROCESS_GTF": {
4747
"grep": 3.11
4848
},
49+
"QDNASEQ_FEMALE": {
50+
"r-base": "4.4.3",
51+
"r-lsr": "0.5.2",
52+
"bioconductor-qdnaseq": "1.42.0"
53+
},
54+
"QDNASEQ_MALE": {
55+
"r-base": "4.4.3",
56+
"r-lsr": "0.5.2",
57+
"bioconductor-qdnaseq": "1.42.0"
58+
},
4959
"SAMTOOLS_CONVERT": {
5060
"samtools": "1.22.1"
5161
},
@@ -64,10 +74,6 @@
6474
},
6575
"Workflow": {
6676
"nf-cmgg/structural": "v0.3.0"
67-
},
68-
"task.process": {
69-
"bioconductor-qdnaseq": "1.34.0",
70-
"r-lsr": "0.5.2"
7177
}
7278
},
7379
[
@@ -208,6 +214,6 @@
208214
"nf-test": "0.9.2",
209215
"nextflow": "25.10.2"
210216
},
211-
"timestamp": "2026-01-13T14:11:41.354981093"
217+
"timestamp": "2026-01-13T15:21:35.911930138"
212218
}
213219
}

0 commit comments

Comments
 (0)