cf-xarray 0.9.4__tar.gz → 0.9.5__tar.gz

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/.github/workflows/ci.yaml

@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.9", "3.12"]
+        python-version: ["3.10", "3.12"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -91,7 +91,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: ["3.9", "3.12"]
+        python-version: ["3.10", "3.12"]
     steps:
       - uses: actions/checkout@v4
         with:

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/.pre-commit-config.yaml

@@ -3,25 +3,25 @@ ci:
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.17.0
     hooks:
       - id: pyupgrade
-        args: ["--py39-plus"]
+        args: ["--py310-plus"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.5.0'
+    rev: 'v0.6.1'
     hooks:
       - id: ruff
         args: ["--show-fixes", "--fix"]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
 
   - repo: https://github.com/rstcheck/rstcheck
-    rev: v6.2.0
+    rev: v6.2.4
     hooks:
         - id: rstcheck
           additional_dependencies: [sphinx, tomli]
@@ -36,7 +36,7 @@ repos:
         - mdformat-myst
 
   - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.8.5
+    rev: 1.8.7
     hooks:
         - id: nbqa-black
         - id: nbqa-ruff
@@ -67,7 +67,7 @@ repos:
     - id: validate-cff
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.18
+    rev: v0.19
     hooks:
       - id: validate-pyproject
 

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/.readthedocs.yml

@@ -1,15 +1,16 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
-    python: mambaforge-4.10
+    python: mambaforge-latest
   jobs:
     post_checkout:
       - (git --no-pager log --pretty="tformat:%s" -1 | grep -vqF "[skip-rtd]") || exit 183
     pre_install:
       - conda list sphinx
       - conda list cf_xarray
+      - conda list
 
 conda:
   environment: ci/doc.yml

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cf_xarray
-Version: 0.9.4
+Version: 0.9.5
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -214,11 +214,10 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: xarray

cf_xarray-0.9.5/cf_xarray/_version.py

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

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/cf_xarray/accessor.py

@@ -5,11 +5,17 @@ import inspect
 import itertools
 import re
 from collections import ChainMap, namedtuple
-from collections.abc import Hashable, Iterable, Mapping, MutableMapping, Sequence
+from collections.abc import (
+    Callable,
+    Hashable,
+    Iterable,
+    Mapping,
+    MutableMapping,
+    Sequence,
+)
 from datetime import datetime
 from typing import (
     Any,
-    Callable,
     Literal,
     TypeVar,
     Union,

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/cf_xarray/geometry.py

@@ -459,11 +459,8 @@ def shapely_to_cf(
             "and set the grid mapping variable as a coordinate",
         )
 
-    # Get all types to call the appropriate translation function.
-    types = {
-        geom.item().geom_type if isinstance(geom, xr.DataArray) else geom.geom_type
-        for geom in geometries
-    }
+    as_data = geometries.data if isinstance(geometries, xr.DataArray) else geometries
+    type_ = as_data[0].geom_type
 
     grid_mapping_varname = None
     if (
@@ -482,16 +479,21 @@ def shapely_to_cf(
         suffix=suffix, grid_mapping_name=grid_mapping, grid_mapping=grid_mapping_varname
     )
 
-    if types.issubset({"Point", "MultiPoint"}):
-        ds = points_to_cf(geometries, names=names)
-    elif types.issubset({"LineString", "MultiLineString"}):
-        ds = lines_to_cf(geometries, names=names)
-    elif types.issubset({"Polygon", "MultiPolygon"}):
-        ds = polygons_to_cf(geometries, names=names)
-    else:
+    try:
+        if type_ in ["Point", "MultiPoint"]:
+            ds = points_to_cf(geometries, names=names)
+        elif type_ in ["LineString", "MultiLineString"]:
+            ds = lines_to_cf(geometries, names=names)
+        elif type_ in ["Polygon", "MultiPolygon"]:
+            ds = polygons_to_cf(geometries, names=names)
+        else:
+            raise ValueError(
+                f"This geometry type is not supported in CF-compliant datasets. Got {type_}"
+            )
+    except NotImplementedError as e:
         raise ValueError(
-            f"Mixed geometry types are not supported in CF-compliant datasets. Got {types}"
-        )
+            "Error converting geometries. Possibly you have provided mixed geometry types."
+        ) from e
 
     return ds
 
@@ -841,7 +843,7 @@ def polygons_to_cf(
         node_count = part_node_count
     elif len(offsets) >= 2:
         indices = np.take(offsets[0], offsets[1])
-        interior_ring = np.isin(offsets[0], indices, invert=True)[:-1].astype(int)
+        interior_ring = np.isin(offsets[0], indices, invert=True)[:-1]
 
         if len(offsets) == 3:
             indices = np.take(indices, offsets[2])
@@ -852,29 +854,32 @@ def polygons_to_cf(
     crdX = geom_coords[:, 0]
     crdY = geom_coords[:, 1]
 
+    data_vars = {names.node_count: (dim, node_count)}
+    geometry_attrs = names.geometry_container_attrs
+
+    # Special case when we have no MultiPolygons and no holes
+    if len(part_node_count) != len(node_count):
+        data_vars[names.part_node_count] = (names.part_dim, part_node_count)
+        geometry_attrs["part_node_count"] = names.part_node_count
+
+    # Special case when we have no holes
+    if interior_ring.any():
+        data_vars[names.interior_ring] = (names.part_dim, interior_ring)
+        geometry_attrs["interior_ring"] = names.interior_ring
+
+    data_vars[names.container_name] = (  # type: ignore[assignment]
+        (),
+        np.nan,
+        {"geometry_type": "polygon", **geometry_attrs},
+    )
     ds = xr.Dataset(
-        data_vars={
-            names.node_count: xr.DataArray(node_count, dims=(dim,)),
-            names.container_name: xr.DataArray(
-                data=np.nan,
-                attrs={"geometry_type": "polygon", **names.geometry_container_attrs},
-            ),
-        },
+        data_vars=data_vars,
         coords=names.coords(x=x, y=y, crdX=crdX, crdY=crdY, dim=dim),
     )
 
     if coord is not None:
         ds = ds.assign_coords({dim: coord})
 
-    # Special case when we have no MultiPolygons and no holes
-    if len(part_node_count) != len(node_count):
-        ds[names.part_node_count] = xr.DataArray(part_node_count, dims=names.part_dim)
-        ds[names.container_name].attrs["part_node_count"] = names.part_node_count
-
-    # Special case when we have no holes
-    if (interior_ring != 0).any():
-        ds[names.interior_ring] = xr.DataArray(interior_ring, dims=names.part_dim)
-        ds[names.container_name].attrs["interior_ring"] = names.interior_ring
     return ds
 
 

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/cf_xarray/tests/test_accessor.py

@@ -57,6 +57,8 @@ datasets = [airds, airds.chunk({"lat": 5})]
 dataarrays = [airds.air, airds.air.chunk({"lat": 5})]
 objects = datasets + dataarrays
 
+xr.set_options(use_flox=False)
+
 
 def assert_dicts_identical(dict1, dict2):
     assert dict1.keys() == dict2.keys()
@@ -1125,7 +1127,7 @@ def _check_unchanged(old, new):
             else:
                 assert v == n[k]
 
-    assert type(old) == type(new)
+    assert type(old) == type(new)  # noqa
     _check_attrs_equal(old.attrs, new.attrs)
 
     # Check coordinate attributes and data variable attributes

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/cf_xarray/tests/test_geometry.py

@@ -352,7 +352,7 @@ def test_shapely_to_cf_errors():
         Polygon([[1, 1, 4], [1, 3, 4], [3, 3, 3], [1, 1, 4]]),
         Point(1, 2),
     ]
-    with pytest.raises(ValueError, match="Mixed geometry types are not supported"):
+    with pytest.raises(ValueError, match="Geometry type combination"):
         cfxr.shapely_to_cf(geoms)
 
     encoded = cfxr.shapely_to_cf(

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/cf_xarray.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cf_xarray
-Version: 0.9.4
+Version: 0.9.5
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -214,11 +214,10 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: xarray

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/ci/doc.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - pip
-  - python=3.10
+  - python
   - matplotlib-base
   - netcdf4
   - pooch
@@ -20,7 +20,7 @@ dependencies:
   - pint
   - regex
   - shapely
-  - furo
+  - furo>=2024
   - myst-nb
   - pip:
       - -e ../

{cf_xarray-0.9.4 → cf_xarray-0.9.5}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "cf_xarray"
 description = "A convenience wrapper for using CF attributes on xarray objects"
 readme = "README.rst"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = {file = "LICENSE"}
 keywords = ["xarray", "metadata", "CF conventions"]
 classifiers = [
@@ -11,7 +11,6 @@ classifiers = [
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",

cf_xarray-0.9.4/cf_xarray/_version.py

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