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

Add support for urllib3 2.0 in Python 3.10+ #3034

Merged
merged 2 commits into from
Oct 6, 2023

Conversation

nateprewitt
Copy link
Contributor

Starting in Python 3.10, the introduction of PEP 644 requires that new versions of Python require OpenSSL 1.1.1+. This will let us confidently move the pin for Python 3.10+ to support the growing adoption of urllib3 2.0.

Details on the current blockers for allowing this for all version can be found in the main tracking thread. Long term, we'll continue looking at options to expand support safely for users as we find other opportunities. For now, we'd encourage anyone looking to use urllib3 2.0 with Botocore to migrate to Python 3.10 or later.

@codecov-commenter
Copy link

codecov-commenter commented Oct 5, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (f6cc297) 93.39% compared to head (1e2a789) 93.43%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3034      +/-   ##
===========================================
+ Coverage    93.39%   93.43%   +0.04%     
===========================================
  Files           66       66              
  Lines        13963    13963              
===========================================
+ Hits         13041    13047       +6     
+ Misses         922      916       -6     

see 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Comment on lines +32 to +35
extras_require = {
'crt': ['awscrt==0.16.26'],
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adding the environment markers to setup.cfg doesn't work with extras for older versions of setuptools. I've replicated the extras info here (similar to how we have the requires info in setup.cfg) to make sure we retain compatibility in those older setuptools versions.

Copy link

@setu4993 setu4993 left a comment

Choose a reason for hiding this comment

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

Thanks for the update + fix here!

@dhhoang
Copy link

dhhoang commented Oct 6, 2023

Thanks for this. Can I ask when we can expect this to be released? We are currently blocked by urllib3 conflict with Google API.

@pquentin
Copy link

pquentin commented Oct 6, 2023

@dhhoang I believe google-auth relaxed its urllib3 pin so there's no conflict right now. Unless you're talking about something else?

Copy link
Contributor

@kyleknap kyleknap left a comment

Choose a reason for hiding this comment

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

Looks good. I just had one comment.

@@ -5,7 +5,8 @@ universal = 0
requires_dist =
Copy link
Contributor

Choose a reason for hiding this comment

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

It's probably worth adding a changelog entry to this.

Copy link
Contributor

@kyleknap kyleknap left a comment

Choose a reason for hiding this comment

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

🚢

@nateprewitt nateprewitt merged commit 8987291 into boto:develop Oct 6, 2023
40 checks passed
@nateprewitt nateprewitt deleted the urllib3-2.0-3.10 branch October 6, 2023 16:40
miketheman added a commit to miketheman/warehouse that referenced this pull request Oct 13, 2023
And associated stubs.

We exclude boto from dependabot due to frequency of updates.

This upgrade includes the ability to use urllib3.
Refs: boto/botocore#3034

We will still need to handle the elasticsearch dependency on its own.
Refs: pypi#14671

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
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.

6 participants