From 01637511abb57ab71924b3f3640b8a9361379bd9 Mon Sep 17 00:00:00 2001 From: Miguel Garcia Garcia Date: Wed, 21 Aug 2024 11:02:29 +0200 Subject: [PATCH] setup: do not use a fixed urllib3 version * ref: https://github.com/cern-sis/issues-inspire/issues/521 --- .github/workflows/build-and-release.yml | 2 -- setup.py | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 5501d534..85b129aa 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -30,7 +30,6 @@ jobs: - name: Install python dependencies run: | ${{ matrix.pip }} install --user --upgrade pip - ${{ matrix.pip }} --no-cache-dir install --user setuptools wheel "urllib3==1.25.11" ${{ matrix.pip }} --no-cache-dir install --user -e .[tests,docs] - name: Show python dependencies @@ -108,7 +107,6 @@ jobs: - name: Install python dependencies run: | python -m pip install --upgrade pip - pip --no-cache-dir install setuptools wheel "urllib3==1.25.11" pip --no-cache-dir install -e .[tests,docs] - name: Show python dependencies diff --git a/setup.py b/setup.py index 9041bdf2..e0fb0fbd 100644 --- a/setup.py +++ b/setup.py @@ -213,15 +213,12 @@ def do_setup(): 'inspire-idutils==1.2.4; python_version == "2.7"', 'idutils~=1.2,>=1.2.1; python_version >= "3"', 'isbnid', - 'inspire-utils~=3.0,>=3.0.0', + 'inspire-utils @ git+https://github.com/miguelgrc/inspire-utils.git@bump-urllib3#egg=inspire-utils', 'isodate', 'pyyaml==5.3.0', 'pytz', 'rfc3987', 'six', - # requests requires a urllib3 version <1.26 but not 1.25.0 and 1.25.1 - # we pin it down here to solve dependency problems - 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', ], tests_require=tests_require, extras_require=extras_require,