Merge branch 'main' of https://github.com/pydata/xarray

Author: TomNicholas

doc/whats-new.rst

@@ -32,7 +32,8 @@ Bug fixes
   By `Deepak Cherian <https://github.com/dcherian>`_.
 - Check and fix character array string dimension names, issue warnings as needed (:issue:`6352`, :pull:`10395`).
   By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.
-
+- Fix the error message of :py:func:`testing.assert_equal` when two different :py:class:`DataTree` objects
+  are passed (:pull:`10440`). By `Mathias Hauser <https://github.com/mathause>`_.
 
 
 Documentation
@@ -1009,7 +1010,7 @@ New Features
   for example, will retain the object.  However, one cannot do operations that are not possible on the ``ExtensionArray``
   then, such as broadcasting. (:issue:`5287`, :issue:`8463`, :pull:`8723`)
   By `Ilan Gold <https://github.com/ilan-gold>`_.
-- :py:func:`testing.assert_allclose`/:py:func:`testing.assert_equal` now accept a new argument ``check_dims="transpose"``, controlling whether a transposed array is considered equal. (:issue:`5733`, :pull:`8991`)
+- :py:func:`testing.assert_allclose` / :py:func:`testing.assert_equal` now accept a new argument ``check_dims="transpose"``, controlling whether a transposed array is considered equal. (:issue:`5733`, :pull:`8991`)
   By `Ignacio Martinez Vazquez <https://github.com/ignamv>`_.
 - Added the option to avoid automatically creating 1D pandas indexes in :py:meth:`Dataset.expand_dims()`, by passing the new kwarg
   ``create_index_for_new_dim=False``. (:pull:`8960`)

xarray/coding/cftime_offsets.py

@@ -289,20 +289,18 @@ def _shift_month(date, months, day_option: DayOption = "start"):
     _ = attempt_import("cftime")
 
     has_year_zero = date.has_year_zero
-    delta_year = (date.month + months) // 12
+    year = date.year + (date.month + months) // 12
     month = (date.month + months) % 12
 
     if month == 0:
         month = 12
-        delta_year = delta_year - 1
+        year -= 1
 
     if not has_year_zero:
-        if date.year < 0 and date.year + delta_year >= 0:
-            delta_year = delta_year + 1
-        elif date.year > 0 and date.year + delta_year <= 0:
-            delta_year = delta_year - 1
-
-    year = date.year + delta_year
+        if date.year < 0 <= year:
+            year += 1
+        elif year <= 0 < date.year:
+            year -= 1
 
     # Silence warnings associated with generating dates with years < 1.
     with warnings.catch_warnings():

xarray/core/coordinates.py

@@ -788,7 +788,7 @@ def _update_coords(
         # check for inconsistent state *before* modifying anything in-place
         dims = calculate_dimensions(variables)
         new_coord_names = set(coords)
-        for dim in dims.keys():
+        for dim in dims:
             if dim in variables:
                 new_coord_names.add(dim)
 

xarray/core/formatting.py

@@ -1039,15 +1039,13 @@ def diff_dataset_repr(a, b, compat):
 def diff_nodewise_summary(a: DataTree, b: DataTree, compat):
     """Iterates over all corresponding nodes, recording differences between data at each location."""
 
-    compat_str = _compat_to_str(compat)
-
     summary = []
     for path, (node_a, node_b) in group_subtrees(a, b):
         a_ds, b_ds = node_a.dataset, node_b.dataset
 
         if not a_ds._all_compat(b_ds, compat):
             path_str = "root node" if path == "." else f"node {path!r}"
-            dataset_diff = diff_dataset_repr(a_ds, b_ds, compat_str)
+            dataset_diff = diff_dataset_repr(a_ds, b_ds, compat)
             data_diff = indent(
                 "\n".join(dataset_diff.split("\n", 1)[1:]), prefix="    "
             )

xarray/core/indexing.py

@@ -2151,7 +2151,7 @@ def __setitem__(self, indexer: ExplicitIndexer, value: Any) -> None:
         )
 
     def transpose(self, order: Iterable[int]) -> Self:
-        new_dims = tuple([self._dims[i] for i in order])
+        new_dims = tuple(self._dims[i] for i in order)
         return type(self)(self._transform, self._coord_name, new_dims)
 
     def __repr__(self: Any) -> str:

xarray/core/utils.py

@@ -1292,7 +1292,7 @@ def attempt_import(module: str) -> ModuleType:
     reason = package_purpose.get(package_name, "")
     try:
         return importlib.import_module(module)
-    except (ImportError, ModuleNotFoundError) as e:
+    except ImportError as e:
         raise ImportError(
             f"The {install_name} package is required {reason}"
             " but could not be imported."

xarray/plot/utils.py

@@ -248,9 +248,7 @@ def _determine_cmap_params(
             isinstance(levels, Iterable) and levels[0] * levels[-1] < 0
         )
         # kwargs not specific about divergent or not: infer defaults from data
-        divergent = (
-            ((vmin < 0) and (vmax > 0)) or not center_is_none or levels_are_divergent
-        )
+        divergent = (vmin < 0 < vmax) or not center_is_none or levels_are_divergent
     else:
         divergent = False
 

xarray/structure/merge.py

@@ -718,7 +718,7 @@ def merge_core(
         coord_names.intersection_update(variables)
     if explicit_coords is not None:
         coord_names.update(explicit_coords)
-    for dim in dims.keys():
+    for dim in dims:
         if dim in variables:
             coord_names.add(dim)
     ambiguous_coords = coord_names.intersection(noncoord_names)

xarray/tests/arrays.py

@@ -1,3 +1,7 @@
+"""
+This module contains various lazy array classes which can be wrapped and manipulated by xarray objects but will raise on data access.
+"""
+
 from collections.abc import Callable, Iterable
 from typing import Any
 
@@ -6,10 +10,6 @@
 from xarray.core import utils
 from xarray.core.indexing import ExplicitlyIndexed
 
-"""
-This module contains various lazy array classes which can be wrapped and manipulated by xarray objects but will raise on data access.
-"""
-
 
 class UnexpectedDataAccess(Exception):
     pass

xarray/tests/test_backends.py

@@ -3803,13 +3803,11 @@ def assert_expected_files(expected: list[str], store: str) -> None:
                     ]
                 )
 
-            assert set(expected) == set(
-                [
-                    file.lstrip("c/")
-                    for file in ls
-                    if (file not in (".zattrs", ".zarray", "zarr.json"))
-                ]
-            )
+            assert set(expected) == {
+                file.lstrip("c/")
+                for file in ls
+                if (file not in (".zattrs", ".zarray", "zarr.json"))
+            }
 
         # The zarr format is set by the `default_zarr_format`
         # pytest fixture that acts on a superclass