Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to vendoring 1.2 #10583

Merged
merged 1 commit into from
Oct 15, 2021
Merged

Upgrade to vendoring 1.2 #10583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member Author

@pradyunsg pradyunsg Oct 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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. :)

distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've filed https://bitbucket.org/pypa/distlib/issues/155/include-license-in-the-generated-wheels for this.

webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've filed gsnedders/python-webencodings#28 for this.

2 changes: 1 addition & 1 deletion src/pip/_vendor/vendor.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines -74 to -76
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about this (mainly because I don't understand why it was needed in the first place)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We get the newest version in the environment anyway?

I don't think a pin for a version ~2 years old is super useful.

vendoring~=1.2.0
whitelist_externals = git
commands =
# Check that the vendoring is up-to-date
Expand Down