Merge branch 'release/0.3.63' into main

.github/workflows/build.yml

@@ -11,8 +11,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.11']
-        django-version: ['4.2', 'dev']
+        python-version: ['3.11', '3.12']
+        django-version: ['4.2', '5.0', 'dev']
+
+        exclude:
+          - python-version: '3.12'
+            django-version: '4.2'
+          - python-version: '3.11'
+            django-version: 'dev'
     services:
       mysql:
         image: mysql:latest

edc_model_admin/templates/edc_model_admin/admin/change_form.html

@@ -28,7 +28,7 @@
 {% block breadcrumbs %}{% endblock %}
 
 {% block branding %}
-  {% show_navbar_for_admin_templates_b3 %}{{ opts.app_config.verbose_name }} › {{ opts.verbose_name }}
+  {% show_navbar_for_admin_templates_b3 %}&nbsp;<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.app_config.verbose_name|capfirst }}</A>&nbsp;&rsaquo;&nbsp;{{ opts.verbose_name|capfirst }}
 {% endblock %}
 
 {% block welcome-msg %}{% endblock %}

edc_model_admin/templates/edc_model_admin/admin/change_list.html

@@ -32,7 +32,7 @@
 {% block breadcrumbs %}{% endblock %}
 
 {% block branding %}
-  {% show_navbar_for_admin_templates_b3 %}
+  {% show_navbar_for_admin_templates_b3 %}{{ opts.app_config.verbose_name }}
 {% endblock %}
 
 {% block welcome-msg %}{% endblock %}

edc_model_admin/utils.py

@@ -1,5 +1,8 @@
 from warnings import warn
 
+from django.contrib import messages
+from django.contrib.messages import get_messages
+from django.core.handlers.wsgi import WSGIRequest
 from django.db.models.constants import LOOKUP_SEP
 from django.urls.base import reverse
 from django.urls.exceptions import NoReverseMatch
@@ -46,3 +49,10 @@ def get_value_from_lookup_string(search_field_name: str = None, obj=None, reques
             if value is None:
                 break
     return value
+
+
+def add_to_messages_once(message: str, request: WSGIRequest, level: int | None = None) -> None:
+    if not [msg_obj for msg_obj in get_messages(request) if msg_obj.message == message]:
+        messages.add_message(
+            request=request, message=message, level=level or messages.INFO, fail_silently=True
+        )

pyproject.toml

@@ -35,19 +35,22 @@ exclude_lines = [
 legacy_tox_ini = """
 [tox]
 envlist =
-    py{311}-dj{42,dev},
+    py{311}-dj{42,50},
+    py{312}-dj{50,dev},
     lint
 
 isolated_build = true
 
 [gh-actions]
 python =
-    3.11: py311, lint
+    3.11: py311
+    3.12: py312, lint
 
 [gh-actions:env]
 DJANGO =
-    4.2: dj42, lint
-    dev: djdev
+    4.2: dj42
+    5.0: dj50
+    dev: djdev, lint
 
 [testenv]
 deps =
@@ -56,6 +59,7 @@ deps =
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/third_party_dev.txt
     dj42: Django>=4.2,<5.0
+    dj50: Django>=5.0
     djdev: https://github.com/django/django/tarball/main
 
 commands =

runtests.py

@@ -1,32 +1,28 @@
 #!/usr/bin/env python
 import logging
-import os
-import sys
-from os.path import abspath, dirname
+from pathlib import Path
 
-import django
-from django.conf import settings
-from django.test.runner import DiscoverRunner
 from edc_constants.constants import IGNORE
-from edc_test_utils import DefaultTestSettings
+from edc_test_utils import DefaultTestSettings, func_main
 
 app_name = "edc_model_admin"
-base_dir = dirname(abspath(__file__))
+base_dir = Path(__file__).absolute().parent
 
-DEFAULT_SETTINGS = DefaultTestSettings(
+project_settings = DefaultTestSettings(
     calling_file=__file__,
-    template_dirs=[os.path.join(base_dir, app_name, "tests", "templates")],
+    template_dirs=[str(base_dir / app_name / "tests" / "templates")],
     BASE_DIR=base_dir,
     APP_NAME=app_name,
     ROOT_URLCONF="model_admin_app.urls",
-    ETC_DIR=os.path.join(base_dir, app_name, "tests", "etc"),
+    ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
     SUBJECT_SCREENING_MODEL="model_admin_app.subjectscreening",
     SUBJECT_CONSENT_MODEL="model_admin_app.subjectconsent",
     SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
     SUBJECT_VISIT_MISSED_MODEL="edc_visit_tracking.subjectvisitmissed",
     SUBJECT_REQUISITION_MODEL="model_admin_app.subjectrequisition",
     SUBJECT_APP_LABEL="model_admin_app",
     EDC_NAVBAR_VERIFY_ON_LOAD=IGNORE,
+    EDC_SITES_REGISTER_DEFAULT=True,
     INSTALLED_APPS=[
         "django.contrib.admin",
         "django.contrib.auth",
@@ -68,11 +64,11 @@
         "model_admin_app.apps.AppConfig",
     ],
     DASHBOARD_BASE_TEMPLATES={
-        "dashboard_template": os.path.join(
-            base_dir, "edc_model_admin", "tests", "templates", "dashboard.html"
+        "dashboard_template": str(
+            base_dir / "edc_model_admin" / "tests" / "templates" / "dashboard.html"
         ),
-        "dashboard2_template": os.path.join(
-            base_dir, "edc_model_admin", "tests", "templates", "dashboard2.html"
+        "dashboard2_template": str(
+            base_dir / "edc_model_admin" / "tests" / "templates" / "dashboard2.html"
         ),
     },
     use_test_urls=False,
@@ -81,13 +77,7 @@
 
 
 def main():
-    if not settings.configured:
-        settings.configure(**DEFAULT_SETTINGS)
-    django.setup()
-    tags = [t.split("=")[1] for t in sys.argv if t.startswith("--tag")]
-    failfast = True if [t for t in sys.argv if t == "--failfast"] else False
-    failures = DiscoverRunner(failfast=failfast, tags=tags).run_tests([f"{app_name}.tests"])
-    sys.exit(bool(failures))
+    func_main(project_settings, *[f"{app_name}.tests"])
 
 
 if __name__ == "__main__":