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

{cf_xarray-0.10.4 → cf_xarray-0.10.6}/.github/workflows/ci.yaml

@@ -70,7 +70,7 @@ jobs:
         run: |
           pytest -n auto --cov=./ --cov-report=xml
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@v5.4.3
         with:
           file: ./coverage.xml
           flags: unittests
@@ -109,7 +109,7 @@ jobs:
         run: |
           python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report cf_xarray/
       - name: Upload mypy coverage to Codecov
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@v5.4.3
         with:
           file: mypy_report/cobertura.xml
           flags: mypy

{cf_xarray-0.10.4 → cf_xarray-0.10.6}/.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.9.3'
+    rev: 'v0.11.4'
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -24,7 +24,7 @@ repos:
           args: ['--config', 'pyproject.toml']
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.21
+    rev: 0.7.22
     hooks:
     - id: mdformat
       additional_dependencies:
@@ -55,7 +55,7 @@ repos:
     - id: validate-cff
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.23
+    rev: v0.24.1
     hooks:
       - id: validate-pyproject
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: cf_xarray
-Version: 0.10.4
+Version: 0.10.6
 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.6/cf_xarray/_version.py

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

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

@@ -39,8 +39,8 @@ except ImportError:
     )
 
 try:
-    from xarray.core.weighted import (
-        Weighted,  # type:ignore[import-not-found,no-redef,unused-ignore]
+    from xarray.core.weighted import (  # type:ignore[import-not-found,no-redef,unused-ignore]
+        Weighted,
     )
 except ImportError:
     from xarray.computation.weighted import (  # type:ignore[import-not-found,no-redef,unused-ignore]
@@ -1376,7 +1376,7 @@ class CFAccessor:
 
     def curvefit(
         self,
-        coords: Hashable | DataArray | Iterable[Hashable | DataArray],
+        coords: Hashable | Iterable[Hashable],
         func: Callable[..., Any],
         reduce_dims: Hashable | Iterable[Hashable] | None = None,
         skipna: bool = True,
@@ -1386,8 +1386,8 @@ class CFAccessor:
         kwargs: dict[str, Any] | None = None,
     ):
         if coords is not None:
-            if isinstance(coords, Hashable | DataArray):
-                coords_iter: Iterable[Hashable | DataArray] = [coords]
+            if isinstance(coords, Hashable):
+                coords_iter: Iterable[Hashable] = [coords]
             else:
                 coords_iter = coords
             coords = [

{cf_xarray-0.10.4 → cf_xarray-0.10.6}/cf_xarray/geometry.py

@@ -298,8 +298,10 @@ def encode_geometries(ds: xr.Dataset):
     geom_var_names = [
         name
         for name, var in ds._variables.items()
-        if var.dtype == "O" and isinstance(var.data.flat[0], SHAPELY_TYPES)
+        if var.dtype == "geometry"
+        or (var.dtype == "O" and isinstance(var.data.flat[0], SHAPELY_TYPES))
     ]
+
     if not geom_var_names:
         return ds
 
@@ -410,8 +412,8 @@ def reshape_unique_geometries(
     out = out.unstack(temp_name)
 
     # geom_var was reshaped also, reconstruct it from the unique values.
-    unique_indexes = xr.DataArray(unique_indexes, dims=(new_dim,))
-    out[geom_var] = ds[geom_var].isel({old_name: unique_indexes})
+    unique_indexes_da = xr.DataArray(unique_indexes, dims=(new_dim,))
+    out[geom_var] = ds[geom_var].isel({old_name: unique_indexes_da})
     if old_name not in ds.coords:
         # If there was no coord before, drop the dummy one we made.
         out = out.drop_vars(old_name)  # type: ignore[arg-type,unused-ignore]  # Hashable/str stuff

{cf_xarray-0.10.4 → cf_xarray-0.10.6}/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.4 → cf_xarray-0.10.6}/cf_xarray/tests/test_geometry.py

@@ -507,5 +507,7 @@ def test_encode_decode(geometry_ds, polygon_geometry):
     )
     multi_ds = xr.merge([polyds, geometry_ds[1]])
     for ds in (geometry_ds[1], polygon_geometry.to_dataset(), geom_dim_ds, multi_ds):
-        roundtripped = decode_geometries(encode_geometries(ds))
+        encoded = encode_geometries(ds)
+        assert len(encoded.data_vars) > len(ds.data_vars)
+        roundtripped = decode_geometries(encoded)
         xr.testing.assert_identical(ds, roundtripped)

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: cf_xarray
-Version: 0.10.4
+Version: 0.10.6
 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.4/cf_xarray/_version.py

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