Merge pull request #13238 from AA-Turner/drop-py38

uranusjr · web-flow · commit bc28953e80d9 · 2025-02-25T11:08:02.000+08:00
Drop support for Python 3.8
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,7 +114,6 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macos-13, macos-latest]
         python:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
@@ -172,10 +171,9 @@ jobs:
       matrix:
         os: [Windows]
         python:
-          - "3.8"
+          - "3.9"
           # Commented out, since Windows tests are expensively slow,
           # only test the oldest and newest Python supported by pip
-          # - "3.9"
           # - "3.10"
           # - "3.11"
           # - "3.12"
diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst
@@ -18,7 +18,6 @@ Supported interpreters
 
 pip support a variety of Python interpreters:
 
-- CPython 3.8
 - CPython 3.9
 - CPython 3.10
 - CPython 3.11
@@ -91,9 +90,7 @@ Actual testing
 +------------------------------+---------------+-----------------+
 |       **interpreter**        |   **unit**    | **integration** |
 +-----------+----------+-------+---------------+-----------------+
-|           |   x86    | CP3.8 |               |                 |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |               |                 |
+|           |   x86    | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
@@ -105,9 +102,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |  Windows  +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |               |                 |
+|           |   x64    | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
@@ -119,9 +114,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |   x86    | CP3.8 |               |                 |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |               |                 |
+|           |   x86    | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
@@ -133,9 +126,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   Linux   +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   GitHub      |   GitHub        |
+|           |   x64    | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
@@ -147,9 +138,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |  arm64   | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   GitHub      |   GitHub        |
+|           |  arm64   | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
@@ -161,9 +150,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   macOS   +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   GitHub      |   GitHub        |
+|           |   x64    | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
diff --git a/docs/html/installation.md b/docs/html/installation.md
@@ -126,7 +126,7 @@ $ pip install --upgrade pip
 The current version of pip works on:
 
 - Windows, Linux and macOS.
-- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, and latest PyPy3.
+- CPython 3.9, 3.10, 3.11, 3.12, 3.13, and latest PyPy3.
 
 pip is tested to work on the latest patch version of the Python interpreter,
 for each of the minor versions listed above. Previous patch versions are
diff --git a/news/12989.removal.rst b/news/12989.removal.rst
@@ -0,0 +1 @@
+Drop support for Python 3.8.
diff --git a/noxfile.py b/noxfile.py
@@ -69,7 +69,7 @@ def should_update_common_wheels() -> bool:
 # -----------------------------------------------------------------------------
 # Development Commands
 # -----------------------------------------------------------------------------
-@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"])
+@nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"])
 def test(session: nox.Session) -> None:
     # Get the common wheels.
     if should_update_common_wheels():
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,6 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -28,7 +27,7 @@ authors = [
 
 # NOTE: requires-python is duplicated in __pip-runner__.py.
 # When changing this value, please change the other copy as well.
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [project.scripts]
 pip = "pip._internal.cli.main:main"
@@ -152,6 +151,8 @@ distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
 #
 
 [tool.ruff]
+# Pinned to delay pyupgrade changes (https://github.com/pypa/pip/issues/13236)
+target-version = "py38"  # Pin Ruff to Python 3.8
 src = ["src"]
 line-length = 88
 extend-exclude = [
diff --git a/src/pip/__pip-runner__.py b/src/pip/__pip-runner__.py
@@ -9,7 +9,7 @@
 import sys
 
 # Copied from pyproject.toml
-PYTHON_REQUIRES = (3, 8)
+PYTHON_REQUIRES = (3, 9)
 
 
 def version_str(version):  # type: ignore
diff --git a/src/pip/_internal/locations/__init__.py b/src/pip/_internal/locations/__init__.py
@@ -304,7 +304,6 @@ def get_scheme(
             user
             and k == "platlib"
             and not WINDOWS
-            and sys.version_info >= (3, 9)
             and _PLATLIBDIR != "lib"
             and _looks_like_bpo_44860()
         )
diff --git a/src/pip/_internal/resolution/resolvelib/found_candidates.py b/src/pip/_internal/resolution/resolvelib/found_candidates.py
@@ -11,7 +11,7 @@
 import functools
 import logging
 from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any, Callable, Iterator, Optional, Set, Tuple
+from typing import Any, Callable, Iterator, Optional, Set, Tuple
 
 from pip._vendor.packaging.version import _BaseVersion
 
@@ -23,21 +23,6 @@
 
 IndexCandidateInfo = Tuple[_BaseVersion, Callable[[], Optional[Candidate]]]
 
-if TYPE_CHECKING:
-    SequenceCandidate = Sequence[Candidate]
-else:
-    # For compatibility: Python before 3.9 does not support using [] on the
-    # Sequence class.
-    #
-    # >>> from collections.abc import Sequence
-    # >>> Sequence[str]
-    # Traceback (most recent call last):
-    #   File "<stdin>", line 1, in <module>
-    # TypeError: 'ABCMeta' object is not subscriptable
-    #
-    # TODO: Remove this block after dropping Python 3.8 support.
-    SequenceCandidate = Sequence
-
 
 def _iter_built(infos: Iterator[IndexCandidateInfo]) -> Iterator[Candidate]:
     """Iterator for ``FoundCandidates``.
@@ -124,7 +109,7 @@ def _iter_built_with_inserted(
         yield installed
 
 
-class FoundCandidates(SequenceCandidate):
+class FoundCandidates(Sequence[Candidate]):
     """A lazy sequence to provide candidates to the resolver.
 
     The intended usage is to return this from `find_matches()` so the resolver
diff --git a/src/pip/_internal/utils/unpacking.py b/src/pip/_internal/utils/unpacking.py
@@ -208,7 +208,6 @@ def pip_filter(member: tarfile.TarInfo, path: str) -> tarfile.TarInfo:
                         member = data_filter(member, location)
                     except tarfile.LinkOutsideDestinationError:
                         if sys.version_info[:3] in {
-                            (3, 8, 17),
                             (3, 9, 17),
                             (3, 10, 12),
                             (3, 11, 4),
diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py
@@ -25,9 +25,10 @@ def on_access_log(self, context: Dict[str, Any]) -> None:
 def test_proxy_overrides_env(
     script: PipTestEnvironment, capfd: pytest.CaptureFixture[str]
 ) -> None:
-    with proxy.Proxy(port=0, num_acceptors=1) as proxy1, proxy.Proxy(
-        plugins=[AccessLogPlugin], port=0, num_acceptors=1
-    ) as proxy2:
+    with (
+        proxy.Proxy(port=0, num_acceptors=1) as proxy1,
+        proxy.Proxy(plugins=[AccessLogPlugin], port=0, num_acceptors=1) as proxy2,
+    ):
         script.environ["http_proxy"] = f"127.0.0.1:{proxy2.flags.port}"
         script.environ["https_proxy"] = f"127.0.0.1:{proxy2.flags.port}"
         result = script.pip(
diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py
@@ -79,7 +79,7 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
     @pytest.mark.xfail(
         sys.platform == "darwin"
         and platform.machine() == "arm64"
-        and sys.version_info[:2] in {(3, 8), (3, 9)},
+        and sys.version_info[:2] < (3, 10),
         reason="Unexpected egg-link install path",
     )
     def test_uninstall_editable_from_usersite(
diff --git a/tests/lib/compat.py b/tests/lib/compat.py
@@ -2,7 +2,7 @@
 
 import contextlib
 import signal
-from typing import Callable, ContextManager, Iterable, Iterator
+from typing import Callable, ContextManager, Iterator
 
 # Applies on Windows.
 if not hasattr(signal, "pthread_sigmask"):
@@ -14,13 +14,7 @@
     @contextlib.contextmanager
     def blocked_signals() -> Iterator[None]:
         """Block all signals for e.g. starting a worker thread."""
-        # valid_signals() was added in Python 3.8 (and not using it results
-        # in a warning on pthread_sigmask() call)
-        mask: Iterable[int]
-        try:
-            mask = signal.valid_signals()
-        except AttributeError:
-            mask = set(range(1, signal.NSIG))
+        mask = signal.valid_signals()
 
         old_mask = signal.pthread_sigmask(  # type: ignore[attr-defined]
             signal.SIG_SETMASK,  # type: ignore[attr-defined]
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
@@ -1033,8 +1033,9 @@ def test_warns_and_fallsback_to_locale_on_utf8_decode_fail(
 
         # it's hard to rely on a locale definitely existing for testing
         # so patch things out for simplicity
-        with caplog.at_level(logging.WARNING), mock.patch(
-            "locale.getpreferredencoding", return_value=locale_encoding
+        with (
+            caplog.at_level(logging.WARNING),
+            mock.patch("locale.getpreferredencoding", return_value=locale_encoding),
         ):
             reqs = tuple(parse_reqfile(req_file.resolve(), session=session))
 
@@ -1065,7 +1066,8 @@ def test_errors_on_non_decodable_data(
         req_file = tmpdir / "requirements.txt"
         req_file.write_bytes(data)
 
-        with pytest.raises(UnicodeDecodeError), mock.patch(
-            "locale.getpreferredencoding", return_value=encoding
+        with (
+            pytest.raises(UnicodeDecodeError),
+            mock.patch("locale.getpreferredencoding", return_value=encoding),
         ):
             next(parse_reqfile(req_file.resolve(), session=session))

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,6 @@ def get_scheme(`
`304`	`304`	`user`
`305`	`305`	`and k == "platlib"`
`306`	`306`	`and not WINDOWS`
`307`		`- and sys.version_info >= (3, 9)`
`308`	`307`	`and _PLATLIBDIR != "lib"`
`309`	`308`	`and _looks_like_bpo_44860()`
`310`	`309`	`)`