Skip to content

Commit c0e53f1

Browse files
committed
Pin dependencies for zarr. Update spatialdata-blobs notebook
1 parent 424ed66 commit c0e53f1

File tree

3 files changed

+526
-20
lines changed

3 files changed

+526
-20
lines changed

docs/notebooks/spatial_data_blobs.ipynb

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@
109109
"outputs": [],
110110
"source": [
111111
"vc = VitessceConfig(\n",
112-
" schema_version=\"1.0.16\",\n",
112+
" schema_version=\"1.0.17\",\n",
113113
" name='Visium SpatialData Demo (blobs)',\n",
114114
")\n",
115115
"# Add data to the configuration:\n",
116116
"wrapper = SpatialDataWrapper(\n",
117-
" sdata_path=spatialdata_filepath,\n",
117+
" sdata_store=spatialdata_filepath,\n",
118118
" # The following paths are relative to the root of the SpatialData zarr store on-disk.\n",
119119
" image_path=\"images/blobs_image\",\n",
120120
" labels_path=\"labels/blobs_labels\",\n",
@@ -140,15 +140,26 @@
140140
" \"spatialTargetC\": 0,\n",
141141
" \"spatialChannelColor\": [255, 0, 0],\n",
142142
" \"spatialChannelOpacity\": 1.0\n",
143+
" },\n",
144+
" {\n",
145+
" \"spatialTargetC\": 1,\n",
146+
" \"spatialChannelColor\": [0, 255, 0],\n",
147+
" \"spatialChannelOpacity\": 1.0\n",
148+
" },\n",
149+
" {\n",
150+
" \"spatialTargetC\": 2,\n",
151+
" \"spatialChannelColor\": [0, 0, 255],\n",
152+
" \"spatialChannelOpacity\": 1.0\n",
143153
" }\n",
144154
" ])\n",
145155
" }]),\n",
146156
"}, scope_prefix=get_initial_coordination_scope_prefix(\"A\", \"image\"))\n",
147157
"\n",
148158
"vc.link_views_by_dict([spatial, layer_controller], {\n",
149159
" 'segmentationLayer': CL([{\n",
160+
" \"fileUid\": \"my_unique_id\",\n",
150161
" 'segmentationChannel': CL([{\n",
151-
" 'spatialChannelVisible': False,\n",
162+
" 'spatialChannelVisible': True,\n",
152163
" 'obsType': 'blob',\n",
153164
" }]),\n",
154165
" }]),\n",
@@ -206,7 +217,7 @@
206217
"name": "python",
207218
"nbconvert_exporter": "python",
208219
"pygments_lexer": "ipython3",
209-
"version": "3.9.20"
220+
"version": "3.10.14"
210221
}
211222
},
212223
"nbformat": 4,

pyproject.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ classifiers = [
2525
'Programming Language :: Python :: 3.12',
2626
]
2727
dependencies = [
28-
'zarr>=2.5.0',
29-
'numcodecs>=0.5.7',
3028
'scipy>=1.2.1',
3129
'negspy>=0.2.24',
3230
'pandas>=1.1.2',
3331
'black>=21.11b1',
3432
'numpy>=1.21.2',
33+
'zarr>=2.5.0,<3',
34+
'numcodecs>=0.5.7',
3535
'anndata>=0.7.8',
36-
# scanpy < 1.10.3 does not support numpy >= 2.0.0 and does not
36+
# scanpy < 1.10.3 does not support numpy >= 2.0.0 and does not
3737
# Reference: https://github.com/scverse/scanpy/pull/3115/files
3838
'scanpy>=1.10.2',
39-
'ome-zarr>=0.8.3',
39+
'ome-zarr<9',
4040
'tifffile>=2020.10.1',
4141
'jsonschema>=3.2',
42-
'tqdm>=4.1.0'
42+
'tqdm>=4.1.0',
4343
]
4444

4545
[project.optional-dependencies]
@@ -74,9 +74,10 @@ all = [
7474
'uvicorn>=0.17.0',
7575
'ujson>=4.0.1',
7676
'starlette==0.14.0',
77-
'generate-tiff-offsets>=0.1.8',
77+
'generate-tiff-offsets>=0.1.9',
7878
'kerchunk>=0.2.6',
7979
'fsspec',
80+
'spatialdata>=0.3.0',
8081

8182
# aiofiles is not explicitly referenced in our code,
8283
# but it is an implicit dependency of starlette==0.14.0.

0 commit comments

Comments
 (0)