cf-xarray 0.10.3__tar.gz → 0.10.5__tar.gz

{cf_xarray-0.10.3 → cf_xarray-0.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: cf_xarray
-Version: 0.10.3
+Version: 0.10.5
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -229,6 +229,7 @@ Requires-Dist: shapely; extra == "all"
 Requires-Dist: regex; extra == "all"
 Requires-Dist: rich; extra == "all"
 Requires-Dist: pooch; extra == "all"
+Dynamic: license-file
 
 .. image:: https://img.shields.io/static/v1.svg?logo=Jupyter&label=Pangeo+Binder&message=GCE+us-central1&color=blue&style=for-the-badge
     :target: https://binder.pangeo.io/v2/gh/xarray-contrib/cf-xarray/main?urlpath=lab

cf_xarray-0.10.5/cf_xarray/_version.py

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

{cf_xarray-0.10.3 → cf_xarray-0.10.5}/cf_xarray/accessor.py

@@ -26,8 +26,27 @@ import xarray as xr
 from xarray import DataArray, Dataset
 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 (

{cf_xarray-0.10.3 → cf_xarray-0.10.5}/cf_xarray/groupers.py

@@ -2,11 +2,12 @@ from dataclasses import dataclass
 
 import numpy as np
 import pandas as pd
-from xarray.groupers import EncodedGroups, UniqueGrouper
+from xarray import Variable
+from xarray.groupers import EncodedGroups, Grouper, UniqueGrouper
 
 
 @dataclass
-class FlagGrouper(UniqueGrouper):
+class FlagGrouper(Grouper):
     """
     Grouper object that allows convenient categorical grouping by a CF flag variable.
 
@@ -23,12 +24,12 @@ class FlagGrouper(UniqueGrouper):
         values = np.array(group.attrs["flag_values"])
         full_index = pd.Index(group.attrs["flag_meanings"].split(" "))
 
-        self.labels = values
+        grouper = UniqueGrouper(labels=values)
 
         # TODO: we could optimize here, since `group` is already factorized,
         # but there are subtleties. For example, the attrs must be up to date,
         # any value that is not in flag_values will cause an error, etc.
-        ret = super().factorize(group)
+        ret = grouper.factorize(group)
 
         ret.codes.attrs.pop("flag_values")
         ret.codes.attrs.pop("flag_meanings")
@@ -36,5 +37,11 @@ class FlagGrouper(UniqueGrouper):
         return EncodedGroups(
             codes=ret.codes,
             full_index=full_index,
+            unique_coord=Variable(
+                dims=ret.codes.name, data=np.array(full_index), attrs=ret.codes.attrs
+            ),
             group_indices=ret.group_indices,
         )
+
+    def reset(self):
+        raise NotImplementedError()

{cf_xarray-0.10.3 → cf_xarray-0.10.5}/cf_xarray.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: cf_xarray
-Version: 0.10.3
+Version: 0.10.5
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -229,6 +229,7 @@ Requires-Dist: shapely; extra == "all"
 Requires-Dist: regex; extra == "all"
 Requires-Dist: rich; extra == "all"
 Requires-Dist: pooch; extra == "all"
+Dynamic: license-file
 
 .. image:: https://img.shields.io/static/v1.svg?logo=Jupyter&label=Pangeo+Binder&message=GCE+us-central1&color=blue&style=for-the-badge
     :target: https://binder.pangeo.io/v2/gh/xarray-contrib/cf-xarray/main?urlpath=lab

cf_xarray-0.10.3/cf_xarray/_version.py

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