From e784b352a1fef26cacf9120223512c6aa8ce4e40 Mon Sep 17 00:00:00 2001 From: MJedr Date: Wed, 12 Jul 2023 10:18:35 +0200 Subject: [PATCH 1/2] allow flask>2.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 64bf462..36b98a9 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ ] install_requires = [ - "Flask>=0.12.3, <2.0.0", + "Flask>=0.12.3", "IDUtils~=1.0,>=1.0.1", "dojson~=1.0,>=1.3.1", "inspire-schemas~=61.4", From 6c4e97774adb2e10b52f060f1f52d4fe8922244b Mon Sep 17 00:00:00 2001 From: MJedr Date: Wed, 12 Jul 2023 10:22:53 +0200 Subject: [PATCH 2/2] fix ci for python2 --- .github/workflows/build-and-release.yml | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index b80ed0e..4008a4c 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -7,12 +7,15 @@ on: branches: [master] jobs: - Test: - runs-on: ubuntu-latest + test: + runs-on: ubuntu-20.04 strategy: - matrix: - python-version: [2.7, 3.8] - + matrix: + include: + - python: python3 + pip: pip3 + - python: python2 + pip: pip steps: - name: Checkout uses: actions/checkout@v2 @@ -20,16 +23,16 @@ jobs: python-version: ${{ matrix.python-version }} fetch-depth: 0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install python dependencies run: | - python -m pip install --upgrade pip - pip install setuptools wheel "urllib3==1.25.11" - pip install -e .[tests] + ${{ 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 + run: | + ${{ matrix.python }} --version + ${{ matrix.pip }} freeze - name: Show python dependencies run: |