Skip to content

Commit 858dd34

Browse files
committed
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.
1 parent 75c11c4 commit 858dd34

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def lint(session: nox.Session) -> None:
171171

172172
@nox.session
173173
def vendoring(session: nox.Session) -> None:
174-
session.install("vendoring~=1.0.0")
174+
session.install("vendoring~=1.2.0")
175175

176176
if "--upgrade" not in session.posargs:
177177
session.run("vendoring", "sync", "-v")

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,6 @@ distro = []
5454
setuptools = "pkg_resources"
5555

5656
[tool.vendoring.license.fallback-urls]
57+
CacheControl = "https://raw.githubusercontent.com/ionrock/cachecontrol/v0.12.6/LICENSE.txt"
58+
distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
5759
webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"

src/pip/_vendor/vendor.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CacheControl==0.12.6
1+
CacheControl==0.12.6 # Make sure to update the license in pyproject.toml for this.
22
colorama==0.4.4
33
distlib==0.3.3
44
distro==1.6.0

tox.ini

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,7 @@ basepython = python3
7070
skip_install = True
7171
commands_pre =
7272
deps =
73-
vendoring~=1.0.0
74-
# Required, otherwise we interpret --no-binary :all: as
75-
# "do not build wheels", which fails for PEP 517 requirements
76-
pip>=19.3.1
73+
vendoring~=1.2.0
7774
whitelist_externals = git
7875
commands =
7976
# Check that the vendoring is up-to-date

0 commit comments

Comments
 (0)