[pre-commit] Upgrade ruff to 0.9.0 / 2025's style

Author: Pierre-Sassoulas

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.8.6"
+  rev: "v0.9.0"
   hooks:
     - id: ruff
       args: ["--fix"]

doc/en/example/assertion/failure_demo.py

@@ -267,9 +267,9 @@ class A:
             a = 1
 
         b = 2
-        assert (
-            A.a == b
-        ), "A.a appears not to be b\nor does not appear to be b\none of those"
+        assert A.a == b, (
+            "A.a appears not to be b\nor does not appear to be b\none of those"
+        )
 
     def test_custom_repr(self):
         class JSON:

scripts/prepare-release-pr.py

@@ -163,7 +163,7 @@ def find_next_version(
     last_version = valid_versions[-1]
 
     if is_major:
-        return f"{last_version[0]+1}.0.0{prerelease}"
+        return f"{last_version[0] + 1}.0.0{prerelease}"
     elif is_feature_release:
         return f"{last_version[0]}.{last_version[1] + 1}.0{prerelease}"
     else:

scripts/update-plugin-list.py

@@ -176,7 +176,7 @@ def version_sort_key(version_string: str) -> Any:
                 )
                 last_release = release_date.strftime("%b %d, %Y")
                 break
-        name = f':pypi:`{info["name"]}`'
+        name = f":pypi:`{info['name']}`"
         summary = ""
         if info["summary"]:
             summary = escape_rst(info["summary"].replace("\n", ""))
@@ -194,7 +194,7 @@ def plugin_definitions(plugins: Iterable[PluginInfo]) -> Iterator[str]:
     for plugin in plugins:
         yield dedent(
             f"""
-            {plugin['name']}
+            {plugin["name"]}
                *last release*: {plugin["last_release"]},
                *status*: {plugin["status"]},
                *requires*: {plugin["requires"]}

src/_pytest/_code/code.py

@@ -217,7 +217,7 @@ def relline(self) -> int:
         return self.lineno - self.frame.code.firstlineno
 
     def __repr__(self) -> str:
-        return f"<TracebackEntry {self.frame.code.path}:{self.lineno+1}>"
+        return f"<TracebackEntry {self.frame.code.path}:{self.lineno + 1}>"
 
     @property
     def statement(self) -> Source:
@@ -303,7 +303,7 @@ def __str__(self) -> str:
         # This output does not quite match Python's repr for traceback entries,
         # but changing it to do so would break certain plugins.  See
         # https://github.com/pytest-dev/pytest/pull/7535/ for details.
-        return f"  File '{self.path}':{self.lineno+1} in {name}\n  {line}\n"
+        return f"  File '{self.path}':{self.lineno + 1} in {name}\n  {line}\n"
 
     @property
     def name(self) -> str:
@@ -527,33 +527,33 @@ def fill_unfilled(self, exc_info: tuple[type[E], E, TracebackType]) -> None:
     @property
     def type(self) -> type[E]:
         """The exception class."""
-        assert (
-            self._excinfo is not None
-        ), ".type can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".type can only be used after the context manager exits"
+        )
         return self._excinfo[0]
 
     @property
     def value(self) -> E:
         """The exception value."""
-        assert (
-            self._excinfo is not None
-        ), ".value can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".value can only be used after the context manager exits"
+        )
         return self._excinfo[1]
 
     @property
     def tb(self) -> TracebackType:
         """The exception raw traceback."""
-        assert (
-            self._excinfo is not None
-        ), ".tb can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".tb can only be used after the context manager exits"
+        )
         return self._excinfo[2]
 
     @property
     def typename(self) -> str:
         """The type name of the exception."""
-        assert (
-            self._excinfo is not None
-        ), ".typename can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".typename can only be used after the context manager exits"
+        )
         return self.type.__name__
 
     @property

src/_pytest/cacheprovider.py

@@ -482,8 +482,7 @@ def pytest_addoption(parser: Parser) -> None:
         "--last-failed",
         action="store_true",
         dest="lf",
-        help="Rerun only the tests that failed "
-        "at the last run (or all if none failed)",
+        help="Rerun only the tests that failed at the last run (or all if none failed)",
     )
     group.addoption(
         "--ff",

src/_pytest/capture.py

@@ -375,10 +375,10 @@ def __repr__(self) -> str:
         )
 
     def _assert_state(self, op: str, states: tuple[str, ...]) -> None:
-        assert (
-            self._state in states
-        ), "cannot {} in state {!r}: expected one of {}".format(
-            op, self._state, ", ".join(states)
+        assert self._state in states, (
+            "cannot {} in state {!r}: expected one of {}".format(
+                op, self._state, ", ".join(states)
+            )
         )
 
     def start(self) -> None:
@@ -492,10 +492,10 @@ def __repr__(self) -> str:
         )
 
     def _assert_state(self, op: str, states: tuple[str, ...]) -> None:
-        assert (
-            self._state in states
-        ), "cannot {} in state {!r}: expected one of {}".format(
-            op, self._state, ", ".join(states)
+        assert self._state in states, (
+            "cannot {} in state {!r}: expected one of {}".format(
+                op, self._state, ", ".join(states)
+            )
         )
 
     def start(self) -> None:

src/_pytest/compat.py

@@ -70,8 +70,8 @@ def getlocation(function, curdir: str | os.PathLike[str] | None = None) -> str:
         except ValueError:
             pass
         else:
-            return f"{relfn}:{lineno+1}"
-    return f"{fn}:{lineno+1}"
+            return f"{relfn}:{lineno + 1}"
+    return f"{fn}:{lineno + 1}"
 
 
 def num_mock_patch_args(function) -> int:

src/_pytest/config/__init__.py

@@ -838,9 +838,9 @@ def import_plugin(self, modname: str, consider_entry_points: bool = False) -> No
         # "terminal" or "capture".  Those plugins are registered under their
         # basename for historic purposes but must be imported with the
         # _pytest prefix.
-        assert isinstance(
-            modname, str
-        ), f"module name as text required, got {modname!r}"
+        assert isinstance(modname, str), (
+            f"module name as text required, got {modname!r}"
+        )
         if self.is_blocked(modname) or self.get_plugin(modname) is not None:
             return
 
@@ -1503,9 +1503,9 @@ def _get_unknown_ini_keys(self) -> list[str]:
 
     def parse(self, args: list[str], addopts: bool = True) -> None:
         # Parse given cmdline arguments into this config object.
-        assert (
-            self.args == []
-        ), "can only parse cmdline args at most once per Config object"
+        assert self.args == [], (
+            "can only parse cmdline args at most once per Config object"
+        )
         self.hook.pytest_addhooks.call_historic(
             kwargs=dict(pluginmanager=self.pluginmanager)
         )

src/_pytest/fixtures.py

@@ -746,7 +746,9 @@ def node(self):
         if node is None and scope is Scope.Class:
             # Fallback to function item itself.
             node = self._pyfuncitem
-        assert node, f'Could not obtain a node for scope "{scope}" for function {self._pyfuncitem!r}'
+        assert node, (
+            f'Could not obtain a node for scope "{scope}" for function {self._pyfuncitem!r}'
+        )
         return node
 
     def _check_scope(
@@ -808,9 +810,9 @@ def formatrepr(self) -> FixtureLookupErrorRepr:
         # new cases it might break.
         # Add the assert to make it clearer to developer that this will fail, otherwise
         # it crashes because `fspath` does not get set due to `stack` being empty.
-        assert (
-            self.msg is None or self.fixturestack
-        ), "formatrepr assumptions broken, rewrite it to handle it"
+        assert self.msg is None or self.fixturestack, (
+            "formatrepr assumptions broken, rewrite it to handle it"
+        )
         if msg is not None:
             # The last fixture raise an error, let's present
             # it at the requesting side.