Update pre-commit config

Author: Zac-HD

.pre-commit-config.yaml

@@ -40,12 +40,12 @@ repos:
     rev: v3.10.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=.:src', --py37-plus]
+        args: ['--application-directories=.:src', --py38-plus]
 -   repo: https://github.com/asottile/pyupgrade
     rev: v3.7.0
     hooks:
     -   id: pyupgrade
-        args: [--py37-plus]
+        args: [--py38-plus]
 -   repo: https://github.com/asottile/setup-cfg-fmt
     rev: v2.3.0
     hooks:

src/_pytest/_code/code.py

@@ -17,19 +17,21 @@
 from typing import Callable
 from typing import ClassVar
 from typing import Dict
+from typing import Final
 from typing import final
 from typing import Generic
 from typing import Iterable
 from typing import List
+from typing import Literal
 from typing import Mapping
 from typing import Optional
 from typing import overload
 from typing import Pattern
 from typing import Sequence
 from typing import Set
+from typing import SupportsIndex
 from typing import Tuple
 from typing import Type
-from typing import TYPE_CHECKING
 from typing import TypeVar
 from typing import Union
 
@@ -48,16 +50,11 @@
 from _pytest.pathlib import absolutepath
 from _pytest.pathlib import bestrelpath
 
-if TYPE_CHECKING:
-    from typing_extensions import Final
-    from typing_extensions import Literal
-    from typing_extensions import SupportsIndex
-
-    _TracebackStyle = Literal["long", "short", "line", "no", "native", "value", "auto"]
-
 if sys.version_info[:2] < (3, 11):
     from exceptiongroup import BaseExceptionGroup
 
+_TracebackStyle = Literal["long", "short", "line", "no", "native", "value", "auto"]
+
 
 class Code:
     """Wrapper around Python code objects."""
@@ -633,7 +630,7 @@ def _getreprcrash(self) -> Optional["ReprFileLocation"]:
     def getrepr(
         self,
         showlocals: bool = False,
-        style: "_TracebackStyle" = "long",
+        style: _TracebackStyle = "long",
         abspath: bool = False,
         tbfilter: Union[
             bool, Callable[["ExceptionInfo[BaseException]"], Traceback]
@@ -725,7 +722,7 @@ class FormattedExcinfo:
     fail_marker: ClassVar = "E"
 
     showlocals: bool = False
-    style: "_TracebackStyle" = "long"
+    style: _TracebackStyle = "long"
     abspath: bool = True
     tbfilter: Union[bool, Callable[[ExceptionInfo[BaseException]], Traceback]] = True
     funcargs: bool = False
@@ -1090,7 +1087,7 @@ def toterminal(self, tw: TerminalWriter) -> None:
 class ReprTraceback(TerminalRepr):
     reprentries: Sequence[Union["ReprEntry", "ReprEntryNative"]]
     extraline: Optional[str]
-    style: "_TracebackStyle"
+    style: _TracebackStyle
 
     entrysep: ClassVar = "_ "
 
@@ -1124,7 +1121,7 @@ def __init__(self, tblines: Sequence[str]) -> None:
 class ReprEntryNative(TerminalRepr):
     lines: Sequence[str]
 
-    style: ClassVar["_TracebackStyle"] = "native"
+    style: ClassVar[_TracebackStyle] = "native"
 
     def toterminal(self, tw: TerminalWriter) -> None:
         tw.write("".join(self.lines))
@@ -1136,7 +1133,7 @@ class ReprEntry(TerminalRepr):
     reprfuncargs: Optional["ReprFuncArgs"]
     reprlocals: Optional["ReprLocals"]
     reprfileloc: Optional["ReprFileLocation"]
-    style: "_TracebackStyle"
+    style: _TracebackStyle
 
     def _write_entry_lines(self, tw: TerminalWriter) -> None:
         """Write the source code portions of a list of traceback entries with syntax highlighting.

src/_pytest/capture.py

@@ -11,12 +11,14 @@
 from typing import Any
 from typing import AnyStr
 from typing import BinaryIO
+from typing import Final
 from typing import final
 from typing import Generator
 from typing import Generic
 from typing import Iterable
 from typing import Iterator
 from typing import List
+from typing import Literal
 from typing import NamedTuple
 from typing import Optional
 from typing import TextIO
@@ -35,11 +37,7 @@
 from _pytest.nodes import File
 from _pytest.nodes import Item
 
-if TYPE_CHECKING:
-    from typing_extensions import Final
-    from typing_extensions import Literal
-
-    _CaptureMethod = Literal["fd", "sys", "no", "tee-sys"]
+_CaptureMethod = Literal["fd", "sys", "no", "tee-sys"]
 
 
 def pytest_addoption(parser: Parser) -> None:
@@ -687,7 +685,7 @@ def readouterr(self) -> CaptureResult[AnyStr]:
         return CaptureResult(out, err)  # type: ignore[arg-type]
 
 
-def _get_multicapture(method: "_CaptureMethod") -> MultiCapture[str]:
+def _get_multicapture(method: _CaptureMethod) -> MultiCapture[str]:
     if method == "fd":
         return MultiCapture(in_=FDCapture(0), out=FDCapture(1), err=FDCapture(2))
     elif method == "sys":
@@ -723,7 +721,7 @@ class CaptureManager:
       needed to ensure the fixtures take precedence over the global capture.
     """
 
-    def __init__(self, method: "_CaptureMethod") -> None:
+    def __init__(self, method: _CaptureMethod) -> None:
         self._method: Final = method
         self._global_capturing: Optional[MultiCapture[str]] = None
         self._capture_fixture: Optional[CaptureFixture[Any]] = None

src/_pytest/compat.py

@@ -12,15 +12,12 @@
 from pathlib import Path
 from typing import Any
 from typing import Callable
+from typing import Final
 from typing import NoReturn
-from typing import TYPE_CHECKING
 from typing import TypeVar
 
 import py
 
-if TYPE_CHECKING:
-    from typing_extensions import Final
-
 
 _T = TypeVar("_T")
 _S = TypeVar("_S")

src/_pytest/legacypath.py

@@ -3,6 +3,7 @@
 import shlex
 import subprocess
 from pathlib import Path
+from typing import Final
 from typing import final
 from typing import List
 from typing import Optional
@@ -32,8 +33,6 @@
 from _pytest.tmpdir import TempPathFactory
 
 if TYPE_CHECKING:
-    from typing_extensions import Final
-
     import pexpect
 
 

src/_pytest/pytester.py

@@ -20,11 +20,13 @@
 from typing import Any
 from typing import Callable
 from typing import Dict
+from typing import Final
 from typing import final
 from typing import Generator
 from typing import IO
 from typing import Iterable
 from typing import List
+from typing import Literal
 from typing import Optional
 from typing import overload
 from typing import Sequence
@@ -68,11 +70,7 @@
 from _pytest.tmpdir import TempPathFactory
 from _pytest.warning_types import PytestWarning
 
-
 if TYPE_CHECKING:
-    from typing_extensions import Final
-    from typing_extensions import Literal
-
     import pexpect