dtype updates

Author: ianhi

ci/install-upstream-wheels.sh

@@ -53,7 +53,7 @@ python -m pip install \
   git+https://github.com/dask/dask \
   git+https://github.com/dask/dask-expr \
   git+https://github.com/dask/distributed \
-  git+https://github.com/d-v-b/zarr-python.git@feat/fixed-length-strings \
+  git+https://github.com/zarr-developers/zarr-python.git@main \
   git+https://github.com/Unidata/cftime \
   git+https://github.com/pypa/packaging \
   git+https://github.com/hgrecco/pint \

xarray/tests/test_backends.py

@@ -365,8 +365,6 @@ def create_store(self):
     def roundtrip(
         self, data, save_kwargs=None, open_kwargs=None, allow_cleanup_failure=False
     ):
-        print(save_kwargs)
-        print(open_kwargs)
         if save_kwargs is None:
             save_kwargs = {}
         if open_kwargs is None:
@@ -912,9 +910,6 @@ def test_roundtrip_bytes_with_fill_value(self) -> None:
         encoding = {"_FillValue": b"X", "dtype": "S1"}
         original = Dataset({"x": ("t", values, {}, encoding)})
         expected = original.copy(deep=True)
-        zarr_format_3 = has_zarr_v3 and zarr.config.config["default_zarr_format"] == 3
-        print(zarr_format_3)
-        print(self.version_kwargs)
         with self.roundtrip(original) as actual:
             assert_identical(expected, actual)
 
@@ -2333,7 +2328,6 @@ def create_store(self, cache_members: bool = False):
             )
 
     def save(self, dataset, store_target, **kwargs):  # type: ignore[override]
-        print("ver kwargs", self.version_kwargs)
         return dataset.to_zarr(store=store_target, **kwargs, **self.version_kwargs)
 
     @contextlib.contextmanager
@@ -2385,7 +2379,8 @@ def test_read_non_consolidated_warning(self) -> None:
 
     def test_non_existent_store(self) -> None:
         with pytest.raises(
-            FileNotFoundError, match="(No such file or directory|Unable to find group)"
+            FileNotFoundError,
+            match="(No such file or directory|Unable to find group|No group found in store)",
         ):
             xr.open_zarr(f"{uuid.uuid4()}")
 
@@ -2467,6 +2462,7 @@ def test_manual_chunk(self) -> None:
                 assert_identical(actual.load(), auto.load())
 
     @requires_dask
+    @pytest.mark.filterwarnings("ignore:.*does not have a Zarr V3 specification.*")
     def test_warning_on_bad_chunks(self) -> None:
         original = create_test_data().chunk({"dim1": 4, "dim2": 3, "dim3": 3})
 
@@ -2875,7 +2871,6 @@ 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:
-        skip_if_zarr_format_3("This actually works fine with Zarr format 3")
         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)
@@ -2884,18 +2879,6 @@ def test_append_string_length_mismatch_raises(self, dtype) -> None:
                     store_target, append_dim="time", **self.version_kwargs
                 )
 
-    @pytest.mark.parametrize("dtype", ["U", "S"])
-    def test_append_string_length_mismatch_works(self, dtype) -> None:
-        skip_if_zarr_format_2("This doesn't work with Zarr format 2")
-        # ...but it probably would if we used object dtype
-        ds, ds_to_append = create_append_string_length_mismatch_test_data(dtype)
-        expected = xr.concat([ds, ds_to_append], dim="time")
-        with self.create_zarr_target() as store_target:
-            ds.to_zarr(store_target, mode="w", **self.version_kwargs)
-            ds_to_append.to_zarr(store_target, append_dim="time", **self.version_kwargs)
-            actual = xr.open_dataset(store_target, engine="zarr")
-            xr.testing.assert_identical(expected, actual)
-
     def test_check_encoding_is_consistent_after_append(self) -> None:
         ds, ds_to_append, _ = create_append_test_data()
 
@@ -2977,6 +2960,11 @@ 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
@@ -3732,10 +3720,6 @@ def roundtrip_dir(
         if open_kwargs is None:
             open_kwargs = {}
 
-        print("here?")
-        print(save_kwargs)
-        print(self.version_kwargs)
-        print(open_kwargs)
         data.to_zarr(store, **save_kwargs, **self.version_kwargs)
         with xr.open_dataset(
             store, engine="zarr", **open_kwargs, **self.version_kwargs