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.

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

Testing with RDM 12 #117

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:
default: 11
type: string

env:
OAREPO_VERSION: ${{ inputs.oarepo }}

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.9", "3.10" ]
services:
postgres:
image: postgres
Expand All @@ -30,10 +30,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
python-version: "3.10"
- name: Cache pip
uses: actions/cache@v3
with:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ permissions:
contents: read

jobs:
build:
build11:
uses: ./.github/workflows/build.yaml
with:
oarepo: 11
oarepo: "11"

build12:
uses: ./.github/workflows/build.yaml
with:
oarepo: "12"

publish:
runs-on: ubuntu-latest
needs: build
needs: build11
steps:
- name: Use built artifacts
uses: actions/download-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
set -e

OAREPO_VERSION="${OAREPO_VERSION:-11}"
OAREPO_VERSION_MAX=$((OAREPO_VERSION+1))


VENV=".venv"
Expand All @@ -16,7 +15,8 @@ python3 -m venv $VENV
. $VENV/bin/activate
pip install -U setuptools pip wheel

pip install "oarepo>=${OAREPO_VERSION},<${OAREPO_VERSION_MAX}"
echo "Installing oarepo version $OAREPO_VERSION"
pip install "oarepo==${OAREPO_VERSION}.*"
pip install -e ".[tests]"

pip uninstall -y uritemplate
Expand Down
24 changes: 3 additions & 21 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = oarepo-ui
version = 5.0.88
version = 5.0.89
description = UI module for invenio 3.5+
long_description = file: README.md
long_description_content_type = text/markdown
Expand All @@ -19,23 +19,10 @@ packages = find:
python_requires = >=3.6
zip_safe = False
install_requires =
Flask>=2.1.2
invenio-records-resources>=0.19.1
importlib-metadata>=4.11.4
invenio-search-ui>=2.2.0,<3.0.0
Flask-Babelex
marshmallow-utils
invenio-i18n
frozendict
jinja2-simple-tags
oarepo-runtime
invenio-search-ui>=2.2.0,<3.0.0
Flask-Babelex
marshmallow-utils
invenio-i18n
frozendict
jinja2-simple-tags
oarepo-runtime
frozendict
jinjax


Expand All @@ -47,12 +34,7 @@ exclude =
dev =
oarepo-tools
tests =
pytest-invenio[opensearch2]
invenio-app
oarepo>=11,<12
pytest-invenio[opensearch2]
invenio-app
oarepo>=11,<12
pytest-invenio
black
isort
autoflake
Expand Down