Merge branch 'main' into type-annotations-internal

Author: harupy

AUTHORS.txt

@@ -22,6 +22,7 @@ Aleks Bunin
 Alethea Flowers
 Alex Gaynor
 Alex Grönholm
+Alex Hedges
 Alex Loosley
 Alex Morega
 Alex Stachowiak
@@ -564,6 +565,7 @@ Sumana Harihareswara
 Surbhi Sharma
 Sviatoslav Sydorenko
 Swat009
+Sylvain
 Takayuki SHIMIZUKAWA
 Taneli Hukkinen
 tbeswick

NEWS.rst

@@ -1,3 +1,15 @@
+21.2.3 (2021-08-06)
+===================
+
+
+
+Bug Fixes
+---------
+
+- Modify the ``sysconfig.get_preferred_scheme`` function check to be
+  compatible with CPython 3.10’s alphareleases. (`#10252 <https://github.com/pypa/pip/issues/10252>`_)
+
+
 21.2.2 (2021-07-31)
 ===================
 

docs/html/cli/pip.rst

@@ -47,7 +47,7 @@ verbosity log will be kept.  This option is empty by default. This log appends
 to previous logging.
 
 Like all pip options, ``--log`` can also be set as an environment variable, or
-placed into the pip config file.  See the :doc:`topics/configuration` section.
+placed into the pip config file. See the :doc:`../topics/configuration` section.
 
 .. _`exists-action`:
 

docs/html/cli/pip_install.rst

@@ -413,14 +413,14 @@ overridden by using ``--cert`` option or by using ``PIP_CERT``,
 Caching
 -------
 
-This is now covered in :doc:`../topics/caching`
+This is now covered in :doc:`../topics/caching`.
 
 .. _`Wheel cache`:
 
 Wheel Cache
 ^^^^^^^^^^^
 
-This is now covered in :doc:`../topics/caching`
+This is now covered in :doc:`../topics/caching`.
 
 .. _`hash-checking mode`:
 

docs/html/development/configuration.rst

@@ -297,7 +297,7 @@ def _looks_like_deb_system_dist_packages(value: str) -> bool:
     we can't do anything about this Debian bug, and this detection allows us to
     skip the warning when needed.
     """
-    if not _looks_like_debian_patched():
+    if not _looks_like_debian_scheme():
         return False
     if value == "/usr/lib/python3/dist-packages":
         return True

src/pip/_internal/locations/__init__.py

@@ -28,8 +28,7 @@ def __init__(self) -> None:
                 "This is taking longer than usual. You might need to provide "
                 "the dependency resolver with stricter constraints to reduce "
                 "runtime. If you want to abort this run, you can press "
-                "Ctrl + C to do so. To improve how pip performs, tell us what "
-                "happened here: https://pip.pypa.io/surveys/backtracking"
+                "Ctrl + C to do so."
             ),
         }