Added urllib3 < 2.X compatibility for the Retry object

Added matrix to test if it also works with urllib3 <2.x
Flared · Oct 22, 2024 · 1e5afe0 · 1e5afe0
1 parent 4c583f3
commit 1e5afe0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,12 +12,18 @@ jobs:
           '3.11',
           '3.12',
         ]
-    name: Python ${{ matrix.python-version }}
+        include:
+          - python-version: '3.9'
+            post-venv: 'venv/bin/pip install "urllib3<2" "requests<=2.30" "types-requests<=2.30"'
+    name: Python ${{ matrix.python-version }} ${{ matrix.post-venv }}
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64
+    - run: make venv
+    - if: ${{ matrix.post-venv }}
+      run: ${{ matrix.post-venv }}
     - run: make test
     - run: make lint
diff --git a/flareio/api_client.py b/flareio/api_client.py
@@ -47,18 +47,21 @@ def _create_session() -> requests.Session:
             ),
         )
 
+        retry = Retry(
+            total=5,
+            backoff_factor=2,
+            status_forcelist=[429, 502, 503, 504],
+            allowed_methods={"GET", "POST"},
+        )
+
+        # Support for urllib3 < 2.X
+        if hasattr(retry, "backoff_max"):
+            retry.backoff_max = 15
+
         # Enable retries
         session.mount(
             "https://",
-            HTTPAdapter(
-                max_retries=Retry(
-                    total=5,
-                    backoff_factor=2,
-                    status_forcelist=[429, 502, 503, 504],
-                    allowed_methods={"GET", "POST"},
-                    backoff_max=15,
-                )
-            ),
+            HTTPAdapter(max_retries=retry),
         )
 
         return session

diff --git a/poetry.toml b/poetry.toml
@@ -0,0 +1,3 @@
+[virtualenvs]
+path = ".venv"
+in-project = true