Skip to content

Commit 057c178

Browse files
committed
Zarr >= 3
1 parent 0f1bb79 commit 057c178

5 files changed

Lines changed: 94 additions & 284 deletions

File tree

doc/whats-new.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Breaking Changes
6060
rasterio 1.3 1.4
6161
scipy 1.13 1.15
6262
toolz 0.12 1.0
63+
zarr 2.18 3.0
6364
===================== ========= =======
6465

6566
- Change the default value for ``chunk`` in ``open_zarr`` to ``_default`` and remove special mapping of ``"auto"``

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ pydap = "3.5.*"
138138
rasterio = "1.4.*"
139139
seaborn = "0.13.*"
140140
sparse = "0.15.*"
141-
zarr = "2.18.*"
142141
toolz = "1.0.*"
142+
zarr = "3.0.*"
143143

144144
# TODO: Remove `target.unix` restriction once pandas nightly has win-64 wheels again.
145145
# Without this, `pixi lock` fails because it can't solve the nightly feature for win-64,

xarray/tests/__init__.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,9 @@ def _importorskip(
114114
has_bottleneck, requires_bottleneck = _importorskip("bottleneck")
115115
has_rasterio, requires_rasterio = _importorskip("rasterio")
116116
has_zarr, requires_zarr = _importorskip("zarr")
117-
has_zarr_v3, requires_zarr_v3 = _importorskip("zarr", "3.0.0")
118117
has_zarr_v3_dtypes, requires_zarr_v3_dtypes = _importorskip("zarr", "3.1.0")
119118
has_zarr_v3_async_oindex, requires_zarr_v3_async_oindex = _importorskip("zarr", "3.1.2")
120-
if has_zarr_v3:
119+
if has_zarr:
121120
import zarr
122121

123122
# manual update by checking attrs for now
@@ -178,14 +177,7 @@ def _importorskip(
178177
"zarr_format",
179178
[
180179
pytest.param(2, id="zarr_format=2"),
181-
pytest.param(
182-
3,
183-
marks=pytest.mark.skipif(
184-
not has_zarr_v3,
185-
reason="zarr-python v2 cannot understand the zarr v3 format",
186-
),
187-
id="zarr_format=3",
188-
),
180+
pytest.param(3, id="zarr_format=3"),
189181
],
190182
)
191183

0 commit comments

Comments
 (0)