Skip to content

Commit ef32b4e

Browse files
committed
Migrate to anndataR for adata_tords
1 parent 9be28d1 commit ef32b4e

File tree

5 files changed

+38
-76
lines changed

5 files changed

+38
-76
lines changed
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
name: adata_tords
21
channels:
32
- conda-forge
43
- bioconda
54
dependencies:
6-
- bioconda::anndata2ri=1.3.2
7-
- conda-forge::anndata=0.11.1
8-
- conda-forge::r-seurat=5.1.0
5+
- bioconda::bioconductor-anndatar=1.0.2

modules/local/adata/tords/main.nf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ process ADATA_TORDS {
44

55
conda "${moduleDir}/environment.yml"
66
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
7-
'oras://community.wave.seqera.io/library/anndata2ri_bioconductor-singlecellexperiment_anndata_r-seurat:c4b75a61a89ec006':
8-
'community.wave.seqera.io/library/anndata2ri_bioconductor-singlecellexperiment_anndata_r-seurat:5fae42aabf7a1c5f' }"
7+
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/9e/9e2d0625efb46bae98303a0e685efa0ee259b939a6490eef13218c16c601bc9b/data':
8+
'community.wave.seqera.io/library/bioconductor-anndatar_bioconductor-rhdf5_bioconductor-singlecellexperiment:b7b9571d025f377e' }"
99

1010
input:
1111
tuple val(meta), path(h5ad)
@@ -20,7 +20,7 @@ process ADATA_TORDS {
2020
script:
2121
counts_layer = task.ext.counts_layer ?: 'X'
2222
prefix = task.ext.prefix ?: "${meta.id}"
23-
template 'tords.py'
23+
template 'tords.R'
2424

2525
stub:
2626
prefix = task.ext.prefix ?: "${meta.id}"
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env Rscript
2+
3+
library(anndataR)
4+
5+
counts_layer <- "${counts_layer}"
6+
prefix <- "${prefix}"
7+
h5ad <- "${h5ad}"
8+
9+
adata <- read_h5ad(h5ad)
10+
sce <- adata\$as_SingleCellExperiment()
11+
12+
SummarizedExperiment::assayNames(sce)[SummarizedExperiment::assayNames(sce) == counts_layer] <- "counts"
13+
14+
saveRDS(sce, paste0(prefix, ".rds"))
15+
16+
ver <- packageVersion("anndataR")
17+
18+
writeLines(
19+
c(
20+
"${task.process}:",
21+
paste0(" anndataR: ", ver)
22+
),
23+
"versions.yml"
24+
)

modules/local/adata/tords/templates/tords.py

Lines changed: 0 additions & 59 deletions
This file was deleted.

modules/local/adata/tords/tests/main.nf.test.snap

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
]
2727
}
2828
],
29+
"timestamp": "2025-06-01T21:20:06.728038404",
2930
"meta": {
3031
"nf-test": "0.9.0",
3132
"nextflow": "25.04.2"
32-
},
33-
"timestamp": "2025-06-01T21:20:06.728038404"
33+
}
3434
},
3535
"Should run without failures": {
3636
"content": [
@@ -40,29 +40,29 @@
4040
{
4141
"id": "test"
4242
},
43-
"test.rds:md5,49e4f1ab25d434c507b5e07d0dd40c5d"
43+
"test.rds:md5,ba065e9d68612a96bcc95eba7ff84da4"
4444
]
4545
],
4646
"1": [
47-
"versions.yml:md5,49dc8f6638973bec2c328ee45dca2137"
47+
"versions.yml:md5,bf93dcd42995e7fa34eac37384568f9d"
4848
],
4949
"rds": [
5050
[
5151
{
5252
"id": "test"
5353
},
54-
"test.rds:md5,49e4f1ab25d434c507b5e07d0dd40c5d"
54+
"test.rds:md5,ba065e9d68612a96bcc95eba7ff84da4"
5555
]
5656
],
5757
"versions": [
58-
"versions.yml:md5,49dc8f6638973bec2c328ee45dca2137"
58+
"versions.yml:md5,bf93dcd42995e7fa34eac37384568f9d"
5959
]
6060
}
6161
],
62+
"timestamp": "2026-03-14T21:05:44.197188707",
6263
"meta": {
63-
"nf-test": "0.9.2",
64-
"nextflow": "25.04.6"
65-
},
66-
"timestamp": "2025-07-13T20:42:25.313956328"
64+
"nf-test": "0.9.4",
65+
"nextflow": "25.10.4"
66+
}
6767
}
6868
}

0 commit comments

Comments
 (0)