Merge branch 'main' into fixturelookuperror_empty_stack

Author: jakkdl

.pre-commit-config.yaml

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

pyproject.toml

@@ -213,7 +213,6 @@ disable = [
     "condition-evals-to-constant",
     "consider-alternative-union-syntax",
     "confusing-consecutive-elif",
-    "consider-using-any-or-all",
     "consider-using-assignment-expr",
     "consider-using-dict-items",
     "consider-using-from-import",

src/_pytest/mark/__init__.py

@@ -193,12 +193,7 @@ def __call__(self, subname: str, /, **kwargs: str | int | bool | None) -> bool:
         if kwargs:
             raise UsageError("Keyword expressions do not support call parameters.")
         subname = subname.lower()
-        names = (name.lower() for name in self._names)
-
-        for name in names:
-            if subname in name:
-                return True
-        return False
+        return any(subname in name.lower() for name in self._names)
 
 
 def deselect_by_keyword(items: list[Item], config: Config) -> None:
@@ -243,10 +238,9 @@ def __call__(self, name: str, /, **kwargs: str | int | bool | None) -> bool:
         if not (matches := self.own_mark_name_mapping.get(name, [])):
             return False
 
-        for mark in matches:
+        for mark in matches:  # pylint: disable=consider-using-any-or-all
             if all(mark.kwargs.get(k, NOT_SET) == v for k, v in kwargs.items()):
                 return True
-
         return False