Skip to content

Commit 8552968

Browse files
authored
Merge pull request #127 from nf-core/seqera-containers
Replace `erikfas/spatialvi` with Seqera image
2 parents f7010ff + 565782d commit 8552968

14 files changed

+50
-125
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ compatible with further downstream analyses and/or exploration in _e.g._
1818

1919
### `Added`
2020

21+
- Make the main spatial Docker image work with Seqera Containers [[#127](https://github.com/nf-core/spatialvi/pull/127)]
2122
- Fix 'dir' handling for cloud file systems [[#122](https://github.com/nf-core/spatialvi/pull/122)]
2223
- Follow the new Nextflow strict syntax for local (sub-) workflows [[#115](https://github.com/nf-core/spatialvi/pull/115)]
2324
- Add ability to use unknown slides for Space Ranger-based analyses [[#99](https://github.com/nf-core/spatialvi/issues/99) and [#109](https://github.com/nf-core/spatialvi/pull/109)]

bin/clustering.qmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sample_id = "".join(
4444
sdata = spatialdata.read_zarr(input_sdata, ["images", "tables", "shapes"])
4545
adata = to_legacy_anndata(
4646
sdata,
47-
coordinate_system="downscaled_hires",
47+
coordinate_system=f"{sample_id}_downscaled_hires",
4848
table_name=f"{sample_id}_table",
4949
include_images=True
5050
)

bin/quality_controls.qmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ sample_id = "".join(
6464
sdata = spatialdata.read_zarr(input_sdata, ["images", "tables", "shapes"])
6565
adata = to_legacy_anndata(
6666
sdata,
67-
coordinate_system="downscaled_hires",
67+
coordinate_system=f"{sample_id}_downscaled_hires",
6868
table_name=f"{sample_id}_table",
6969
include_images=True
7070
)

bin/spatially_variable_genes.qmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sample_id = "".join(
4141
sdata = spatialdata.read_zarr(input_sdata, ["images", "tables", "shapes"])
4242
adata = to_legacy_anndata(
4343
sdata,
44-
coordinate_system="downscaled_hires",
44+
coordinate_system=f"{sample_id}_downscaled_hires",
4545
table_name=f"{sample_id}_table",
4646
include_images=True
4747
)

conf/modules.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,13 @@ process {
6262
container = 'docker.io/multiqc/multiqc:v1.29'
6363
}
6464

65+
// The Seqera image used in multiple modules of this pipeline contains many
66+
// different packages, the build information for which you can find here:
67+
// https://wave.seqera.io/view/builds/bd-95f731fde0b9ddef_1.
6568
withName: 'READ_DATA|QUALITY_CONTROLS|CLUSTERING|SPATIALLY_VARIABLE_GENES' {
6669
ext.prefix = { "${notebook.baseName}" }
6770
ext.args = { "--metadata subtitle:'Sample: ${meta.id}'" }
68-
container = 'docker.io/erikfas/spatialvi'
71+
container = 'community.wave.seqera.io/library/harmonypy_scanorama_gcc_gxx_pruned:95f731fde0b9ddef'
6972
publishDir = [
7073
[
7174
path: { "${params.outdir}/${meta.id}/reports" },
@@ -115,7 +118,7 @@ process {
115118

116119
withName: 'INTEGRATE_SDATA' {
117120
ext.prefix = { "${notebook.baseName}" }
118-
container = 'docker.io/erikfas/spatialvi'
121+
container = 'community.wave.seqera.io/library/harmonypy_scanorama_gcc_gxx_pruned:95f731fde0b9ddef'
119122
publishDir = [
120123
[
121124
path: { "${params.outdir}/aggregation/reports"},

env/.dockerignore

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

env/Dockerfile

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

env/environment.yml

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

modules/local/merge_sdata/main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
process MERGE_SDATA {
55

66
label 'process_low'
7-
container "docker.io/erikfas/spatialvi"
7+
container "community.wave.seqera.io/library/harmonypy_scanorama_gcc_gxx_pruned:95f731fde0b9ddef"
88

99
input:
1010
path(sdata, stageAs: "?/*")

modules/local/read_data/main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ process READ_DATA {
66
tag "${meta.id}"
77
label 'process_low'
88

9-
container "docker.io/erikfas/spatialvi"
9+
container "community.wave.seqera.io/library/harmonypy_scanorama_gcc_gxx_pruned:95f731fde0b9ddef"
1010

1111
input:
1212
tuple val(meta), path("${meta.id}")

0 commit comments

Comments
 (0)