Fix calculation of PipProvider._known_depths

docs/html/cli/pip_install.rst

@@ -379,7 +379,7 @@ Finding Packages
 
 pip searches for packages on `PyPI`_ using the
 `HTTP simple interface <https://pypi.org/simple/>`_,
-which is documented `here <https://setuptools.readthedocs.io/en/latest/easy_install.html#package-index-api>`_
+which is documented `here <https://packaging.python.org/specifications/simple-repository-api/>`_
 and `there <https://www.python.org/dev/peps/pep-0503/>`_.
 
 pip offers a number of package index options for modifying how packages are
@@ -620,7 +620,7 @@ option in pip's command line.
 ^^^^^^^^^^^^^^^^^^^
 
 "Editable" installs are fundamentally `"setuptools develop mode"
-<https://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode>`_
+<https://setuptools.readthedocs.io/en/latest/userguide/development_mode.html>`_
 installs.
 
 You can install local projects or VCS projects in "editable" mode:
@@ -653,7 +653,7 @@ Controlling setup_requires
 --------------------------
 
 Setuptools offers the ``setup_requires`` `setup() keyword
-<https://setuptools.readthedocs.io/en/latest/setuptools.html#new-and-changed-setup-keywords>`_
+<https://setuptools.readthedocs.io/en/latest/userguide/keywords.html>`_
 for specifying dependencies that need to be present in order for the
 ``setup.py`` script to run.  Internally, Setuptools uses ``easy_install``
 to fulfill these dependencies.
@@ -693,7 +693,7 @@ the following commands::
 
 The ``egg_info`` command should create egg metadata for the package, as
 described in the setuptools documentation at
-https://setuptools.readthedocs.io/en/latest/setuptools.html#egg-info-create-egg-metadata-and-set-build-tags
+https://setuptools.readthedocs.io/en/latest/userguide/commands.html#egg-info-create-egg-metadata-and-set-build-tags
 
 The ``install`` command should implement the complete process of installing the
 package to the target directory XXX.

docs/html/user_guide.rst

@@ -180,7 +180,7 @@ In practice, there are 4 common uses of Requirements files:
 
 It's important to be clear that pip determines package dependencies using
 `install_requires metadata
-<https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-dependencies>`_,
+<https://setuptools.readthedocs.io/en/latest/userguide/dependency_management.html>`_,
 not by discovering ``requirements.txt`` files embedded in projects.
 
 See also:

news/10430.doc.rst

@@ -0,0 +1 @@
+Update links of setuptools as setuptools moved these documents. The Simple Repository link now points to PyPUG as that is the canonical place of packaging specification, and setuptools's ``easy_install`` is deprecated.

noxfile.py

@@ -171,7 +171,7 @@ def lint(session: nox.Session) -> None:
 
 @nox.session
 def vendoring(session: nox.Session) -> None:
-    session.install("vendoring>=0.3.0")
+    session.install("vendoring~=1.0.0")
 
     if "--upgrade" not in session.posargs:
         session.run("vendoring", "sync", ".", "-v")

pyproject.toml

@@ -53,9 +53,6 @@ distro = []
 
 [tool.vendoring.license.directories]
 setuptools = "pkg_resources"
-msgpack-python = "msgpack"
 
 [tool.vendoring.license.fallback-urls]
-pytoml = "https://github.com/avakar/pytoml/raw/master/LICENSE"
-resolvelib = "https://github.com/sarugaku/resolvelib/raw/master/LICENSE"
 webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"

src/pip/_internal/resolution/resolvelib/provider.py

@@ -112,9 +112,9 @@ def get_preference(
                 for _, parent in information[identifier]
             )
             inferred_depth = min(d for d in parent_depths) + 1.0
-            self._known_depths[identifier] = inferred_depth
         else:
             inferred_depth = 1.0
+        self._known_depths[identifier] = inferred_depth
 
         requested_order = self._user_requested.get(identifier, math.inf)
 

src/pip/_vendor/urllib3/contrib/pyopenssl.py

@@ -28,8 +28,8 @@
 .. code-block:: python
 
     try:
-        import urllib3.contrib.pyopenssl
-        urllib3.contrib.pyopenssl.inject_into_urllib3()
+        import pip._vendor.urllib3.contrib.pyopenssl as pyopenssl
+        pyopenssl.inject_into_urllib3()
     except ImportError:
         pass
 

src/pip/_vendor/urllib3/contrib/securetransport.py

@@ -19,8 +19,8 @@
 
 To use this module, simply import and inject it::
 
-    import urllib3.contrib.securetransport
-    urllib3.contrib.securetransport.inject_into_urllib3()
+    import pip._vendor.urllib3.contrib.securetransport as securetransport
+    securetransport.inject_into_urllib3()
 
 Happy TLSing!
 

tests/functional/test_install_reqs.py

@@ -62,7 +62,7 @@ def test_requirements_file(script, with_wheel):
     Test installing from a requirements file.
 
     """
-    other_lib_name, other_lib_version = "anyjson", "0.3"
+    other_lib_name, other_lib_version = "peppercorn", "0.6"
     script.scratch_path.joinpath("initools-req.txt").write_text(
         textwrap.dedent(
             f"""\
@@ -157,7 +157,7 @@ def test_multiple_requirements_files(script, tmpdir, with_wheel):
     Test installing from multiple nested requirements files.
 
     """
-    other_lib_name, other_lib_version = "anyjson", "0.3"
+    other_lib_name, other_lib_version = "six", "1.16.0"
     script.scratch_path.joinpath("initools-req.txt").write_text(
         textwrap.dedent(
             """

tests/functional/test_install_upgrade.py

@@ -1,6 +1,5 @@
 import itertools
 import os
-import sys
 import textwrap
 
 import pytest
@@ -352,54 +351,6 @@ def test_upgrade_vcs_req_with_dist_found(script):
     assert "pypi.org" not in result.stdout, result.stdout
 
 
-class TestUpgradeDistributeToSetuptools:
-    """
-    From pip1.4 to pip6, pip supported a set of "hacks" (see Issue #1122) to
-    allow distribute to conflict with setuptools, so that the following would
-    work to upgrade distribute:
-
-     ``pip install -U  setuptools``
-
-    In pip7, the hacks were removed.  This test remains to at least confirm pip
-    can upgrade distribute to setuptools using:
-
-      ``pip install -U distribute``
-
-    The reason this works is that a final version of distribute (v0.7.3) was
-    released that is simple wrapper with:
-
-      install_requires=['setuptools>=0.7']
-
-    The test use a fixed set of packages from our test packages dir. Note that
-    virtualenv-1.9.1 contains distribute-0.6.34 and virtualenv-1.10 contains
-    setuptools-0.9.7
-    """
-
-    def prep_ve(self, script, version, pip_src, distribute=False):
-        self.script = script
-        self.script.pip_install_local(f"virtualenv=={version}")
-        args = ["virtualenv", self.script.scratch_path / "VE"]
-        if distribute:
-            args.insert(1, "--distribute")
-        if version == "1.9.1" and not distribute:
-            # setuptools 0.6 didn't support PYTHONDONTWRITEBYTECODE
-            del self.script.environ["PYTHONDONTWRITEBYTECODE"]
-        self.script.run(*args)
-        if sys.platform == "win32":
-            bindir = "Scripts"
-        else:
-            bindir = "bin"
-        self.ve_bin = self.script.scratch_path / "VE" / bindir
-        self.script.run(self.ve_bin / "pip", "uninstall", "-y", "pip")
-        self.script.run(
-            self.ve_bin / "python",
-            "setup.py",
-            "install",
-            cwd=pip_src,
-            expect_stderr=True,
-        )
-
-
 @pytest.mark.parametrize(
     "req1, req2",
     list(