Merge branch 'release/0.3.1' into main

Author: erikvw

.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

README.rst

@@ -9,8 +9,8 @@ Classes to manage glucose, ifg and ogtt
 .. |pypi| image:: https://img.shields.io/pypi/v/edc-glucose.svg
     :target: https://pypi.python.org/pypi/edc-glucose
 
-.. |actions| image:: https://github.com/clinicedc/edc-glucose/workflows/build/badge.svg?branch=develop
-  :target: https://github.com/clinicedc/edc-glucose/actions?query=workflow:build
+.. |actions| image:: https://github.com/clinicedc/edc-glucose/actions/workflows/build.yml/badge.svg
+  :target: https://github.com/clinicedc/edc-glucose/actions/workflows/build.yml
 
 .. |codecov| image:: https://codecov.io/gh/clinicedc/edc-glucose/branch/develop/graph/badge.svg
   :target: https://codecov.io/gh/clinicedc/edc-glucose

edc_glucose/tests/tests/test_glucose_form_validator.py

@@ -1,6 +1,6 @@
 from _decimal import Decimal
 from django.core.exceptions import ValidationError
-from django.test import TestCase
+from django.test import TestCase, override_settings
 from edc_appointment.constants import SCHEDULED_APPT
 from edc_appointment.models import Appointment
 from edc_constants.constants import NOT_APPLICABLE, YES
@@ -15,6 +15,7 @@
 from edc_glucose.tests.visit_schedules import visit_schedule
 
 
+@override_settings(SITE_ID=10)
 class TestGlucose(TestCase):
     def setUp(self):
         site_visit_schedules._registry = {}

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,27 +1,19 @@
 #!/usr/bin/env python
 import logging
-import sys
-from os.path import abspath, dirname, join
+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
 
-base_dir = dirname(abspath(__file__))
 app_name = "edc_glucose"
 
-DEFAULT_SETTINGS = DefaultTestSettings(
+base_dir = Path(__file__).absolute().parent
+
+project_settings = DefaultTestSettings(
     calling_file=__file__,
     BASE_DIR=base_dir,
     APP_NAME=app_name,
-    ETC_DIR=join(base_dir, app_name, "tests", "etc"),
-    # SUBJECT_SCREENING_MODEL=f"edc_screening.subjectscreening",
-    # SUBJECT_CONSENT_MODEL=f"edc_metadata.subjectconsent",
     SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
-    # SUBJECT_VISIT_MISSED_MODEL=f"edc_metadata.subjectvisitmissed",
-    # SUBJECT_REQUISITION_MODEL=f"edc_metadata.subjectrequisition",
     LIST_MODEL_APP_LABEL="edc_glucose",
     EDC_NAVBAR_VERIFY_ON_LOAD=IGNORE,
     EDC_AUTH_SKIP_SITE_AUTHS=True,
@@ -34,49 +26,14 @@
     ],
     EDC_DX_LABELS=dict(dm="Diabetes"),
     EDC_DX_REVIEW_LIST_MODEL_APP_LABEL="edc_glucose",
-    # INSTALLED_APPS=[
-    #     "django.contrib.admin",
-    #     "django.contrib.auth",
-    #     "django.contrib.contenttypes",
-    #     "django.contrib.sessions",
-    #     "django.contrib.messages",
-    #     "django.contrib.staticfiles",
-    #     "django.contrib.sites",
-    #     "django_crypto_fields.apps.AppConfig",
-    #     "django_revision.apps.AppConfig",
-    #     "multisite",
-    #     "edc_appointment.apps.AppConfig",
-    #     "edc_action_item.apps.AppConfig",
-    #     "edc_crf.apps.AppConfig",
-    #     "edc_device.apps.AppConfig",
-    #     # "edc_dashboard.apps.AppConfig",
-    #     "edc_facility.apps.AppConfig",
-    #     "edc_lab.apps.AppConfig",
-    #     "edc_metadata.apps.AppConfig",
-    #     "edc_offstudy.apps.AppConfig",
-    #     "edc_registration.apps.AppConfig",
-    #     "edc_identifier.apps.AppConfig",
-    #     "edc_notification.apps.AppConfig",
-    #     "edc_sites.apps.AppConfig",
-    #     "edc_timepoint.apps.AppConfig",
-    #     "edc_visit_schedule.apps.AppConfig",
-    #     "edc_visit_tracking.apps.AppConfig",
-    #     "edc_glucose.apps.AppConfig",
-    # ],
-    RANDOMIZATION_LIST_PATH=join(base_dir, app_name, "tests", "test_randomization_list.csv"),
     add_dashboard_middleware=True,
     add_lab_dashboard_middleware=True,
     use_test_urls=True,
 ).settings
 
 
 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")]
-    failures = DiscoverRunner(failfast=False, tags=tags).run_tests([f"{app_name}.tests"])
-    sys.exit(failures)
+    func_main(project_settings, *[f"{app_name}.tests"])
 
 
 if __name__ == "__main__":