test: proper skip behavior for zarr versions

Author: ianhi

xarray/tests/__init__.py

@@ -130,6 +130,20 @@ def _importorskip(
 has_rasterio, requires_rasterio = _importorskip("rasterio")
 has_zarr, requires_zarr = _importorskip("zarr")
 has_zarr_v3, requires_zarr_v3 = _importorskip("zarr", "3.0.0")
+has_zarr_v3_dtypes, requires_zarr_v3_dtypes = _importorskip("zarr", "3.0.9")
+
+# Additional check for zarr dtype support (dev versions > 3.0.9)
+if has_zarr:
+    import zarr
+
+    # Dev versions like "3.0.9.dev47+g9da38f75" are > "3.0.9"
+    has_zarr_v3_dtypes = has_zarr_v3_dtypes or (
+        Version(zarr.__version__) > Version("3.0.9")
+    )
+    requires_zarr_v3_dtypes = pytest.mark.skipif(
+        not has_zarr_v3_dtypes, reason="requires zarr>3.0.9 (including dev versions)"
+    )
+
 has_fsspec, requires_fsspec = _importorskip("fsspec")
 has_iris, requires_iris = _importorskip("iris")
 has_numbagg, requires_numbagg = _importorskip("numbagg")

xarray/tests/test_backends.py

@@ -72,6 +72,7 @@
     has_scipy,
     has_zarr,
     has_zarr_v3,
+    has_zarr_v3_dtypes,
     mock,
     network,
     requires_cftime,
@@ -369,14 +370,11 @@ def create_store(self):
     def roundtrip(
         self, data, save_kwargs=None, open_kwargs=None, allow_cleanup_failure=False
     ):
-        print("INT ROUNDTRIP")
         if save_kwargs is None:
             save_kwargs = {}
         if open_kwargs is None:
             open_kwargs = {}
         with create_tmp_file(allow_cleanup_failure=allow_cleanup_failure) as path:
-            print(path)
-            print(save_kwargs)
             self.save(data, path, **save_kwargs)
             with self.open(path, **open_kwargs) as ds:
                 yield ds
@@ -851,16 +849,8 @@ def test_outer_indexing_reversed(self) -> None:
             {"z": (("t", "p", "y", "x"), np.ones((1, 1, 31, 40)))},
         )
 
-        print("jsda;lkjasdlfk")
-        print(f"Test class: {self.__class__.__name__}")
-        print(f"Dataset: {ds}")
         with self.roundtrip(ds) as on_disk:
-            print(f"on_disk type: {type(on_disk)}")
-            print(f"on_disk.z type: {type(on_disk.z)}")
             subset = on_disk.isel(t=[0], p=0).z[:, ::10, ::10][:, ::-1, :]
-            print(f"subset sizes: {subset.sizes}")
-            loaded = subset.load()
-            print(f"loaded sizes: {loaded.sizes}")
             assert subset.sizes == subset.load().sizes
 
     def test_isel_dataarray(self) -> None:
@@ -2918,6 +2908,9 @@ def test_append_with_existing_encoding_raises(self) -> None:
 
     @pytest.mark.parametrize("dtype", ["U", "S"])
     def test_append_string_length_mismatch_raises(self, dtype) -> None:
+        if has_zarr_v3() and not has_zarr_v3_dtypes:
+            pytest.skip("This works on pre dtype updated zarr python")
+
         ds, ds_to_append = create_append_string_length_mismatch_test_data(dtype)
         with self.create_zarr_target() as store_target:
             ds.to_zarr(store_target, mode="w", **self.version_kwargs)