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 v2 #719

Merged
merged 1 commit into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]
### Added
- Added support for urllib3 2+ in Python 3.10+ ([#719](https://github.com/opensearch-project/opensearch-py/pull/719))
- Added support for Python 3.12 ([#717](https://github.com/opensearch-project/opensearch-py/pull/717))
- Added service time metrics ([#716](https://github.com/opensearch-project/opensearch-py/pull/716))
- Added `search_pipeline` APIs and `notifications` plugin APIs ([#724](https://github.com/opensearch-project/opensearch-py/pull/724))
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
if package == MODULE_DIR or package.startswith(MODULE_DIR + ".")
]
install_requires = [
"urllib3>=1.26.18, <2",
'urllib3>=1.26.18,<1.27 ; python_version < "3.10"',

Choose a reason for hiding this comment

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

Why <1.27 rather than <2? Surely we want those who cannot use urllib3 2.x to at least get updates to 1.x?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This also mirrors what botocore did. I believe the original rationale was that 1.27 may introduce some breaking changes.

'urllib3>=1.26.18,!=2.2.0,<3 ; python_version >= "3.10"',

Choose a reason for hiding this comment

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

Why the specific exclusion of 2.2.0?

Copy link
Contributor Author

@iherasymenko iherasymenko Apr 18, 2024

Choose a reason for hiding this comment

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

This mirrors what botocore did. 2.2.0 has some breaking changes.

boto/botocore#3141

boto/botocore#3138 (comment)

"requests>=2.4.0, <3.0.0",
"six",
"python-dateutil",
Expand Down
Loading