Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix anndata concatenation #416

Merged
merged 12 commits into from
Jan 15, 2025
2 changes: 1 addition & 1 deletion conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ process {
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
}
withName: 'ADATA_BARCODES' {
withName: 'ANNDATA_BARCODES' {
ext.prefix = { "${meta.id}_${meta.input_type}_matrix" }
publishDir = [
path: { "${params.outdir}/${params.aligner}/mtx_conversions/${meta.id}" },
Expand Down
12 changes: 11 additions & 1 deletion modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@
"https://github.com/nf-core/modules.git": {
"modules": {
"nf-core": {
"anndata/barcodes": {
"branch": "master",
"git_sha": "05e4d643e8a9cd600fdce51dccdfc68cf9a72489",
"installed_by": ["h5ad_removebackground_barcodes_cellbender_anndata"]
},
"cellbender/removebackground": {
"branch": "master",
"git_sha": "e01435f46b46adff59546d6a4b4002e31f6c4457",
"installed_by": ["modules"]
"installed_by": ["h5ad_removebackground_barcodes_cellbender_anndata", "modules"]
},
"cellranger/count": {
"branch": "master",
Expand Down Expand Up @@ -94,6 +99,11 @@
},
"subworkflows": {
"nf-core": {
"h5ad_removebackground_barcodes_cellbender_anndata": {
"branch": "master",
"git_sha": "23600f6cd1c7fc4da79709bb531e5ba3cd5e840e",
"installed_by": ["subworkflows"]
},
"utils_nextflow_pipeline": {
"branch": "master",
"git_sha": "3aa0aec1d52d492fe241919f0c6100ebf0074082",
Expand Down
29 changes: 0 additions & 29 deletions modules/local/adata_barcodes.nf

This file was deleted.

4 changes: 2 additions & 2 deletions modules/local/templates/concat_h5ad.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def dump_versions():

# merge with data.frame, on sample information
adata.obs = adata.obs.join(df_samplesheet, on="sample", how="left").astype(str)
adata.write_h5ad("combined_${meta.input_type}_matrix.h5ad")
adata.write_h5ad("${meta.id}_${meta.input_type}_matrix.h5ad")

print("Wrote h5ad file to {}".format("combined_${meta.input_type}_matrix.h5ad"))
print("Wrote h5ad file to {}".format("${meta.id}_${meta.input_type}_matrix.h5ad"))

# dump versions
dump_versions()
5 changes: 5 additions & 0 deletions modules/nf-core/anndata/barcodes/environment.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions modules/nf-core/anndata/barcodes/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 58 additions & 0 deletions modules/nf-core/anndata/barcodes/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions modules/nf-core/anndata/barcodes/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 72 additions & 0 deletions modules/nf-core/anndata/barcodes/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions modules/nf-core/anndata/barcodes/tests/tags.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading