diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml new file mode 100644 index 000000000..a3b72443f --- /dev/null +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -0,0 +1,60 @@ +# This CI job is adapted from: +# Cookiecutter Django (2013-10-17), BSD-3-Clause license +# Ref: https://github.com/cookiecutter/cookiecutter-django/blob/2023.10.17/.github/workflows/pre-commit-autoupdate.yml + +name: Update pre-commit hooks + +on: + schedule: + # run once a month at midnight of the first day of the month + - cron: 0 0 1 * * + # run manually from actions tab + workflow_dispatch: + +permissions: + contents: read + +jobs: + auto-update: + # Disables this workflow from running in a repository that is not part of the indicated organization/user + if: github.repository_owner == 'rdmorganiser' + permissions: + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 + with: + python-version: "3.12" + cache: pip + - run: python -m pip install pre-commit + - run: pre-commit autoupdate > autoupdate.log + - name: Prepare message for pr body + run: | + grep "updating" autoupdate.log > updates.log + sed -i -e 's/\[/- /g' updates.log + echo -e "## Proposed changes\n\nBumps the pre-commit config with the following updates:\n" > pr-body.md + cat updates.log >> pr-body.md + echo -e "\n---\nThis PR is auto-generated once a month." >> pr-body.md + # Ref: https://github.com/peter-evans/create-pull-request + - name: Create pull request + uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2 + with: + branch: pre-commit-autoupdate + base: dependency-updates + committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + title: "build: update pre-commit hooks" + commit-message: "build: update pre-commit hooks" + add-paths: .pre-commit-config.yaml + body-path: pr-body.md + labels: | + dependencies + pre-commit + type: maintenance + delete-branch: true + - name: Write to job summary + run: | + cat updates.log >> $GITHUB_STEP_SUMMARY diff --git a/CHANGELOG.md b/CHANGELOG.md index dee19b0b3..308e14474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [RDMO 2.0.2](https://github.com/rdmorganiser/rdmo/compare/2.0.1...2.0.2) (Nov 2, 2023) + +* Fix migration to RDMO 2.0 for PostgreSQL +* Fix Shibboleth urls +* Fix issue view +* Fix margins in management interface ## [RDMO 2.0.1](https://github.com/rdmorganiser/rdmo/compare/2.0.0...2.0.1) (Oct 9, 2023) diff --git a/README.md b/README.md index faf00c685..67fadec6b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,10 @@ RDMO - Research Data Management Organiser [![Latest release](https://img.shields.io/pypi/v/rdmo.svg?style=flat)](https://pypi.python.org/pypi/rdmo/) [![Python Versions](https://img.shields.io/pypi/pyversions/rdmo.svg?style=flat)](https://www.python.org/) -[![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/master/LICENSE) +[![Django Versions](https://img.shields.io/pypi/frameworkversions/django/rdmo)](https://pypi.python.org/pypi/rdmo/) +[![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/master/LICENSE) \ +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) +[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![CI Workflow Status](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml/badge.svg)](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml) [![Coverage Status](https://coveralls.io/repos/rdmorganiser/rdmo/badge.svg?branch=master&service=github)](https://coveralls.io/github/rdmorganiser/rdmo?branch=master) [![Documentation status](https://readthedocs.org/projects/rdmo/badge/?version=latest)](http://rdmo.readthedocs.io/en/latest/?badge=latest) diff --git a/rdmo/accounts/urls/__init__.py b/rdmo/accounts/urls/__init__.py index aaa135462..7e04c8845 100644 --- a/rdmo/accounts/urls/__init__.py +++ b/rdmo/accounts/urls/__init__.py @@ -21,8 +21,6 @@ shibboleth_login, name='shibboleth_login'), re_path('^shibboleth/logout/', shibboleth_logout, name='shibboleth_logout'), - re_path('^logout/', - auth_views.LogoutView.as_view(next_page=settings.SHIBBOLETH_LOGOUT_URL), name='account_logout'), ] if settings.ACCOUNT or settings.SOCIALACCOUNT: diff --git a/rdmo/management/assets/js/components/nested/NestedPage.js b/rdmo/management/assets/js/components/nested/NestedPage.js index c19a212b8..801ddc464 100644 --- a/rdmo/management/assets/js/components/nested/NestedPage.js +++ b/rdmo/management/assets/js/components/nested/NestedPage.js @@ -52,7 +52,7 @@ const NestedPage = ({ config, page, configActions, elementActions }) => { options={getUriPrefixes(page.elements)} /> -