Add small test exposing issue from #7794. Propose fix for _wrap_numpy_scalars

huard · huard · commit 28bbf962a252 · 2024-03-11T18:45:24.000-04:00
diff --git a/xarray/core/indexing.py b/xarray/core/indexing.py
@@ -686,6 +686,10 @@ def _wrap_numpy_scalars(array):
     """Wrap NumPy scalars in 0d arrays."""
     if np.isscalar(array):
         return np.array(array)
+    elif hasattr(array, "dtype"):
+        return array
+    elif np.ndim(array) == 0:
+        return np.array(array)
     else:
         return array
 
diff --git a/xarray/tests/test_backends.py b/xarray/tests/test_backends.py
@@ -2060,6 +2060,25 @@ def test_write_inconsistent_chunks(self) -> None:
             assert actual["x"].encoding["chunksizes"] == (50, 100)
             assert actual["y"].encoding["chunksizes"] == (100, 50)
 
+    @requires_cftime
+    def test_roundtrip_cftime_bnds(self):
+        # Regression test for issue #7794
+        import cftime
+        original = xr.Dataset(
+            {"foo": ("time", [0.]),
+             "time_bnds": (("time","bnds"), [[cftime.Datetime360Day(2005, 12, 1, 0, 0, 0, 0),
+                                              cftime.Datetime360Day(2005, 12, 2, 0, 0, 0, 0)]])},
+            {"time": [cftime.Datetime360Day(2005, 12, 1, 12, 0, 0, 0)]})
+
+
+        with create_tmp_file() as tmp_file:
+            original.to_netcdf(tmp_file)
+            with open_dataset(tmp_file) as actual:
+                tb = actual.time_bnds.values
+                chunked = actual.chunk(time=1)
+                with create_tmp_file() as tmp_file_chunked:
+                    chunked.to_netcdf(tmp_file_chunked)
+
 
 @requires_zarr
 class ZarrBase(CFEncodedBase):
