From 2c91769a6d53679efa8f0d20d0c23ba1ba045b84 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 13:25:15 +0200 Subject: [PATCH 1/9] fix: Use the older version of urllib3 --- .github/workflows/integration-tests.yml | 8 +++++++- setup.py | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 666da493e..3d3ac6df0 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -11,13 +11,19 @@ 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 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 diff --git a/setup.py b/setup.py index 21ba6e32e..9a774ee1d 100644 --- 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 From 6c4b61060ff6fe8efa966855ec85778d2db15483 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 13:34:23 +0200 Subject: [PATCH 2/9] Update code --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 49be5f962..96985e664 100644 --- 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 From 5854526792e8a2b2fb67b6bbfe24eb97ac96db45 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 13:42:44 +0200 Subject: [PATCH 3/9] Update code --- .github/workflows/integration-tests.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3d3ac6df0..fe9f9379b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -27,7 +27,7 @@ jobs: - 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/tox.ini b/tox.ini index 96985e664..f2d48728b 100644 --- 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 From 0b034767c3bfcb5bc1f49945d13474ed9845dc11 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 14:00:01 +0200 Subject: [PATCH 4/9] Update code --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index fe9f9379b..25dfde770 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: 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: ${{ matrix.python-version }} From 6591a1c4b67cfb826f6dfd60e89b550b91ce26f6 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 15:57:58 +0200 Subject: [PATCH 5/9] Update code --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f2d48728b..49be5f962 100644 --- 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 From 08b71664c91b701c605b29c8ef7539c46881fab3 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 16:30:46 +0200 Subject: [PATCH 6/9] Update code --- .github/workflows/integration-tests.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 25dfde770..46a8aa737 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install tox==3.28.0 + pip3 install -e ".[dev]" - name: Run integration tests run: | tox -e integration-tests diff --git a/setup.py b/setup.py index 9a774ee1d..1a8c26e3f 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def main(): redis_requires = ['redis>=2.10.3'] jwt_requires = ['pyjwt>=1.7.0', 'cryptography>=3'] coveralls_requires = ['coveralls'] - dev_requires = ['tox'] + dev_requires = ['tox<=3.28.0'] gh_requires = ['tox-gh-actions'] test_requires = [ 'bottle', From 862fd540a5f5eabe9aaab21bd966c7119597d1ca Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 16:31:33 +0200 Subject: [PATCH 7/9] Update code --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 46a8aa737..bb2ca7942 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip3 install -e ".[dev]" + python -m pip install -e ".[dev]" - name: Run integration tests run: | tox -e integration-tests From c9b34f854425af2d85aba165a004bc8c11255238 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Cong Date: Mon, 8 May 2023 20:33:26 +0200 Subject: [PATCH 8/9] Update code --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1a8c26e3f..040637a20 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def main(): install_requires = [ 'attrs>=17.3.0', 'urllib3<2', - 'requests>=2.4.3', + 'requests>=2.4.3,<=2.29.0', 'requests-toolbelt>=0.4.0', 'python-dateutil', # To be removed after dropping Python 3.6 ] From 43ad099e5d6f0740cbd9f72ae1a0ad5487ba9cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Socha?= <31014760+lukaszsocha2@users.noreply.github.com> Date: Tue, 9 May 2023 12:06:33 +0200 Subject: [PATCH 9/9] don't limit requests minor version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 040637a20..f25d829a9 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def main(): install_requires = [ 'attrs>=17.3.0', 'urllib3<2', - 'requests>=2.4.3,<=2.29.0', + 'requests>=2.4.3,<3', 'requests-toolbelt>=0.4.0', 'python-dateutil', # To be removed after dropping Python 3.6 ]