Merge branch 'release/0.3.44' into main

edc_model/tests/test_settings.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+import sys
+from pathlib import Path
+
+from edc_test_settings.default_test_settings import DefaultTestSettings
+
+app_name = "edc_model"
+base_dir = Path(__file__).absolute().parent.parent.parent
+
+project_settings = DefaultTestSettings(
+    APP_NAME="edc_model",
+    BASE_DIR=base_dir,
+    ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
+    KEY_PATH=str(base_dir / app_name / "tests" / "etc"),
+    ALLOWED_HOSTS=["localhost"],
+    ROOT_URLCONF=f"{app_name}.tests.urls",
+    STATIC_URL="/static/",
+    INSTALLED_APPS=[
+        "django.contrib.admin",
+        "django.contrib.auth",
+        "django.contrib.contenttypes",
+        "django.contrib.sessions",
+        "django.contrib.messages",
+        "django.contrib.staticfiles",
+        "django.contrib.sites",
+        "multisite",
+        "django_crypto_fields.apps.AppConfig",
+        "edc_device.apps.AppConfig",
+        "edc_sites.apps.AppConfig",
+        "edc_model.apps.AppConfig",
+    ],
+    add_dashboard_middleware=False,
+).settings
+
+for k, v in project_settings.items():
+    setattr(sys.modules[__name__], k, v)

runtests.py

@@ -1,43 +1,6 @@
 #!/usr/bin/env python
-import logging
-from pathlib import Path
-
-from edc_test_utils import DefaultTestSettings, func_main
-
-app_name = "edc_model"
-base_dir = Path(__file__).absolute().parent
-
-project_settings = DefaultTestSettings(
-    APP_NAME="edc_model",
-    BASE_DIR=base_dir,
-    ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
-    KEY_PATH=str(base_dir / app_name / "tests" / "etc"),
-    ALLOWED_HOSTS=["localhost"],
-    ROOT_URLCONF=f"{app_name}.tests.urls",
-    STATIC_URL="/static/",
-    INSTALLED_APPS=[
-        "django.contrib.admin",
-        "django.contrib.auth",
-        "django.contrib.contenttypes",
-        "django.contrib.sessions",
-        "django.contrib.messages",
-        "django.contrib.staticfiles",
-        "django.contrib.sites",
-        "multisite",
-        "django_crypto_fields.apps.AppConfig",
-        "edc_dashboard.apps.AppConfig",
-        "edc_device.apps.AppConfig",
-        "edc_sites.apps.AppConfig",
-        "edc_model.apps.AppConfig",
-    ],
-    add_dashboard_middleware=True,
-).settings
-
-
-def main():
-    func_main(project_settings, *[f"{app_name}.tests"])
 
+from edc_test_settings.func_main import func_main2
 
 if __name__ == "__main__":
-    logging.basicConfig()
-    main()
+    func_main2("edc_model.tests.test_settings", "edc_model.tests")