global: clean test infrastructure

inveniosoftware · Jun 14, 2022 · 9ea8eb3 · 9ea8eb3
1 parent 37533c1
commit 9ea8eb3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 39 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,3 +1,12 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2020 CERN.
+# Copyright (C) 2022 Graz University of Technology.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
 name: CI
 
 on:
@@ -21,41 +30,29 @@ jobs:
     strategy:
       matrix:
           python-version: [3.7, 3.8, 3.9]
-          requirements-level: [min, pypi]
+          requirements-level: [pypi]
           db-service: [postgresql10, postgresql14, mysql5, mysql8]
           exclude:
           - python-version: 3.7
-            requirements-level: pypi
-
-          - python-version: 3.7
-            requirements-level: min
             db-service: postgresql14
+            requirements-level: pypi
 
           - python-version: 3.7
-            requirements-level: min
             db-service: mysql8
+            requirements-level: pypi
 
           - python-version: 3.8
-            requirements-level: min
+            db-service: postgresql10
 
           - python-version: 3.9
-            requirements-level: min
-
-          - python-version: 3.8
-            requirements-level: pypi
             db-service: postgresql10
 
           - python-version: 3.8
-            requirements-level: pypi
             db-service: mysql5
 
           - python-version: 3.9
-            requirements-level: pypi
-            db-service: postgresql10
-
-          - python-version: 3.9
-            requirements-level: pypi
             db-service: mysql5
+
           include:
           - db-service: postgresql10
             DB_EXTRAS: "postgresql"
@@ -71,7 +68,7 @@ jobs:
 
     env:
       DB: ${{ matrix.db-service }}
-      EXTRAS: tests,versioning,${{ matrix.DB_EXTRAS }}
+      EXTRAS: tests
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -83,7 +80,7 @@ jobs:
 
       - name: Generate dependencies
         run: |
-          python -m pip install --upgrade pip setuptools py wheel requirements-builder
+          pip install wheel requirements-builder
           requirements-builder -e "$EXTRAS" --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
 
       - name: Cache pip

diff --git a/constraints-min.txt b/constraints-min.txt
diff --git a/run-tests.sh b/run-tests.sh
@@ -26,5 +26,4 @@ python -m sphinx.cmd.build -qnNW docs docs/_build/html
 eval "$(docker-services-cli up --db ${DB:-postgresql} --env)"
 python -m pytest
 tests_exit_code=$?
-python -m sphinx.cmd.build -qnNW -b doctest docs docs/_build/doctest
 exit "$tests_exit_code"
diff --git a/setup.cfg b/setup.cfg
@@ -31,7 +31,6 @@ zip_safe = False
 install_requires =
     Flask-Alembic>=2.0.1
     Flask-SQLAlchemy>=2.1,<3.0.0
-    # Update constraints-min.txt if you update invenio-base version.
     invenio-base>=1.2.10
     SQLAlchemy-Continuum>=1.3.12
     SQLAlchemy-Utils>=0.33.1,<0.39
@@ -42,13 +41,13 @@ tests =
     pytest-black>=0.3.0,<0.3.10
     cryptography>=2.1.4
     pytest-invenio>=1.4.5
-    Sphinx==4.2.0
-mysql =
+    Sphinx>=4.5.0
     pymysql>=0.10.1
-postgresql =
     psycopg2-binary>=2.8.6
+# Left here for backward compatibility
+mysql =
+postgresql =
 versioning =
-    # Left here for backward compatibility
 
 [options.entry_points]
 invenio_base.api_apps =