Merge branch 'main' into Optimize---find-links=<path-to-dir>

news/12477.feature.rst

@@ -1,2 +1,2 @@
 Make pip freeze and pip uninstall of legacy editable installs of packages whose name
-contains ``_`` compatible with ``setuptools>=69``.
+contains ``_`` compatible with ``setuptools>=69.0.3``.

news/distlib.vendor.rst

@@ -0,0 +1 @@
+Upgrade distlib to 0.3.8

src/pip/_internal/operations/check.py

@@ -168,7 +168,7 @@ def warn_legacy_versions_and_specifiers(package_set: PackageSet) -> None:
                     f"release a version with a conforming version number"
                 ),
                 issue=12063,
-                gone_in="24.0",
+                gone_in="24.1",
             )
         for dep in package_details.dependencies:
             if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier):
@@ -183,5 +183,5 @@ def warn_legacy_versions_and_specifiers(package_set: PackageSet) -> None:
                         f"release a version with a conforming dependency specifiers"
                     ),
                     issue=12063,
-                    gone_in="24.0",
+                    gone_in="24.1",
                 )

src/pip/_internal/req/req_install.py

@@ -905,7 +905,7 @@ def check_legacy_setup_py_options(
             reason="--build-option and --global-option are deprecated.",
             issue=11859,
             replacement="to use --config-settings",
-            gone_in="24.0",
+            gone_in="24.2",
         )
         logger.warning(
             "Implying --no-binary=:all: due to the presence of "

src/pip/_internal/req/req_set.py

@@ -99,7 +99,7 @@ def warn_legacy_versions_and_specifiers(self) -> None:
                         "or contact the package author to fix the version number"
                     ),
                     issue=12063,
-                    gone_in="24.0",
+                    gone_in="24.1",
                 )
             for dep in req.get_dist().iter_dependencies():
                 if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier):
@@ -115,5 +115,5 @@ def warn_legacy_versions_and_specifiers(self) -> None:
                             "or contact the package author to fix the version number"
                         ),
                         issue=12063,
-                        gone_in="24.0",
+                        gone_in="24.1",
                     )

src/pip/_vendor/distlib/__init__.py

@@ -1,23 +1,33 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2022 Vinay Sajip.
+# Copyright (C) 2012-2023 Vinay Sajip.
 # Licensed to the Python Software Foundation under a contributor agreement.
 # See LICENSE.txt and CONTRIBUTORS.txt.
 #
 import logging
 
-__version__ = '0.3.6'
+__version__ = '0.3.8'
+
 
 class DistlibException(Exception):
     pass
 
+
 try:
     from logging import NullHandler
-except ImportError: # pragma: no cover
+except ImportError:  # pragma: no cover
+
     class NullHandler(logging.Handler):
-        def handle(self, record): pass
-        def emit(self, record): pass
-        def createLock(self): self.lock = None
+
+        def handle(self, record):
+            pass
+
+        def emit(self, record):
+            pass
+
+        def createLock(self):
+            self.lock = None
+
 
 logger = logging.getLogger(__name__)
 logger.addHandler(NullHandler())