Merge pull request #11944 from hugovk/rm-3.7

Drop support for EOL Python 3.7

.github/workflows/ci.yml

@@ -104,7 +104,6 @@ jobs:
  matrix:
  os: [Ubuntu, MacOS]
  python:
- - "3.7"
  - "3.8"
  - "3.9"
  - "3.10"
@@ -155,9 +154,8 @@ jobs:
  matrix:
  os: [Windows]
  python:
- - "3.7"
+ - "3.8"
  # Commented out, since Windows tests are expensively slow.
- # - "3.8"
  # - "3.9"
  # - "3.10"
  - "3.11"

docs/html/development/ci.rst

@@ -18,7 +18,6 @@ Supported interpreters
 
 pip support a variety of Python interpreters:
 
-- CPython 3.7
 - CPython 3.8
 - CPython 3.9
 - CPython 3.10
@@ -90,9 +89,7 @@ Actual testing
 +------------------------------+---------------+-----------------+
 | **interpreter** | **unit** | **integration** |
 +-----------+----------+-------+---------------+-----------------+
-| | x86 | CP3.7 | | |
-| | +-------+---------------+-----------------+
-| | | CP3.8 | | |
+| | x86 | CP3.8 | | |
 | | +-------+---------------+-----------------+
 | | | CP3.9 | | |
 | | +-------+---------------+-----------------+
@@ -104,9 +101,7 @@ Actual testing
 | | +-------+---------------+-----------------+
 | | | PyPy3 | | |
 | Windows +----------+-------+---------------+-----------------+
-| | x64 | CP3.7 | GitHub | GitHub |
-| | +-------+---------------+-----------------+
-| | | CP3.8 | | |
+| | x64 | CP3.8 | GitHub | GitHub |
 | | +-------+---------------+-----------------+
 | | | CP3.9 | | |
 | | +-------+---------------+-----------------+
@@ -118,9 +113,7 @@ Actual testing
 | | +-------+---------------+-----------------+
 | | | PyPy3 | | |
 +-----------+----------+-------+---------------+-----------------+
-| | x86 | CP3.7 | | |
-| | +-------+---------------+-----------------+
-| | | CP3.8 | | |
+| | x86 | CP3.8 | | |
 | | +-------+---------------+-----------------+
 | | | CP3.9 | | |
 | | +-------+---------------+-----------------+
@@ -132,9 +125,7 @@ Actual testing
 | | +-------+---------------+-----------------+
 | | | PyPy3 | | |
 | Linux +----------+-------+---------------+-----------------+
-| | x64 | CP3.7 | GitHub | GitHub |
-| | +-------+---------------+-----------------+
-| | | CP3.8 | GitHub | GitHub |
+| | x64 | CP3.8 | GitHub | GitHub |
 | | +-------+---------------+-----------------+
 | | | CP3.9 | GitHub | GitHub |
 | | +-------+---------------+-----------------+
@@ -146,9 +137,7 @@ Actual testing
 | | +-------+---------------+-----------------+
 | | | PyPy3 | | |
 +-----------+----------+-------+---------------+-----------------+
-| | arm64 | CP3.7 | | |
-| | +-------+---------------+-----------------+
-| | | CP3.8 | | |
+| | arm64 | CP3.8 | | |
 | | +-------+---------------+-----------------+
 | | | CP3.9 | | |
 | | +-------+---------------+-----------------+
@@ -160,9 +149,7 @@ Actual testing
 | | +-------+---------------+-----------------+
 | | | PyPy3 | | |
 | macOS +----------+-------+---------------+-----------------+
-| | x64 | CP3.7 | GitHub | GitHub |
-| | +-------+---------------+-----------------+
-| | | CP3.8 | GitHub | GitHub |
+| | x64 | CP3.8 | GitHub | GitHub |
 | | +-------+---------------+-----------------+
 | | | CP3.9 | GitHub | GitHub |
 | | +-------+---------------+-----------------+

docs/html/installation.md

@@ -102,8 +102,8 @@ $ pip install --upgrade pip
 
 The current version of pip works on:
 
-- Windows, Linux and MacOS.
-- CPython 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, and latest PyPy3.
+- Windows, Linux and macOS.
+- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 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

news/11934.removal.rst

@@ -0,0 +1 @@
+Drop support for EOL Python 3.7.

noxfile.py

@@ -67,7 +67,7 @@ def should_update_common_wheels() -> bool:
 # -----------------------------------------------------------------------------
 # Development Commands
 # -----------------------------------------------------------------------------
-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"])
+@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"])
 def test(session: nox.Session) -> None:
  # Get the common wheels.
  if should_update_common_wheels():

pyproject.toml

@@ -13,7 +13,6 @@ classifiers = [
  "Programming Language :: Python",
  "Programming Language :: Python :: 3",
  "Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
  "Programming Language :: Python :: 3.8",
  "Programming Language :: Python :: 3.9",
  "Programming Language :: Python :: 3.10",
@@ -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.7"
+requires-python = ">=3.8"
 
 [project.urls]
 Homepage = "https://pip.pypa.io/"
@@ -139,7 +138,7 @@ webencodings = "https:/SimonSapin/python-webencodings/raw/master/LIC
 
 [tool.ruff]
 src = ["src"]
-target-version = "py37"
+target-version = "py38"
 line-length = 88
 extend-exclude = [
  "_vendor",

src/pip/__pip-runner__.py

@@ -8,8 +8,8 @@
 
 import sys
 
-# Copied from setup.py
-PYTHON_REQUIRES = (3, 7)
+# Copied from pyproject.toml
+PYTHON_REQUIRES = (3, 8)
 
 
 def version_str(version): # type: ignore

src/pip/_internal/commands/search.py

@@ -5,7 +5,7 @@
 import xmlrpc.client
 from collections import OrderedDict
 from optparse import Values
-from typing import TYPE_CHECKING, Dict, List, Optional
+from typing import TYPE_CHECKING, Dict, List, Optional, TypedDict
 
 from pip._vendor.packaging.version import parse as parse_version
 
@@ -20,7 +20,6 @@
 from pip._internal.utils.misc import write_output
 
 if TYPE_CHECKING:
- from typing import TypedDict
 
  class TransformedHit(TypedDict):
  name: str

src/pip/_internal/distributions/sdist.py

@@ -117,7 +117,7 @@ def _install_build_reqs(self, finder: PackageFinder) -> None:
  if (
  self.req.editable
  and self.req.permit_editable_wheels
- and self.req.supports_pyproject_editable()
+ and self.req.supports_pyproject_editable
  ):
  build_reqs = self._get_build_requires_editable()
  else:

src/pip/_internal/exceptions.py

@@ -13,7 +13,7 @@
 import re
 import sys
 from itertools import chain, groupby, repeat
-from typing import TYPE_CHECKING, Dict, Iterator, List, Optional, Union
+from typing import TYPE_CHECKING, Dict, Iterator, List, Literal, Optional, Union
 
 from pip._vendor.requests.models import Request, Response
 from pip._vendor.rich.console import Console, ConsoleOptions, RenderResult
@@ -22,7 +22,6 @@
 
 if TYPE_CHECKING:
  from hashlib import _Hash
- from typing import Literal
 
  from pip._internal.metadata import BaseDistribution
  from pip._internal.req.req_install import InstallRequirement

src/pip/_internal/index/collector.py

@@ -14,14 +14,14 @@
 from html.parser import HTMLParser
 from optparse import Values
 from typing import (
- TYPE_CHECKING,
  Callable,
  Dict,
  Iterable,
  List,
  MutableMapping,
  NamedTuple,
  Optional,
+ Protocol,
  Sequence,
  Tuple,
  Union,
@@ -42,11 +42,6 @@
 
 from .sources import CandidatesFromPage, LinkSource, build_source
 
-if TYPE_CHECKING:
- from typing import Protocol
-else:
- Protocol = object
-
 logger = logging.getLogger(__name__)
 
 ResponseHeaders = MutableMapping[str, str]

src/pip/_internal/locations/__init__.py

@@ -336,17 +336,6 @@ def get_scheme(
  if skip_linux_system_special_case:
  continue
 
- # On Python 3.7 and earlier, sysconfig does not include sys.abiflags in
- # the "pythonX.Y" part of the path, but distutils does.
- skip_sysconfig_abiflag_bug = (
- sys.version_info < (3, 8)
- and not WINDOWS
- and k in ("headers", "platlib", "purelib")
- and tuple(_fix_abiflags(old_v.parts)) == new_v.parts
- )
- if skip_sysconfig_abiflag_bug:
- continue
-
  # MSYS2 MINGW's sysconfig patch does not include the "site-packages"
  # part of the path. This is incorrect and will be fixed in MSYS.
  skip_msys2_mingw_bug = (

src/pip/_internal/metadata/base.py

@@ -8,7 +8,6 @@
 import zipfile
 from typing import (
  IO,
- TYPE_CHECKING,
  Any,
  Collection,
  Container,
@@ -18,6 +17,7 @@
  List,
  NamedTuple,
  Optional,
+ Protocol,
  Tuple,
  Union,
 )
@@ -41,11 +41,6 @@
 
 from ._json import msg_to_json
 
-if TYPE_CHECKING:
- from typing import Protocol
-else:
- Protocol = object
-
 DistributionVersion = Union[LegacyVersion, Version]
 
 InfoPath = Union[str, pathlib.PurePath]
@@ -385,15 +380,7 @@ def iter_entry_points(self) -> Iterable[BaseEntryPoint]:
  def _metadata_impl(self) -> email.message.Message:
  raise NotImplementedError()
 
- @functools.lru_cache(maxsize=1)
- def _metadata_cached(self) -> email.message.Message:
- # When we drop python 3.7 support, move this to the metadata property and use
- # functools.cached_property instead of lru_cache.
- metadata = self._metadata_impl()
- self._add_egg_info_requires(metadata)
- return metadata
-
- @property
+ @functools.cached_property
  def metadata(self) -> email.message.Message:
  """Metadata of distribution parsed from e.g. METADATA or PKG-INFO.
 
@@ -402,7 +389,9 @@ def metadata(self) -> email.message.Message:
  :raises NoneMetadataError: If the metadata file is available, but does
  not contain valid metadata.
  """
- return self._metadata_cached()
+ metadata = self._metadata_impl()
+ self._add_egg_info_requires(metadata)
+ return metadata
 
  @property
  def metadata_dict(self) -> Dict[str, Any]:

src/pip/_internal/network/auth.py

@@ -151,7 +151,7 @@ def _set_password(self, service_name: str, username: str, password: str) -> None
  env["PYTHONIOENCODING"] = "utf-8"
  subprocess.run(
  [self.keyring, "set", service_name, username],
- input=f"{password}{os.linesep}".encode("utf-8"),
+ input=f"{password}{os.linesep}".encode(),
  env=env,
  check=True,
  )

src/pip/_internal/network/session.py

@@ -230,7 +230,7 @@ def send(
  # to return a better error message:
  resp.status_code = 404
  resp.reason = type(exc).__name__
- resp.raw = io.BytesIO(f"{resp.reason}: {exc}".encode("utf8"))
+ resp.raw = io.BytesIO(f"{resp.reason}: {exc}".encode())
  else:
  modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
  content_type = mimetypes.guess_type(pathname)[0] or "text/plain"

src/pip/_internal/operations/build/build_tracker.py

@@ -99,7 +99,7 @@ def add(self, req: InstallRequirement, key: TrackerId) -> None:
  except FileNotFoundError:
  pass
  else:
- message = "{} is already being built: {}".format(req.link, contents)
+ message = f"{req.link} is already being built: {contents}"
  raise LookupError(message)
 
  # If we're here, req should really not be building already.

src/pip/_internal/operations/build/metadata_legacy.py

@@ -27,7 +27,7 @@ def _find_egg_info(directory: str) -> str:
 
  if len(filenames) > 1:
  raise InstallationError(
- "More than one .egg-info directory found in {}".format(directory)
+ f"More than one .egg-info directory found in {directory}"
  )
 
  return os.path.join(directory, filenames[0])

src/pip/_internal/operations/install/wheel.py

@@ -28,6 +28,7 @@
  List,
  NewType,
  Optional,
+ Protocol,
  Sequence,
  Set,
  Tuple,
@@ -60,7 +61,6 @@
 from pip._internal.utils.wheel import parse_wheel
 
 if TYPE_CHECKING:
- from typing import Protocol
 
  class File(Protocol):
  src_record_path: "RecordPath"

src/pip/_internal/req/req_file.py

@@ -17,6 +17,7 @@
  Generator,
  Iterable,
  List,
+ NoReturn,
  Optional,
  Tuple,
 )
@@ -30,10 +31,6 @@
 from pip._internal.utils.urls import get_url_scheme
 
 if TYPE_CHECKING:
- # NoReturn introduced in 3.6.2; imported only for type checking to maintain
- # pip compatibility with older patch versions of Python 3.6
- from typing import NoReturn
-
  from pip._internal.index.package_finder import PackageFinder
 
 __all__ = ["parse_requirements"]

src/pip/_internal/req/req_install.py

@@ -244,7 +244,7 @@ def name(self) -> Optional[str]:
  return None
  return self.req.name
 
- @functools.lru_cache() # use cached_property in python 3.8+
+ @functools.cached_property
  def supports_pyproject_editable(self) -> bool:
  if not self.use_pep517:
  return False
@@ -542,7 +542,7 @@ def isolated_editable_sanity_check(self) -> None:
  if (
  self.editable
  and self.use_pep517
- and not self.supports_pyproject_editable()
+ and not self.supports_pyproject_editable
  and not os.path.isfile(self.setup_py_path)
  and not os.path.isfile(self.setup_cfg_path)
  ):
@@ -568,7 +568,7 @@ def prepare_metadata(self) -> None:
  if (
  self.editable
  and self.permit_editable_wheels
- and self.supports_pyproject_editable()
+ and self.supports_pyproject_editable
  ):
  self.metadata_directory = generate_editable_metadata(
  build_env=self.build_env,