Skip to content

Commit

Permalink
Merge branch 'release/1.0.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Jan 21, 2025
2 parents 73b2aff + 40d1a51 commit 4fb96f5
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ exclude: tests/etc/user-*

repos:
- repo: https://github.com/PyCQA/bandit
rev: 1.7.10
rev: 1.8.2
hooks:
- id: bandit
args:
Expand Down
79 changes: 79 additions & 0 deletions edc_unblinding/tests/test_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#!/usr/bin/env python
import sys
from pathlib import Path

from edc_test_settings.default_test_settings import DefaultTestSettings

app_name = "edc_unblinding"
base_dir = Path(__file__).absolute().parent.parent.parent

project_settings = DefaultTestSettings(
calling_file=__file__,
template_dirs=[base_dir / app_name / "tests" / "templates"],
BASE_DIR=base_dir,
APP_NAME=app_name,
ETC_DIR=base_dir / app_name / "tests" / "etc",
EDC_AUTH_CODENAMES_WARN_ONLY=True,
SILENCED_SYSTEM_CHECKS=[
"sites.E101",
"edc_navbar.E002",
"edc_navbar.E003",
"edc_consent.E001",
"edc_sites.E001",
],
SUBJECT_SCREENING_MODEL="visit_schedule_app.subjectscreening",
SUBJECT_CONSENT_MODEL="visit_schedule_app.subjectconsent",
SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
SUBJECT_VISIT_MISSED_MODEL="visit_schedule_app.subjectvisitmissed",
SUBJECT_REQUISITION_MODEL="visit_schedule_app.subjectrequisition",
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",
"multisite",
"edc_action_item.apps.AppConfig",
"edc_appointment.apps.AppConfig",
"edc_auth.apps.AppConfig",
"edc_crf.apps.AppConfig",
"edc_data_manager.apps.AppConfig",
"edc_device.apps.AppConfig",
"edc_facility.apps.AppConfig",
"edc_form_runners.apps.AppConfig",
"edc_identifier.apps.AppConfig",
"edc_lab.apps.AppConfig",
"edc_label.apps.AppConfig",
"edc_locator.apps.AppConfig",
"edc_metadata.apps.AppConfig",
"edc_notification.apps.AppConfig",
"edc_offstudy.apps.AppConfig",
"edc_registration.apps.AppConfig",
"edc_sites.apps.AppConfig",
"edc_timepoint.apps.AppConfig",
"edc_visit_schedule.apps.AppConfig",
"edc_visit_tracking.apps.AppConfig",
"edc_prn.apps.AppConfig",
"edc_pdf_reports.apps.AppConfig",
"edc_unblinding.apps.AppConfig",
"visit_schedule_app.apps.AppConfig",
"visit_tracking_app.apps.AppConfig",
"edc_appconfig.apps.AppConfig",
],
DASHBOARD_BASE_TEMPLATES={
"dashboard_template": (
base_dir / "edc_unblinding" / "tests" / "templates" / "dashboard.html"
),
"dashboard2_template": (
base_dir / "edc_unblinding" / "tests" / "templates" / "dashboard2.html"
),
},
use_test_urls=True,
add_dashboard_middleware=True,
add_lab_dashboard_middleware=True,
).settings
for k, v in project_settings.items():
setattr(sys.modules[__name__], k, v)
85 changes: 2 additions & 83 deletions runtests.py
Original file line number Diff line number Diff line change
@@ -1,86 +1,5 @@
#!/usr/bin/env python
import logging
from pathlib import Path

from edc_test_utils import DefaultTestSettings, func_main

app_name = "edc_unblinding"
base_dir = Path(__file__).absolute().parent

project_settings = DefaultTestSettings(
calling_file=__file__,
template_dirs=[str(base_dir / app_name / "tests" / "templates")],
BASE_DIR=base_dir,
APP_NAME=app_name,
ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
EDC_AUTH_CODENAMES_WARN_ONLY=True,
SILENCED_SYSTEM_CHECKS=[
"sites.E101",
"edc_navbar.E002",
"edc_navbar.E003",
"edc_consent.E001",
"edc_sites.E001",
],
SUBJECT_SCREENING_MODEL="visit_schedule_app.subjectscreening",
SUBJECT_CONSENT_MODEL="visit_schedule_app.subjectconsent",
SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
SUBJECT_VISIT_MISSED_MODEL="visit_schedule_app.subjectvisitmissed",
SUBJECT_REQUISITION_MODEL="visit_schedule_app.subjectrequisition",
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",
"multisite",
"edc_action_item.apps.AppConfig",
"edc_appointment.apps.AppConfig",
"edc_auth.apps.AppConfig",
"edc_crf.apps.AppConfig",
"edc_data_manager.apps.AppConfig",
"edc_device.apps.AppConfig",
"edc_facility.apps.AppConfig",
"edc_form_runners.apps.AppConfig",
"edc_identifier.apps.AppConfig",
"edc_lab.apps.AppConfig",
"edc_label.apps.AppConfig",
"edc_locator.apps.AppConfig",
"edc_metadata.apps.AppConfig",
"edc_notification.apps.AppConfig",
"edc_offstudy.apps.AppConfig",
"edc_registration.apps.AppConfig",
"edc_sites.apps.AppConfig",
"edc_timepoint.apps.AppConfig",
"edc_visit_schedule.apps.AppConfig",
"edc_visit_tracking.apps.AppConfig",
"edc_prn.apps.AppConfig",
"edc_pdf_reports.apps.AppConfig",
"edc_unblinding.apps.AppConfig",
"visit_schedule_app.apps.AppConfig",
"visit_tracking_app.apps.AppConfig",
"edc_appconfig.apps.AppConfig",
],
DASHBOARD_BASE_TEMPLATES={
"dashboard_template": str(
base_dir / "edc_unblinding" / "tests" / "templates" / "dashboard.html"
),
"dashboard2_template": str(
base_dir / "edc_unblinding" / "tests" / "templates" / "dashboard2.html"
),
},
use_test_urls=True,
add_dashboard_middleware=True,
add_lab_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_unblinding.tests.test_settings", "edc_unblinding.tests")

0 comments on commit 4fb96f5

Please sign in to comment.