Merge pull request #1427 from rdmorganiser/2.4.0

RDMO 2.4.0 🎆

Author: jochenklar

.github/dependabot.yml

@@ -30,6 +30,8 @@ updates:
       patterns:
       - django*
       - drf*
+  cooldown:
+    default-days: 7
 - package-ecosystem: github-actions
   directory: /
   schedule:
@@ -44,6 +46,8 @@ updates:
     github-actions:
       patterns:
       - '*'
+  cooldown:
+    default-days: 7
 - package-ecosystem: npm
   directory: /
   schedule:
@@ -82,3 +86,5 @@ updates:
       dependency-type: production
     dev-dependencies:
       dependency-type: development
+  cooldown:
+    default-days: 7

.github/workflows/ci.yml

@@ -27,88 +27,48 @@ env:
   PYTHONDONTWRITEBYTECODE: 1
   FORCE_COLOR: 1 # colored output by pytest etc.
 
+permissions: {}
+
 jobs:
 
   build-wheel:
     name: Build python wheel
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v4
-    # update the version
-    - name: Get short commit SHA
-      run: |
-        if [ "${{ github.event_name }}" = "pull_request" ]; then
-          SHA="${{ github.event.pull_request.head.sha }}"
-        else
-          SHA="${{ github.sha }}"
-        fi
-        echo "SHA=$(git rev-parse --short $SHA)" >> $GITHUB_ENV
-    - name: Get current version (MAJOR.MINOR.PATCH)
-      id: current-version
-      run: echo "current_version=$(grep -Po '(?<=__version__ = ")[\d\w.]+(?=")' rdmo/__init__.py)" >> $GITHUB_OUTPUT
-    - name: Generate new version (current version + SHA)
-      id: new-version
-      run: echo "new_version=${{ steps.current-version.outputs.current_version }}+$SHA" >> $GITHUB_OUTPUT
-    - name: Update version in rdmo/__init__.py
-      run: |
-        sed -i "s/__version__ = .*/__version__ = \"${{ steps.new-version.outputs.new_version }}\"/" rdmo/__init__.py
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+        fetch-depth: 0  # important for setuptools_scm
     # build the webpack bundle
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 22
         cache: npm
     - run: npm ci && npm run build:dist
-    # build the wheel
-    - uses: actions/setup-python@v5
-      with:
-        python-version: '3.13'
-        cache: pip
-    - run: |
-        python -m pip install --upgrade pip build[uv] twine
-        python -m pip --version
-    - name: Build the wheel
-      run: python -m build --installer=uv
-    - name: Check the metadata of wheel and sdist
-      run: python -m twine check --strict dist/*
-    - name: Install package from built wheel
-      run: python -m pip install --no-compile dist/rdmo*.whl # do not create __pycache__/*.pyc files
-    - name: Write info to step summary
-      run: |
-          {
-            echo -e "# ✓ Wheel successfully built (v${{ steps.new-version.outputs.new_version }})\n\n"
-            echo '<details><summary>Information about installed wheel</summary>'
-            echo -e "\n\`\`\`console"
-            echo "$ python -m pip show --files --verbose rdmo"
-            python -m pip show --files --verbose rdmo
-            echo -e "\`\`\`\n</details>"
-          } >> $GITHUB_STEP_SUMMARY
-    - name: Upload wheel as artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: wheel
-        path: dist/rdmo*.whl
-        if-no-files-found: error
-        retention-days: 30
+    - name: Build and inspect package
+      uses: hynek/build-and-inspect-python-package@efb823f52190ad02594531168b7a2d5790e66516 # v2.14.0
 
   test:
     name: "Test (Python: ${{ matrix.python-version }}, DB: ${{ matrix.db-backend }})"
     needs: build-wheel
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        python-version: ['3.9', '3.13']
+        python-version: ['3.10', '3.13']
         db-backend: [mysql, postgres]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
     - name: Download wheel
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
-        name: wheel
+        name: Packages
         path: dist
     - name: Install Dependencies
       run: |
@@ -141,10 +101,12 @@ jobs:
       env:
         GITHUB_DB_BACKEND: ${{ matrix.db-backend }}
     - name: Upload coverage data to coveralls.io
-      uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
+      uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
       with:
         flag-name: '${{ matrix.db-backend }}: ${{ matrix.python-version }}'
         parallel: true
+        fail-on-error: false
+        allow-empty: true
 
   test-e2e:
     name: "End-to-end Test (Python: ${{ matrix.python-version }}, DB: ${{ matrix.db-backend }})"
@@ -155,16 +117,18 @@ jobs:
         python-version: ['3.13']
         db-backend: [postgres]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
     - name: Download wheel
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
-        name: wheel
+        name: Packages
         path: dist
     - name: Install Dependencies
       run: |
@@ -190,7 +154,7 @@ jobs:
       env:
         DJANGO_DEBUG: True
         GITHUB_DB_BACKEND: ${{ matrix.db-backend }}
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
       with:
         name: screenshots
         path: screenshots/**/*.png
@@ -202,9 +166,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
     - name: Run Coveralls finish
-      uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
+      uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
       with:
         parallel-finished: true
+        fail-on-error: false
 
   dev-setup:
     # Ref: structlog (MIT licensed) <https://github.com/hynek/structlog/blob/main/.github/workflows/ci.yml>
@@ -214,8 +179,10 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.13"
           cache: pip
@@ -227,24 +194,26 @@ jobs:
     needs: build-wheel
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.13"
           cache: pip
       - name: Download wheel
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
-          name: wheel
+          name: Packages
           path: dist
       - name: Install os requirements for python-ldap
         run: sudo apt-get update && sudo apt-get install --yes libldap2-dev libsasl2-dev
       - run: python -m pip install --upgrade pip
       - name: Install rdmo wheel with all optional dependency groups
-        run: python -m pip install --no-compile "$(ls dist/*.whl)[allauth,ci,dev,gunicorn,ldap,mysql,postgres,pytest]"
+        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@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 22
           cache: npm
@@ -286,6 +255,6 @@ jobs:
       - dependencies
     runs-on: ubuntu-24.04
     steps:
-      - uses: re-actors/alls-green@release/v1
+      - uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe # v1.2.2
         with:
           jobs: ${{ toJSON(needs) }}

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
     hooks:
       - id: check-hooks-apply
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-ast
       - id: check-json
@@ -22,12 +22,12 @@ repos:
         exclude: \.dot$
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.12
+    rev: v0.14.7
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.28.0
+    rev: v9.39.1
     hooks:
       - id: eslint
         args: [--fix, --color]
@@ -36,7 +36,7 @@ repos:
           - eslint-plugin-react@7.37.0
           - react@18.3.1
   - repo: https://github.com/crate-ci/typos
-    rev: v1
+    rev: v1.40.0
     hooks:
     - id: typos
       exclude: |
@@ -49,6 +49,11 @@ repos:
             testing/.*.json|
             testing/.*.xml
         )$
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.18.0
+    hooks:
+    - id: zizmor
+      args: [--fix, --offline]
 ci:
   autoupdate_schedule: monthly
   autofix_prs: false

CHANGELOG.md

@@ -1,5 +1,55 @@
 # Changelog 📔
 
+## [RDMO 2.4.0](https://github.com/rdmorganiser/rdmo/releases/tag/2.4.0) (December 15, 2025)
+
+### Main improvements ⭐
+
+* Rewrite progress bar and navigation using a new `AnswerTree` class (#1346)
+* Allow links in select dropdown by optionset provider plugins (#1408)
+
+### Breaking changes ⚠️
+
+* The filtering behaviour of sites in a multisite setup for catalogs, tasks and views was changed (#1488).
+  From now on, but only when `settings.MULTISITE = True`, a catalog that does not have any sites associated
+  with it will not be available to **any site**. Before those catalogs were available to all sites. For non-multisite
+  instances, this behaviour will not change. A data migration for catalogs is included in this release, so that
+  no extra action is required when updating.
+* The rules `is_editor_for_current_site` and `is_reviewer_for_current_site` (which might be used in templates) were
+  removed and the equivalent `is_editor` and `is_reviewer` can be used instead (#1431).
+
+### Bug fixes 🐛
+
+* Fix a bug with the autosave of checkboxes, radio buttons and additional input (#1406)
+* Fix a bug where text and icons overlap in the interview (#1398)
+* Fix datepicker date conversion in interview (#1465)
+* Fix a bug with legacy management permissions and disable the latter in a multisite setup (#1425)
+* Fix a bug with verbose name that contain a space (#1453)
+* Fix a bug with site availability of catalogs in a multisite setup (#1481)
+
+### Translations 🌍
+
+* Consistent naming of "Tabs" in every language (#1459)
+* Language improvements in the French localisation (#1397)
+* Several minor fixes (#1411, #1424)
+
+### Maintenance and Dependencies 🔧
+
+* Drop support for Python 3.9
+* Add `all` and `recommended` dependency groups
+* Ignore fewer `ruff` rules (`B007`, `B006`, `B018`)
+* Use [zizmor](https://github.com/zizmorcore/zizmor) to harden CI setup
+* Update `poedit` management script to work on macOS
+* Add checks for shibboleth setup (#1407)
+* Add cookies to window (#1473)
+* Use dynamic versioning (#1486)
+
+**Milestones**:
+[2.3.3](https://github.com/rdmorganiser/rdmo/milestone/24?closed=1),
+[2.4.0](https://github.com/rdmorganiser/rdmo/milestone/21?closed=1)
+
+**Commit history**: [2.3.2...2.4.0](https://github.com/rdmorganiser/rdmo/compare/2.3.2...2.4.0)
+
+
 ## [RDMO 2.3.2](https://github.com/rdmorganiser/rdmo/compare/2.3.1...2.3.2) (July 4, 2025)
 
 * Improve ORCID branding display and social connections page (#1376)

CONTRIBUTING.md

@@ -31,7 +31,7 @@ If you decide to work on the issue yourself, please wait until you received some
 
 ## How to set up your development environment
 
-You need [Python 3.9+](https://www.python.org/downloads).
+You need [Python 3.10+](https://www.python.org/downloads).
 
 Install the package with development requirements: