From 858dd34af6d792e122715ac10374d0d8380ac9d4 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Thu, 14 Oct 2021 08:00:40 +0100 Subject: [PATCH] Upgrade to vendoring 1.2 This enables wheel usage in vendoring's license fetching, at the cost of requiring two more license-related fallbacks. The additional fallbacks are due to packages which include the license in their source distributions but not in their wheel distributions, and the change in vendoring that prefers using wheels when possible. This should fix the bootstrapping problem we're seeing with `flit` and `tomli`, by allowing us to use wheels to break the loop. --- noxfile.py | 2 +- pyproject.toml | 2 ++ src/pip/_vendor/vendor.txt | 2 +- tox.ini | 5 +---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index df42af8b8f5..5b5a66d5307 100644 --- a/noxfile.py +++ b/noxfile.py @@ -171,7 +171,7 @@ def lint(session: nox.Session) -> None: @nox.session def vendoring(session: nox.Session) -> None: - session.install("vendoring~=1.0.0") + session.install("vendoring~=1.2.0") if "--upgrade" not in session.posargs: session.run("vendoring", "sync", "-v") diff --git a/pyproject.toml b/pyproject.toml index fac27944798..9bb5900d0e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,4 +54,6 @@ distro = [] setuptools = "pkg_resources" [tool.vendoring.license.fallback-urls] +CacheControl = "https://raw.githubusercontent.com/ionrock/cachecontrol/v0.12.6/LICENSE.txt" +distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt" webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE" diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index 0b74c2bacc2..1b5829a038a 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -1,4 +1,4 @@ -CacheControl==0.12.6 +CacheControl==0.12.6 # Make sure to update the license in pyproject.toml for this. colorama==0.4.4 distlib==0.3.3 distro==1.6.0 diff --git a/tox.ini b/tox.ini index 23738ad1ae5..9063c3ac340 100644 --- a/tox.ini +++ b/tox.ini @@ -70,10 +70,7 @@ basepython = python3 skip_install = True commands_pre = deps = - vendoring~=1.0.0 - # Required, otherwise we interpret --no-binary :all: as - # "do not build wheels", which fails for PEP 517 requirements - pip>=19.3.1 + vendoring~=1.2.0 whitelist_externals = git commands = # Check that the vendoring is up-to-date