Remove vendored typing-extensions

Author: ichard26

.pre-commit-config.yaml

@@ -41,6 +41,7 @@ repos:
         'types-setuptools==68.2.0.0',
         'types-freezegun==1.1.10',
         'types-pyyaml==6.0.12.12',
+        'typing-extensions',
     ]
 
 - repo: https://github.com/pre-commit/pygrep-hooks

news/typing_extensions.vendor.rst

@@ -1 +1 @@
-Upgrade typing_extensions to 4.14.1
+Remove vendored typing-extensions.

src/pip/_internal/index/package_finder.py

@@ -45,7 +45,7 @@
 from pip._internal.utils.unpacking import SUPPORTED_EXTENSIONS
 
 if TYPE_CHECKING:
-    from pip._vendor.typing_extensions import TypeGuard
+    from typing_extensions import TypeGuard
 
 __all__ = ["FormatControl", "BestCandidateResult", "PackageFinder"]
 

src/pip/_internal/models/pylock.py

@@ -5,16 +5,18 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from pip._vendor import tomli_w
-from pip._vendor.typing_extensions import Self
 
 from pip._internal.models.direct_url import ArchiveInfo, DirInfo, VcsInfo
 from pip._internal.models.link import Link
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.urls import url_to_path
 
+if TYPE_CHECKING:
+    from typing_extensions import Self
+
 PYLOCK_FILE_NAME_RE = re.compile(r"^pylock\.([^.]+)\.toml$")
 
 

src/pip/_internal/utils/retry.py

@@ -1,11 +1,14 @@
+from __future__ import annotations
+
 import functools
 from time import perf_counter, sleep
-from typing import Callable, TypeVar
+from typing import TYPE_CHECKING, Callable, TypeVar
 
-from pip._vendor.typing_extensions import ParamSpec
+if TYPE_CHECKING:
+    from typing_extensions import ParamSpec
 
-T = TypeVar("T")
-P = ParamSpec("P")
+    T = TypeVar("T")
+    P = ParamSpec("P")
 
 
 def retry(

src/pip/_vendor/pkg_resources/__init__.py

@@ -100,7 +100,7 @@
 
 if TYPE_CHECKING:
     from _typeshed import BytesPath, StrPath, StrOrBytesPath
-    from pip._vendor.typing_extensions import Self
+    from typing_extensions import Self
 
 
 # Patch: Remove deprecation warning from vendored pkg_resources.

src/pip/_vendor/rich/live.py

@@ -16,7 +16,7 @@
 
 if TYPE_CHECKING:
     # Can be replaced with `from typing import Self` in Python 3.11+
-    from pip._vendor.typing_extensions import Self  # pragma: no cover
+    from typing_extensions import Self  # pragma: no cover
 
 
 class _RefreshThread(Thread):

src/pip/_vendor/rich/progress.py

@@ -38,7 +38,7 @@
 
 if TYPE_CHECKING:
     # Can be replaced with `from typing import Self` in Python 3.11+
-    from pip._vendor.typing_extensions import Self  # pragma: no cover
+    from typing_extensions import Self  # pragma: no cover
 
 from . import filesize, get_console
 from .console import Console, Group, JustifyMethod, RenderableType

src/pip/_vendor/truststore/_api.py

@@ -22,7 +22,7 @@
     from ._openssl import _configure_context, _verify_peercerts_impl
 
 if typing.TYPE_CHECKING:
-    from pip._vendor.typing_extensions import Buffer
+    from typing_extensions import Buffer
 
 # From typeshed/stdlib/ssl.pyi
 _StrOrBytesPath: typing.TypeAlias = str | bytes | os.PathLike[str] | os.PathLike[bytes]