cleanup

Author: ianhi

pyproject.toml

@@ -45,7 +45,6 @@ io = [
   "cftime",
   "pooch",
 ]
-# "zarr @ git+https://github.com/zarr-developers/zarr-python.git",
 etc = ["sparse>=0.15"]
 parallel = ["dask[complete]"]
 viz = ["cartopy>=0.23", "matplotlib", "nc-time-axis", "seaborn"]

xarray/backends/zarr.py

@@ -107,10 +107,7 @@ def _choose_default_mode(
 
 
 def _zarr_v3() -> bool:
-    # hack for this test only
-    # version being pickd up as 3.0.0b which is apparently not greater than 3
-    # return True
-    return module_available("zarr", minversion="3.0.0a0")
+    return module_available("zarr", minversion="3")
 
 
 # need some special secret attributes to tell us the dimensions
@@ -1068,7 +1065,6 @@ def _open_existing_array(self, *, name) -> ZarrArray:
     def _create_new_array(
         self, *, name, shape, dtype, fill_value, encoding, attrs
     ) -> ZarrArray:
-        # STRING ERROR FOR OBJECT HERE
         if coding.strings.check_vlen_dtype(dtype) is str:
             dtype = str
 

xarray/tests/__init__.py

@@ -129,7 +129,7 @@ def _importorskip(
 has_bottleneck, requires_bottleneck = _importorskip("bottleneck")
 has_rasterio, requires_rasterio = _importorskip("rasterio")
 has_zarr, requires_zarr = _importorskip("zarr")
-has_zarr_v3, requires_zarr_v3 = _importorskip("zarr", "3.0.0a01")
+has_zarr_v3, requires_zarr_v3 = _importorskip("zarr", "3.0.0")
 has_fsspec, requires_fsspec = _importorskip("fsspec")
 has_iris, requires_iris = _importorskip("iris")
 has_numbagg, requires_numbagg = _importorskip("numbagg")

xarray/tests/test_backends.py

@@ -369,11 +369,14 @@ 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
@@ -848,8 +851,16 @@ 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:
@@ -2996,11 +3007,6 @@ def test_append_with_append_dim_no_overwrite(self) -> None:
             original2["lon"] = lon
             assert_identical(original2, actual)
 
-    def test_minimal_round(self) -> None:
-        ds = create_test_data()
-        with self.roundtrip(ds) as ds_reload:
-            assert_identical(ds, ds_reload)
-
     @requires_dask
     def test_to_zarr_compute_false_roundtrip(self) -> None:
         from dask.delayed import Delayed