Skip to content

Commit 0dd816a

Browse files
committed
Merge branch 'main' into faster-imports
2 parents 609e40b + 6cc3afc commit 0dd816a

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ default_stages:
77
minimum_pre_commit_version: 2.16.0
88
repos:
99
- repo: https://github.com/rbubley/mirrors-prettier
10-
rev: v3.7.4
10+
rev: v3.8.1
1111
hooks:
1212
- id: prettier
1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.14.11
14+
rev: v0.15.2
1515
hooks:
1616
- id: ruff
1717
args: [--fix, --exit-non-zero-on-fix, --unsafe-fixes]

src/spatialdata_io/readers/xenium.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ def xenium(
6969
morphology_focus: bool = True,
7070
aligned_images: bool = True,
7171
cells_table: bool = True,
72+
n_jobs: int | None = None,
7273
gex_only: bool = True,
7374
imread_kwargs: Mapping[str, Any] = MappingProxyType({}),
7475
image_models_kwargs: Mapping[str, Any] = MappingProxyType({}),
@@ -121,6 +122,10 @@ def xenium(
121122
`False` and use the `xenium_aligned_image` function directly.
122123
cells_table
123124
Whether to read the cell annotations in the `AnnData` table.
125+
n_jobs
126+
.. deprecated::
127+
``n_jobs`` is not used anymore and will be removed in a future release. The reading time of shapes is now
128+
greatly improved and does not require parallelization.
124129
gex_only
125130
Whether to load only the "Gene Expression" feature type.
126131
imread_kwargs
@@ -153,6 +158,13 @@ def xenium(
153158
... )
154159
>>> sdata.write("path/to/data.zarr")
155160
"""
161+
if n_jobs is not None:
162+
warnings.warn(
163+
"The `n_jobs` parameter is deprecated and will be removed in a future release. "
164+
"The reading time of shapes is now greatly improved and does not require parallelization.",
165+
DeprecationWarning,
166+
stacklevel=2,
167+
)
156168
image_models_kwargs, labels_models_kwargs = _initialize_raster_models_kwargs(
157169
image_models_kwargs, labels_models_kwargs
158170
)
@@ -245,7 +257,7 @@ def xenium(
245257
labels_name="nucleus_labels",
246258
labels_models_kwargs=labels_models_kwargs,
247259
cells_zarr=cells_zarr,
248-
cell_id_str=cells_zarr_cell_id_str,
260+
cell_id_str=None,
249261
)
250262
if cells_labels:
251263
labels["cell_labels"], cell_labels_indices_mapping = _get_labels_and_indices_mapping(

0 commit comments

Comments
 (0)