Skip to content

Commit a0eded2

Browse files
committed
Merge branch 'release/0.3.25' into main
2 parents ae3da42 + b8b7527 commit a0eded2

File tree

4 files changed

+41
-21
lines changed

4 files changed

+41
-21
lines changed

edc_list_data/apps.py

-18
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
1-
import sys
2-
31
from django.apps import AppConfig as DjangoAppConfig
42
from django.core.management.color import color_style
5-
from django.db.models.signals import post_migrate
6-
7-
from .site_list_data import get_autodiscover_enabled, site_list_data
83

94
style = color_style()
105

116

12-
def post_migrate_list_data(sender=None, **kwargs):
13-
if get_autodiscover_enabled():
14-
sys.stdout.write(style.MIGRATE_HEADING("Updating list data:\n"))
15-
16-
site_list_data.autodiscover()
17-
site_list_data.load_data()
18-
sys.stdout.write("Done.\n")
19-
sys.stdout.flush()
20-
21-
227
class AppConfig(DjangoAppConfig):
238
name = "edc_list_data"
249
verbose_name = "Edc List Data"
25-
26-
def ready(self):
27-
post_migrate.connect(post_migrate_list_data, sender=self)

edc_list_data/post_migrate_signals.py

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import sys
2+
3+
from django.core.management.color import color_style
4+
5+
style = color_style()
6+
7+
8+
def post_migrate_list_data(sender=None, **kwargs):
9+
from .site_list_data import get_autodiscover_enabled, site_list_data
10+
11+
if get_autodiscover_enabled():
12+
sys.stdout.write(style.MIGRATE_HEADING("Updating list data:\n"))
13+
site_list_data.load_data()
14+
sys.stdout.write("Done.\n")
15+
sys.stdout.flush()

edc_list_data/site_list_data.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def register(self, module, app_name=None):
5353
else:
5454
self.app_names.append(app_name)
5555
opts = copy.deepcopy(self._get_options(module))
56-
sys.stdout.write(f" + registered {self.module_name} from '{module.__name__}'\n")
56+
sys.stdout.write(f" - registered {self.module_name} from '{module.__name__}'\n")
5757
if opts.get(self.module_name):
5858
self._replace_list_data_or_raise_on_duplicate(module, opts)
5959
self.registry[module.__name__] = opts
@@ -120,8 +120,8 @@ def _replace_default_list_data_for_model(
120120
) -> None:
121121
self.registry[default_module_name][self.module_name].pop(label_lower)
122122
sys.stdout.write(
123-
f" - {self.module_name} from `{full_module_name}.{label_lower}`\n"
124-
f" has replaced `{default_module_name}.{label_lower}`.\n"
123+
f" + {self.module_name} from `{full_module_name}.{label_lower}`\n"
124+
f" has replaced `{default_module_name}.{label_lower}`.\n"
125125
)
126126

127127
@staticmethod

runtests.py

+23
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,16 @@
1111
calling_file=__file__,
1212
APP_NAME=app_name,
1313
BASE_DIR=base_dir,
14+
SILENCED_SYSTEM_CHECKS=[
15+
"sites.E101",
16+
"edc_navbar.E002",
17+
"edc_navbar.E003",
18+
"edc_consent.E001",
19+
"edc_sites.E001",
20+
"edc_sites.E002",
21+
],
1422
EDC_LIST_DATA_ENABLE_AUTODISCOVER=False,
23+
SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
1524
INSTALLED_APPS=[
1625
"django.contrib.admin",
1726
"django.contrib.auth",
@@ -23,9 +32,23 @@
2332
"multisite",
2433
"django_crypto_fields.apps.AppConfig",
2534
"django_revision.apps.AppConfig",
35+
"edc_appointment.apps.AppConfig",
36+
"edc_auth.apps.AppConfig",
37+
"edc_lab.apps.AppConfig",
38+
"edc_action_item.apps.AppConfig",
39+
"edc_metadata.apps.AppConfig",
40+
"edc_registration.apps.AppConfig",
41+
"edc_identifier.apps.AppConfig",
42+
"edc_visit_schedule.apps.AppConfig",
43+
"edc_data_manager.apps.AppConfig",
44+
"edc_form_runners.apps.AppConfig",
45+
"edc_visit_tracking.apps.AppConfig",
46+
"edc_notification.apps.AppConfig",
2647
"edc_sites.apps.AppConfig",
48+
"edc_label.apps.AppConfig",
2749
"edc_list_data.apps.AppConfig",
2850
"my_list_app.apps.AppConfig",
51+
"edc_appconfig.apps.AppConfig",
2952
],
3053
add_dashboard_middleware=True,
3154
use_test_urls=True,

0 commit comments

Comments
 (0)