Dependency updates for 2.3.0

.github/workflows/ci.yml

@@ -17,11 +17,6 @@ on:
       - conftest.py
       - package.json
       - pyproject.toml
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review # this is needed to trigger checks, when an auto-generated "draft" PR is set for "ready for review".
 
 # Ref: https://docs.github.com/en/actions/using-jobs/using-concurrency
 concurrency:
@@ -150,7 +145,7 @@ jobs:
       env:
         GITHUB_DB_BACKEND: ${{ matrix.db-backend }}
     - name: Upload coverage data to coveralls.io
-      uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
+      uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
       with:
         flag-name: '${{ matrix.db-backend }}: ${{ matrix.python-version }}'
         parallel: true
@@ -211,7 +206,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
     - name: Run Coveralls finish
-      uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
+      uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
       with:
         parallel-finished: true
 

.gitignore

@@ -36,8 +36,12 @@ dist
 
 rdmo/management/static
 
-rdmo/projects/static/projects/js/projects.js
+rdmo/core/static/core/js/base.js
+rdmo/core/static/core/fonts
+rdmo/core/static/core/css/base.css
+
+rdmo/projects/static/projects/js/*.js
 rdmo/projects/static/projects/fonts
-rdmo/projects/static/projects/css/projects.css
+rdmo/projects/static/projects/css/*.css
 
 screenshots

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
     hooks:
       - id: check-hooks-apply
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-ast
       - id: check-json
@@ -22,21 +22,21 @@ repos:
         exclude: \.dot$
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.7
+    rev: v0.7.2
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.56.0
+    rev: v9.14.0
     hooks:
       - id: eslint
         args: [--fix, --color]
         additional_dependencies:
           - [email protected]
-          - eslint-plugin-react@7.34.0
+          - eslint-plugin-react@7.37.0
           - [email protected]
   - repo: https://github.com/crate-ci/typos
-    rev: v1.23.6
+    rev: v1.27.0
     hooks:
     - id: typos
       exclude: |
@@ -49,3 +49,8 @@ repos:
             testing/.*.json|
             testing/.*.xml
         )$
+ci:
+  autoupdate_schedule: monthly
+  autofix_prs: false
+  autoupdate_branch: 'dependency-updates'
+  autoupdate_commit_msg: 'build(pre-commit): pre-commit autoupdate by ci'

AUTHORS

@@ -6,6 +6,7 @@ The core developers are:
     Olaf Michaelis
     David Wallace
     Max Schröder
+    Claudia Malzer
 
 We appreciate contributions from:
 
@@ -40,6 +41,7 @@ The development of RDMO was supported by the following institutions:
     Istituto Nazionale di Ricerca Metrologica (https://www.inrim.eu)
     Universität Rostock (https://www.uni-rostock.de)
     Freie Universität Berlin (https://www.fu-berlin.de)
+    Julius Kühn-Institut – Bundesforschungsinstitut für Kulturpflanzen (JKI) (https://www.julius-kuehn.de/)
 
 Funding for RDMO was received from:
 

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## [RDMO 2.2.0](https://github.com/rdmorganiser/rdmo/compare/2.1.3...2.2.0) (Jul 25, 2024)
+## [RDMO 2.2.1](https://github.com/rdmorganiser/rdmo/compare/2.2.0...2.2.1) (Sep 13, 2024)
+
+* Fix import error when allauth is not used (#1145)
+* Fix a bug with collection pages when optionset refresh is true (#1147)
+* Prevent the page to change when a validation error occurs on project_questions (#1134)
+* Pin importlib_metadata to 0.8.4 due to an upstream problem
+
+## [RDMO 2.2.0](https://github.com/rdmorganiser/rdmo/compare/2.1.3...2.2.0) (Sep 05, 2024)
 
 * Add new projects overview (#865, #355)
   * Projects are now displayed in an interactive table which can be filtered and ordered
@@ -30,6 +37,7 @@
 * Fix textarea resizing (#1021)
 * Fix export links in management (#915)
 * Fix typos (#1001)
+* Use ACCOUNT_FORMS instead of ACCOUNT_SIGNUP_FORM_CLASS in settings
 * Remove local hosts from ALLOWED_HOSTS settings
 * Improve admin interface (#942, #918)
 * Update default home page

CITATION.cff

@@ -21,6 +21,9 @@ authors:
     given-names:  Heinz-Alexander
     orcid:        https://orcid.org/0000-0003-4397-027X
 
+  - family-names: Malzer
+    given-names:  Claudia
+
   - family-names: Lanza
     given-names:  Giacomo
     orcid:        https://orcid.org/0000-0002-2239-3955
@@ -32,8 +35,8 @@ authors:
     given-names:  Dario
     orcid:        https://orcid.org/0000-0003-4499-8573
 
-  - family-names: Harry
-    given-names:  Enke
+  - family-names: Enke
+    given-names:  Harry
     orcid:        https://orcid.org/0000-0002-2366-8316
 
 title: Research Data Management Organiser (RDMO)

NOTICE

@@ -4,7 +4,7 @@ THIS NOTICE APPLIES TO ALL FILES CONTAINED IN THIS AND UNDERLYING FOLDERS
 
 RDMO - Research Data Management Organiser
 
-Copyright (c) 2015-2023  RDMO Arbeitsgemeinschaft <rdmorganiser.github.io>
+Copyright (c) 2015-2024  RDMO Arbeitsgemeinschaft <rdmorganiser.github.io>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -6,6 +6,7 @@ RDMO - Research Data Management Organiser
 [![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/main/LICENSE) \
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/rdmorganiser/rdmo/main.svg)](https://results.pre-commit.ci/latest/github/rdmorganiser/rdmo/main)
 [![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=main&service=github)](https://coveralls.io/github/rdmorganiser/rdmo?branch=main)