From 913bc4878e442dbd7acfd6e7b9d75ea55545eda9 Mon Sep 17 00:00:00 2001
From: Jair Henrique <jair.henrique@gmail.com>
Date: Fri, 8 Dec 2023 16:43:57 -0300
Subject: [PATCH] Uncap urllib3 version on Python < 3.10

---
 .github/workflows/main.yml | 2 +-
 setup.py                   | 7 -------
 tox.ini                    | 3 +--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0277aa95..9804d86d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy-3.8", "pypy-3.9", "pypy-3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.8", "pypy-3.9", "pypy-3.10"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/setup.py b/setup.py
index 0afb8106..413cb734 100644
--- a/setup.py
+++ b/setup.py
@@ -46,13 +46,6 @@ def run_tests(self):
     "PyYAML",
     "wrapt",
     "yarl",
-    # Support for urllib3 >=2 needs Python >=3.10
-    # so we need to block urllib3 >=2 for Python <3.10 for now.
-    # Note that vcrpy would work fine without any urllib3 around,
-    # so this block and the dependency can be dropped at some point
-    # in the future. For more Details:
-    # https://github.com/kevin1024/vcrpy/pull/699#issuecomment-1551439663
-    "urllib3 <2; python_version <'3.10'",
 ]
 
 tests_require = [
diff --git a/tox.ini b/tox.ini
index 62035131..2beda2ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,8 @@ envlist =
   cov-clean,
   lint,
   {py38,py39,py310,py311,py312}-{requests-urllib3-1,httplib2,urllib3-1,tornado4,boto3,aiohttp,httpx},
-  {py310,py311,py312}-{requests-urllib3-2,urllib3-2},
+  {py38,py39,py310,py311,py312}-{requests-urllib3-2,urllib3-2},
   {pypy3}-{requests-urllib3-1,httplib2,urllib3-1,tornado4,boto3},
-  #{py310}-httpx019,
   cov-report