Merge branch 'release/0.3.34' 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

@@ -56,8 +56,8 @@ before registering your custom modeladmin class.
 .. |pypi| image:: https://img.shields.io/pypi/v/edc-locator.svg
     :target: https://pypi.python.org/pypi/edc-locator
 
-.. |actions| image:: https://github.com/clinicedc/edc-locator/workflows/build/badge.svg?branch=develop
-  :target: https://github.com/clinicedc/edc-locator/actions?query=workflow:build
+.. |actions| image:: https://github.com/clinicedc/edc-locator/action/workflows/build.yml/badge.svg
+  :target: https://github.com/clinicedc/edc-locator/action/workflows/build.yml
 
 .. |codecov| image:: https://codecov.io/gh/clinicedc/edc-locator/branch/develop/graph/badge.svg
   :target: https://codecov.io/gh/clinicedc/edc-locator

edc_locator/migrations/0032_alter_subjectlocator_managers.py

@@ -1,8 +1,9 @@
 # Generated by Django 4.2.1 on 2023-07-07 19:32
 
+import edc_sites.models
 from django.db import migrations
+
 import edc_locator.model_mixins.locator_model_mixin
-import edc_sites.model_mixins
 
 
 class Migration(migrations.Migration):
@@ -18,7 +19,7 @@ class Migration(migrations.Migration):
                     "objects",
                     edc_locator.model_mixins.locator_model_mixin.LocatorManager(),
                 ),
-                ("on_site", edc_sites.model_mixins.CurrentSiteManager()),
+                ("on_site", edc_sites.models.CurrentSiteManager()),
             ],
         ),
     ]

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,23 +1,18 @@
 #!/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_test_utils import DefaultTestSettings
+from edc_test_utils import DefaultTestSettings, func_main
 
 app_name = "edc_locator"
-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,
-    ETC_DIR=os.path.join(base_dir, app_name, "tests", "etc"),
+    ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
     SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
     INSTALLED_APPS=[
         "django.contrib.admin",
@@ -54,11 +49,7 @@
 
 
 def main():
-    if not settings.configured:
-        settings.configure(**DEFAULT_SETTINGS)
-    django.setup()
-    failures = DiscoverRunner(failfast=True).run_tests([f"{app_name}.tests"])
-    sys.exit(failures)
+    func_main(project_settings, *[f"{app_name}.tests"])
 
 
 if __name__ == "__main__":