Upgrade to vendoring 1.2 #10583
Upgrade to vendoring 1.2 #10583
Conversation
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.
| @@ -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" | |||
There was a problem hiding this comment.
cachecontrol has changed how they handle their license, and we'd need to update this URL when we upgrade -- or hope that they address psf/cachecontrol#255 prior to the next release.
I've added a note to the vendor.txt file as well, so that we don't forget. :)
| @@ -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" | |||
There was a problem hiding this comment.
| @@ -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" | |||
There was a problem hiding this comment.
I've filed gsnedders/python-webencodings#28 for this.
pradyunsg
added
the
skip news
|
And, in case you're curious, here's what's changed across the different vendoring versions: https://github.com/pradyunsg/vendoring/compare/92eba67d46e3bdc275d70138bacbd81cc8f60307..1fa21f6cacc021e647c9b2dcb409b00c18188ed9?diff=split |
|
Any takers got a review on this? 😉 |
| # Required, otherwise we interpret --no-binary :all: as | ||
| # "do not build wheels", which fails for PEP 517 requirements | ||
| pip>=19.3.1 |
There was a problem hiding this comment.
Not sure about this (mainly because I don't understand why it was needed in the first place)
There was a problem hiding this comment.
We get the newest version in the environment anyway?
I don't think a pin for a version ~2 years old is super useful.
|
I'm gonna go ahead and merge this in, since it'd be a good idea to get The CI is happy with this PR, and if any humans aren't, please do say so; and I'd be more than happy address concerns. :) |
Closes #10570
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
flitandtomli, by allowing us to use wheels to break the loop.