[flake8-pyi] Add checks for flake8-pyi and fix existing

Author: Pierre-Sassoulas

pyproject.toml

@@ -133,6 +133,7 @@ select = [
     "E",  # pycodestyle
     "F",  # pyflakes
     "I",  # isort
+    "PYI", # flake8-pyi
     "UP", # pyupgrade
     "RUF", # ruff
     "W",  # pycodestyle

src/_pytest/capture.py

@@ -598,7 +598,8 @@ class CaptureResult(NamedTuple, Generic[AnyStr]):
 else:
 
     class CaptureResult(
-        collections.namedtuple("CaptureResult", ["out", "err"]), Generic[AnyStr]
+        collections.namedtuple("CaptureResult", ["out", "err"]),  # noqa: PYI024
+        Generic[AnyStr],
     ):
         """The result of :method:`caplog.readouterr() <pytest.CaptureFixture.readouterr>`."""
 

src/_pytest/compat.py

@@ -15,11 +15,6 @@
 from typing import Callable
 from typing import Final
 from typing import NoReturn
-from typing import TypeVar
-
-
-_T = TypeVar("_T")
-_S = TypeVar("_S")
 
 
 # fmt: off

testing/test_assertion.py

@@ -1,10 +1,10 @@
 # mypy: allow-untyped-defs
-import collections
 import sys
 import textwrap
 from typing import Any
 from typing import List
 from typing import MutableSequence
+from typing import NamedTuple
 from typing import Optional
 
 import attr
@@ -1179,7 +1179,9 @@ def __eq__(self, other):  # pragma: no cover
 
 class TestAssert_reprcompare_namedtuple:
     def test_namedtuple(self) -> None:
-        NT = collections.namedtuple("NT", ["a", "b"])
+        class NT(NamedTuple):
+            a: Any
+            b: Any
 
         left = NT(1, "b")
         right = NT(1, "c")
@@ -1200,8 +1202,13 @@ def test_namedtuple(self) -> None:
         ]
 
     def test_comparing_two_different_namedtuple(self) -> None:
-        NT1 = collections.namedtuple("NT1", ["a", "b"])
-        NT2 = collections.namedtuple("NT2", ["a", "b"])
+        class NT1(NamedTuple):
+            a: Any
+            b: Any
+
+        class NT2(NamedTuple):
+            a: Any
+            b: Any
 
         left = NT1(1, "b")
         right = NT2(2, "b")

testing/test_terminal.py

@@ -1,6 +1,5 @@
 # mypy: allow-untyped-defs
 """Terminal reporting of the full testing process."""
-import collections
 from io import StringIO
 import os
 from pathlib import Path
@@ -10,6 +9,7 @@
 from typing import cast
 from typing import Dict
 from typing import List
+from typing import NamedTuple
 from typing import Tuple
 
 import pluggy
@@ -34,7 +34,9 @@
 import pytest
 
 
-DistInfo = collections.namedtuple("DistInfo", ["project_name", "version"])
+class DistInfo(NamedTuple):
+    project_name: str
+    version: int
 
 
 TRANS_FNMATCH = str.maketrans({"[": "[[]", "]": "[]]"})