Merge branch 'main' into pydap4_scale

Author: Mikejmnez

.readthedocs.yaml

@@ -18,4 +18,5 @@ build:
 conda:
   environment: ci/requirements/doc.yml
 
-formats: []
+formats:
+  - htmlzip

ci/release_contributors.py

@@ -7,6 +7,32 @@
 co_author_re = re.compile(r"Co-authored-by: (?P<name>[^<]+?) <(?P<email>.+)>")
 
 
+ignored = [
+    {"name": "dependabot[bot]"},
+    {"name": "pre-commit-ci[bot]"},
+    {
+        "name": "Claude",
+        "email": [
+            "noreply@anthropic.com",
+            "claude@anthropic.com",
+            "no-reply@anthropic.com",
+        ],
+    },
+]
+
+
+def is_ignored(name, email):
+    # linear search, for now
+    for ignore in ignored:
+        if ignore["name"] != name:
+            continue
+        ignored_email = ignore.get("email")
+        if ignored_email is None or email in ignored_email:
+            return True
+
+    return False
+
+
 def main():
     repo = git.Repo(".")
 
@@ -22,11 +48,8 @@ def main():
 
     # deduplicate and ignore
     # TODO: extract ignores from .github/release.yml
-    ignored = ["dependabot", "pre-commit-ci"]
     unique_contributors = unique(
-        contributor
-        for contributor in contributors.values()
-        if contributor.removesuffix("[bot]") not in ignored
+        name for email, name in contributors.items() if not is_ignored(name, email)
     )
 
     sorted_ = sorted(unique_contributors)

doc/whats-new.rst

@@ -121,6 +121,9 @@ Bug fixes
 - Allow ``combine_attrs="drop_conflicts"`` to handle objects with ``__eq__`` methods that return
   non-bool values (e.g., numpy arrays) without raising ``ValueError`` (:pull:`10726`).
   By `Maximilian Roos <https://github.com/max-sixty>`_.
+- Fix error raised when writing scalar variables to Zarr with ``region={}``
+  (:pull:`10796`).
+  By `Stephan Hoyer <https://github.com/shoyer>`_.
 
 Documentation
 ~~~~~~~~~~~~~

xarray/backends/zarr.py

@@ -1364,7 +1364,7 @@ def _validate_and_autodetect_region(self, ds: Dataset) -> Dataset:
         non_matching_vars = [
             k for k, v in ds.variables.items() if not set(region).intersection(v.dims)
         ]
-        if non_matching_vars:
+        if region and non_matching_vars:
             raise ValueError(
                 f"when setting `region` explicitly in to_zarr(), all "
                 f"variables in the dataset to write must have at least "
@@ -1620,6 +1620,7 @@ class ZarrBackendEntrypoint(BackendEntrypoint):
 
     description = "Open zarr files (.zarr) using zarr in Xarray"
     url = "https://docs.xarray.dev/en/stable/generated/xarray.backends.ZarrBackendEntrypoint.html"
+    supports_groups = True
 
     def guess_can_open(self, filename_or_obj: T_PathFileOrDataStore) -> bool:
         if isinstance(filename_or_obj, str | os.PathLike):

xarray/tests/test_backends.py

@@ -3443,6 +3443,14 @@ def test_write_region(self, consolidated, compute, use_dask, write_empty) -> Non
             ) as actual:
                 assert_identical(actual, nonzeros)
 
+    def test_region_scalar(self) -> None:
+        ds = Dataset({"x": 0})
+        with self.create_zarr_target() as store:
+            ds.to_zarr(store)
+            ds.to_zarr(store, region={}, mode="r+")
+            with xr.open_zarr(store) as actual:
+                assert_identical(actual, ds)
+
     @pytest.mark.parametrize("mode", [None, "r+", "a"])
     def test_write_region_mode(self, mode) -> None:
         zeros = Dataset({"u": (("x",), np.zeros(10))})

xarray/tests/test_backends_datatree.py

@@ -1109,3 +1109,27 @@ def test_write_inherited_coords_true(self, tmpdir, zarr_format) -> None:
         expected_child.name = None
         with open_datatree(filepath, group="child", engine="zarr") as roundtrip_child:
             assert_identical(expected_child, roundtrip_child)
+
+    @pytest.mark.xfail(
+        ON_WINDOWS,
+        reason="Permission errors from Zarr: https://github.com/pydata/xarray/pull/10793",
+    )
+    @pytest.mark.filterwarnings(
+        "ignore:Failed to open Zarr store with consolidated metadata:RuntimeWarning"
+    )
+    def test_zarr_engine_recognised(self, tmpdir, zarr_format) -> None:
+        """Test that xarray can guess the zarr backend when the engine is not specified"""
+        original_dt = DataTree.from_dict(
+            {
+                "/": xr.Dataset(coords={"x": [1, 2, 3]}),
+                "/child": xr.Dataset({"foo": ("x", [4, 5, 6])}),
+            }
+        )
+
+        filepath = str(tmpdir / "test.zarr")
+        original_dt.to_zarr(
+            filepath, write_inherited_coords=True, zarr_format=zarr_format
+        )
+
+        with open_datatree(filepath) as roundtrip_dt:
+            assert_identical(original_dt, roundtrip_dt)