Skip to content

Use ruff-format instead of black #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions adaptive/learner/average_learner1D.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 8 additions & 6 deletions adaptive/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
--------
Expand All @@ -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:
Expand Down Expand Up @@ -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]
Expand Down
6 changes: 5 additions & 1 deletion adaptive/tests/algorithm_4.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"]
Expand Down