Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0722b2d
Adding rna-probes-pipeline as submodule
SFD5311 Jan 7, 2025
6cb9c0f
Initial commit of dag for scnra-probes processing
SFD5311 Jan 7, 2025
6d73908
Adding azimuth annotation to dag
SFD5311 Jan 7, 2025
d91048b
Bugfixing downgraded submodules
sunset666 Jan 9, 2025
d5c19d4
Bugfixing downgraded submodules
sunset666 Jan 9, 2025
0acf08e
Bugfixing downgraded submodules
sunset666 Jan 9, 2025
dca5fe1
Bugfixing downgraded submodules
sunset666 Jan 9, 2025
02ac5af
Bugfixing downgraded submodules
sunset666 Jan 9, 2025
c07bc4e
Bugfixing downgraded submodules
sunset666 Jan 9, 2025
7bca37a
Bugfixing downgraded submodules
sunset666 Jan 9, 2025
f55dbce
Bumping rna-probes-pipeline version to v1.0.1
SFD5311 Jan 14, 2025
e6a8804
Adding mappings for new pipeline.
sunset666 Jan 21, 2025
ad50fe1
Merge branch 'refs/heads/devel' into sfd5311/rna-probes-pipeline
sunset666 May 22, 2025
cdb207a
Refactor rna-with-probes DAG with the new data model approach
sunset666 May 22, 2025
bfe42f2
General: Add missing param
May 30, 2025
e676fd4
Adding pan organ azimuth submodule
SFD5311 Jun 4, 2025
3d3e91a
Setting pan-organ-azimuth-annotate version to v0.1
SFD5311 Jun 4, 2025
4bbab09
Using pan-organ-azimuth for annotating rna with probes data
SFD5311 Jun 4, 2025
00c14e7
Using pan-organ-azimuth-annotate for cell type annotation
SFD5311 Jun 6, 2025
b70bc85
Adding organism parameter to pan-organ-azimuth-annotate call
SFD5311 Jun 18, 2025
4ef90a3
Bumping pan-organ-azimuth-annotate to v0.1.3
SFD5311 Jun 18, 2025
a7a480a
Bumping rna-probes-pipeline to v1.0.2
SFD5311 Jun 19, 2025
74b2e62
Bumping rna-probes-pipeline version to v1.0.3
SFD5311 Jul 11, 2025
d9a2d86
Bumping pan-organ-azimuth-annotate version to v0.1.5
SFD5311 Jul 11, 2025
158c08d
Bumping pan-organ-azimuth-annotate to v0.1.6
SFD5311 Jul 16, 2025
052b583
Bumping rna-probes-pipeline version to v1.0.4
SFD5311 Jul 17, 2025
ab206de
Bumping pan-organ-azimuth-annotate version to v0.1.7
SFD5311 Jul 29, 2025
634be28
Merge branch 'refs/heads/devel' into sfd5311/rna-probes-pipeline
sunset666 Aug 27, 2025
be63199
Rebasing to keep testing
sunset666 Aug 27, 2025
a83f567
Bugfix pan-organ-azimuth parameter name
sunset666 Aug 28, 2025
9d6eaf4
Bumping rna-probes-pipeline version to v1.0.5
SFD5311 Sep 16, 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
9 changes: 6 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,15 @@
[submodule "src/ingest-pipeline/airflow/dags/cwl/ribca"]
path = src/ingest-pipeline/airflow/dags/cwl/ribca
url = https://github.com/hubmapconsortium/ribca
[submodule "src/ingest-pipeline/airflow/dags/cwl/rna-probes-pipeline"]
path = src/ingest-pipeline/airflow/dags/cwl/rna-probes-pipeline
url = https://github.com/hubmapconsortium/rna-probes-pipeline
[submodule "src/ingest-pipeline/airflow/dags/cwl/pan-organ-azimuth-annotate"]
path = src/ingest-pipeline/airflow/dags/cwl/pan-organ-azimuth-annotate
url = https://github.com/hubmapconsortium/pan-organ-azimuth-annotate
[submodule "src/ingest-pipeline/airflow/dags/cwl/xenium-pipeline"]
path = src/ingest-pipeline/airflow/dags/cwl/xenium-pipeline
url = https://github.com/hubmapconsortium/xenium-pipeline
[submodule "src/ingest-pipeline/airflow/dags/cwl/stellar"]
path = src/ingest-pipeline/airflow/dags/cwl/stellar
url = https://github.com/hubmapconsortium/stellar
[submodule "src/ingest-pipeline/airflow/dags/cwl/pan-organ-azimuth-annotate"]
path = src/ingest-pipeline/airflow/dags/cwl/pan-organ-azimuth-annotate
url = https://github.com/hubmapconsortium/pan-organ-azimuth-annotate
2 changes: 1 addition & 1 deletion src/ingest-pipeline/airflow/dags/cwl/celldive-pipeline
Submodule celldive-pipeline updated from c89303 to 20ea8d
2 changes: 1 addition & 1 deletion src/ingest-pipeline/airflow/dags/cwl/codex-pipeline
Submodule codex-pipeline updated 47 files
+1 −1 .travis.yml
+37 −0 Dockerfile
+0 −0 Dockerfile_fiji
+0 −1 bin/best_focus/best_z_identification.py
+0 −1 bin/best_focus/best_z_paths.py
+0 −1 bin/best_focus/file_manipulation.py
+0 −1 bin/best_focus/run_best_focus_selection.py
+0 −1 bin/codex_stitching/bigstitcher_dataset_meta.py
+0 −1 bin/codex_stitching/directory_management.py
+0 −1 bin/codex_stitching/generate_bigstitcher_macro.py
+0 −1 bin/codex_stitching/image_stitching.py
+0 −1 bin/codex_stitching/run_stitching.py
+0 −1 bin/codex_stitching/secondary_stitcher/mask_stitching.py
+0 −1 bin/codex_stitching/secondary_stitcher/match_masks.py
+0 −1 bin/codex_stitching/secondary_stitcher/secondary_stitcher.py
+0 −1 bin/codex_stitching/secondary_stitcher/secondary_stitcher_runner.py
+5 −8 bin/convert_to_ometiff.py
+0 −1 bin/create_cytokit_config.py
+1 −21 bin/dataset_info/collect_dataset_info.py
+1 −2 bin/dataset_info/collect_dataset_info_old.py
+0 −1 bin/dataset_info/run_collection.py
+0 −1 bin/illumination_correction/generate_basic_macro.py
+0 −1 bin/illumination_correction/run_illumination_correction.py
+0 −1 bin/pipeline_utils/dataset_listing.py
+0 −1 bin/pipeline_utils/pipeline_config_reader.py
+0 −1 bin/slicing/modify_pipeline_config.py
+0 −1 bin/slicing/run_slicing.py
+0 −1 bin/slicing/slicer.py
+0 −1 bin/utils.py
+0 −0 cytokit-docker/Dockerfile
+0 −0 cytokit-docker/cytokit_wrapper.py
+0 −0 cytokit-docker/setup_data_directory.py
+0 −43 docker/codex_scripts/Dockerfile
+0 −25 docker/codex_scripts/environment.yml
+3 −3 docker_images.txt
+25 −0 environment.yml
+2 −2 requirements-test.txt
+1 −1 steps/illumination_first_stitching/best_focus.cwl
+1 −1 steps/illumination_first_stitching/collect_dataset_info.cwl
+1 −1 steps/illumination_first_stitching/create_yaml_config.cwl
+1 −1 steps/illumination_first_stitching/first_stitching.cwl
+1 −1 steps/illumination_first_stitching/illumination_correction.cwl
+1 −1 steps/illumination_first_stitching/slicing.cwl
+1 −1 steps/ometiff_second_stitching/background_subtraction.cwl
+1 −1 steps/ometiff_second_stitching/ome_tiff_creation.cwl
+1 −1 steps/ometiff_second_stitching/second_stitching.cwl
+1 −1 steps/run_cytokit.cwl
2 changes: 1 addition & 1 deletion src/ingest-pipeline/airflow/dags/cwl/portal-containers
Submodule portal-containers updated 31 files
+1 −1 .github/workflows/workflow.yml
+0 −10 anndata-to-ui-manifest.json
+1 −1 containers/mudata-to-ui/VERSION
+8 −8 containers/mudata-to-ui/context/requirements-freeze.txt
+5 −8 containers/mudata-to-ui/context/requirements.txt
+1 −1 containers/mudata-to-ui/test-output-expected/secondary_analysis.zarr/.zattrs
+1 −1 containers/mudata-to-ui/test-output-expected/secondary_analysis.zarr/mod/atac_cbg/.zattrs
+1 −1 containers/mudata-to-ui/test-output-expected/secondary_analysis.zarr/mod/rna/.zattrs
+0 −26 containers/object-by-analyte-to-ui/Dockerfile
+0 −17 containers/object-by-analyte-to-ui/README.md
+0 −1 containers/object-by-analyte-to-ui/VERSION
+0 −123 containers/object-by-analyte-to-ui/context/main.py
+0 −88 containers/object-by-analyte-to-ui/context/requirements-freeze.txt
+0 −9 containers/object-by-analyte-to-ui/context/requirements.txt
+0 −188 containers/object-by-analyte-to-ui/create-test-input.py
+0 −137 containers/object-by-analyte-to-ui/test-input-parameters.json
+ containers/object-by-analyte-to-ui/test-input/secondary_analysis.h5mu
+ containers/object-by-analyte-to-ui/test-output-expected/secondary_analysis.zarr.zip
+0 −1 containers/object-by-analyte-to-ui/test-output-expected/secondary_analysis_metadata.json
+0 −5 mudata-to-ui-manifest.json
+1 −1 mudata-to-ui.cwl
+0 −12 object-by-analyte-to-ui-manifest.json
+0 −19 object-by-analyte-to-ui.cwl
+1 −1 workflows/mudata-to-ui/test-output-expected/mudata-zarr/secondary_analysis.zarr/.zattrs
+1 −1 workflows/mudata-to-ui/test-output-expected/mudata-zarr/secondary_analysis.zarr/mod/atac_cbg/.zattrs
+1 −1 workflows/mudata-to-ui/test-output-expected/mudata-zarr/secondary_analysis.zarr/mod/rna/.zattrs
+0 −1 workflows/object-by-analyte-to-ui/README.md
+ workflows/object-by-analyte-to-ui/test-input/secondary_analysis.h5mu
+0 −3 workflows/object-by-analyte-to-ui/test-job.yml
+ workflows/object-by-analyte-to-ui/test-output-expected/mudata-zarr/secondary_analysis.zarr.zip
+0 −1 workflows/object-by-analyte-to-ui/test-output-expected/mudata-zarr/secondary_analysis_metadata.json
1 change: 1 addition & 0 deletions src/ingest-pipeline/airflow/dags/cwl/rna-probes-pipeline
Submodule rna-probes-pipeline added at f1d0f7
8 changes: 8 additions & 0 deletions src/ingest-pipeline/airflow/dags/resource_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,14 @@ resource_map:
- 'task_re': '.*'
'queue': 'general'
'threads': 6
- 'dag_re': 'rna_with_probes'
'preserve_scratch': true
'lanes': 2
# 'lanes': 12
'tasks':
- 'task_re': '.*'
'queue': 'general'
'threads': 6
- 'dag_re': '.xenium'
'preserve_scratch': true
'lanes': 2
Expand Down
Loading