RDMO 2.5.0 ⛄

.github/dependabot.yml

@@ -64,6 +64,10 @@ updates:
     update-types: ["version-update:semver-patch"] # ignore patch versions for all JavaScript dependencies
   - dependency-name: react-redux
     update-types: ["version-update:semver-major"] # ignore major for react-redux
+  - dependency-name: eslint
+    update-types: ["version-update:semver-major"] # keep eslint 8.56.0 for now
+  - dependency-name: jquery
+    update-types: [ "version-update:semver-major" ] # keep jQuery 3.x until Bootstrap is upgraded
   groups:
     react:
       patterns:

.github/workflows/ci.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+    tags:
+      - '*'
   pull_request:
     # run CI only if files in these whitelisted paths are changed
     paths:
@@ -31,42 +33,42 @@ permissions: {}
 
 jobs:
 
-  build-wheel:
-    name: Build python wheel
+  build:
+    name: Build python package
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         persist-credentials: false
         fetch-depth: 0  # important for setuptools_scm
-    # build the webpack bundle
-    - uses: actions/setup-node@v6
+    - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
       with:
         node-version: 22.22
-        cache: npm
-    - run: npm ci && npm run build:dist
+        cache: ${{ startsWith(github.ref, 'refs/tags/') && '' || 'npm' }}  # disable cache on tags
+    - name: build front end
+      run: npm ci && npm run build:dist
     - name: Build and inspect package
-      uses: hynek/build-and-inspect-python-package@efb823f52190ad02594531168b7a2d5790e66516 # v2.14.0
+      uses: hynek/build-and-inspect-python-package@d44ca7d91762de7a7d5436ddae667c6da6d1c3df # v2.18.0
 
   test:
     name: "Test (Python: ${{ matrix.python-version }}, DB: ${{ matrix.db-backend }})"
-    needs: build-wheel
+    needs: build
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        python-version: ['3.10', '3.13']
+        python-version: ['3.10', '3.14']
         db-backend: [mysql, postgres]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
     - name: Download wheel
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
       with:
         name: Packages
         path: dist
@@ -94,7 +96,7 @@ jobs:
     - name: Run package status tests first
       run: |
         pytest rdmo/core/tests/test_package_status.py --nomigrations --verbose
-      if: matrix.python-version == '3.13' && matrix.db-backend == 'postgres'
+      if: matrix.python-version == '3.14' && matrix.db-backend == 'postgres'
     - name: Run Tests
       run: |
         pytest -p randomly -p no:cacheprovider --cov --reuse-db --numprocesses=auto --dist=loadscope
@@ -110,23 +112,23 @@ jobs:
 
   test-e2e:
     name: "End-to-end Test (Python: ${{ matrix.python-version }}, DB: ${{ matrix.db-backend }})"
-    needs: build-wheel
+    needs: build
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        python-version: ['3.13']
+        python-version: ['3.14']
         db-backend: [postgres]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
-    - name: Download wheel
-      uses: actions/download-artifact@v6
+    - name: Download package
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
       with:
         name: Packages
         path: dist
@@ -154,7 +156,7 @@ jobs:
       env:
         DJANGO_DEBUG: True
         GITHUB_DB_BACKEND: ${{ matrix.db-backend }}
-    - uses: actions/upload-artifact@v5
+    - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
       with:
         name: screenshots
         path: screenshots/**/*.png
@@ -163,7 +165,7 @@ jobs:
     name: Indicate completion to coveralls
     needs: test
     if: ${{ always() }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-slim
     steps:
     - name: Run Coveralls finish
       uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
@@ -179,30 +181,30 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version: "3.13"
+          python-version: "3.14"
           cache: pip
       - run: python -Im pip install --editable .[dev]
       - run: python -Ic 'import rdmo; print(rdmo.__version__)'
 
   dependencies:
     name: Test installation of all dependencies
-    needs: build-wheel
+    needs: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version: "3.13"
+          python-version: "3.14"
           cache: pip
-      - name: Download wheel
-        uses: actions/download-artifact@v6
+      - name: Download package
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           name: Packages
           path: dist
@@ -213,7 +215,7 @@ jobs:
         run: python -m pip install --no-compile "$(ls dist/*.whl)[all]"
       - name: Verify installed packages have compatible dependencies
         run: python -m pip check
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 22
           cache: npm
@@ -244,16 +246,38 @@ jobs:
             echo -e "\`\`\`\n</details>"
           } >> $GITHUB_STEP_SUMMARY
 
+  pypi-release:
+    name: Publish distribution to PyPI
+    if: startsWith(github.ref, 'refs/tags/')
+    needs:
+    - build
+    - test
+    - test-e2e
+    runs-on: ubuntu-24.04
+    environment:
+      name: pypi
+      url: https://pypi.org/p/rdmo
+    permissions:
+      id-token: write
+    steps:
+    - name: Download package
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
+      with:
+        name: Packages
+        path: dist
+    - name: Publish to PyPI
+      uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b  # v1.14.0
+
   required-checks-pass:
     if: always()
     needs:
-      - build-wheel
+      - build
       - test
       - coveralls
       - test-e2e
       - dev-setup
       - dependencies
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-slim
     steps:
       - uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe # v1.2.2
         with:

.github/zizmor.yml

@@ -0,0 +1,4 @@
+rules:
+  cache-poisoning:
+    ignore:
+    - ci.yml

.pre-commit-config.yaml

@@ -1,5 +1,8 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+# Run manual autoupdate with:
+#   pre-commit autoupdate --freeze
+#   pre-commit run --all-files
 
 # do not touch the migration files at all: these are auto-generated by Django
 exclude: \/migrations\/
@@ -9,7 +12,7 @@ repos:
     hooks:
       - id: check-hooks-apply
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
+    rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c  # frozen: v6.0.0
     hooks:
       - id: check-ast
       - id: check-json
@@ -22,12 +25,12 @@ repos:
         exclude: \.dot$
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.7
+    rev: 0671d8ab202c4ac093b78433ae5baf74f3fc7246  # frozen: v0.15.15
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.39.1
+    rev: 61e8b06e669ce52c94348373faab214beaa8cd4c  # frozen: v10.4.1
     hooks:
       - id: eslint
         args: [--fix, --color]
@@ -36,7 +39,7 @@ repos:
           - eslint-plugin-react@7.37.0
           - react@18.3.1
   - repo: https://github.com/crate-ci/typos
-    rev: v1.40.0
+    rev: f8a58b6b53f2279f71eb605f03a4ae4d10608f45  # frozen: v1.47.0
     hooks:
     - id: typos
       exclude: |
@@ -50,12 +53,9 @@ repos:
             testing/.*.xml
         )$
   - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.18.0
+    rev: 9257c6050c0261b8c57e712f632dc4a8010109a9  # frozen: v1.25.2
     hooks:
     - id: zizmor
       args: [--fix, --offline]
 ci:
-  autoupdate_schedule: monthly
   autofix_prs: false
-  autoupdate_branch: 'dependency-updates'
-  autoupdate_commit_msg: 'build(pre-commit): pre-commit autoupdate by ci'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog 📔
 
+## [RDMO 2.5.0](https://github.com/rdmorganiser/rdmo/releases/tag/2.5.0)
+
+**Milestone**: [2.5.0](https://github.com/rdmorganiser/rdmo/milestone/26)
+
+**Commit history**: [2.4.0...2.5.0](https://github.com/rdmorganiser/rdmo/compare/2.4.0...2.5.0)
+
 ## [RDMO 2.4.4](https://github.com/rdmorganiser/rdmo/releases/tag/2.4.4) (March 26, 2026)
 
 ### Bug fixes 🐛

README.md

@@ -22,8 +22,8 @@ RDMO is a tool to support the systematic planning, organisation and implementati
   <dd>https://rdmo.readthedocs.io</dd>
   <dt>Mailing list</dt>
   <dd>https://www.listserv.dfn.de/sympa/subscribe/rdmo</dd>
-  <dt>Slack</dt>
-  <dd>https://rdmo.slack.com</dd>
+  <dt>Matrix</dt>
+  <dd>https://matrix.to/#/#rdmo:matrix.org</dd>
   <dt>Demo</dt>
   <dd>https://rdmo.aip.de</dd>
 </dl>

conftest.py

@@ -1,11 +1,13 @@
 import json
 import shutil
 from pathlib import Path
+from types import SimpleNamespace
 
 import pytest
 
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.core.management import call_command
 
 from rdmo.accounts.utils import set_group_permissions
@@ -75,3 +77,18 @@ def delete_all(*models):
         for model in models:
             model.objects.all().delete()
     return delete_all
+
+
+@pytest.fixture
+def sites(settings):
+    Site.objects.clear_cache()
+
+    def activate(domain):
+        site = Site.objects.get(domain=domain)
+        settings.SITE_ID = site.id
+        Site.objects.clear_cache()
+        return site
+
+    yield SimpleNamespace(activate=activate)
+
+    Site.objects.clear_cache()