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

Vendoring Updates: July 2020 #8611

Merged
merged 12 commits into from
Jul 23, 2020
Merged

Conversation

pradyunsg
Copy link
Member

@pradyunsg pradyunsg commented Jul 22, 2020

Closes #8446
Closes #8591
Closes #8478

Created using #8610, but rebased to remove the automation-logic commit.

Notable details:

  • Did not upgrade setuptools or pkg_resources.
  • html5lib patch is no longer needed, since they made the new release containing those changes! 🎉
  • certifi gets a new .patch file, to use pip._vendor.certifi as the namespace, when loading cacert.pem.
  • requests has an update to its' patch, since the underlying logic changed a bit.

@pradyunsg pradyunsg added the type: maintenance Related to Development and Maintenance Processes label Jul 22, 2020
@pradyunsg pradyunsg force-pushed the vendoring/july-2020 branch from 75677c2 to db669e7 Compare July 22, 2020 02:08
@pradyunsg
Copy link
Member Author

Note: I'm not touching the tox CI pin for vendoring==0.2.2, since it's easier to audit/review when less things are changing.

@pradyunsg pradyunsg force-pushed the vendoring/july-2020 branch from db669e7 to 0142131 Compare July 22, 2020 02:15
@pradyunsg pradyunsg marked this pull request as ready for review July 22, 2020 02:17
pradyunsg added 12 commits July 22, 2020 19:57
Also, drop the no-longer-necessary patch.
This should make debugging issues in this test easier.
This is a fix for the sole failing test in the CI for these changes (in
tests/functional/test_debug.py::test_debug__library_versions). The
failure took me a fair bit of time to diagnose, but it looks like the
issue is that we're strictly comparing versions as strings. This is a
bad idea when they're not normalized.
@pradyunsg pradyunsg force-pushed the vendoring/july-2020 branch from 0142131 to dcfea6e Compare July 23, 2020 16:51
@pradyunsg pradyunsg added this to the 20.2 milestone Jul 23, 2020
@pradyunsg
Copy link
Member Author

Merging since CI approves, and I don't think the patches are controversial. Holler in the (currently pinned) 20.2 release issue if they are!

@pradyunsg pradyunsg merged commit 50aca38 into pypa:master Jul 23, 2020
@pradyunsg pradyunsg deleted the vendoring/july-2020 branch July 23, 2020 17:42
@mattip
Copy link
Contributor

mattip commented Aug 7, 2020

Yay for packaging 20.4 which has PEP 600 parsing!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type: maintenance Related to Development and Maintenance Processes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update vendored packages for pip 20.2 release Upgrade toml to rid DeprecationWarning
2 participants