Merge branch 'main' into move-co-var-rr

pydata · Oct 17, 2023 · 892a8c8 · 892a8c8
2 parents 5c7f036 + f895dc1
commit 892a8c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/xarray/core/variable.py b/xarray/core/variable.py
@@ -2787,13 +2787,7 @@ def copy(self, deep: bool = True, data: T_DuckArray | ArrayLike | None = None):
             data copied from original.
         """
         if data is None:
-            data_old = self._data
-
-            if not isinstance(data_old, indexing.MemoryCachedArray):
-                ndata = data_old
-            else:
-                # don't share caching between copies
-                ndata = indexing.MemoryCachedArray(data_old.array)
+            ndata = self._data
 
             if deep:
                 ndata = copy.deepcopy(ndata, None)

diff --git a/xarray/tests/test_computation.py b/xarray/tests/test_computation.py
@@ -283,7 +283,7 @@ def add_one(a, core_dims, on_missing_core_dim):
 
     # `raise` — should raise on a missing dim
     with pytest.raises(ValueError):
-        add_one(ds, core_dims=[["y"]], on_missing_core_dim="raise"),
+        add_one(ds, core_dims=[["y"]], on_missing_core_dim="raise")
 
     # `drop` — should drop the var with the missing dim
     assert_identical(
@@ -1249,7 +1249,7 @@ def check(x, y):
         assert actual.data.chunks == array.chunks
         assert_identical(data_array, actual)
 
-    check(data_array, 0),
+    check(data_array, 0)
     check(0, data_array)
     check(data_array, xr.DataArray(0))
     check(data_array, 0 * data_array)