global: upgrade to 12.0.0b3.dev7

.github/workflows/tests.yml

@@ -27,8 +27,8 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-          python-version: [3.9]
-          requirements-level: [pypi]
+          package-dir: ["site"]
+          python-version: [3.9, 3.12]
           db-service: [postgresql14]
           search-service: [opensearch2]
           cache-service: [redis]
@@ -40,7 +40,7 @@ jobs:
     env:
       DB: ${{ matrix.db-service }}
       SEARCH: ${{ matrix.search-service }}
-      EXTRAS: tests,${{ matrix.search-service }}
+      EXTRAS: tests
 
     steps:
       - name: Install python-ldap dependencies
@@ -52,7 +52,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -71,13 +71,17 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pipenv install --dev --deploy --system
-          pip install "./site[$EXTRAS]"
+          [ "${{ matrix.package-dir }}" == "site" ] && pipenv install --dev --deploy --system
+          pip install "./${{ matrix.package-dir }}[$EXTRAS]"
+          # make sure that typings are installed in all python versions
+          pip install typing-extensions
           pip freeze
           docker --version
           docker-compose --version
 
       - name: Run tests
-        working-directory: ./site
+        working-directory: ./${{ matrix.package-dir }}
+        # ignore collection of the migration folder. It should be reverted once we
+        # install again invenio-rdm-migrator/cds-dojson
         run: |
-          ./run-tests.sh
+          ./run-tests.sh --ignore=cds_rdm/migration

.gitignore

@@ -81,3 +81,6 @@ celerybeat-schedule.db
 # node modules
 **/*/node_modules
 node_modules
+
+# local tmp folder
+tmp

Pipfile

@@ -7,13 +7,14 @@ verify_ssl = true
 check-manifest = ">=0.25"
 
 [packages]
-invenio-app-rdm = {version = "~=12.0.0b2.dev9", extras = ["opensearch2"]}
-invenio-logging = {extras = ["sentry-sdk"], version = "~=1.3.0"}
+invenio-app-rdm = {version = "~=12.0.0b3.dev7", extras = ["opensearch2"]}
+invenio-logging = {extras = ["sentry_sdk"], version = "~=2.0"}
 cds-rdm = {editable="True", path="./site"}
-cds-dojson = {git = "https://github.com/CERNDocumentServer/cds-dojson", ref = "rdm"}
-invenio-rdm-migrator = "==1.0.0a14"
+# Re-enable when the pycountry dependency is updated
+#cds-dojson = {git = "https://github.com/CERNDocumentServer/cds-dojson", ref = "rdm"}
+#jsonschema = ">=4.17.0,<4.18.0" # due to compatibility issues with alpha
+#invenio-rdm-migrator = "==1.0.0a14"
 lxml = ">=4.6.5"
-
 ipython = "!=8.1.0"
 uwsgi = ">=2.0"
 uwsgitop = ">=0.11"

app_data/vocabularies.yaml

@@ -7,11 +7,7 @@ subjects:
       data-file: vocabularies/subjects_oecd_fos.yaml
 affiliations:
   pid-type: aff
-  schemes:
-    - id: ROR
-      name: Research Organization Registry
-      uri: "https://ror.org/"
-      data-file: vocabularies/affiliations_ror.yaml
+  data-file: vocabularies/affiliations_ror.yaml
 funders:
   pid-type: fun
   data-file: vocabularies/funders.yaml

docker-services.yml

@@ -18,7 +18,7 @@ services:
       - "INVENIO_SECRET_KEY=CHANGE_ME"
       - "INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://cds-rdm:cds-rdm@db/cds-rdm"
       - "INVENIO_WSGI_PROXIES=2"
-      - "INVENIO_RATELIMIT_STORAGE_URL=redis://cache:6379/3"
+      - "INVENIO_RATELIMIT_STORAGE_URI=redis://cache:6379/3"
   frontend:
     build: ./docker/nginx/
     image: cds-rdm-frontend

invenio.cfg

@@ -9,12 +9,9 @@ https://inveniordm.docs.cern.ch/reference/configuration/.
 
 import os
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from invenio_i18n import lazy_gettext as _
-from cds_rdm.permissions import (
-    CDSCommunitiesPermissionPolicy,
-    CDSRDMRecordPermissionPolicy
-)
+from cds_rdm.permissions import CDSCommunitiesPermissionPolicy
 from cds_rdm.files import storage_factory
 from invenio_app_rdm.config import CELERY_BEAT_SCHEDULE as APP_RDM_CELERY_BEAT_SCHEDULE
 from celery.schedules import crontab
@@ -131,13 +128,6 @@ BASE_TEMPLATE = "cds_rdm/page.html"
 # Instance's theme entrypoint file. Path relative to the ``assets/`` folder.
 INSTANCE_THEME_FILE = './less/theme.less'
 
-
-# Invenio-rdm-records
-# ===================
-
-# Revert this when we manage to deploy latest app-rdm in prod
-RDM_PERMISSION_POLICY = CDSRDMRecordPermissionPolicy
-
 # Invenio-communities
 # ===================
 # Communities permission policy
@@ -198,6 +188,7 @@ SECURITY_CHANGEABLE = False  # local login: allow users to change psw
 SECURITY_CONFIRMABLE = False  # local login: users can confirm e-mail address
 SECURITY_LOGIN_WITHOUT_CONFIRMATION = True # require users to confirm email before being able to login
 ACCOUNTS_DEFAULT_USER_VISIBILITY = "public" # enables users to be searchable for invites
+PERMANENT_SESSION_LIFETIME = timedelta(days=10)
 
 # Emails sending
 # Disable sending all account-related emails because of CERN SSO usage