Skip to content

Update vendored urllib3 from 1.26.15 to 1.26.16 #12136

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

Jump to bottom
Merged
merged 1 commit into from
Jul 10, 2023
Merged

Update vendored urllib3 from 1.26.15 to 1.26.16 #12136

merged 1 commit into from
Jul 10, 2023

Conversation

jbylund
Copy link
Contributor

@jbylund jbylund commented Jul 9, 2023 •
edited
Loading

Update vendor-ed version of urllib3 to 1.26.16. This is a follow on to #12135, unclear if the patches didn't apply there because urllib3 2.x was being targeted? But per some conversation in prs/issues, 1.26.16 might actually be a better fit (this comment).

I think the vendoring was all smooth, but this is the first time I've done this, so definitely take a look:

  Running git apply --verbose tools/vendoring/patches/urllib3.patch
    Checking patch src/pip/_vendor/urllib3/contrib/securetransport.py...
    Checking patch src/pip/_vendor/urllib3/contrib/pyopenssl.py...
    Applied patch src/pip/_vendor/urllib3/contrib/securetransport.py cleanly.
    Applied patch src/pip/_vendor/urllib3/contrib/pyopenssl.py cleanly.
  Running git apply --verbose tools/vendoring/patches/urllib3-disable-brotli.patch
    Checking patch src/pip/_vendor/urllib3/response.py...
    Hunk #1 succeeded at 9 (offset 1 line).
    Checking patch src/pip/_vendor/urllib3/util/request.py...
    Applied patch src/pip/_vendor/urllib3/response.py cleanly.
    Applied patch src/pip/_vendor/urllib3/util/request.py cleanly.

uranusjr
uranusjr approved these changes Jul 10, 2023
View reviewed changes
Copy link
Member

@uranusjr uranusjr left a comment

Choose a reason for hiding this comment

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

I think this would be a good idea for the next release

@uranusjr uranusjr added this to the 23.2 milestone Jul 10, 2023
@pfmoore pfmoore merged commit ea727e4 into pypa:main Jul 10, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@uranusjr uranusjr uranusjr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
23.2
Development

Successfully merging this pull request may close these issues.
3 participants
@jbylund @uranusjr @pfmoore