installation: fix setup syntax

CERNDocumentServer · Jul 15, 2024 · f6a3efd · f6a3efd
1 parent e7eea7a
commit f6a3efd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 32 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,46 +27,33 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-          python-version: [3.6]
+          python-version: [3.9]
           requirements-level: [pypi]
-          db-service: [postgresql12]
+          db-service: [postgresql14]
           include:
-          - db-service: postgresql12
+          - db-service: postgresql14
             DB_EXTRAS: "postgresql"
 
     env:
       DB: ${{ matrix.db-service }}
       EXTRAS: all,${{ matrix.DB_EXTRAS }},${{ matrix.SEARCH_EXTRAS }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
-      - name: Generate dependencies
-        run: |
-          python -m pip install "pip>=20,<20.3" setuptools py twine wheel requirements-builder
-          requirements-builder -e "$EXTRAS" --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
-
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('.${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt') }}
+          cache: pip
+          cache-dependency-path: setup.cfg
 
       - name: Install dependencies
         run: |
-          pip install pyOpenSSL
-          pip install -r .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
-          pip install .[$EXTRAS]
-          pip install -r requirements-devel.txt
+          pip install ".[$EXTRAS]"
           pip freeze
           docker --version
           docker-compose --version
 
       - name: Run tests
-        run: |
-          ./run-tests.sh
+        run: ./run-tests.sh
diff --git a/setup.cfg b/setup.cfg
@@ -15,7 +15,6 @@ packages = find:
 python_requires = >=3.9
 zip_safe = False
 install_requires =
-    ;    python-ldap>=3.4.0,<3.5.0
     invenio-app-rdm[opensearch2]>=13.0.0b0.dev4
     invenio-logging[sentry_sdk]>=2.0
     cds-rdm @ git+https://github.com/CERNDocumentServer/cds-rdm#egg=cds-rdm-1.0.0&subdirectory=site
@@ -27,11 +26,9 @@ install_requires =
     uwsgitop>=0.11
     uwsgi-tools>=1.1.1
     flask-mail>=0.9.0,<0.10.0
-    # 'secrets>=1.0.2',
-    fuzzywuzzy>=0.18.0,
-    python-Levenshtein>=0.25.1,
-    # needed by legacy pip resolver
-    #missing invenio-rdm-migrator?
+    fuzzywuzzy>=0.18.0
+    python-Levenshtein>=0.25.1
+    # needed to run the server
     gunicorn
 
 [options.extras_require]
@@ -45,16 +42,12 @@ tests =
 console_scripts =
     migrator = invenio_app.cli:cli
 flask.commands =
-;    cds-admin = cds_rdm.cli:cds_admin
     report = cds_migrator_kit.records.cli:report
-;    circulation = cds_migrator_kit.circulation:circulation
     migration = cds_migrator_kit.rdm.migration.cli:migration
 invenio_base.apps =
     cds_migrator_kit = cds_migrator_kit:CdsMigratorKit
 invenio_config.module =
     invenio_app_rdm = cds_migrator_kit.migration_config
-;invenio_base.api_apps =
-;    cds_rdm = cds_rdm:CDS_RDM_REST
 invenio_base.blueprints =
     cds_migrator_kit_views = cds_migrator_kit.records.views:blueprint
 cds_migrator_kit.migrator.models =