Bump mypy and ruff in pre-commit (#479)

Author: basnijholt

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -9,21 +9,21 @@ repos:
       - id: debug-statements
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.3.5"
+    rev: "v0.11.9"
     hooks:
       - id: ruff
         args: ["--fix"]
       - id: ruff-format
   - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.8.5
+    rev: 1.9.1
     hooks:
       - id: nbqa-black
         additional_dependencies: [jupytext, black]
       - id: nbqa
         args: ["ruff", "--fix", "--ignore=E402,B018,F704"]
         additional_dependencies: [jupytext, ruff]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.9.0"
+    rev: "v1.15.0"
     hooks:
       - id: mypy
         exclude: ipynb_filter.py|docs/source/conf.py

adaptive/learner/average_learner1D.py

@@ -499,8 +499,7 @@ def tell_many(  # type: ignore[override]
         # but ignore it going forward.
         if not np.prod([x >= self.bounds[0] and x <= self.bounds[1] for _, x in xs]):
             raise ValueError(
-                "x value out of bounds, "
-                "remove x or enlarge the bounds of the learner"
+                "x value out of bounds, remove x or enlarge the bounds of the learner"
             )
 
         # Create a mapping of points to a list of samples
@@ -533,8 +532,7 @@ def tell_many_at_point(self, x: Real, seed_y_mapping: dict[int, Real]) -> None:
         # Check x is within the bounds
         if not np.prod(x >= self.bounds[0] and x <= self.bounds[1]):
             raise ValueError(
-                "x value out of bounds, "
-                "remove x or enlarge the bounds of the learner"
+                "x value out of bounds, remove x or enlarge the bounds of the learner"
             )
 
         # If x is a new point:

adaptive/learner/balancing_learner.py

@@ -106,9 +106,7 @@ def __init__(
         self._cdims_default = cdims
 
         if len({learner.__class__ for learner in self.learners}) > 1:
-            raise TypeError(
-                "A BalacingLearner can handle only one type" " of learners."
-            )
+            raise TypeError("A BalacingLearner can handle only one type of learners.")
 
         self.strategy: STRATEGY_TYPE = strategy
 

adaptive/learner/data_saver.py

@@ -162,7 +162,7 @@ def _set_data(
         self.learner._set_data(learner_data)
 
     def __getstate__(self) -> tuple[LearnerType, Callable, OrderedDict]:
-        return (
+        return (  # type: ignore[return-value]
             self.learner,
             self.arg_picker,
             self.extra_data,

adaptive/learner/learner1D.py

@@ -761,8 +761,9 @@ def _ask_points_without_adding(self, n: int) -> tuple[list[float], list[float]]:
                 ival is not None
                 and self._loss(self.losses_combined, ival) >= self._loss(quals, qual)
             ):
+                assert ival is not None
                 i += 1
-                quals[(*ival, 2)] = loss_ival / 2
+                quals[(ival[0], ival[1], 2)] = loss_ival / 2
             else:
                 quals.pop(qual, None)
                 *xs, n = qual

adaptive/learner/learner2D.py

@@ -448,7 +448,7 @@ def __init__(
         self.aspect_ratio = 1
 
         self._bounds_points = list(itertools.product(*bounds))
-        self._stack.update({p: np.inf for p in self._bounds_points})
+        self._stack.update(dict.fromkeys(self._bounds_points, np.inf))
         self.function = function  # type: ignore
         self._ip = self._ip_combined = None
 

adaptive/learner/learnerND.py

@@ -1098,8 +1098,7 @@ def _get_iso(self, level=0.0, which="surface"):
         if which == "surface":
             if self.ndim != 3 or self.vdim != 1:
                 raise Exception(
-                    "Isosurface plotting is only supported"
-                    " for a 3D input and 1D output"
+                    "Isosurface plotting is only supported for a 3D input and 1D output"
                 )
             get_surface = True
             get_line = False

adaptive/learner/triangulation.py

@@ -336,8 +336,7 @@ def __init__(self, coords):
         vectors = subtract(coords[1:], coords[0])
         if matrix_rank(vectors) < dim:
             raise ValueError(
-                "Initial simplex has zero volumes "
-                "(the points are linearly dependent)"
+                "Initial simplex has zero volumes (the points are linearly dependent)"
             )
 
         self.vertices = list(coords)

adaptive/notebook_integration.py

@@ -16,8 +16,7 @@ def notebook_extension(*, _inline_js=True):
     """Enable ipywidgets, holoviews, and asyncio notebook integration."""
     if not in_ipynb():
         raise RuntimeError(
-            '"adaptive.notebook_extension()" may only be run '
-            "from a Jupyter notebook."
+            '"adaptive.notebook_extension()" may only be run from a Jupyter notebook.'
         )
 
     global _holoviews_enabled, _ipywidgets_enabled
@@ -116,8 +115,7 @@ def live_plot(runner, *, plotter=None, update_interval=2, name=None, normalize=T
     """
     if not _holoviews_enabled:
         raise RuntimeError(
-            "Live plotting is not enabled; did you run "
-            "'adaptive.notebook_extension()'?"
+            "Live plotting is not enabled; did you run 'adaptive.notebook_extension()'?"
         )
 
     import holoviews as hv
@@ -202,8 +200,7 @@ def live_info(runner, *, update_interval=0.5):
     """
     if not _holoviews_enabled:
         raise RuntimeError(
-            "Live plotting is not enabled; did you run "
-            "'adaptive.notebook_extension()'?"
+            "Live plotting is not enabled; did you run 'adaptive.notebook_extension()'?"
         )
 
     import ipywidgets
@@ -268,7 +265,7 @@ def _info_html(runner):
         info.append(("# of samples", runner.learner.nsamples))
 
     with suppress(Exception):
-        info.append(("latest loss", f'{runner.learner._cache["loss"]:.3f}'))
+        info.append(("latest loss", f"{runner.learner._cache['loss']:.3f}"))
 
     table = "\n".join(_table_row(i, k, v) for i, (k, v) in enumerate(info))
 

adaptive/runner.py

@@ -1157,7 +1157,7 @@ def auto_goal(
     if isinstance(learner, DataSaver):
         assert learner is not None
         return auto_goal(
-            learner=learner.learner,
+            learner=learner.learner,  # type: ignore[arg-type]
             loss=loss,
             npoints=npoints,
             end_time=end_time,