Merge branch 'release/0.3.40' 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_export/archive_exporter.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Type
 
 from edc_pdutils import CsvModelExporter
-from edc_sites.get_sites_from_user import get_sites_from_user
+from edc_sites.site import sites
 from edc_utils import get_utcnow
 
 from .files_archiver import FilesArchiver
@@ -58,7 +58,7 @@ def __init__(
                 model=model,
                 export_folder=tmp_folder,
                 decrypt=decrypt,
-                sites=get_sites_from_user(user),
+                site_ids=sites.get_site_ids_for_user(user),
                 **kwargs,
             )
             self.exported.append(csv_exporter.to_csv())

edc_export/migrations/0015_alter_datarequest_managers_and_more.py

@@ -1,8 +1,8 @@
 # Generated by Django 4.2.3 on 2023-07-18 17:27
 
-from django.db import migrations, models
 import django.db.models.deletion
-import edc_sites.model_mixins
+import edc_sites.models
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -15,13 +15,13 @@ class Migration(migrations.Migration):
         migrations.AlterModelManagers(
             name="datarequest",
             managers=[
-                ("on_site", edc_sites.model_mixins.CurrentSiteManager()),
+                ("on_site", edc_sites.models.CurrentSiteManager()),
             ],
         ),
         migrations.AlterModelManagers(
             name="datarequesthistory",
             managers=[
-                ("on_site", edc_sites.model_mixins.CurrentSiteManager()),
+                ("on_site", edc_sites.models.CurrentSiteManager()),
             ],
         ),
         migrations.AddField(

edc_export/models/data_request.py

@@ -2,7 +2,7 @@
 from django.db import models
 from django.db.models import Index
 from edc_model.models import BaseUuidModel, HistoricalRecords
-from edc_sites.model_mixins import SiteModelMixin
+from edc_sites.models import SiteModelMixin
 
 from ..choices import EXPORT_FORMATS
 from ..constants import CSV

edc_export/models/data_request_history.py

@@ -2,7 +2,7 @@
 from django.db.models import Index
 from django.db.models.deletion import PROTECT
 from edc_model.models import BaseUuidModel
-from edc_sites.model_mixins import SiteModelMixin
+from edc_sites.models import SiteModelMixin
 from edc_utils import get_utcnow
 
 from .data_request import DataRequest

pyproject.toml

@@ -1,18 +1,17 @@
 [build-system]
-requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
-build-backend = "setuptools.build_meta"
+requires = ["setuptools>=60", "setuptools-scm>=8.0"]
 
 [tool.setuptools_scm]
-write_to = "_version.py"
+version_file="_version.py"
 
 [tool.black]
 line-length = 95
-target-version = ["py310"]
+target-version = ["py311"]
 extend-exclude = '''^(.*\/)*\b(migrations)\b($|\/.*$)'''
 
 [tool.isort]
 profile = "black"
-py_version = "310"
+py_version = "311"
 skip = [".tox", ".eggs", "migrations"]
 
 [tool.coverage.run]
@@ -36,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 =
@@ -57,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,19 @@
 #!/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_export"
-base_dir = dirname(abspath(__file__))
+base_dir = Path(__file__).absolute().parent
 
-DEFAULT_SETTINGS = DefaultTestSettings(
+project_settings = DefaultTestSettings(
     calling_file=__file__,
     APP_NAME=app_name,
     BASE_DIR=base_dir,
-    ETC_DIR=os.path.join(base_dir, app_name, "tests", "etc"),
+    ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
     EDC_BOOTSTRAP=3,
+    EDC_SITES_REGISTER_DEFAULT=True,
     INSTALLED_APPS=[
         "django.contrib.admin",
         "django.contrib.auth",
@@ -56,12 +52,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")]
-    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__":