Merge branch 'master' into public_private

.git-blame-ignore-revs

@@ -1 +1,2 @@
 947b46503e3eb5e5ca55b09f996875c775cda483
+7ab9b850bf9bda488273056fba04d6c656eed117

.github/workflows/tests-feature.yml

@@ -30,10 +30,10 @@ jobs:
         python-version: [3.8] # for efficiency test only one specific python version
         requirements-level: [pypi]
         cache-service: [redis]
-        db-service: [postgresql13]
+        db-service: [postgresql14]
         search-service: [opensearch2,elasticsearch7]
         include:
-          - db-service: postgresql13
+          - db-service: postgresql14
             DB_EXTRAS: "postgresql"
 
           - search-service: opensearch2

.github/workflows/tests.yml

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 CERN.
+# Copyright (C) 2020-2024 CERN.
 # Copyright (C) 2020 Northwestern University.
 #
 # Invenio-RDM-Records is free software; you can redistribute it and/or modify
@@ -26,80 +26,11 @@ on:
         default: "Manual trigger"
 
 jobs:
-  Tests:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: [3.8, 3.9]
-        requirements-level: [pypi]
-        db-service: [postgresql13]
-        search-service: [opensearch2,elasticsearch7]
-        node-version: [16.x]
-        include:
-          - db-service: postgresql13
-            DB_EXTRAS: "postgresql"
-
-          - search-service: opensearch2
-            SEARCH_EXTRAS: "opensearch2"
-
-          - search-service: elasticsearch7
-            SEARCH_EXTRAS: "elasticsearch7"
-
-    env:
-      DB: ${{ matrix.db-service }}
-      SEARCH: ${{ matrix.search-service }}
-      EXTRAS: tests,${{ matrix.SEARCH_EXTRAS }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Run eslint test
-        run: ./run-js-linter.sh -i
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Generate dependencies
-        run: |
-          pip install wheel requirements-builder
-          requirements-builder -e "$EXTRAS" --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
-          cat .${{ 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') }}
-
-      - name: Install dependencies
-        run: |
-          pip install -r .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt -c constraints-${{ matrix.requirements-level }}.txt
-          pip install ".[$EXTRAS]"
-          pip freeze
-          docker --version
-          docker-compose --version
-
-      - name: Run translations test
-        run: ./run-i18n-tests.sh
-
-      - name: Run tests
-        run: |
-          ./run-tests.sh
-
-      - name: Install deps for frontend tests
-        working-directory: ./invenio_rdm_records/assets/semantic-ui/js/invenio_rdm_records
-        run: npm install
-
-      - name: Install deps for frontend tests - translations
-        working-directory: ./invenio_rdm_records/assets/semantic-ui/translations/invenio_rdm_records
-        run: npm install
-
-      - name: Run frontend tests
-        working-directory: ./invenio_rdm_records/assets/semantic-ui/js/invenio_rdm_records
-        run: npm test
+  Python:
+    uses: inveniosoftware/workflows/.github/workflows/tests-python.yml@master
+
+  JS:
+    uses: inveniosoftware/workflows/.github/workflows/tests-js.yml@master
+    with:
+      js-working-directory: ./invenio_rdm_records/assets/semantic-ui/js/invenio_rdm_records
+      translations-working-directory: ./invenio_rdm_records/assets/semantic-ui/translations/invenio_rdm_records

.gitignore

@@ -74,3 +74,6 @@ Pipfile.lock
 
 # pip wheel
 pip-wheel-metadata/
+
+# node_modules
+node_modules

.tx/config

@@ -61,7 +61,7 @@ type = PO
 #    $ npm run compile_catalog lang <lang>
 
 [o:inveniosoftware:p:invenio:r:invenio-rdm-records-messages-ui]
-file_filter = invenio-rdm-records/assets/semantic-ui/translations/invenio-rdm-records/messages/<lang>/messages.po
-source_file = invenio-rdm-records/assets/semantic-ui/translations/invenio-rdm-records/translations.pot
+file_filter = invenio_rdm_records/assets/semantic-ui/translations/invenio_rdm_records/messages/<lang>/messages.po
+source_file = invenio_rdm_records/assets/semantic-ui/translations/invenio_rdm_records/translations.pot
 source_lang = en
 type = PO