Merge 0b03476 into c1c096f

box · May 8, 2023 · 26e1984 · 26e1984
2 parents c1c096f + 0b03476
commit 26e1984
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -11,17 +11,23 @@ jobs:
   tests:
     name: Integration tests
     runs-on: ubuntu-20.04
+    strategy:
+      max-parallel: 1
+      matrix:
+        python-version:
+        - '3.6'
+        - '3.8'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Set up Python 3.6
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install tox
+          python -m pip install tox==3.28.0
       - name: Run integration tests
         run: |
           tox -e integration-tests

diff --git a/setup.py b/setup.py
@@ -53,6 +53,7 @@ def main():
     base_dir = dirname(__file__)
     install_requires = [
         'attrs>=17.3.0',
+        'urllib3<2',
         'requests>=2.4.3',
         'requests-toolbelt>=0.4.0',
         'python-dateutil',  # To be removed after dropping Python 3.6

diff --git a/tox.ini b/tox.ini
@@ -96,7 +96,7 @@ deps =
     twine
 
 [testenv:integration-tests]
-passenv = JWT_CONFIG_BASE_64 ADMIN_USER_ID
+passenv = JWT_CONFIG_BASE_64 ADMIN_USER_ID 
 
 commands =
     pytest {toxinidir}/test/integration_new {posargs} --disable-pytest-warnings