cf-xarray 0.10.8__tar.gz → 0.10.10__tar.gz

cf_xarray-0.10.10/.github/workflows/ci.yaml

@@ -0,0 +1,107 @@
+name: CI
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "*"
+  schedule:
+    - cron: "0 13 * * 1"
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  COLUMNS: 120
+
+jobs:
+  build:
+    name: Build (${{ matrix.python-version }}, ${{ matrix.os }}), ${{ matrix.env }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest"]
+        python-version: ["3.11", "3.13"]
+        env: ["test"]
+        include:
+          - env: "test-min-deps"
+            python-version: "3.11"
+            os: ubuntu-latest
+          - env: "test-no-optional"
+            python-version: "3.13"
+            os: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0 # Fetch all history for all branches and tags.
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+
+      - name: Install dependencies
+        run: |
+          uv pip install --system -e .
+          uv pip install --system --group ${{ matrix.env }}
+
+      - name: Run Tests
+        run: |
+          pytest -n auto --cov=./ --cov-report=xml
+
+      - name: Upload code coverage to Codecov
+        uses: codecov/codecov-action@v5.5.1
+        with:
+          file: ./coverage.xml
+          flags: unittests
+          env_vars: RUNNER_OS,PYTHON_VERSION
+          name: codecov-umbrella
+          fail_ci_if_error: false
+
+  mypy:
+    name: mypy
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        python-version: ["3.11", "3.13"]
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0 # Fetch all history for all branches and tags.
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+
+      - name: Install dependencies
+        run: |
+          uv pip install --system -e .
+          uv pip install --system --group test
+          uv pip install --system --group typing
+
+      - name: Run mypy
+        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.5.1
+        with:
+          file: mypy_report/cobertura.xml
+          flags: mypy
+          env_vars: PYTHON_VERSION
+          name: codecov-umbrella
+          fail_ci_if_error: false

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/.github/workflows/pypi.yaml

@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'xarray-contrib/cf-xarray'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         name: Install Python
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
@@ -41,7 +41,7 @@ jobs:
           else
             echo "✅ Looks good"
           fi
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: releases
           path: dist
@@ -50,11 +50,11 @@ jobs:
     needs: build-artifacts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         name: Install Python
         with:
-          python-version: "3.10"
-      - uses: actions/download-artifact@v5
+          python-version: "3.11"
+      - uses: actions/download-artifact@v6
         with:
           name: releases
           path: dist
@@ -91,7 +91,7 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           name: releases
           path: dist

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/.github/workflows/testpypi-release.yaml

@@ -17,14 +17,14 @@ jobs:
     if: ${{ contains( github.event.pull_request.labels.*.name, 'test-build') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         name: Install Python
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
@@ -53,7 +53,7 @@ jobs:
             echo "✅ Looks good"
           fi
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: releases
           path: dist
@@ -62,11 +62,11 @@ jobs:
     needs: build-artifacts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         name: Install Python
         with:
-          python-version: "3.10"
-      - uses: actions/download-artifact@v5
+          python-version: "3.11"
+      - uses: actions/download-artifact@v6
         with:
           name: releases
           path: dist

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/.github/workflows/upstream-dev-ci.yaml

@@ -8,7 +8,7 @@ on:
     branches:
       - main
   schedule:
-    - cron: "0 0 * * *" # Daily “At 00:00” UTC
+    - cron: "0 0 * * *" # Daily "At 00:00" UTC
   workflow_dispatch: # allows you to trigger the workflow run manually
 
 concurrency:
@@ -23,31 +23,28 @@ jobs:
     name: upstream-dev
     runs-on: ubuntu-latest
     if: ${{ (contains( github.event.pull_request.labels.*.name, 'test-upstream') && github.event_name == 'pull_request') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-    defaults:
-      run:
-        shell: bash -l {0}
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.13"]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
-      - name: Set environment variables
-        run: |
-          echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
-      - name: Set up conda environment
-        uses: mamba-org/setup-micromamba@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          environment-file: ci/upstream-dev-env.yml
-          environment-name: cf_xarray_test
-          cache-env: False
-          create-args: >-
-            python=${{ matrix.python-version }}
-      - name: Install cf_xarray
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Install dependencies
         run: |
-          python -m pip install --no-deps -e .
+          uv pip install --system -e .
+          uv pip install --system --group test-upstream
+
       - name: Run Tests
         if: success()
         id: status

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.12.2'
+    rev: 'v0.13.3'
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -41,7 +41,7 @@ repos:
           additional_dependencies: [mdformat==0.7.17]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

cf_xarray-0.10.10/.readthedocs.yml

@@ -0,0 +1,20 @@
+version: 2
+sphinx:
+  configuration: doc/conf.py
+build:
+  os: ubuntu-lts-latest
+  tools:
+    python: "3.11"
+  jobs:
+    pre_create_environment:
+      - asdf plugin add uv
+      - asdf install uv latest
+      - asdf global uv latest
+    create_environment:
+      - uv venv "${READTHEDOCS_VIRTUALENV_PATH}"
+    install:
+      - UV_PROJECT_ENVIRONMENT="${READTHEDOCS_VIRTUALENV_PATH}" uv sync --frozen --group docs
+    post_checkout:
+      - (git --no-pager log --pretty="tformat:%s" -1 | grep -vqF "[skip-rtd]") || exit 183
+
+formats: []

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cf_xarray
-Version: 0.10.8
+Version: 0.10.10
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -220,7 +220,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: xarray>=2023.09.0
+Requires-Dist: xarray>=2024.7.0
 Provides-Extra: all
 Requires-Dist: matplotlib; extra == "all"
 Requires-Dist: pint!=0.24.0,>=0.18; extra == "all"

cf_xarray-0.10.10/cf_xarray/_version.py

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

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray/accessor.py

@@ -796,7 +796,6 @@ def _guess_bounds(da, dim=None, out_dim="bounds"):
                 f"If dim is None, variable {da.name} must be 1D or 2D. Received {da.ndim}D variable instead."
             )
         dim = da.dims
-
     if not isinstance(dim, str):
         if len(dim) > 2:
             raise NotImplementedError(

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray/geometry.py

@@ -586,7 +586,11 @@ def points_to_cf(
         coord = None
         pts_ = pts
 
-    x, y, node_count, crdX, crdY = [], [], [], [], []
+    x: list[np.ndarray] = []
+    y: list[np.ndarray] = []
+    node_count: list[int] = []
+    crdX: list[float] = []
+    crdY: list[float] = []
     for pt in pts_:
         if isinstance(pt, MultiPoint):
             xy = np.concatenate([p.coords for p in pt.geoms])

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray/helpers.py

@@ -34,7 +34,7 @@ def _guess_bounds_1d(da, dim):
     result = xr.concat([first, bounds], dim=dim).transpose(..., "bounds")
     if ADDED_INDEX:
         result = result.drop_vars(dim)
-    return result
+    return result.drop_attrs(deep=False)
 
 
 def _guess_bounds_2d(da, dims):
@@ -222,6 +222,11 @@ def _get_core_dim_orders(core_dim_coords: dict[str, np.ndarray]) -> dict[str, st
     core_dim_orders = {}
 
     for dim, coords in core_dim_coords.items():
+        if coords.size <= 1:
+            # A single value, same as all values are equal, treat as ascending
+            core_dim_orders[dim] = "ascending"
+            continue
+
         diffs = np.diff(coords)
 
         # Handle datetime64 and timedelta64 safely for both numpy 1.26.4 and numpy 2
@@ -333,6 +338,12 @@ def _get_ordered_vertices(
         elif order == "descending":
             endpoints = np.maximum(bounds[..., :, 0], bounds[..., :, 1])
             last_endpoint = np.minimum(bounds[..., -1, 0], bounds[..., -1, 1])
+        else:
+            raise NotImplementedError(
+                f"Cannot determine vertices for non-monotonic bounds with {order} core "
+                "dimension orders. Try normalizing the coordinates to a monotonic "
+                "convention and try again."
+            )
 
         vertices = np.concatenate(
             [endpoints, np.expand_dims(last_endpoint, axis=-1)], axis=-1

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray/tests/test_accessor.py

@@ -832,6 +832,9 @@ def test_add_bounds(dims):
         assert_allclose(
             added[name].reset_coords(drop=True), expected[dim].transpose(..., "bounds")
         )
+        if dim == "lat":
+            # The CF axes shouldn't have changed
+            assert added.cf.axes["Y"] == ["lat"]
 
     _check_unchanged(original, ds)
 

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray/units.py

@@ -60,7 +60,7 @@ def short_formatter(unit, registry, **options):
 # Reused with modification from MetPy under the terms of the BSD 3-Clause License.
 # Copyright (c) 2015,2017,2019 MetPy Developers.
 # Create registry, with preprocessors for UDUNITS-style powers (m2 s-2) and percent signs
-units = pint.UnitRegistry(
+units: pint.UnitRegistry = pint.UnitRegistry(
     autoconvert_offset_to_baseunit=True,
     preprocessors=[
         functools.partial(

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cf_xarray
-Version: 0.10.8
+Version: 0.10.10
 Summary: A convenience wrapper for using CF attributes on xarray objects
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -220,7 +220,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: xarray>=2023.09.0
+Requires-Dist: xarray>=2024.7.0
 Provides-Extra: all
 Requires-Dist: matplotlib; extra == "all"
 Requires-Dist: pint!=0.24.0,>=0.18; extra == "all"

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ LICENSE
 README.rst
 codecov.yml
 pyproject.toml
+uv.lock
 .binder/environment.yml
 .github/dependabot.yml
 .github/release.yml
@@ -50,11 +51,6 @@ cf_xarray/tests/test_options.py
 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
 doc/2D_bounds_averaged.png
 doc/2D_bounds_error.png
 doc/2D_bounds_nonunique.png

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/cf_xarray.egg-info/requires.txt

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

{cf_xarray-0.10.8 → cf_xarray-0.10.10}/pyproject.toml

@@ -16,7 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "xarray>=2023.09.0",
+    "xarray>=2024.7.0",
 ]
 dynamic = ["version"]
 
@@ -107,7 +107,6 @@ docstring-code-format = true
 
 
 [tool.pytest]
-python_files = "test_*.py"
 testpaths = ["cf_xarray/tests"]
 
 [tool.rstcheck]
@@ -150,3 +149,95 @@ ignore_missing_imports = true
 
 [tool.coverage.run]
 omit = ["*/tests/*"]
+
+[dependency-groups]
+test-base = [
+    "pytest-cov",
+    "pytest",
+    "pytest-xdist",
+    "pytest-pretty",
+]
+
+test = [
+    {include-group = "test-base"},
+    "dask",
+    "flox",
+    "lxml",
+    "matplotlib",
+    "netcdf4",
+    "pandas",
+    "pint",
+    "pooch",
+    "regex",
+    "rich",
+    "scipy",
+    "shapely",
+    "pyproj",
+]
+
+test-no-optional = [
+    {include-group = "test-base"},
+    "dask",
+    "matplotlib",
+    "netcdf4",
+    "pandas",
+    "pooch",
+]
+
+test-min-deps = [
+    {include-group = "test-base"},
+    "dask",
+    "flox",
+    "lxml",
+    "matplotlib",
+    "netcdf4",
+    "pandas",
+    "pint>=0.18",
+    "pooch",
+    "regex",
+    "rich",
+    "scipy",
+    "shapely",
+    "pyproj",
+]
+
+docs = [
+    "matplotlib",
+    "netcdf4",
+    "pooch",
+    "sphinx",
+    "sphinx-copybutton",
+    "sphinx-autobuild",
+    "numpydoc",
+    "sphinx-autosummary-accessors",
+    "ipython",
+    "ipykernel",
+    "ipywidgets",
+    "pandas",
+    "pint",
+    "regex",
+    "shapely",
+    "furo>=2024",
+    "myst-nb",
+    "pyproj",
+]
+
+test-upstream = [
+    {include-group = "test-base"},
+    "pytest-reportlog",
+    "dask",
+    "matplotlib",
+    "netcdf4",
+    "pandas",
+    "pooch",
+    "rich",
+    "shapely",
+    "pyproj",
+    "xarray @ git+https://github.com/pydata/xarray.git",
+    "flox @ git+https://github.com/dcherian/flox.git",
+    "pint @ git+https://github.com/hgrecco/pint.git",
+]
+
+typing = [
+    "mypy",
+]