Merge pull request #3034 from nateprewitt/urllib3-2.0-3.10

Add support for urllib3 2.0 in Python 3.10+
boto · Oct 6, 2023 · 8987291 · 8987291
2 parents f6cc297 + 1e2a789
commit 8987291
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.changes/next-release/enhancement-Dependencies-60903.json 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+"
+}
diff --git 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
@@ -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=[