meta-edc 1.1.10__py3-none-any.whl → 1.1.13__py3-none-any.whl

meta_ae/action_items.py

@@ -3,7 +3,8 @@ from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
-from edc_action_item import ActionWithNotification, site_action_items
+from edc_action_item.action_with_notification import ActionWithNotification
+from edc_action_item.site_action_items import site_action_items
 from edc_adverse_event.constants import (
     AE_FOLLOWUP_ACTION,
     AE_INITIAL_ACTION,

meta_ae/admin/__init__.py

@@ -6,3 +6,14 @@ from .death_report_admin import DeathReportAdmin
 from .death_report_tmg_admin import DeathReportTmgAdmin
 from .death_report_tmg_second_admin import DeathReportTmgSecondAdmin
 from .hospitalization_admin import HospitalizationAdmin
+
+__all__ = [
+    "AeFollowupAdmin",
+    "AeInitialAdmin",
+    "AeSusarAdmin",
+    "AeTmgAdmin",
+    "DeathReportAdmin",
+    "DeathReportTmgAdmin",
+    "DeathReportTmgSecondAdmin",
+    "HospitalizationAdmin",
+]

meta_ae/admin/ae_susar_admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from edc_adverse_event.modeladmin_mixins import AeSusarModelAdminMixin
+from edc_adverse_event.modeladmin_mixins.ae_susar_admin_mixin import AeSusarModelAdminMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
 

meta_ae/admin/death_report_admin.py

@@ -65,7 +65,7 @@ class DeathReportAdmin(SiteModelAdminMixin, DeathReportModelAdminMixin, SimpleHi
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "cause_of_death": admin.VERTICAL,
         "death_as_inpatient": admin.VERTICAL,
         "death_location": admin.VERTICAL,

meta_ae/admin/modeladmin_mixins.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
@@ -8,7 +6,7 @@ from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
 from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_adverse_event.forms import AeFollowupForm
 from edc_adverse_event.modeladmin_mixins import (
@@ -51,13 +49,13 @@ class AeReviewModelAdminMixin(
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "outcome": admin.VERTICAL,
         "followup": admin.VERTICAL,
         "ae_grade": admin.VERTICAL,
     }
 
-    list_display: Tuple[str, ...] = (
+    list_display: tuple[str, ...] = (
         "identifier",
         "dashboard",
         "description",
@@ -66,9 +64,9 @@ class AeReviewModelAdminMixin(
         "user",
     )
 
-    list_filter: Tuple[str, ...] = ("ae_grade", "followup", "outcome_date", "report_datetime")
+    list_filter: tuple[str, ...] = ("ae_grade", "followup", "outcome_date", "report_datetime")
 
-    search_fields: Tuple[str, ...] = (
+    search_fields: tuple[str, ...] = (
         "action_identifier",
         "ae_initial__subject_identifier",
         "ae_initial__action_identifier",
@@ -96,8 +94,8 @@ class AeReviewModelAdminMixin(
         if follow_up_reports:
             return format_html(
                 "{}. See {}",
-                mark_safe(_(obj.get_outcome_display())),  # nosec B703, B308
-                mark_safe(_(follow_up_reports)),  # nosec B703, B308
+                mark_safe(_(obj.get_outcome_display())),  # noqa: S308
+                mark_safe(_(follow_up_reports)),  # noqa: S308
             )
         return obj.get_outcome_display()
 
@@ -114,10 +112,10 @@ class AeReviewModelAdminMixin(
                 '<a data-toggle="tooltip" title="{title}" '
                 'href="{url}?q={action_identifier}">{identifier}</a>',
                 title=_("go to ae initial report"),
-                url=mark_safe(url),  # nosec B703, B308
-                action_identifier=mark_safe(  # nosec B703, B308
+                url=mark_safe(url),  # noqa: S308
+                action_identifier=mark_safe(  # noqa: S308
                     obj.ae_initial.action_identifier
                 ),
-                identifier=mark_safe(obj.ae_initial.identifier),  # nosec B703, B308
+                identifier=mark_safe(obj.ae_initial.identifier),  # noqa: S308
             )
         return None

meta_ae/baker_recipes.py

@@ -1,6 +1,6 @@
+from django.utils import timezone
 from edc_adverse_event.constants import NOT_RELATED
 from edc_constants.constants import GRADE4, NO, NOT_APPLICABLE, YES
-from edc_utils.date import get_utcnow
 from model_bakery.recipe import Recipe
 
 from meta_ae.models.ae_followup import AeFollowup
@@ -15,8 +15,8 @@ aeinitial = Recipe(
     ae_description="A description of this event",
     ae_grade=GRADE4,
     ae_study_relation_possibility=YES,
-    ae_start_date=get_utcnow().date(),
-    ae_awareness_date=get_utcnow().date(),
+    ae_start_date=timezone.now().date(),
+    ae_awareness_date=timezone.now().date(),
     study_drug_relation=NOT_RELATED,
     ae_treatment="Some special treatment",
     sae=NO,

meta_ae/forms/__init__.py

@@ -8,3 +8,16 @@ from .death_report_form import DeathReportForm
 from .death_report_tmg_form import DeathReportTmgForm
 from .death_report_tmg_second_form import DeathReportTmgSecondForm
 from .hospitalization_form import HospitalizationForm
+
+__all__ = [
+    "AeFollowupForm",
+    "AeInitialForm",
+    "AeLocalReviewForm",
+    "AeSponsorReviewForm",
+    "AeSusarForm",
+    "AeTmgForm",
+    "DeathReportForm",
+    "DeathReportTmgForm",
+    "DeathReportTmgSecondForm",
+    "HospitalizationForm",
+]

meta_ae/forms/modelform_mixins.py

@@ -21,8 +21,8 @@ class AeReviewModelFormMixin(
         return cleaned_data
 
     class Meta:
-        help_text = {"subject_identifier": "(read-only)", "action_identifier": "(read-only)"}
-        widgets = {
+        help_text = {"subject_identifier": "(read-only)", "action_identifier": "(read-only)"}  # noqa: RUF012
+        widgets = {  # noqa: RUF012
             "subject_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
             "action_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
         }

meta_ae/migrations/0001_initial.py

@@ -8,7 +8,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_crypto_fields.fields.encrypted_text_field
 import django_revision.revision_field
 import edc_action_item.managers
@@ -51,14 +51,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -347,14 +347,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -617,14 +617,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -870,14 +870,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -1123,14 +1123,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -1436,14 +1436,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -1726,14 +1726,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -1948,14 +1948,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -2288,14 +2288,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -2531,14 +2531,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -2750,14 +2750,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -2999,14 +2999,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -3180,14 +3180,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

meta_ae/migrations/0006_aelocalreview_aesponsorreview.py

@@ -5,7 +5,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_revision.revision_field
 import edc_model.models.fields.other_charfield
 import edc_model.validators.date
@@ -38,14 +38,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -237,14 +237,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

meta_ae/migrations/0022_historicalhospitalization_hospitalization.py

@@ -5,7 +5,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_revision.revision_field
 import edc_action_item.managers
 import edc_model.models.fields.date_estimated
@@ -44,15 +44,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -332,15 +328,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",