Bump to py3.9, test py3.12 (#475)

* Bump to py3.9, test py3.12

* fix

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* cleanup warnings / speed up

* Silence warning

* Bump sphinx

* Handle the `_deprecate_positional_kwargs` decorator

* Add min xarray

* Typing fixes

* revert one

* More bumps

* update RTD yaml

* fix?

* skip unshallow fetch

* try again

* install local cf-xarray

* try again

* print sphinx version

* see if furo in pip overrides

* yet agauin

* again

* Switich ot py 3.10

* try typing

* try again

* update pypi workflow

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: dcherian

.github/workflows/ci.yaml

@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.9", "3.12"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -58,47 +58,6 @@ jobs:
           name: codecov-umbrella
           fail_ci_if_error: false
 
-  old-xarray:
-    name: xarray 2022.03.0
-    runs-on: "ubuntu-latest"
-    defaults:
-      run:
-        shell: bash -l {0}
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.10"]
-    steps:
-      - uses: actions/checkout@v4
-        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/provision-with-micromamba@v15
-        with:
-          environment-file: ci/environment.yml
-          environment-name: cf_xarray_test
-          cache-env: true
-          extra-specs: |
-            python="${{ matrix.python-version }}"
-            xarray="2022.03.0"
-      - name: Install cf_xarray
-        run: |
-          python -m pip install --no-deps -e .
-      - name: Run Tests
-        run: |
-          pytest -n auto --cov=./ --cov-report=xml
-      - name: Upload code coverage to Codecov
-        uses: codecov/[email protected]
-        with:
-          file: ./coverage.xml
-          flags: unittests
-          env_vars: RUNNER_OS,PYTHON_VERSION
-          name: codecov-umbrella
-          fail_ci_if_error: false
-
   no-optional-deps:
     name: no-optional-deps
     runs-on: ubuntu-latest
@@ -132,7 +91,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.9", "3.12"]
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/pypi.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: 3.8
+          python-version: 3.10
 
       - name: Install dependencies
         run: |
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: 3.8
+          python-version: 3.10
       - uses: actions/download-artifact@v3
         with:
           name: releases

.pre-commit-config.yaml

@@ -2,6 +2,12 @@ ci:
     autoupdate_schedule: quarterly
 
 repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+      - id: pyupgrade
+        args: ["--py39-plus"]
+
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
     rev: 'v0.1.1'

.readthedocs.yml

@@ -1,20 +1,17 @@
-# Required
 version: 2
 
 build:
-  os: 'ubuntu-20.04'
+  os: ubuntu-22.04
   tools:
-    python: 'mambaforge-4.10'
+    python: mambaforge-4.10
+  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
 
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: doc/conf.py
-
-# Optionally set the version of Python and requirements required to build your docs
 conda:
-    environment: ci/doc.yml
+  environment: ci/doc.yml
 
-python:
-  install:
-    - method: pip
-      path: .
+formats: []

cf_xarray/accessor.py

@@ -6,16 +6,11 @@
 import re
 import warnings
 from collections import ChainMap, namedtuple
+from collections.abc import Hashable, Iterable, Mapping, MutableMapping, Sequence
 from datetime import datetime
 from typing import (
     Any,
     Callable,
-    Hashable,
-    Iterable,
-    List,
-    Mapping,
-    MutableMapping,
-    Sequence,
     TypeVar,
     Union,
     cast,
@@ -84,7 +79,7 @@
 ATTRS["vertical"] = ATTRS["Z"]
 
 # Type for Mapper functions
-Mapper = Callable[[Union[DataArray, Dataset], Hashable], List[Hashable]]
+Mapper = Callable[[Union[DataArray, Dataset], Hashable], list[Hashable]]
 
 # Type for decorators
 F = TypeVar("F", bound=Callable[..., Any])
@@ -496,7 +491,7 @@ def _get_coords(obj: DataArray | Dataset, key: Hashable) -> list[Hashable]:
 def _variables(func: F) -> F:
     @functools.wraps(func)
     def wrapper(obj: DataArray | Dataset, key: Hashable) -> list[DataArray]:
-        return [obj[k] for k in func(obj, key)]  # type: ignore
+        return [obj[k] for k in func(obj, key)]  # type: ignore[misc]
 
     return cast(F, wrapper)
 
@@ -1293,7 +1288,7 @@ def _process_signature(
            This uses ``key_mappers``
         3. Unpacks arguments if necessary before returning them.
         """
-        sig = inspect.signature(func, follow_wrapped=False)
+        sig = inspect.signature(func, follow_wrapped=True)
 
         # Catch things like .isel(T=5).
         # This assigns indexers_kwargs=dict(T=5).

cf_xarray/criteria.py

@@ -9,7 +9,8 @@
 except ImportError:
     import re  # type: ignore
 
-from typing import Any, Mapping, MutableMapping, Tuple
+from collections.abc import Mapping, MutableMapping
+from typing import Any
 
 _DSG_ROLES = ["timeseries_id", "profile_id", "trajectory_id"]
 
@@ -30,7 +31,7 @@
     "grid_mapping": {"grid_mapping_name": re.compile(".")}
 }
 
-coordinate_criteria: MutableMapping[str, MutableMapping[str, Tuple]] = {
+coordinate_criteria: MutableMapping[str, MutableMapping[str, tuple]] = {
     "latitude": {
         "standard_name": ("latitude",),
         "units": (

cf_xarray/formatting.py

@@ -1,6 +1,6 @@
 import warnings
+from collections.abc import Hashable, Iterable
 from functools import partial
-from typing import Dict, Hashable, Iterable, List
 
 import numpy as np
 
@@ -56,7 +56,7 @@ def make_text_section(
         warnings.simplefilter("ignore")
         if isinstance(attr, str):
             try:
-                vardict: Dict[str, Iterable[Hashable]] = getattr(accessor, attr, {})
+                vardict: dict[str, Iterable[Hashable]] = getattr(accessor, attr, {})
             except ValueError:
                 vardict = {}
         else:
@@ -103,7 +103,7 @@ def make_text_section(
     return _print_rows(subtitle, rows, rich)
 
 
-def _print_rows(subtitle: str, rows: List[str], rich: bool):
+def _print_rows(subtitle: str, rows: list[str], rich: bool):
     subtitle = f"{subtitle.rjust(20)}:"
 
     # Add subtitle to the first row, align other rows

cf_xarray/geometry.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 import pandas as pd

cf_xarray/helpers.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Hashable, Sequence
+from collections.abc import Hashable, Sequence
 
 import numpy as np
 import xarray as xr

cf_xarray/options.py

@@ -3,7 +3,8 @@
 """
 
 import copy
-from typing import Any, MutableMapping
+from collections.abc import MutableMapping
+from typing import Any
 
 from .utils import always_iterable