From d2c80418b5e6055b524f5fda1b36d0f8cde40868 Mon Sep 17 00:00:00 2001
From: Bas Nijholt <bas@nijho.lt>
Date: Tue, 13 Feb 2024 12:10:29 -0800
Subject: [PATCH] Use ruff-format instead of black (#446)

---
 .pre-commit-config.yaml               |  5 +----
 adaptive/learner/average_learner1D.py |  5 ++---
 adaptive/runner.py                    | 14 ++++++++------
 adaptive/tests/algorithm_4.py         |  6 +++++-
 pyproject.toml                        |  5 +++--
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2405489e1..833bcbdcb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,15 +8,12 @@ repos:
       - id: check-yaml
       - id: debug-statements
       - id: check-ast
-  - repo: https://github.com/psf/black
-    rev: 24.2.0
-    hooks:
-      - id: black-jupyter
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: "v0.2.1"
     hooks:
       - id: ruff
         args: ["--fix"]
+      - id: ruff-format
   - repo: https://github.com/nbQA-dev/nbQA
     rev: 1.7.1
     hooks:
diff --git a/adaptive/learner/average_learner1D.py b/adaptive/learner/average_learner1D.py
index 5dc9097ba..9678b4f64 100644
--- a/adaptive/learner/average_learner1D.py
+++ b/adaptive/learner/average_learner1D.py
@@ -79,9 +79,8 @@ def __init__(
         self,
         function: Callable[[tuple[int, Real]], Real],
         bounds: tuple[Real, Real],
-        loss_per_interval: None | (
-            Callable[[Sequence[Real], Sequence[Real]], float]
-        ) = None,
+        loss_per_interval: None
+        | (Callable[[Sequence[Real], Sequence[Real]], float]) = None,
         delta: float = 0.2,
         alpha: float = 0.005,
         neighbor_sampling: float = 0.3,
diff --git a/adaptive/runner.py b/adaptive/runner.py
index 84fcecd9f..4f877096f 100644
--- a/adaptive/runner.py
+++ b/adaptive/runner.py
@@ -788,8 +788,8 @@ def live_info_terminal(
         Parameters
         ----------
         update_interval : float, optional
-            The time interval (in seconds) at which the runner's status is updated in the terminal.
-            Default is 0.5 seconds.
+            The time interval (in seconds) at which the runner's status is updated
+            in the terminal. Default is 0.5 seconds.
         overwrite_previous : bool, optional
             If True, each update will overwrite the previous status in the terminal.
             If False, each update will be printed on a new line.
@@ -798,7 +798,8 @@ def live_info_terminal(
         Returns
         -------
         asyncio.Task
-            The asynchronous task responsible for updating the runner's status in the terminal.
+            The asynchronous task responsible for updating the runner's status in
+            the terminal.
 
         Examples
         --------
@@ -807,8 +808,8 @@ def live_info_terminal(
 
         Notes
         -----
-        This function uses ANSI escape sequences to control the terminal's cursor position.
-        It might not work as expected on all terminal emulators.
+        This function uses ANSI escape sequences to control the terminal's cursor
+        position. It might not work as expected on all terminal emulators.
         """
 
         async def _update(runner: AsyncRunner) -> None:
@@ -1189,7 +1190,8 @@ def auto_goal(
             for lrn in learner.learners
         ]
         return lambda learner: all(
-            goal(lrn) for lrn, goal in zip(learner.learners, goals)  # type: ignore[attr-defined]
+            goal(lrn)
+            for lrn, goal in zip(learner.learners, goals)  # type: ignore[attr-defined]
         )
     if npoints is not None:
         return lambda learner: learner.npoints >= npoints  # type: ignore[operator]
diff --git a/adaptive/tests/algorithm_4.py b/adaptive/tests/algorithm_4.py
index b010b667a..27832298e 100644
--- a/adaptive/tests/algorithm_4.py
+++ b/adaptive/tests/algorithm_4.py
@@ -319,7 +319,11 @@ def refine(self, f: Callable) -> tuple[np.ndarray, bool, int]:
 
 
 def algorithm_4(
-    f: Callable, a: int, b: int, tol: float, N_loops: int = int(1e9)  # noqa: B008
+    f: Callable,
+    a: int,
+    b: int,
+    tol: float,
+    N_loops: int = int(1e9),  # noqa: B008
 ) -> tuple[float, float, int, list[_Interval]]:
     """ALGORITHM_4 evaluates an integral using adaptive quadrature. The
     algorithm uses Clenshaw-Curtis quadrature rules of increasing
diff --git a/pyproject.toml b/pyproject.toml
index 1cdc34dfd..63037d1ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -95,7 +95,7 @@ ignore_missing_imports = true
 python_version = "3.9"
 
 [tool.ruff]
-line-length = 150
+line-length = 88
 target-version = "py39"
 
 [tool.ruff.lint]
@@ -109,12 +109,13 @@ ignore = [
     "D402",    # First line should not be the function's signature
     "PLW0603", # Using the global statement to update `X` is discouraged
     "D401",    # First line of docstring should be in imperative mood
+    "E501",    # Line too long
 ]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 18
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/*" = ["SLF001"]
 "ci/*" = ["INP001"]
 "tests/test_examples.py" = ["E501"]