Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rdm conftest #26

Merged
merged 2 commits into from
Dec 10, 2024
Merged

rdm conftest #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2a0b88
rdm conftest
Dec 10, 2024
4c1bb52
version 12
Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions oarepo_model_builder_tests/templates/conftest.py.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
Loading