From 785d22457779cdb4054b77f4bd8fbca3feaf45a2 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Thu, 5 Oct 2023 17:54:16 -0600 Subject: [PATCH 1/2] Add support for urllib3 2.0 in Python 3.10+ --- setup.cfg | 3 ++- setup.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index f29b12a824..a73a819bfc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,8 @@ universal = 0 requires_dist = jmespath>=0.7.1,<2.0.0 python-dateutil>=2.1,<3.0.0 - urllib3>=1.25.4,<1.27 + urllib3>=1.25.4,<1.27; python_version<"3.10" + urllib3>=1.25.4,<2.1; python_version>="3.10" [options.extras_require] crt = awscrt==0.16.26 diff --git a/setup.py b/setup.py index e2947f9506..33dd132b4a 100644 --- a/setup.py +++ b/setup.py @@ -25,9 +25,14 @@ def find_version(*file_paths): requires = [ 'jmespath>=0.7.1,<2.0.0', 'python-dateutil>=2.1,<3.0.0', - 'urllib3>=1.25.4,<1.27', + 'urllib3>=1.25.4,<1.27 ; python_version < "3.10"', + 'urllib3>=1.25.4,<2.1 ; python_version >= "3.10"', ] +extras_require = { + 'crt': ['awscrt==0.16.26'], +} + setup( name='botocore', version=find_version("botocore", "__init__.py"), @@ -43,6 +48,7 @@ def find_version(*file_paths): }, include_package_data=True, install_requires=requires, + extras_require=extras_require, license="Apache License 2.0", python_requires=">= 3.7", classifiers=[ From 1e2a7895954509015fb013310773468cb15cd746 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Fri, 6 Oct 2023 10:11:56 -0600 Subject: [PATCH 2/2] Add changelog --- .changes/next-release/enhancement-Dependencies-60903.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changes/next-release/enhancement-Dependencies-60903.json diff --git a/.changes/next-release/enhancement-Dependencies-60903.json b/.changes/next-release/enhancement-Dependencies-60903.json new file mode 100644 index 0000000000..d8f755985b --- /dev/null +++ b/.changes/next-release/enhancement-Dependencies-60903.json @@ -0,0 +1,5 @@ +{ + "type": "enhancement", + "category": "Dependencies", + "description": "Add support for urllib3 2.0 for Python 3.10+" +}