cf-xarray 0.10.2__tar.gz → 0.10.4__tar.gz

{cf_xarray-0.10.2 → cf_xarray-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cf_xarray
-Version: 0.10.2
+Version: 0.10.4
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004

cf_xarray-0.10.4/cf_xarray/_version.py

@@ -0,0 +1 @@
+__version__ = "0.10.4"

{cf_xarray-0.10.2 → cf_xarray-0.10.4}/cf_xarray/accessor.py

@@ -24,11 +24,29 @@ from typing import (
 
 import xarray as xr
 from xarray import DataArray, Dataset
-from xarray.core.arithmetic import SupportsArithmetic
 from xarray.core.groupby import GroupBy
 from xarray.core.resample import Resample
-from xarray.core.rolling import Coarsen, Rolling
-from xarray.core.weighted import Weighted
+
+try:
+    from xarray.core.rolling import (  # type:ignore[import-not-found,no-redef,unused-ignore]
+        Coarsen,
+        Rolling,
+    )
+except ImportError:
+    from xarray.computation.rolling import (  # type:ignore[import-not-found,no-redef,unused-ignore]
+        Coarsen,
+        Rolling,
+    )
+
+try:
+    from xarray.core.weighted import (
+        Weighted,  # type:ignore[import-not-found,no-redef,unused-ignore]
+    )
+except ImportError:
+    from xarray.computation.weighted import (  # type:ignore[import-not-found,no-redef,unused-ignore]
+        Weighted,
+    )
+
 
 from . import parametric, sgrid
 from .criteria import (
@@ -997,7 +1015,7 @@ def _possible_x_y_plot(obj, key, skip=None):
         return _get_possible(obj.cf, y_criteria)
 
 
-class _CFWrappedClass(SupportsArithmetic):
+class _CFWrappedClass:
     """
     This class is used to wrap any class in _WRAPPED_CLASSES.
     """
@@ -2727,7 +2745,9 @@ class CFDatasetAccessor(CFAccessor):
                 results[v].append(k)
         return results
 
-    def decode_vertical_coords(self, *, outnames=None, prefix=None):
+    def decode_vertical_coords(
+        self, *, outnames: dict[str, str] | None = None, prefix: str | None = None
+    ) -> None:
         """
         Decode parameterized vertical coordinates in place.
 
@@ -2765,6 +2785,7 @@ class CFDatasetAccessor(CFAccessor):
         allterms = self.formula_terms
 
         for dim in allterms:
+            dim = cast(str, dim)
             if prefix is None:
                 assert outnames is not None, (
                     "if prefix is None, outnames must be provided"
@@ -2810,7 +2831,7 @@ class CFDatasetAccessor(CFAccessor):
                     f"Coordinate function for {stdname!r} not implmented yet. Contributions welcome!"
                 ) from None
 
-            ds.coords[zname] = transform.from_terms(terms)
+            ds.coords[zname] = transform.from_terms(terms).decode()
 
 
 @xr.register_dataarray_accessor("cf")

{cf_xarray-0.10.2 → cf_xarray-0.10.4}/cf_xarray/parametric.py

@@ -782,7 +782,7 @@ class OceanDoubleSigma(ParametricVerticalCoordinate):
         return cls(**get_terms(terms, "sigma", "depth", "z1", "z2", "a", "href", "k_c"))
 
 
-TRANSFORM_FROM_STDNAME = {
+TRANSFORM_FROM_STDNAME: dict[str, type[ParametricVerticalCoordinate]] = {
     "atmosphere_ln_pressure_coordinate": AtmosphereLnPressure,
     "atmosphere_sigma_coordinate": AtmosphereSigma,
     "atmosphere_hybrid_sigma_pressure_coordinate": AtmosphereHybridSigmaPressure,

{cf_xarray-0.10.2 → cf_xarray-0.10.4}/cf_xarray/tests/test_accessor.py

@@ -1306,15 +1306,25 @@ def test_Z_vs_vertical_ROMS() -> None:
 
 
 def test_decode_vertical_coords() -> None:
+    # Fixes 'UnboundLocalError: cannot access local variable 'romsds' where it is not associated with a value'
+    from ..datasets import romsds
+
+    # needs standard names on `eta` and `depth` to derive computed standard name
+    romsds.h.attrs["standard_name"] = "sea_floor_depth_below_geopotential_datum"
+    romsds.zeta.attrs["standard_name"] = "sea_surface_height_above_geopotential_datum"
+
+    romsds.cf.decode_vertical_coords(outnames={"s_rho": "z_rho"})
+
+    assert romsds.z_rho.shape == (2, 30)
+    assert romsds.z_rho.attrs["standard_name"] == "height_above_geopotential_datum"
+
+    romsds = romsds.drop_vars("z_rho")
+
     with pytest.raises(
         AssertionError, match="if prefix is None, outnames must be provided"
     ):
         romsds.cf.decode_vertical_coords()
 
-    # needs standard names on `eta` and `depth` to derive computed standard name
-    romsds.h.attrs["standard_name"] = "sea_floor_depth_below_ geopotential_datum"
-    romsds.zeta.attrs["standard_name"] = "sea_surface_height_above_ geopotential_datum"
-
     with pytest.warns(DeprecationWarning):
         romsds.cf.decode_vertical_coords(prefix="z_rho")
 
@@ -1514,15 +1524,14 @@ def test_groupby_special_ops() -> None:
     grouped = airds.groupby_bins("lat", np.arange(20, 50, 10))
 
     # __iter__
-    for (label, group), (cflabel, cfgroup) in zip(grouped, cfgrouped, strict=False):
+    for (label, group), (cflabel, cfgroup) in zip(grouped, cfgrouped, strict=True):
         assert label == cflabel
         assert_identical(group, cfgroup)
 
     # arithmetic
     # TODO: Extremely buggy!
     # 1. cfgrouped - cfgrouped.mean() raises RecursionError
-    # 2. use_flox=True doesn't preserve attributes for some reason
-    with xr.set_options(keep_attrs=True):
+    with xr.set_options(keep_attrs=True, use_flox=True):
         expected = grouped - grouped.mean()
         actual = grouped - cfgrouped.mean()
     assert_identical(expected, actual)

{cf_xarray-0.10.2 → cf_xarray-0.10.4}/cf_xarray.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cf_xarray
-Version: 0.10.2
+Version: 0.10.4
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004

cf_xarray-0.10.2/cf_xarray/_version.py

@@ -1 +0,0 @@
-__version__ = "0.10.2"