From 5ea966974944bbc2a1aabd6a356b79837fbec8d3 Mon Sep 17 00:00:00 2001 From: Mirek Simek Date: Wed, 13 Dec 2023 08:36:54 +0100 Subject: [PATCH 1/5] Testing with RDM 12 --- .github/workflows/build.yaml | 3 +++ run-tests.sh | 4 ++-- setup.cfg | 22 ++-------------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c3eb49dc..57084758 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,6 +9,9 @@ on: default: 11 type: string +env: + OAREPO_VERSION: ${{ inputs.oarepo }} + jobs: build: runs-on: ubuntu-latest diff --git a/run-tests.sh b/run-tests.sh index bd0e31ba..430676f9 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -3,7 +3,6 @@ set -e OAREPO_VERSION="${OAREPO_VERSION:-11}" -OAREPO_VERSION_MAX=$((OAREPO_VERSION+1)) VENV=".venv" @@ -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 diff --git a/setup.cfg b/setup.cfg index 2a8f0c9a..846864e1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -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 From 6e941e0d7d4154114d506fd71414f19af4a53bec Mon Sep 17 00:00:00 2001 From: Mirek Simek Date: Wed, 13 Dec 2023 08:38:58 +0100 Subject: [PATCH 2/5] workflow upgrade --- .github/workflows/push.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index fad9a87e..f92291fc 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -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 From 0b0888d23c634af413a0a99c5931db91e7574e09 Mon Sep 17 00:00:00 2001 From: Mirek Simek Date: Wed, 13 Dec 2023 08:39:38 +0100 Subject: [PATCH 3/5] python version --- .github/workflows/build.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 57084758..faf7ae5f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,9 +15,6 @@ env: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [ "3.9", "3.10" ] services: postgres: image: postgres @@ -33,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: From 5c8108f3070027ad25a928913277cefd3d4d8d07 Mon Sep 17 00:00:00 2001 From: Mirek Simek Date: Wed, 13 Dec 2023 10:04:02 +0100 Subject: [PATCH 4/5] python version --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index faf7ae5f..64244567 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: 3.10 + python-version: "3.10" - name: Cache pip uses: actions/cache@v3 with: From 3057a983e835eceaf25c4bca07232292da0886ac Mon Sep 17 00:00:00 2001 From: Mirek Simek Date: Wed, 13 Dec 2023 10:19:46 +0100 Subject: [PATCH 5/5] Version bump --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 846864e1..ead2e8f5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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