[pre-commit] Upgrade ruff to 0.8.1

Author: Pierre-Sassoulas

.pre-commit-config.yaml

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

pyproject.toml

@@ -156,8 +156,10 @@ lint.ignore = [
     "PLW0120", # remove the else and dedent its contents
     "PLW0603", # Using the global statement
     "PLW2901", # for loop variable overwritten by assignment target
+    "PYI063",
     # ruff ignore
     "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
+    "UP031",
 ]
 lint.per-file-ignores."src/_pytest/_py/**/*.py" = [
     "B",

src/_pytest/_code/__init__.py

@@ -16,11 +16,11 @@
 __all__ = [
     "Code",
     "ExceptionInfo",
-    "filter_traceback",
     "Frame",
-    "getfslineno",
-    "getrawcode",
+    "Source",
     "Traceback",
     "TracebackEntry",
-    "Source",
+    "filter_traceback",
+    "getfslineno",
+    "getrawcode",
 ]

src/_pytest/_code/code.py

@@ -953,7 +953,7 @@ def repr_traceback_entry(
             if short:
                 message = f"in {entry.name}"
             else:
-                message = excinfo and excinfo.typename or ""
+                message = (excinfo and excinfo.typename) or ""
             entry_path = entry.path
             path = self._makepath(entry_path)
             reprfileloc = ReprFileLocation(path, entry.lineno + 1, message)
@@ -1182,10 +1182,8 @@ def toterminal(self, tw: TerminalWriter) -> None:
             entry.toterminal(tw)
             if i < len(self.reprentries) - 1:
                 next_entry = self.reprentries[i + 1]
-                if (
-                    entry.style == "long"
-                    or entry.style == "short"
-                    and next_entry.style == "long"
+                if entry.style == "long" or (
+                    entry.style == "short" and next_entry.style == "long"
                 ):
                     tw.sep(self.entrysep)
 
@@ -1369,7 +1367,7 @@ def getfslineno(obj: object) -> tuple[str | Path, int]:
         except TypeError:
             return "", -1
 
-        fspath = fn and absolutepath(fn) or ""
+        fspath = (fn and absolutepath(fn)) or ""
         lineno = -1
         if fspath:
             try:

src/_pytest/assertion/rewrite.py

@@ -53,7 +53,7 @@ class Sentinel:
 
 # pytest caches rewritten pycs in pycache dirs
 PYTEST_TAG = f"{sys.implementation.cache_tag}-pytest-{version}"
-PYC_EXT = ".py" + (__debug__ and "c" or "o")
+PYC_EXT = ".py" + ((__debug__ and "c") or "o")
 PYC_TAIL = "." + PYTEST_TAG + PYC_EXT
 
 # Special marker that denotes we have just left a scope definition
@@ -481,7 +481,7 @@ def _should_repr_global_name(obj: object) -> bool:
 
 
 def _format_boolop(explanations: Iterable[str], is_or: bool) -> str:
-    explanation = "(" + (is_or and " or " or " and ").join(explanations) + ")"
+    explanation = "(" + ((is_or and " or ") or " and ").join(explanations) + ")"
     return explanation.replace("%", "%%")
 
 

src/_pytest/capture.py

@@ -360,7 +360,7 @@ def repr(self, class_name: str) -> str:
         return "<{} {} _old={} _state={!r} tmpfile={!r}>".format(
             class_name,
             self.name,
-            hasattr(self, "_old") and repr(self._old) or "<UNSET>",
+            (hasattr(self, "_old") and repr(self._old)) or "<UNSET>",
             self._state,
             self.tmpfile,
         )
@@ -369,7 +369,7 @@ def __repr__(self) -> str:
         return "<{} {} _old={} _state={!r} tmpfile={!r}>".format(
             self.__class__.__name__,
             self.name,
-            hasattr(self, "_old") and repr(self._old) or "<UNSET>",
+            (hasattr(self, "_old") and repr(self._old)) or "<UNSET>",
             self._state,
             self.tmpfile,
         )

src/_pytest/fixtures.py

@@ -305,7 +305,7 @@ class FuncFixtureInfo:
     these are not reflected here.
     """
 
-    __slots__ = ("argnames", "initialnames", "names_closure", "name2fixturedefs")
+    __slots__ = ("argnames", "initialnames", "name2fixturedefs", "names_closure")
 
     # Fixture names that the item requests directly by function parameters.
     argnames: tuple[str, ...]

src/_pytest/mark/expression.py

@@ -58,7 +58,7 @@ class TokenType(enum.Enum):
 
 @dataclasses.dataclass(frozen=True)
 class Token:
-    __slots__ = ("type", "value", "pos")
+    __slots__ = ("pos", "type", "value")
     type: TokenType
     value: str
     pos: int
@@ -80,7 +80,7 @@ def __str__(self) -> str:
 
 
 class Scanner:
-    __slots__ = ("tokens", "current")
+    __slots__ = ("current", "tokens")
 
     def __init__(self, input: str) -> None:
         self.tokens = self.lex(input)
@@ -238,10 +238,8 @@ def single_kwarg(s: Scanner) -> ast.keyword:
         value: str | int | bool | None = value_token.value[1:-1]  # strip quotes
     else:
         value_token = s.accept(TokenType.IDENT, reject=True)
-        if (
-            (number := value_token.value).isdigit()
-            or number.startswith("-")
-            and number[1:].isdigit()
+        if (number := value_token.value).isdigit() or (
+            number.startswith("-") and number[1:].isdigit()
         ):
             value = int(number)
         elif value_token.value in BUILTIN_MATCHERS:

src/_pytest/mark/structures.py

@@ -562,7 +562,7 @@ def __getattr__(self, name: str) -> MarkDecorator:
 
 @final
 class NodeKeywords(MutableMapping[str, Any]):
-    __slots__ = ("node", "parent", "_markers")
+    __slots__ = ("_markers", "node", "parent")
 
     def __init__(self, node: Node) -> None:
         self.node = node
@@ -584,10 +584,8 @@ def __setitem__(self, key: str, value: Any) -> None:
     # below and use the collections.abc fallback, but that would be slow.
 
     def __contains__(self, key: object) -> bool:
-        return (
-            key in self._markers
-            or self.parent is not None
-            and key in self.parent.keywords
+        return key in self._markers or (
+            self.parent is not None and key in self.parent.keywords
         )
 
     def update(  # type: ignore[override]

src/_pytest/nodes.py

@@ -143,14 +143,14 @@ class Node(abc.ABC, metaclass=NodeMeta):
     # Use __slots__ to make attribute access faster.
     # Note that __dict__ is still available.
     __slots__ = (
+        "__dict__",
+        "_nodeid",
+        "_store",
+        "config",
         "name",
         "parent",
-        "config",
-        "session",
         "path",
-        "_nodeid",
-        "_store",
-        "__dict__",
+        "session",
     )
 
     def __init__(

src/_pytest/python.py

@@ -431,7 +431,7 @@ def _genfunctions(self, name: str, funcobj) -> Iterator[Function]:
         assert modulecol is not None
         module = modulecol.obj
         clscol = self.getparent(Class)
-        cls = clscol and clscol.obj or None
+        cls = (clscol and clscol.obj) or None
 
         definition = FunctionDefinition.from_parent(self, name=name, callobj=funcobj)
         fixtureinfo = definition._fixtureinfo
@@ -848,12 +848,12 @@ class IdMaker:
 
     __slots__ = (
         "argnames",
-        "parametersets",
+        "config",
+        "func_name",
         "idfn",
         "ids",
-        "config",
         "nodeid",
-        "func_name",
+        "parametersets",
     )
 
     # The argnames of the parametrization.

src/_pytest/runner.py

@@ -533,7 +533,7 @@ def teardown_exact(self, nextitem: Item | None) -> None:
         When nextitem is None (meaning we're at the last item), the entire
         stack is torn down.
         """
-        needed_collectors = nextitem and nextitem.listchain() or []
+        needed_collectors = (nextitem and nextitem.listchain()) or []
         exceptions: list[BaseException] = []
         while self.stack:
             if list(self.stack.keys()) == needed_collectors[: len(self.stack)]:

src/_pytest/skipping.py

@@ -196,7 +196,7 @@ def evaluate_skip_marks(item: Item) -> Skip | None:
 class Xfail:
     """The result of evaluate_xfail_marks()."""
 
-    __slots__ = ("reason", "run", "strict", "raises")
+    __slots__ = ("raises", "reason", "run", "strict")
 
     reason: str
     run: bool

src/pytest/__init__.py

@@ -88,41 +88,27 @@
 
 
 __all__ = [
-    "__version__",
-    "approx",
     "Cache",
     "CallInfo",
     "CaptureFixture",
     "Class",
-    "cmdline",
-    "Collector",
     "CollectReport",
+    "Collector",
     "Config",
-    "console_main",
-    "deprecated_call",
     "Dir",
     "Directory",
     "DoctestItem",
-    "exit",
     "ExceptionInfo",
     "ExitCode",
-    "fail",
     "File",
-    "fixture",
     "FixtureDef",
     "FixtureLookupError",
     "FixtureRequest",
-    "freeze_includes",
     "Function",
-    "hookimpl",
     "HookRecorder",
-    "hookspec",
-    "importorskip",
     "Item",
     "LineMatcher",
     "LogCaptureFixture",
-    "main",
-    "mark",
     "Mark",
     "MarkDecorator",
     "MarkGenerator",
@@ -131,39 +117,53 @@
     "MonkeyPatch",
     "OptionGroup",
     "Package",
-    "param",
     "Parser",
     "PytestAssertRewriteWarning",
     "PytestCacheWarning",
     "PytestCollectionWarning",
     "PytestConfigWarning",
     "PytestDeprecationWarning",
     "PytestExperimentalApiWarning",
-    "PytestRemovedIn9Warning",
-    "Pytester",
     "PytestPluginManager",
+    "PytestRemovedIn9Warning",
     "PytestUnhandledThreadExceptionWarning",
     "PytestUnknownMarkWarning",
     "PytestUnraisableExceptionWarning",
     "PytestWarning",
-    "raises",
+    "Pytester",
     "RecordedHookCall",
-    "register_assert_rewrite",
     "RunResult",
     "Session",
-    "set_trace",
-    "skip",
     "Stash",
     "StashKey",
-    "version_tuple",
-    "TempdirFactory",
     "TempPathFactory",
+    "TempdirFactory",
     "TerminalReporter",
-    "Testdir",
     "TestReport",
     "TestShortLogReport",
+    "Testdir",
     "UsageError",
     "WarningsRecorder",
+    "__version__",
+    "approx",
+    "cmdline",
+    "console_main",
+    "deprecated_call",
+    "exit",
+    "fail",
+    "fixture",
+    "freeze_includes",
+    "hookimpl",
+    "hookspec",
+    "importorskip",
+    "main",
+    "mark",
+    "param",
+    "raises",
+    "register_assert_rewrite",
+    "set_trace",
+    "skip",
+    "version_tuple",
     "warns",
     "xfail",
     "yield_fixture",

testing/_py/test_local.py

@@ -855,7 +855,7 @@ def test_fnmatch_file_abspath(self, tmpdir):
         assert b.fnmatch(pattern)
 
     def test_sysfind(self):
-        name = sys.platform == "win32" and "cmd" or "test"
+        name = (sys.platform == "win32" and "cmd") or "test"
         x = local.sysfind(name)
         assert x.check(file=1)
         assert local.sysfind("jaksdkasldqwe") is None
@@ -1250,7 +1250,7 @@ def test_owner_group_not_implemented(self, path1):
     def test_chmod_simple_int(self, path1):
         mode = path1.stat().mode
         # Ensure that we actually change the mode to something different.
-        path1.chmod(mode == 0 and 1 or 0)
+        path1.chmod((mode == 0 and 1) or 0)
         try:
             print(path1.stat().mode)
             print(mode)