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

From MuData to SpatialData #319

Open
wants to merge 57 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
921126e
create spatialdata visium
SarahOuologuem Oct 4, 2024
43e0c1e
create spatialdata vizgen
SarahOuologuem Oct 4, 2024
c1e823a
rename python file
SarahOuologuem Oct 8, 2024
e3d6f2e
adjust spatial loading for spatialData
SarahOuologuem Oct 8, 2024
07844b5
adjust spatial loading for spatialData
SarahOuologuem Oct 8, 2024
2c92e9a
remove squidpy merfish parameters
SarahOuologuem Oct 8, 2024
d198b11
add parameter=None for vizgen
SarahOuologuem Oct 8, 2024
2b4c01b
change h5mu to zarr
SarahOuologuem Oct 8, 2024
459d07f
change from mudata to spatialdata
SarahOuologuem Oct 15, 2024
c3fd8d5
write obs spatialdata
SarahOuologuem Oct 15, 2024
b828166
adjust filtering to spatialdata
SarahOuologuem Oct 22, 2024
a3251d7
exchange h5mu for zarr
SarahOuologuem Oct 22, 2024
5851feb
bug fix
SarahOuologuem Oct 24, 2024
dc969bb
change mudata to spatialdata
SarahOuologuem Oct 24, 2024
8920cde
bug fix
SarahOuologuem Oct 24, 2024
f1ac785
bug fix
SarahOuologuem Oct 24, 2024
cb16526
bug fixes
SarahOuologuem Oct 24, 2024
24f035a
add vpt parameters
SarahOuologuem Nov 7, 2024
ac41674
add vpt output parameter
SarahOuologuem Nov 7, 2024
9acc5d0
add xenium
SarahOuologuem Nov 11, 2024
8ab1570
adjust sample submission file
SarahOuologuem Nov 26, 2024
f3b8747
add spatialdata
SarahOuologuem Nov 26, 2024
1937c1a
change file name
SarahOuologuem Nov 26, 2024
5d17214
adjust submission file
SarahOuologuem Nov 26, 2024
72f5d5b
change None to string
SarahOuologuem Nov 26, 2024
afd6378
rename data files
SarahOuologuem Nov 26, 2024
90ef6e6
add ingest merscope action
SarahOuologuem Dec 1, 2024
5fef8cf
test to pin squidpy version
SarahOuologuem Dec 1, 2024
1f33c41
remove detected transcripts
SarahOuologuem Dec 17, 2024
2f4392c
remove squidpy version pin
SarahOuologuem Dec 17, 2024
cf4ff07
remove unnecessary imports
SarahOuologuem Dec 17, 2024
124d849
add ingest xenium action
SarahOuologuem Dec 17, 2024
a79bc58
add cells.zarr file
SarahOuologuem Dec 17, 2024
218f437
add morphology focus folder
SarahOuologuem Dec 17, 2024
89a19bf
adjust spatial preprocessing to spatialData
SarahOuologuem Dec 17, 2024
5fa72b0
adjust file name
SarahOuologuem Dec 17, 2024
7e04d41
xenium adjust figshare links
SarahOuologuem Dec 17, 2024
1e002b5
update from mudata to spatialdata
SarahOuologuem Jan 14, 2025
35d5ecb
correct data type of reference
SarahOuologuem Jan 14, 2025
358da95
adjust to spatialData
SarahOuologuem Jan 14, 2025
857d043
add tangram github action
SarahOuologuem Jan 20, 2025
573fcc2
pin spatialdata version
SarahOuologuem Jan 28, 2025
e4564c5
pin dask
SarahOuologuem Jan 28, 2025
a72fbcb
remove outfile_spatial
SarahOuologuem Jan 28, 2025
86fd9d4
add option to export gene by spot matrix
SarahOuologuem Jan 28, 2025
7e8bcf1
adjust docs to SpatialData
SarahOuologuem Feb 4, 2025
463ba6f
change to SpatialData
SarahOuologuem Feb 4, 2025
5cb183b
update to spatialData
SarahOuologuem Feb 10, 2025
96695cf
check if columns exist
SarahOuologuem Feb 10, 2025
4d873f2
remove index
SarahOuologuem Feb 10, 2025
39d3c57
fix bug
SarahOuologuem Feb 10, 2025
775e334
use zip files
SarahOuologuem Feb 10, 2025
66890d4
change function and parameter names
SarahOuologuem Feb 10, 2025
33259c3
decrease font size
SarahOuologuem Feb 10, 2025
b6844b5
add changes to changelog
SarahOuologuem Feb 10, 2025
bbf99cc
update comment
SarahOuologuem Feb 12, 2025
a96ea4c
update logging info
SarahOuologuem Feb 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Run tutorials (spatial deconvolution)
name: Run tutorials (spatial deconvolution cell2location)

on:
push:
Expand All @@ -12,7 +12,7 @@ env:
debug: 'true'

jobs:
spatial_deconvolution:
spatial_deconvolution_cell2location:
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down Expand Up @@ -60,7 +60,9 @@ jobs:
cd deconvolution/data
curl -L -o Human_Heart_reference.h5mu https://figshare.com/ndownloader/files/44969677
cd spatial_data
curl -L -o Human_Heart.h5mu https://figshare.com/ndownloader/files/44969488
curl -L -o Human_Heart.zarr.zip https://figshare.com/ndownloader/files/51667673
unzip Human_Heart.zarr.zip
rm Human_Heart.zarr.zip


# Note: we run the following to test that the commands works
Expand Down
98 changes: 98 additions & 0 deletions .github/workflows/spatial_deconvolution_tangram-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
name: Run tutorials (spatial deconvolution tangram)

on:
push:
branches:
- main
pull_request:
branches:
- main

env:
debug: 'true'

jobs:
spatial_deconvolution_tangram:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"] # , "macos-latest", "windows-latest"
python-version: ["3.10"]

steps:
- uses: actions/checkout@v4

- name: File tree
if: env.debug == 'true'
run: tree

- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
auto-activate-base: true
auto-update-conda: true
channels: conda-forge
channel-priority: strict
activate-environment: pipeline_env
environment-file: pipeline_env.yaml

- name: Install Panpipes
shell: bash -el {0}
run: |
pip install .[spatial]
conda list

- name: Conda info
if: env.debug == 'true'
shell: bash -el {0}
run: conda info

- name: Conda list
if: env.debug == 'true'
shell: pwsh
run: conda list


- name: Preparing the data
run: |
mkdir deconvolution_tangram deconvolution_tangram/data deconvolution_tangram/data/spatial_data
cd deconvolution_tangram/data
curl -L -o Human_Heart_reference.h5mu https://figshare.com/ndownloader/files/44969677
cd spatial_data
curl -L -o Human_Heart.zarr.zip https://figshare.com/ndownloader/files/51667673
unzip Human_Heart.zarr.zip
rm Human_Heart.zarr.zip


# Note: we run the following to test that the commands works
- name: Preparing the configuration file
shell: bash -el {0}
run: |
cd deconvolution_tangram
panpipes deconvolution_spatial config

- name: Edit the submission file
run: |
cd deconvolution_tangram
curl -o pipeline.yml https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/deconvolution_tangram/pipeline.yml

- name: File tree
if: env.debug == 'true'
run: tree deconvolution_tangram

- name: Review pipeline tasks
shell: bash -el {0}
run: |
cd deconvolution_tangram
panpipes deconvolution_spatial show full --local

- name: Run pipeline tasks
shell: bash -el {0}
run: |
cd deconvolution_tangram
panpipes deconvolution_spatial make full --local

- name: File tree
if: env.debug == 'true'
run: tree deconvolution_tangram
10 changes: 5 additions & 5 deletions .github/workflows/spatial_ingestion_merfish-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ jobs:
run: |
mkdir spatial spatial/ingestion_merfish spatial/ingestion_merfish/data
cd spatial/ingestion_merfish/data
curl -L -o datasets_mouse_brain_map_BrainReceptorShowcase_Slice1_Replicate1_cell_by_gene_S1R1.csv https://figshare.com/ndownloader/files/45028624
curl -L -o datasets_mouse_brain_map_BrainReceptorShowcase_Slice1_Replicate1_cell_metadata_S1R1.csv https://figshare.com/ndownloader/files/45028621
curl -L -o cell_by_gene.csv https://figshare.com/ndownloader/files/45028624
curl -L -o cell_metadata.csv https://figshare.com/ndownloader/files/45028621
mkdir images
cd images
curl -L -o datasets_mouse_brain_map_BrainReceptorShowcase_Slice1_Replicate1_images_micron_to_mosaic_pixel_transform.csv https://figshare.com/ndownloader/files/45028645
curl -L -o micron_to_mosaic_pixel_transform.csv https://figshare.com/ndownloader/files/45028645


# Note: we run the following to test that the commands works
Expand All @@ -75,12 +75,12 @@ jobs:
- name: Preparing the submission file
run: |
cd spatial/ingestion_merfish
curl -o sample_file_qc_spatial.txt https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/main/docs/ingesting_merfish_data/sample_file_qc_spatial.txt
curl -o sample_file_qc_merfish.txt https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_merfish_data/sample_file_qc_merfish.txt

- name: Preparing the yaml file
run: |
cd spatial/ingestion_merfish
curl -o pipeline.yml https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/main/docs/ingesting_merfish_data/pipeline.yml
curl -o pipeline.yml https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_merfish_data/pipeline.yml

- name: File tree
if: env.debug == 'true'
Expand Down
105 changes: 105 additions & 0 deletions .github/workflows/spatial_ingestion_merscope-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: Run tutorials (spatial ingest merscope)

on:
push:
branches:
- main
pull_request:
branches:
- main

env:
debug: 'true'

jobs:
spatial_ingest_merscope:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"] # , "macos-latest", "windows-latest"
python-version: ["3.10"]

steps:
- uses: actions/checkout@v4

- name: File tree
if: env.debug == 'true'
run: tree

- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
auto-activate-base: true
auto-update-conda: true
channels: conda-forge
channel-priority: strict
activate-environment: pipeline_env
environment-file: pipeline_env.yaml

- name: Install Panpipes
shell: bash -el {0}
run: |
pip install .[spatial]
conda list

- name: Conda info
if: env.debug == 'true'
shell: bash -el {0}
run: conda info

- name: Conda list
if: env.debug == 'true'
shell: pwsh
run: conda list


- name: Preparing the data
run: |
mkdir spatial spatial/ingestion_merscope spatial/ingestion_merscope/data
cd spatial/ingestion_merscope/data
curl -L -o cell_by_gene.csv https://figshare.com/ndownloader/files/50899455
curl -L -o cell_metadata.csv https://figshare.com/ndownloader/files/50899452
curl -L -o cellpose_micron_space.parquet https://figshare.com/ndownloader/files/50899458
# curl -L -o detected_transcripts.csv https://figshare.com/ndownloader/files/50899476
mkdir images
cd images
curl -L -o micron_to_mosaic_pixel_transform.csv https://figshare.com/ndownloader/files/50899449


# Note: we run the following to test that the commands works
- name: Preparing the configuration file
shell: bash -el {0}
run: |
cd spatial/ingestion_merscope
panpipes qc_spatial config

- name: Preparing the submission file
run: |
cd spatial/ingestion_merscope
curl -o sample_file_qc_merscope.txt https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_merscope_data/sample_file_qc_merscope.txt

- name: Preparing the yaml file
run: |
cd spatial/ingestion_merscope
curl -o pipeline.yml https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_merscope_data/pipeline.yml

- name: File tree
if: env.debug == 'true'
run: tree spatial/ingestion_merscope

- name: Review pipeline tasks
shell: bash -el {0}
run: |
cd spatial/ingestion_merscope
panpipes qc_spatial show full --local

- name: Run pipeline tasks
shell: bash -el {0}
run: |
cd spatial/ingestion_merscope
panpipes qc_spatial make full --local

- name: File tree
if: env.debug == 'true'
run: tree spatial/ingestion_merscope
5 changes: 2 additions & 3 deletions .github/workflows/spatial_ingestion_visium-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,11 @@ jobs:
- name: Preparing the submission file
run: |
cd spatial/ingestion
curl -o sample_file_qc_spatial.txt https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/main/docs/ingesting_visium_data/sample_file_qc_spatial.txt

curl -o sample_file_qc_visium.txt https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_visium_data/sample_file_qc_visium.txt
- name: Preparing the yaml file
run: |
cd spatial/ingestion
curl -o pipeline.yml https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/main/docs/ingesting_visium_data/pipeline.yml
curl -o pipeline.yml https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_visium_data/pipeline.yml

- name: File tree
if: env.debug == 'true'
Expand Down
109 changes: 109 additions & 0 deletions .github/workflows/spatial_ingestion_xenium.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
name: Run tutorials (spatial ingest xenium)

on:
push:
branches:
- main
pull_request:
branches:
- main

env:
debug: 'true'

jobs:
spatial_ingest_xenium:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"] # , "macos-latest", "windows-latest"
python-version: ["3.10"]

steps:
- uses: actions/checkout@v4

- name: File tree
if: env.debug == 'true'
run: tree

- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
auto-activate-base: true
auto-update-conda: true
channels: conda-forge
channel-priority: strict
activate-environment: pipeline_env
environment-file: pipeline_env.yaml

- name: Install Panpipes
shell: bash -el {0}
run: |
pip install .[spatial]
conda list

- name: Conda info
if: env.debug == 'true'
shell: bash -el {0}
run: conda info

- name: Conda list
if: env.debug == 'true'
shell: pwsh
run: conda list


- name: Preparing the data
run: |
mkdir spatial spatial/ingestion_xenium spatial/ingestion_xenium/data
cd spatial/ingestion_xenium/data
curl -L -o experiment.xenium https://figshare.com/ndownloader/files/51244265
curl -L -o nucleus_boundaries.parquet https://figshare.com/ndownloader/files/51244286
curl -L -o cell_boundaries.parquet https://figshare.com/ndownloader/files/51244244
curl -L -o transcripts.parquet https://figshare.com/ndownloader/files/51244283
curl -L -o cell_feature_matrix.h5 https://figshare.com/ndownloader/files/51244247
curl -L -o cells.parquet https://figshare.com/ndownloader/files/51244259
curl -L -o morphology_mip.ome.tif https://figshare.com/ndownloader/files/51244415
curl -L -o cells.zarr.zip https://figshare.com/ndownloader/files/51244262
mkdir morphology_focus
cd morphology_focus
curl -L -o morphology_focus_0000.ome.tif https://figshare.com/ndownloader/files/51244277


# Note: we run the following to test that the commands works
- name: Preparing the configuration file
shell: bash -el {0}
run: |
cd spatial/ingestion_xenium
panpipes qc_spatial config

- name: Preparing the submission file
run: |
cd spatial/ingestion_xenium
curl -o sample_file_qc_xenium.txt https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_xenium_data/sample_file_qc_xenium.txt

- name: Preparing the yaml file
run: |
cd spatial/ingestion_xenium
curl -o pipeline.yml https://raw.githubusercontent.com/DendrouLab/panpipes-tutorials/sarah_spatialData/docs/ingesting_xenium_data/pipeline.yml

- name: File tree
if: env.debug == 'true'
run: tree spatial/ingestion_xenium

- name: Review pipeline tasks
shell: bash -el {0}
run: |
cd spatial/ingestion_xenium
panpipes qc_spatial show full --local

- name: Run pipeline tasks
shell: bash -el {0}
run: |
cd spatial/ingestion_xenium
panpipes qc_spatial make full --local

- name: File tree
if: env.debug == 'true'
run: tree spatial/ingestion_xenium
Loading
Loading