meta-edc 1.1.8__py3-none-any.whl → 1.1.12__py3-none-any.whl

meta_prn/admin/off_study_medication_admin.py

@@ -1,8 +1,7 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
@@ -40,7 +39,7 @@ class OffStudyMedicationAdmin(
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "reason": admin.VERTICAL,
     }
 
@@ -48,7 +47,7 @@ class OffStudyMedicationAdmin(
 
     search_fields = ("subject_identifier",)
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = (
             "subject_identifier",
@@ -58,7 +57,7 @@ class OffStudyMedicationAdmin(
         )
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = (
             "medications",

meta_prn/admin/offschedule_admin.py

@@ -1,10 +1,9 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django_audit_fields import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
@@ -23,7 +22,7 @@ class OffScheduleAdmin(
 ):
     form = OffScheduleForm
 
-    additional_instructions = mark_safe(
+    additional_instructions = mark_safe(  # noqa: S308
         render_to_string(
             "meta_prn/offschedule/additional_instructions.html",
             context=dict(verbose_name=EndOfStudy._meta.verbose_name),
@@ -36,12 +35,12 @@ class OffScheduleAdmin(
         audit_fieldset_tuple,
     )
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = ("subject_identifier", "dashboard", "offschedule_datetime")
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("offschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)

meta_prn/admin/offschedule_dm_referral_admin.py

@@ -1,10 +1,10 @@
-from typing import Tuple
 
 from django.contrib import admin
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django_audit_fields import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
@@ -25,12 +25,12 @@ class OffScheduleDmReferralAdmin(
 
     form = OffScheduleDmReferralForm
 
-    additional_instructions = mark_safe(
+    additional_instructions = mark_safe(  # noqa: S308
         render_to_string(
             "meta_prn/offschedule/additional_instructions.html",
             context=dict(verbose_name=EndOfStudy._meta.verbose_name),
         )
-    )  # nosec B703, B308
+    )
 
     fieldsets = (
         (None, {"fields": ("subject_identifier", "offschedule_datetime")}),
@@ -38,12 +38,12 @@ class OffScheduleDmReferralAdmin(
         audit_fieldset_tuple,
     )
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = ("subject_identifier", "dashboard", "offschedule_datetime")
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("offschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)

meta_prn/admin/offschedule_postnatal_admin.py

@@ -1,10 +1,10 @@
-from typing import Tuple
 
 from django.contrib import admin
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django_audit_fields import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
@@ -22,12 +22,12 @@ class OffSchedulePostnatalAdmin(
 ):
     instructions = None
 
-    additional_instructions = mark_safe(
+    additional_instructions = mark_safe(  # noqa: S308
         render_to_string(
             "meta_prn/offschedule/additional_instructions.html",
             context=dict(verbose_name=EndOfStudy._meta.verbose_name),
         )
-    )  # nosec B703, B308
+    )
 
     fieldsets = (
         (None, {"fields": ("subject_identifier", "offschedule_datetime")}),
@@ -35,16 +35,16 @@ class OffSchedulePostnatalAdmin(
         audit_fieldset_tuple,
     )
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = ("subject_identifier", "dashboard", "offschedule_datetime")
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("offschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         custom_fields = ("subject_identifier", "offschedule_datetime")
         return tuple(set(super().get_readonly_fields(request, obj=obj) + custom_fields))

meta_prn/admin/offschedule_pregnancy_admin.py

@@ -1,10 +1,10 @@
-from typing import Tuple
 
 from django.contrib import admin
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django_audit_fields import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
@@ -23,12 +23,12 @@ class OffSchedulePregnancyAdmin(
 ):
     instructions = None
 
-    additional_instructions = mark_safe(
+    additional_instructions = mark_safe(  # noqa: S308
         render_to_string(
             "meta_prn/offschedule/additional_instructions.html",
             context=dict(verbose_name=EndOfStudy._meta.verbose_name),
         )
-    )  # nosec B703, B308
+    )
 
     form = OffSchedulePregnancyForm
 
@@ -38,16 +38,17 @@ class OffSchedulePregnancyAdmin(
         audit_fieldset_tuple,
     )
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = ("subject_identifier", "dashboard", "offschedule_datetime")
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("offschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
 
     # def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
     #     custom_fields = ("subject_identifier", "offschedule_datetime")
-    #     return tuple(set(super().get_readonly_fields(request, obj=obj) + custom_fields))
+    #     return tuple(set(super().get_readonly_fields(request, obj=obj) +
+    #     custom_fields))

meta_prn/admin/onschedule_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
@@ -17,23 +15,24 @@ class OnScheduleAdmin(
 
     fields = ("subject_identifier", "onschedule_datetime")
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = ("subject_identifier", "dashboard", "onschedule_datetime")
         return custom_fields + tuple(
-            f for f in list_display if f not in custom_fields + ("__str__",)
+            f for f in list_display if f not in (*custom_fields, "__str__")
         )
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("onschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:  # noqa: ARG002
         return (
             "subject_identifier",
             "onschedule_datetime",
         )
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
-        return tuple(set(super().get_search_fields(request) + ("subject_identifier",)))
+    def get_search_fields(self, request) -> tuple[str, ...]:
+        fields = super().get_search_fields(request)
+        return tuple({*fields, "subject_identifier"})

meta_prn/admin/onschedule_dm_referral_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
@@ -17,14 +15,14 @@ class OnScheduleDmReferralAdmin(
 
     fields = ("subject_identifier", "onschedule_datetime")
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = ("subject_identifier", "dashboard", "onschedule_datetime")
         return custom_fields + tuple(
-            f for f in list_display if f not in custom_fields + ("__str__",)
+            f for f in list_display if f not in (*custom_fields, "__str__")
         )
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("onschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
@@ -35,5 +33,6 @@ class OnScheduleDmReferralAdmin(
     #         "onschedule_datetime",
     #     )
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
-        return tuple(set(super().get_search_fields(request) + ("subject_identifier",)))
+    def get_search_fields(self, request) -> tuple[str, ...]:
+        fields = super().get_search_fields(request)
+        return tuple({*fields, "subject_identifier"})

meta_prn/admin/pregnancy_notification_admin.py

@@ -1,8 +1,7 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
@@ -46,12 +45,12 @@ class PregnancyNotificationAdmin(
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "bhcg_confirmed": admin.VERTICAL,
         "may_contact": admin.VERTICAL,
     }
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = (
             "subject_identifier",
@@ -61,7 +60,7 @@ class PregnancyNotificationAdmin(
         )
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("edd", "may_contact")
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)

meta_prn/admin/protocol_incident_admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from edc_action_item import ActionItemModelAdminMixin
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_protocol_incident.modeladmin_mixins import ProtocolIncidentModelAdminMixin

meta_prn/admin/subject_transfer_admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from edc_action_item import ActionItemModelAdminMixin
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin

meta_prn/baker_recipes.py

@@ -1,6 +1,6 @@
 from dateutil.relativedelta import relativedelta
+from django.utils import timezone
 from edc_constants.constants import YES
-from edc_utils import get_utcnow
 from faker import Faker
 from model_bakery.recipe import Recipe
 
@@ -14,15 +14,15 @@ pregnancynotification = Recipe(
     # site=None,
     action_identifier=None,
     subject_identifier=None,
-    report_datetime=get_utcnow(),
+    report_datetime=timezone.now(),
     bhcg_confirmed=YES,
     unconfirmed_details=None,
-    edd=get_utcnow() + relativedelta(months=6),
+    edd=timezone.now() + relativedelta(months=6),
 )
 
 dmreferral = Recipe(
     DmReferral,
     action_identifier=None,
     subject_identifier=None,
-    report_datetime=get_utcnow(),
+    report_datetime=timezone.now(),
 )

meta_prn/form_validators/__init__.py

@@ -1,2 +1,7 @@
 from .end_of_study import EndOfStudyFormValidator
 from .protocol_incident import ProtocolIncidentFormValidator
+
+__all__ = [
+    "EndOfStudyFormValidator",
+    "ProtocolIncidentFormValidator",
+]

meta_prn/form_validators/end_of_study.py

@@ -192,7 +192,7 @@ class EndOfStudyFormValidator(
                 if (obj.bhcg_date or obj.report_datetime.date()) != self.cleaned_data.get(
                     "pregnancy_date"
                 ):
-                    dt = formatted_date((obj.bhcg_date or obj.report_datetime.date()))
+                    dt = formatted_date(obj.bhcg_date or obj.report_datetime.date())
                     self.raise_validation_error(
                         {
                             "pregnancy_date": (
@@ -229,7 +229,7 @@ class EndOfStudyFormValidator(
                     obj.delivery_datetime.date() or obj.report_datetime.date()
                 ) != self.cleaned_data.get("delivery_date"):
                     dt = formatted_date(
-                        (obj.delivery_datetime.date() or obj.report_datetime.date())
+                        obj.delivery_datetime.date() or obj.report_datetime.date()
                     )
                     self.raise_validation_error(
                         {

meta_prn/forms/__init__.py

@@ -8,3 +8,16 @@ from .offschedule_pregnancy_form import OffSchedulePregnancyForm
 from .pregnancy_notification_form import PregnancyNotificationForm
 from .protocol_incident_form import ProtocolIncidentForm
 from .subject_transfer_form import SubjectTransferForm
+
+__all__ = [
+    "DmReferralForm",
+    "EndOfStudyForm",
+    "LossToFollowupForm",
+    "OffScheduleDmReferralForm",
+    "OffScheduleForm",
+    "OffSchedulePregnancyForm",
+    "OffStudyMedicationForm",
+    "PregnancyNotificationForm",
+    "ProtocolIncidentForm",
+    "SubjectTransferForm",
+]

meta_prn/migrations/0001_initial.py

@@ -9,7 +9,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_identifier.managers
@@ -80,14 +80,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,
                     ),
                 ),
                 (
@@ -250,14 +250,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,
                     ),
                 ),
                 (
@@ -439,14 +439,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,
                     ),
                 ),
                 (
@@ -779,14 +779,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,
                     ),
                 ),
                 (
@@ -885,14 +885,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,
                     ),
                 ),
                 (
@@ -1063,14 +1063,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,
                     ),
                 ),
                 (
@@ -1270,14 +1270,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,
                     ),
                 ),
                 (
@@ -1496,14 +1496,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,
                     ),
                 ),
                 (
@@ -1870,14 +1870,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,
                     ),
                 ),
                 (
@@ -2003,14 +2003,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,
                     ),
                 ),
                 (
@@ -2222,14 +2222,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,
                     ),
                 ),
                 (
@@ -2448,14 +2448,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,
                     ),
                 ),
                 (