Merge branch 'main' into pre-commit-ci-update-config

Author: basnijholt

.github/workflows/coverage.yml

@@ -11,10 +11,10 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
-        python-version: 3.11
-    - name: Install dependencies
-      run: pip install nox
+        python-version: 3.13
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
     - name: Test with nox
-      run: nox -e coverage
+      run: uv run --group nox nox -e coverage
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4

.github/workflows/matchers/pytest.json

@@ -12,19 +12,17 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Register Python problem matcher
-      run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
-    - name: Install dependencies
-      run: pip install nox pytest-github-actions-annotate-failures
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
     - name: Test with nox using minimal dependencies
-      run: nox -e "pytest-${{ matrix.python-version }}(all_deps=False)"
+      run: uv run --group nox nox -e "pytest_min_deps-${{ matrix.python-version }}"
     - name: Test with nox with all dependencies
-      run: nox -e "pytest-${{ matrix.python-version }}(all_deps=True)"
+      run: uv run --group nox nox -e "pytest_all_deps-${{ matrix.python-version }}"

.github/workflows/nox.yml

@@ -12,8 +12,8 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
-        python-version: "3.11"
-    - name: Install dependencies
-      run: pip install nox
+        python-version: "3.13"
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
     - name: Test with nox
-      run: nox -e pytest_typeguard
+      run: uv run --group nox nox -e pytest_typeguard

.github/workflows/typeguard.yml

@@ -160,12 +160,12 @@ jupyter labextension install @pyviz/jupyterlab_pyviz
 
 ## :wrench: Development
 
-Clone the repository and run `pip install -e ".[notebook,testing,other]"` to add a link to the cloned repo into your Python path:
+Clone the repository and run `pip install -e ".[notebook,test,other]"` to add a link to the cloned repo into your Python path:
 
 ```bash
 git clone git@github.com:python-adaptive/adaptive.git
 cd adaptive
-pip install -e ".[notebook,testing,other]"
+pip install -e ".[notebook,test,other]"
 ```
 
 We recommend using a Conda environment or a virtualenv for package management during Adaptive development.

README.md

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from math import sqrt
-from typing import Callable
 
 import cloudpickle
 import numpy as np

adaptive/learner/average_learner.py

@@ -3,10 +3,9 @@
 import math
 import sys
 from collections import defaultdict
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from copy import deepcopy
 from math import hypot
-from typing import Callable
 
 import numpy as np
 import scipy.stats

adaptive/learner/average_learner1D.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
 import itertools
-import sys
 from collections import defaultdict
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from contextlib import suppress
 from functools import partial
 from operator import itemgetter
-from typing import Any, Callable, Union, cast
+from typing import Any, Literal, TypeAlias, cast
 
 import numpy as np
 
@@ -16,13 +15,6 @@
 from adaptive.types import Int, Real
 from adaptive.utils import cache_latest, named_product, restore
 
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
-
-from typing import Literal
-
 try:
     import pandas
 
@@ -38,11 +30,9 @@ def dispatch(child_functions: list[Callable], arg: Any) -> Any:
 
 STRATEGY_TYPE: TypeAlias = Literal["loss_improvements", "loss", "npoints", "cycle"]
 
-CDIMS_TYPE: TypeAlias = Union[
-    Sequence[dict[str, Any]],
-    tuple[Sequence[str], Sequence[tuple[Any, ...]]],
-    None,
-]
+CDIMS_TYPE: TypeAlias = (
+    Sequence[dict[str, Any]] | tuple[Sequence[str], Sequence[tuple[Any, ...]]] | None
+)
 
 
 class BalancingLearner(BaseLearner):

adaptive/learner/balancing_learner.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import abc
+from collections.abc import Callable
 from contextlib import suppress
-from typing import TYPE_CHECKING, Any, Callable, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 
 import cloudpickle
 

adaptive/learner/base_learner.py

@@ -2,7 +2,8 @@
 
 import functools
 from collections import OrderedDict
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from adaptive.learner.base_learner import BaseLearner, LearnerType
 from adaptive.utils import copy_docstring_from

adaptive/learner/data_saver.py

@@ -3,9 +3,10 @@
 
 import sys
 from collections import defaultdict
+from collections.abc import Callable
 from math import sqrt
 from operator import attrgetter
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 import cloudpickle
 import numpy as np

adaptive/learner/integrator_learner.py

@@ -3,10 +3,9 @@
 import collections.abc
 import itertools
 import math
-import sys
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from copy import copy, deepcopy
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union
+from typing import TYPE_CHECKING, Any, TypeAlias
 
 import cloudpickle
 import numpy as np
@@ -24,12 +23,6 @@
     partial_function_from_dataframe,
 )
 
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
-
-
 try:
     import pandas
 
@@ -42,28 +35,21 @@
     # -- types --
 
     # Commonly used types
-    Interval: TypeAlias = Union[tuple[float, float], tuple[float, float, int]]
-    NeighborsType: TypeAlias = SortedDict[float, list[Optional[float]]]
+    Interval: TypeAlias = tuple[float, float] | tuple[float, float, int]
+    NeighborsType: TypeAlias = SortedDict[float, list[float | None]]
 
     # Types for loss_per_interval functions
     XsType0: TypeAlias = tuple[float, float]
-    YsType0: TypeAlias = Union[tuple[float, float], tuple[np.ndarray, np.ndarray]]
-    XsType1: TypeAlias = tuple[
-        Optional[float], Optional[float], Optional[float], Optional[float]
-    ]
-    YsType1: TypeAlias = Union[
-        tuple[Optional[float], Optional[float], Optional[float], Optional[float]],
-        tuple[
-            Optional[np.ndarray],
-            Optional[np.ndarray],
-            Optional[np.ndarray],
-            Optional[np.ndarray],
-        ],
-    ]
-    XsTypeN: TypeAlias = tuple[Optional[float], ...]
-    YsTypeN: TypeAlias = Union[
-        tuple[Optional[float], ...], tuple[Optional[np.ndarray], ...]
-    ]
+    YsType0: TypeAlias = tuple[float, float] | tuple[np.ndarray, np.ndarray]
+    XsType1: TypeAlias = tuple[float | None, float | None, float | None, float | None]
+    YsType1: TypeAlias = (
+        tuple[float | None, float | None, float | None, float | None]
+        | tuple[
+            np.ndarray | None, np.ndarray | None, np.ndarray | None, np.ndarray | None
+        ]
+    )
+    XsTypeN: TypeAlias = tuple[float | None, ...]
+    YsTypeN: TypeAlias = tuple[float | None, ...] | tuple[np.ndarray | None, ...]
 
 
 __all__ = [
@@ -598,7 +584,7 @@ def tell(self, x: float, y: Float | Sequence[Float] | np.ndarray) -> None:
             )
 
         # either it is a float/int, if not, try casting to a np.array
-        if not isinstance(y, (float, int)):
+        if not isinstance(y, float | int):
             y = np.asarray(y, dtype=float)
 
         # Add point to the real data dict

adaptive/learner/learner1D.py

@@ -3,15 +3,14 @@
 import itertools
 import warnings
 from collections import OrderedDict
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from copy import copy
 from math import sqrt
-from typing import Callable
 
 import cloudpickle
 import numpy as np
 from scipy import interpolate
-from scipy.interpolate import LinearNDInterpolator
+from scipy.interpolate import CloughTocher2DInterpolator, LinearNDInterpolator
 
 from adaptive.learner.base_learner import BaseLearner
 from adaptive.learner.triangulation import simplex_volume_in_embedding
@@ -49,9 +48,7 @@ def deviations(ip: LinearNDInterpolator) -> list[np.ndarray]:
         The deviation per triangle.
     """
     values = ip.values / (np.ptp(ip.values, axis=0).max() or 1)
-    gradients = interpolate.interpnd.estimate_gradients_2d_global(
-        ip.tri, values, tol=1e-6
-    )
+    gradients = CloughTocher2DInterpolator(ip.tri, values, tol=1e-6).grad
 
     simplices = ip.tri.simplices
     p = ip.tri.points[simplices]

adaptive/learner/learner2D.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-import sys
 from copy import copy
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, TypeAlias
 
 import cloudpickle
 from sortedcontainers import SortedDict, SortedSet
@@ -16,8 +15,7 @@
 )
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
-    from typing import Callable
+    from collections.abc import Callable, Sequence
 
 try:
     import pandas
@@ -27,10 +25,6 @@
 except ModuleNotFoundError:
     with_pandas = False
 
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
 
 PointType: TypeAlias = tuple[Int, Any]