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

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/.github/workflows/ci.yaml

@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    name: Build (${{ matrix.python-version }}, ${{ matrix.os }})
+    name: Build (${{ matrix.python-version }}, ${{ matrix.os }}), ${{ matrix.env }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -27,7 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.10", "3.12"]
+        python-version: ["3.10", "3.13"]
+        env: [""]
+        include:
+          - env: "all-min-deps"
+            python-version: "3.10"
+            os: ubuntu-latest
+          - env: "no-optional-deps"
+            python-version: "3.13"
+            os: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -35,10 +43,22 @@ jobs:
       - name: Set environment variables
         run: |
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
+          if [[ "${{ matrix.env }}" == "" ]] ;
+          then
+              echo "CONDA_ENV_FILE=ci/environment.yml" >> $GITHUB_ENV
+          fi
+          if [[ "${{ matrix.env }}" == "no-optional-deps" ]] ;
+          then
+              echo "CONDA_ENV_FILE=ci/environment-no-optional-deps.yml" >> $GITHUB_ENV
+          fi
+          if [[ "${{ matrix.env }}" == "all-min-deps" ]] ;
+          then
+              echo "CONDA_ENV_FILE=ci/environment-all-min-deps.yml" >> $GITHUB_ENV
+          fi
       - name: Set up conda environment
         uses: mamba-org/setup-micromamba@v2
         with:
-          environment-file: ci/environment.yml
+          environment-file: ${{ env.CONDA_ENV_FILE }}
           environment-name: cf_xarray_test
           cache-environment: true
           create-args: >-
@@ -58,31 +78,6 @@ jobs:
           name: codecov-umbrella
           fail_ci_if_error: false
 
-  no-optional-deps:
-    name: no-optional-deps
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash -l {0}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # need to fetch all tags to get a correct version
-          fetch-depth: 0  # fetch all branches and tags
-      - name: Set up conda environment
-        uses: mamba-org/setup-micromamba@v2
-        with:
-          environment-file: ci/environment-no-optional-deps.yml
-          environment-name: cf_xarray_test
-          cache-environment: true
-      - name: Install cf_xarray
-        run: |
-          python -m pip install --no-deps -e .
-      - name: Run Tests
-        shell: bash -l {0}
-        run: |
-          pytest -n 2
-
   mypy:
     name: mypy
     runs-on: "ubuntu-latest"
@@ -91,7 +86,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: ["3.10", "3.12"]
+        python-version: ["3.10", "3.13"]
     steps:
       - uses: actions/checkout@v4
         with:

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/.github/workflows/upstream-dev-ci.yaml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.12"]
+        python-version: ["3.13"]
     steps:
       - uses: actions/checkout@v4
         with:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cf_xarray
-Version: 0.10.1
+Version: 0.10.3
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -217,10 +217,11 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: xarray>=2022.03.0
+Requires-Dist: xarray>=2023.09.0
 Provides-Extra: all
 Requires-Dist: matplotlib; extra == "all"
 Requires-Dist: pint!=0.24.0,>=0.18; extra == "all"

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/cf_xarray/__init__.py

@@ -1,3 +1,7 @@
+import xarray
+from packaging.version import Version
+
+from . import geometry as geometry
 from . import sgrid  # noqa
 from .accessor import CFAccessor  # noqa
 from .coding import (  # noqa
@@ -9,6 +13,7 @@ from .helpers import bounds_to_vertices, vertices_to_bounds  # noqa
 from .options import set_options  # noqa
 from .utils import _get_version
 
-from . import geometry, groupers  # noqa
+if Version(xarray.__version__) >= Version("2024.07.0"):
+    from . import groupers as groupers
 
 __version__ = _get_version()

cf_xarray-0.10.3/cf_xarray/_version.py

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

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

@@ -24,7 +24,6 @@ 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
@@ -997,7 +996,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 +2726,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 +2766,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 +2812,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.1 → cf_xarray-0.10.3}/cf_xarray/groupers.py

@@ -7,6 +7,12 @@ from xarray.groupers import EncodedGroups, UniqueGrouper
 
 @dataclass
 class FlagGrouper(UniqueGrouper):
+    """
+    Grouper object that allows convenient categorical grouping by a CF flag variable.
+
+    Labels in the grouped output will be restricted to those listed in ``flag_meanings``.
+    """
+
     def factorize(self, group) -> EncodedGroups:
         if "flag_values" not in group.attrs or "flag_meanings" not in group.attrs:
             raise ValueError(

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/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.1 → cf_xarray-0.10.3}/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.1 → cf_xarray-0.10.3}/cf_xarray/tests/test_groupers.py

@@ -3,6 +3,8 @@ import pytest
 import xarray as xr
 from xarray.testing import assert_identical
 
+pytest.importorskip("xarray", "2024.07.0")
+
 from cf_xarray.datasets import flag_excl
 from cf_xarray.groupers import FlagGrouper
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cf_xarray
-Version: 0.10.1
+Version: 0.10.3
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -217,10 +217,11 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: xarray>=2022.03.0
+Requires-Dist: xarray>=2023.09.0
 Provides-Extra: all
 Requires-Dist: matplotlib; extra == "all"
 Requires-Dist: pint!=0.24.0,>=0.18; extra == "all"

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/cf_xarray.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ cf_xarray/tests/test_parametric.py
 cf_xarray/tests/test_scripts.py
 cf_xarray/tests/test_units.py
 ci/doc.yml
+ci/environment-all-min-deps.yml
 ci/environment-no-optional-deps.yml
 ci/environment.yml
 ci/upstream-dev-env.yml

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/cf_xarray.egg-info/requires.txt

@@ -1,4 +1,4 @@
-xarray>=2022.03.0
+xarray>=2023.09.0
 
 [all]
 matplotlib

cf_xarray-0.10.3/ci/environment-all-min-deps.yml

@@ -0,0 +1,24 @@
+name: cf_xarray_test
+channels:
+  - conda-forge
+dependencies:
+  - pytest-cov
+  - pytest
+  - pytest-xdist
+  - dask
+  - flox
+  - lxml
+  - matplotlib-base
+  - netcdf4
+  - pandas
+  - pint==0.19
+  - pooch
+  - regex
+  - rich
+  - pooch
+  - scipy
+  - shapely
+  - xarray==2023.09.0
+  - pip
+  - pip:
+      - pytest-pretty

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/doc/api.rst

@@ -21,8 +21,8 @@ Geometries
 ----------
 .. autosummary::
     :toctree: generated/
-    geometry.decode_geometries
 
+    geometry.decode_geometries
     geometry.encode_geometries
     geometry.shapely_to_cf
     geometry.cf_to_shapely
@@ -33,7 +33,8 @@ Groupers
 --------
 .. autosummary::
     :toctree: generated/
-    groupers.FlagGrouper
+
+   groupers.FlagGrouper
 
 .. currentmodule:: xarray
 

{cf_xarray-0.10.1 → cf_xarray-0.10.3}/pyproject.toml

@@ -14,9 +14,10 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "xarray>=2022.03.0",
+    "xarray>=2023.09.0",
 ]
 dynamic = ["version"]
 
@@ -32,7 +33,7 @@ changelog = "https://cf-xarray.readthedocs.io/en/latest/whats-new.html"
 [build-system]
 requires = [
     # xarray is need for dynamic version string
-    "xarray>=2022.03.0",
+    "xarray>=2023.09.0",
     "setuptools>=45",
     "setuptools_scm[toml]>=6.2",
 ]

cf_xarray-0.10.1/cf_xarray/_version.py

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