Merge pull request #26 from oarepo/rdm_conftest

rdm conftest
oarepo · Dec 10, 2024 · 096e1a3 · 096e1a3
2 parents 3e561ed + 4c1bb52
commit 096e1a3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,9 +4,9 @@ on:
   workflow_call:
     inputs:
       oarepo:
-        description: OARepo version (11, 12, ...)
+        description: OARepo version (12, ...)
         required: true
-        default: 11
+        default: 12
         type: string
 
 env:
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - name: Cache pip
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml
@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       oarepo:
-        description: OARepo version (11, 12, ...)
+        description: OARepo version (12, ...)
         required: true
-        default: 11
+        default: 12
 
 jobs:
   build:

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -7,19 +7,14 @@ permissions:
   contents: read
 
 jobs:
-  build11:
-    uses: ./.github/workflows/build.yaml
-    with:
-      oarepo: 11
-
   build12:
     uses: ./.github/workflows/build.yaml
     with:
       oarepo: 12
 
   publish:
     runs-on: ubuntu-latest
-    needs: build11
+    needs: build12
     steps:
       - name: Use built artifacts
         uses: actions/download-artifact@v4

diff --git a/oarepo_model_builder_tests/templates/conftest.py.jinja2 b/oarepo_model_builder_tests/templates/conftest.py.jinja2
@@ -33,6 +33,9 @@ APP_CONFIG = {
     # disable redis cache
     "CACHE_TYPE": "SimpleCache",  # Flask-Caching related configs
     "CACHE_DEFAULT_TIMEOUT": 300,
+    "RDM_PERSISTENT_IDENTIFIERS": {},
+    "RDM_USER_MODERATION_ENABLED": True,
+    "RDM_RECORDS_ALLOW_RESTRICTION_AFTER_GRACE_PERIOD": False
 }
 
 @pytest.fixture

diff --git a/run-tests.sh b/run-tests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-OAREPO_VERSION=${OAREPO_VERSION:-11}
+OAREPO_VERSION=${OAREPO_VERSION:-12}
 
 if [ -d .venv-builder ] ; then
     rm -rf .venv-builder

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder-tests
-version = 4.0.7
+version = 4.0.8
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md
@@ -9,7 +9,7 @@ long_description_content_type = text/markdown
 
 
 [options]
-python = >=3.9
+python = >=3.12
 install_requires =
     oarepo-model-builder>=4.0.3
 packages = find: