Merge pull request #287 from MJedr/bump-flask

allow flask>2.0
inspirehep · Jul 12, 2023 · 2d56907 · 2d56907
2 parents 63068a3 + 6c4e977
commit 2d56907
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -7,29 +7,32 @@ 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
         with:
           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: |

diff --git 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",