cf-xarray 0.10.11__tar.gz → 0.11.0__tar.gz

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/.github/workflows/ci.yaml

@@ -58,7 +58,7 @@ jobs:
           pytest -n auto --cov=./ --cov-report=xml
 
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v5.5.2
+        uses: codecov/codecov-action@v6.0.0
         with:
           file: ./coverage.xml
           flags: unittests
@@ -98,7 +98,7 @@ jobs:
           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.5.2
+        uses: codecov/codecov-action@v6.0.0
         with:
           file: mypy_report/cobertura.xml
           flags: mypy

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/.github/workflows/pypi.yaml

@@ -41,7 +41,7 @@ jobs:
           else
             echo "✅ Looks good"
           fi
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           name: releases
           path: dist
@@ -54,7 +54,7 @@ jobs:
         name: Install Python
         with:
           python-version: "3.11"
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: releases
           path: dist
@@ -72,7 +72,7 @@ jobs:
 
       - name: Publish package to TestPyPI
         if: github.event_name == 'push'
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.0
         with:
           password: ${{ secrets.TESTPYPI_TOKEN }}
           repository_url: https://test.pypi.org/legacy/
@@ -91,11 +91,11 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: releases
           path: dist
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.0
         with:
           verbose: true

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/.github/workflows/testpypi-release.yaml

@@ -53,7 +53,7 @@ jobs:
             echo "✅ Looks good"
           fi
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           name: releases
           path: dist
@@ -66,7 +66,7 @@ jobs:
         name: Install Python
         with:
           python-version: "3.11"
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: releases
           path: dist

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.14.10'
+    rev: 'v0.15.9'
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -55,7 +55,7 @@ repos:
     - id: validate-cff
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24.1
+    rev: v0.25
     hooks:
       - id: validate-pyproject
 

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/PKG-INFO

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

cf_xarray-0.11.0/cf_xarray/_version.py

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

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/cf_xarray/accessor.py

@@ -48,6 +48,11 @@ except ImportError:
         Weighted,
     )
 
+try:
+    from regex import match as regex_match
+except ImportError:
+    from re import match as regex_match  # type: ignore[no-redef]
+
 
 from . import parametric, sgrid
 from .criteria import (
@@ -305,12 +310,6 @@ def _get_custom_criteria(
     List[str]
         Variable name(s) in parent xarray object that matches axis, coordinate, or custom ``key``
     """
-
-    try:
-        from regex import match as regex_match
-    except ImportError:
-        from re import match as regex_match  # type: ignore[no-redef]
-
     if criteria is None:
         if not OPTIONS["custom_criteria"]:
             return []
@@ -1814,10 +1813,6 @@ class CFAccessor:
                         for k, v in value.items()
                     )
                 )
-
-            elif value is Ellipsis:
-                pass
-
             else:
                 # things like sum which have dim
                 newvalue = [

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/cf_xarray/helpers.py

@@ -17,24 +17,23 @@ def _guess_bounds_1d(da, dim):
     """
     if dim not in da.dims:
         (dim,) = da.cf.axes[dim]
-    ADDED_INDEX = False
-    if dim not in da.coords:
-        # For proper alignment in the lines below, we need an index on dim.
-        da = da.assign_coords({dim: da[dim]})
-        ADDED_INDEX = True
-
-    diff = da.diff(dim)
-    lower = da - diff / 2
-    upper = da + diff / 2
-    bounds = xr.concat([lower, upper], dim="bounds")
-
-    first = (bounds.isel({dim: 0}) - diff.isel({dim: 0})).assign_coords(
-        {dim: da[dim][0]}
+
+    bound_position = 0.5
+
+    diff = da.diff(dim).pad({dim: (1, 1)}, mode="edge")
+    lower = da.copy(
+        deep=False,
+        data=da.data - bound_position * diff.isel({dim: slice(0, -1)}).data,
+    )
+    upper = da.copy(
+        deep=False,
+        data=da.data + bound_position * diff.isel({dim: slice(1, None)}).data,
+    )
+    return (
+        xr.concat([lower, upper], dim="bounds")
+        .transpose(..., "bounds")
+        .drop_attrs(deep=False)
     )
-    result = xr.concat([first, bounds], dim=dim).transpose(..., "bounds")
-    if ADDED_INDEX:
-        result = result.drop_vars(dim)
-    return result.drop_attrs(deep=False)
 
 
 def _guess_bounds_2d(da, dims):

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/cf_xarray/tests/test_accessor.py

@@ -3,6 +3,7 @@ import pickle
 import warnings
 from textwrap import dedent
 
+import dask.array
 import matplotlib as mpl
 import numpy as np
 import pandas as pd
@@ -839,6 +840,51 @@ def test_add_bounds(dims):
     _check_unchanged(original, ds)
 
 
+def test_add_bounds_preserves_array_type() -> None:
+    # Test that the array type of the bounds variable is the same as the original variable.
+    ds = airds
+    original = ds.copy(deep=True)
+    ds = ds.drop_indexes("lat").rename_dims(lat="x")
+    ds["lat"] = ds.lat.copy(data=dask.array.asarray(ds.lat.data))
+    added = ds.cf.add_bounds("lat")
+
+    assert isinstance(added.lat.data, dask.array.Array)
+    assert isinstance(added.lat_bounds.data, dask.array.Array)
+
+    assert isinstance(ds.lat.data, dask.array.Array)
+    _check_unchanged(original, ds)
+
+
+def test_add_irregularly_spaced_bounds_do_not_overlap() -> None:
+    # Test that added bounds with irregular spacing do not overlap.
+    ds = airds
+    original = ds.copy(deep=True)
+    ds["time"] = ds["time"].copy(data=pd.date_range("2013-01", "2013-04", freq="MS"))
+    expected = xr.DataArray(
+        data=[
+            pd.to_datetime(t)
+            for t in [
+                ["2012-12-16T12", "2013-01-16T12"],
+                ["2013-01-16T12", "2013-02-15T00"],
+                ["2013-02-15T00", "2013-03-16T12"],
+                ["2013-03-16T12", "2013-04-16T12"],
+            ]
+        ],
+        dims=["time", "bounds"],
+        name="time_bounds",
+        coords={"time": ds.time.data},
+    )
+    added = ds.copy(deep=False)
+    added = added.cf.add_bounds("time")
+
+    name = "time_bounds"
+    assert name in added.coords
+    assert added["time"].attrs["bounds"] == name
+    assert_allclose(added[name].reset_coords(drop=True), expected)
+
+    _check_unchanged(original, ds)
+
+
 def test_add_bounds_multiple() -> None:
     # Test multiple dimensions
     assert not {"x1_bounds", "x2_bounds"} <= set(multiple.variables)
@@ -853,7 +899,7 @@ def test_add_bounds_nd_variable() -> None:
 
     # 2D
     expected = (
-        vertices_to_bounds(  # type: ignore[misc]
+        vertices_to_bounds(
             xr.DataArray(
                 np.arange(0, 13, 3).reshape(5, 1) + np.arange(-2, 2).reshape(1, 4),
                 dims=("x", "y"),
@@ -861,7 +907,7 @@ def test_add_bounds_nd_variable() -> None:
             out_dims=("bounds", "x", "y"),
         )
         .rename("z_bounds")
-        .assign_coords(**ds.coords)
+        .assign_coords(**ds.coords)  # type: ignore[arg-type]
     )
     actual = ds.cf.add_bounds("z").z_bounds.reset_coords(drop=True)
     xr.testing.assert_identical(actual, expected)
@@ -882,11 +928,11 @@ def test_add_bounds_nd_variable() -> None:
     expected = (
         xr.concat([ds.z - 1.5, ds.z + 1.5], dim="bounds")
         .rename("z_bounds")
-        .transpose("bounds", "y", "x")
+        .transpose(..., "bounds")
     )
 
     actual = ds.cf.add_bounds("z", dim="x").z_bounds.reset_coords(drop=True)
-    xr.testing.assert_identical(expected.transpose(..., "bounds"), actual)
+    xr.testing.assert_identical(expected, actual)
 
     # Requesting bounds on a non-variable dimension
     with pytest.raises(ValueError, match="are dimensions with no index."):

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/cf_xarray.egg-info/PKG-INFO

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

{cf_xarray-0.10.11 → cf_xarray-0.11.0}/doc/index.rst

@@ -35,7 +35,7 @@ or using ``conda``
    examples/introduction
    EarthCube 2021 demo <https://earthcube2021.github.io/ec21_book/notebooks/ec21_cherian_etal/DC_01_cf-xarray.html>
    CESM ocean model demo <https://pop-tools.readthedocs.io/en/latest/examples/cesm-cmip-cf-xarray.html>
-   COSIMA ocean-sea ice model demo <https://cosima-recipes.readthedocs.io/en/latest/Tutorials/Model_Agnostic_Analysis.html>
+   COSIMA ocean-sea ice model demo <https://cosima-recipes.readthedocs.io/en/latest/01-Cooking-Lessons-101/02-Advanced/Model_Agnostic_Analysis.html>
 
 .. toctree::
    :maxdepth: 2