Skip to content

Commit def2d3c

Browse files
fix pip installation problems due to xarray-dataclasses (#967)
* constrain xarray * fix pre-commit, allow python3.13, update xarray-dataclass dep * remove xarray-constraint * update spatial image dependency and msi, remove xarray-dataclass dep * revert type ngff_transformations * add mypy ignore * fix --------- Co-authored-by: Wouter-Michiel Vierdag <[email protected]>
1 parent 7604a3d commit def2d3c

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.mypy.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[mypy]
22
python_version = 3.10
3-
plugins = numpy.typing.mypy_plugin
43

54
ignore_errors = False
65
warn_redundant_casts = True

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ maintainers = [
1515
urls.Documentation = "https://spatialdata.scverse.org/en/latest"
1616
urls.Source = "https://github.com/scverse/spatialdata.git"
1717
urls.Home-page = "https://github.com/scverse/spatialdata.git"
18-
requires-python = ">=3.10, <3.13" # include 3.13 once multiscale-spatial-image conflicts are resolved
18+
requires-python = ">=3.10"
1919
dynamic= [
2020
"version" # allow version to be set by git tags
2121
]
@@ -29,7 +29,7 @@ dependencies = [
2929
"datashader",
3030
"fsspec",
3131
"geopandas>=0.14",
32-
"multiscale_spatial_image>=2.0.2",
32+
"multiscale_spatial_image>=2.0.3",
3333
"networkx",
3434
"numba>=0.55.0",
3535
"numpy",
@@ -40,14 +40,13 @@ dependencies = [
4040
"rich",
4141
"setuptools",
4242
"shapely>=2.0.1",
43-
"spatial_image>=1.1.0",
43+
"spatial_image>=1.2.3",
4444
"scikit-image",
4545
"scipy",
4646
"typing_extensions>=4.8.0",
4747
"xarray>=2024.10.0",
4848
"xarray-schema",
4949
"xarray-spatial>=0.3.5",
50-
"xarray-dataclasses>=1.8.0",
5150
"zarr<3",
5251
]
5352

src/spatialdata/transformations/ngff/ngff_transformations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def transform_points(self, points: ArrayLike) -> ArrayLike:
340340
self._validate_transform_points_shapes(len(input_axes), points.shape)
341341
p = np.vstack([points.T, np.ones(points.shape[0])])
342342
q = self.affine @ p
343-
return q[: len(output_axes), :].T
343+
return q[: len(output_axes), :].T # type: ignore[no-any-return]
344344

345345
def to_affine(self) -> "NgffAffine":
346346
return NgffAffine(
@@ -744,7 +744,7 @@ def _get_and_validate_axes(self) -> tuple[tuple[str, ...], tuple[str, ...]]:
744744
def transform_points(self, points: ArrayLike) -> ArrayLike:
745745
input_axes, _ = self._get_and_validate_axes()
746746
self._validate_transform_points_shapes(len(input_axes), points.shape)
747-
return (self.rotation @ points.T).T
747+
return (self.rotation @ points.T).T # type: ignore[no-any-return]
748748

749749
def to_affine(self) -> NgffAffine:
750750
m = np.eye(len(self.rotation) + 1)

0 commit comments

Comments
 (0)