merge v1.2.3 release

Author: mikkonie

.github/ISSUE_TEMPLATE/release_cleanup.md

@@ -11,6 +11,10 @@ assignees: 'mikkonie'
 
 TBA
 
+## Documentation
+
+TBA
+
 ## Issues to Add in CHANGELOG
 
 TBA

CHANGELOG.rst

@@ -5,6 +5,35 @@ Changelog for the **SODAR Core** Django app package. Loosely follows the
 `Keep a Changelog <http://keepachangelog.com/en/1.0.0/>`_ guidelines.
 
 
+v1.2.3 (2025-09-26)
+===================
+
+Added
+-----
+
+- **General**
+    - Documentation section in ``release_cleanup.md`` issue template (#1776)
+- **Projectroles**
+    - ``get_sodar_constant()`` common template tag (#1772)
+
+Changed
+-------
+
+- **General**
+    - Update ``test.py`` settings hardcoding (#1768)
+
+Fixed
+-----
+
+- **General**
+    - Type hint issues (#1769)
+    - UI tests failing with ``ENABLE_LDAP=0`` and ``ENABLE_OIDC=1`` (#1767)
+- **Projectroles**
+    - ``_modal.html`` close button padding (#1764)
+    - Uncaught exception in ``ProjectForm`` with empty ``title`` field (#1778)
+    - ``ProjectCreateView`` fields not correctly displayed on field error reload (#1770)
+
+
 v1.2.2 (2025-09-17)
 ===================
 

README.rst

@@ -117,7 +117,7 @@ and breaking changes are possible.
 
 .. code-block:: console
 
-    pip install django-sodar-core==1.2.2
+    pip install django-sodar-core==1.2.3
 
 For installing a development version you can point your dependency to a specific
 commit ID in GitHub. Note that these versions may not be stable.

adminalerts/plugins.py

@@ -2,17 +2,21 @@
 
 from typing import Optional
 
+from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.utils import timezone
 
 # Projectroles dependency
-from projectroles.models import SODARUser, SODAR_CONSTANTS
+from projectroles.models import SODAR_CONSTANTS
 from projectroles.plugins import SiteAppPluginPoint, PluginAppSettingDef
 
 from adminalerts.models import AdminAlert
 from adminalerts.urls import urlpatterns
 
 
+User = get_user_model()
+
+
 # SODAR constants
 APP_SETTING_SCOPE_USER = SODAR_CONSTANTS['APP_SETTING_SCOPE_USER']
 APP_SETTING_TYPE_BOOLEAN = SODAR_CONSTANTS['APP_SETTING_TYPE_BOOLEAN']
@@ -71,7 +75,7 @@ def get_statistics(self) -> dict:
             }
         }
 
-    def get_messages(self, user: Optional[SODARUser] = None) -> list[dict]:
+    def get_messages(self, user: Optional[User] = None) -> list[dict]:
         """
         Return a list of messages to be shown to users.
 

adminalerts/tests/test_models.py

@@ -1,24 +1,25 @@
 """Tests for models in the adminalerts app"""
 
+from django.contrib.auth import get_user_model
 from django.forms.models import model_to_dict
 from django.utils import timezone
 
 from test_plus.test import TestCase
 
-# Projectroles dependency
-from projectroles.models import SODARUser
-
 from adminalerts.models import AdminAlert
 
 
+User = get_user_model()
+
+
 class AdminAlertMixin:
     """Helper mixin for AdminAlert creation"""
 
     @classmethod
     def make_alert(
         cls,
         message: str,
-        user: SODARUser,
+        user: User,
         description: str,
         active: bool = True,
         require_auth: bool = True,

appalerts/api.py

@@ -2,12 +2,17 @@
 
 from typing import Optional
 
+from django.contrib.auth import get_user_model
+
 from djangoplugins.models import Plugin
 
 from appalerts.models import AppAlert, ALERT_LEVELS
 
 # Projectroles dependency
-from projectroles.models import Project, SODARUser
+from projectroles.models import Project
+
+
+User = get_user_model()
 
 
 class AppAlertAPI:
@@ -27,7 +32,7 @@ def add_alert(
         cls,
         app_name: str,
         alert_name: str,
-        user: SODARUser,
+        user: User,
         message: str,
         level: str = 'INFO',
         url: Optional[str] = None,
@@ -72,7 +77,7 @@ def add_alerts(
         cls,
         app_name: str,
         alert_name: str,
-        users: list[SODARUser],
+        users: list[User],
         message: str,
         level: str = 'INFO',
         url: Optional[str] = None,

appalerts/tests/test_models.py

@@ -2,20 +2,24 @@
 
 from typing import Optional
 
+from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.forms.models import model_to_dict
 from django.urls import reverse
 
-from djangoplugins.models import Plugin, PluginPoint
+from djangoplugins.models import Plugin
 from test_plus.test import TestCase
 
 # Projectroles dependency
-from projectroles.models import Project, SODARUser, SODAR_CONSTANTS
+from projectroles.models import Project, SODAR_CONSTANTS
 from projectroles.tests.test_models import ProjectMixin
 
 from appalerts.models import AppAlert
 
 
+User = get_user_model()
+
+
 # SODAR constants
 PROJECT_TYPE_PROJECT = SODAR_CONSTANTS['PROJECT_TYPE_PROJECT']
 
@@ -32,9 +36,9 @@ class AppAlertMixin:
     @classmethod
     def make_app_alert(
         cls,
-        app_plugin: Optional[PluginPoint] = None,
+        app_plugin: Optional[Plugin] = None,
         alert_name: str = ALERT_NAME,
-        user: Optional[SODARUser] = None,
+        user: Optional[User] = None,
         message: str = ALERT_MSG,
         level: str = ALERT_LEVEL,
         active: bool = True,

codemeta.json

@@ -40,12 +40,12 @@
   ],
   "identifier": "https://doi.org/10.5281/zenodo.4269346",
   "codeRepository": "https://github.com/bihealth/sodar-core",
-  "datePublished": "2025-09-17",
-  "dateModified": "2025-09-17",
+  "datePublished": "2025-09-26",
+  "dateModified": "2025-09-26",
   "dateCreated": "2019-06-26",
   "description": "SODAR Core: A Django-based framework for scientific data management and analysis web apps",
   "keywords": "Python, Django, scientific data managmenent, software library",
   "license": "MIT",
   "title": "SODAR Core",
-  "version": "v1.2.2"
+  "version": "v1.2.3"
 }

config/settings/base.py

@@ -9,7 +9,6 @@
 """
 
 import environ
-import itertools
 import os
 
 from projectroles.constants import get_sodar_constants
@@ -412,12 +411,9 @@
     AUTH_LDAP_DOMAIN_PRINTABLE = env.str(
         'AUTH_LDAP_DOMAIN_PRINTABLE', AUTH_LDAP_USERNAME_DOMAIN
     )
-    AUTHENTICATION_BACKENDS = tuple(
-        itertools.chain(
-            ('projectroles.auth_backends.PrimaryLDAPBackend',),
-            AUTHENTICATION_BACKENDS,
-        )
-    )
+    AUTHENTICATION_BACKENDS = [
+        'projectroles.auth_backends.PrimaryLDAPBackend'
+    ] + AUTHENTICATION_BACKENDS
 
     # Secondary LDAP server (optional)
     if ENABLE_LDAP_SECONDARY:
@@ -448,12 +444,9 @@
         AUTH_LDAP2_DOMAIN_PRINTABLE = env.str(
             'AUTH_LDAP2_DOMAIN_PRINTABLE', AUTH_LDAP2_USERNAME_DOMAIN
         )
-        AUTHENTICATION_BACKENDS = tuple(
-            itertools.chain(
-                ('projectroles.auth_backends.SecondaryLDAPBackend',),
-                AUTHENTICATION_BACKENDS,
-            )
-        )
+        AUTHENTICATION_BACKENDS = [
+            'projectroles.auth_backends.SecondaryLDAPBackend'
+        ] + AUTHENTICATION_BACKENDS
 
 
 # OpenID Connect (OIDC) configuration
@@ -462,12 +455,9 @@
 ENABLE_OIDC = env.bool('ENABLE_OIDC', False)
 
 if ENABLE_OIDC:
-    AUTHENTICATION_BACKENDS = tuple(
-        itertools.chain(
-            ('social_core.backends.open_id_connect.OpenIdConnectAuth',),
-            AUTHENTICATION_BACKENDS,
-        )
-    )
+    AUTHENTICATION_BACKENDS = [
+        'social_core.backends.open_id_connect.OpenIdConnectAuth'
+    ] + AUTHENTICATION_BACKENDS
     TEMPLATES[0]['OPTIONS']['context_processors'] += [
         'social_django.context_processors.backends',
         'social_django.context_processors.login_redirect',
@@ -684,13 +674,16 @@ def set_logging(level=None):
     MIDDLEWARE += ['projectroles.middleware.ProfilerMiddleware']
 
 
-# Bgjobs app settings
-BGJOBS_PAGINATION = env.int('BGJOBS_PAGINATION', 15)
+# Adminalerts app settings
+ADMINALERTS_PAGINATION = env.int('ADMINALERTS_PAGINATION', 15)
 
 
-# Timeline app settings
-TIMELINE_PAGINATION = env.int('TIMELINE_PAGINATION', 15)
-TIMELINE_SEARCH_LIMIT = env.int('TIMELINE_SEARCH_LIMIT', 250)
+# Appalerts app settings
+APPALERTS_STATUS_INTERVAL = env.int('APPALERTS_STATUS_INTERVAL', 5)
+
+
+# Bgjobs app settings
+BGJOBS_PAGINATION = env.int('BGJOBS_PAGINATION', 15)
 
 
 # Filesfolders app settings
@@ -710,12 +703,9 @@ def set_logging(level=None):
 )
 
 
-# Adminalerts app settings
-ADMINALERTS_PAGINATION = env.int('ADMINALERTS_PAGINATION', 15)
-
-
-# Appalerts app settings
-APPALERTS_STATUS_INTERVAL = env.int('APPALERTS_STATUS_INTERVAL', 5)
+# Timeline app settings
+TIMELINE_PAGINATION = env.int('TIMELINE_PAGINATION', 15)
+TIMELINE_SEARCH_LIMIT = env.int('TIMELINE_SEARCH_LIMIT', 250)
 
 
 # Tokens app settings