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.

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

Vendor in pip 22.1.2 #5166

Merged
merged 4 commits into from
Jul 7, 2022
Merged

Vendor in pip 22.1.2 #5166

merged 4 commits into from
Jul 7, 2022

Conversation

matteius
Copy link
Member

@matteius matteius commented Jul 7, 2022

Vendor in pip 22.1.2 -- the latest pip. Also does:
Vendor in latest requirementslib which has a fix for Annotated variables and rewriting imports of packaging library, as well as vendor in latest pip-shims which rewrites imports of packaging library.
The net benefit is I was able to drop the vendor'd packaging and use the one from pip _internals across the board. Prior behavior is some things were using pip _internals packaging and some were using packaging that was installed in the virtualenv as a side-effect of creating the virtualenv.

The issue

Fixes #5147

The fix

By keeping pip updated in this project we maintain the latest fixes and have an easier time with future vendoring tasks.

The checklist

  • Associated issue
  • A news fragment in the news/ directory to describe this fix with the extension .bugfix, .feature, .behavior, .doc. .vendor. or .trivial (this will appear in the release changelog). Use semantic line breaks and name the file after the issue number or the PR #.

log("Using vendor dir: %s" % vendor_dir)
vendor(ctx, vendor_dir, package=package)
download_licenses(ctx, vendor_dir, package=package)
if type is None or type == "vendor":
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a change I was making time and time again to the vendoring script to actually respect the argument being passed.

@matteius matteius requested a review from oz123 July 7, 2022 20:08
Copy link
Contributor

@oz123 oz123 left a comment

Choose a reason for hiding this comment

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

Yay! Nice work.

@oz123 oz123 merged commit 8be1262 into main Jul 7, 2022
@oz123 oz123 deleted the vendor-pip-22.1.2-take2 branch July 7, 2022 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Vendor in the latest pip 22.1.2
2 participants