clinicedc 2.0.6__py3-none-any.whl → 2.0.7__py3-none-any.whl

edc_model/validators/date.py

@@ -1,37 +1,36 @@
 from datetime import date, datetime, timedelta
 
 from django.core.exceptions import ValidationError
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 
 def datetime_not_future(utc_datetime: datetime) -> None:
     time_error = timedelta(minutes=10)
-    if utc_datetime > get_utcnow() + time_error:
+    if utc_datetime > timezone.now() + time_error:
         raise ValidationError("Cannot be a future date/time")
 
 
 def date_not_future(value: date) -> None:
-    if value > get_utcnow().date():
+    if value > timezone.now().date():
         raise ValidationError("Cannot be a future date")
 
 
 def date_is_past(value: date) -> None:
-    if value > get_utcnow().date():
+    if value > timezone.now().date():
         raise ValidationError("Expected a past date")
 
 
 def date_is_not_now(value: date) -> None:
-    if value == get_utcnow().date():
+    if value == timezone.now().date():
         raise ValidationError("Cannot be today")
 
 
 def datetime_is_future(utc_datetime: datetime) -> None:
     time_error = timedelta(minutes=10)
-    if utc_datetime < get_utcnow() + time_error:
+    if utc_datetime < timezone.now() + time_error:
         raise ValidationError("Expected a future date/time")
 
 
 def date_is_future(value: date) -> None:
-    if value < get_utcnow().date():
+    if value < timezone.now().date():
         raise ValidationError("Expected a future date")

edc_model_admin/list_filters/future_date_list_filter.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dateutil.relativedelta import MO, relativedelta
 from django.contrib.admin import SimpleListFilter
 from django.db.models import QuerySet
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 from edc_constants.constants import (
@@ -16,7 +17,6 @@ from edc_constants.constants import (
     TODAY,
     TOMORROW,
 )
-from edc_utils import get_utcnow
 
 
 class FutureDateListFilter(SimpleListFilter):
@@ -42,9 +42,9 @@ class FutureDateListFilter(SimpleListFilter):
         return {}
 
     def queryset(self, request, queryset) -> QuerySet | None:
-        morning = get_utcnow().replace(second=0, hour=0, minute=0)
+        morning = timezone.now().replace(second=0, hour=0, minute=0)
         monday = morning + relativedelta(weekday=MO(-1))
-        night = get_utcnow().replace(second=59, hour=23, minute=59)
+        night = timezone.now().replace(second=59, hour=23, minute=59)
         qs = None
         if self.value() == NEXT_WEEK:
             qs = queryset.filter(

edc_model_admin/list_filters/past_date_list_filter.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dateutil.relativedelta import MO, relativedelta
 from django.contrib.admin import SimpleListFilter
 from django.db.models import QuerySet
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 from edc_constants.constants import (
@@ -17,7 +18,6 @@ from edc_constants.constants import (
     TODAY,
     YESTERDAY,
 )
-from edc_utils import get_utcnow
 
 
 class PastDateListFilter(SimpleListFilter):
@@ -45,9 +45,9 @@ class PastDateListFilter(SimpleListFilter):
         return {}
 
     def queryset(self, request, queryset) -> QuerySet | None:
-        morning = get_utcnow().replace(second=0, hour=0, minute=0)
+        morning = timezone.now().replace(second=0, hour=0, minute=0)
         monday = morning + relativedelta(weekday=MO(-1))
-        night = get_utcnow().replace(second=59, hour=23, minute=59)
+        night = timezone.now().replace(second=59, hour=23, minute=59)
         qs = None
         if self.value() == THIS_WEEK:
             qs = queryset.filter(

edc_model_admin/mixins/model_admin_protect_pii_mixin.py

@@ -21,16 +21,15 @@ class ModelAdminProtectPiiMixin:
     the changelist, add the method name to `extra_pii_attrs`.
     """
 
-    extra_pii_attrs: list[str] | None = []
+    extra_pii_attrs: tuple[str] | None = ()
 
     def get_extra_pii_attrs(self) -> list[str | tuple[str, str]]:
         return self.extra_pii_attrs or []
 
-    def get_encrypted_fields(self) -> list[str]:
+    def get_encrypted_fields(self) -> tuple[str, ...]:
         encrypted_fields = [f.name for f in get_encrypted_fields(self.model)]
-        encrypted_fields.extend(self.get_extra_pii_attrs())
-        encrypted_fields = list(set(encrypted_fields))
-        return encrypted_fields
+        encrypted_fields.extend(*self.get_extra_pii_attrs())
+        return tuple(set(encrypted_fields))
 
     def get_list_display(self, request) -> tuple[str]:
         list_display = super().get_list_display(request)

edc_model_fields/fields/other_charfield.py

@@ -12,7 +12,7 @@ class OtherCharField(CharField):
     def __init__(self, metadata=None, *args, **kwargs):
         self.metadata = metadata
         kwargs.update(blank=True)
-        kwargs.update(null=True)
+        kwargs.update(default="")
         kwargs.setdefault("max_length", self.DEFAULT_MAX_LENGTH)
         kwargs.setdefault("verbose_name", _("If other, please specify ..."))
         self.max_length = kwargs["max_length"]
@@ -25,7 +25,7 @@ class OtherCharField(CharField):
     def deconstruct(self):
         name, path, args, kwargs = super().deconstruct()
         kwargs.update(blank=True)
-        kwargs.update(null=True)
+        kwargs.update(default="")
         kwargs.update(max_length=self.max_length)
         kwargs.update(verbose_name=self.verbose_name)
         if self.metadata is not None:

edc_navbar/migrations/0004_auto_20220825_0451.py

@@ -7,6 +7,7 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -33,14 +34,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,
                     ),
                 ),
                 (

edc_navbar/migrations/0009_alter_edcpermissions_device_created_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_navbar", "0008_alter_edcpermissions_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]

edc_notification/migrations/0001_initial.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -21,11 +21,11 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",

edc_notification/migrations/0004_auto_20190305_0123.py

@@ -4,6 +4,7 @@ import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.models.audit_model_mixin
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="notification",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="notification",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="notification",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="notification",

edc_notification/migrations/0011_alter_notification_device_created_and_more.py

@@ -0,0 +1,59 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_notification", "0010_alter_notification_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="notification",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="mailing_list_address",
+            field=models.EmailField(
+                blank=True,
+                default="",
+                max_length=254,
+                verbose_name="Mailing list address",
+            ),
+        ),
+    ]

edc_notification/models/notification.py

@@ -20,7 +20,7 @@ class Notification(BaseUuidModel):
 
     display_name = models.CharField(max_length=255, unique=True)
 
-    mailing_list_address = models.EmailField(_("Mailing list address"), blank=True, null=True)
+    mailing_list_address = models.EmailField(_("Mailing list address"), blank=True, default="")
 
     enabled = models.BooleanField(default=True)
 

edc_notification/notification/notification.py

@@ -1,13 +1,15 @@
+import contextlib
+
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import EmailMessage
+from django.utils import timezone
 from twilio.base.exceptions import TwilioException, TwilioRestException
 from twilio.rest import Client
 
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 from edc_sites.site import SiteNotRegistered, sites
-from edc_utils import get_utcnow
 
 from ..site_notifications import site_notifications
 from ..stubs import NotificationModelStub
@@ -30,7 +32,7 @@ class Notification:
 
     sms_client = Client
 
-    email_from: list[str] = get_email_contacts("data_manager")
+    email_from: str = get_email_contacts("data_manager")
     email_to: list[str] | None = None  # usually a mailing list address
     email_message_cls = EmailMessage
 
@@ -124,9 +126,9 @@ class Notification:
             if use_sms:
                 sms_sent = self.send_sms(**kwargs)
             self.post_notification_actions(email_sent=email_sent, sms_sent=sms_sent, **kwargs)
-        return True if email_sent or sms_sent else False
+        return bool(email_sent or sms_sent)
 
-    def notify_on_condition(self, **kwargs) -> bool:
+    def notify_on_condition(self, **kwargs) -> bool:  # noqa: ARG002
         """Override to conditionally return True if the notification
         should be sent by email and/or sms.
 
@@ -174,7 +176,7 @@ class Notification:
             notification_model = notification_model_cls.objects.get(name=self.name)
         return notification_model
 
-    def get_display_name(self, **kwargs):
+    def get_display_name(self, **kwargs):  # noqa: ARG002
         return self.display_name
 
     def get_template_options(self, instance=None, test_message=None, **kwargs):
@@ -193,30 +195,28 @@ class Notification:
             test_subject_line=(self.email_test_subject_line if test_message else "").strip(),
             test_body_line=self.email_test_body_line if test_message else "",
             test_line=self.sms_test_line if test_message else "",
-            message_datetime=get_utcnow(),
+            message_datetime=timezone.now(),
             message_reference="",
         )
         if "subject_identifier" not in template_options:
-            try:
+            with contextlib.suppress(AttributeError):
                 template_options.update(subject_identifier=instance.subject_identifier)
-            except AttributeError:
-                pass
         if "site_name" not in template_options:
             try:
                 site_name = sites.get(instance.site.id).description
             except AttributeError:
                 pass
             except SiteNotRegistered as e:
-                raise NotificationError(e)
+                raise NotificationError(e) from e
             else:
                 template_options.update(site_name=site_name.replace("_", " ").title())
         return template_options
 
     def send_email(
         self,
+        email_to: list[str],
         fail_silently: bool | None = None,
-        email_to: list[str] = None,
-        email_body_template: str = None,
+        email_body_template: str | None = None,
         **kwargs,
     ) -> int:
         kwargs.update(**self.get_template_options(**kwargs))

edc_offstudy/migrations/0001_initial.py

@@ -10,7 +10,7 @@ import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.other_charfield
 import edc_model_fields.fields.userfield
 import edc_protocol.validators
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -24,11 +24,11 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -97,7 +97,7 @@ class Migration(migrations.Migration):
                 (
                     "offstudy_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
                             edc_model.validators.date.datetime_not_future,

edc_offstudy/migrations/0002_auto_20180921_0434.py

@@ -14,7 +14,7 @@ import edc_model_fields.fields.other_charfield
 import edc_model_fields.fields.userfield
 import edc_protocol.validators
 import edc_sites.models
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -30,11 +30,11 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -102,7 +102,7 @@ class Migration(migrations.Migration):
                 (
                     "offstudy_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
                             edc_model.validators.date.datetime_not_future,

edc_offstudy/migrations/0005_auto_20190305_0123.py

@@ -4,6 +4,7 @@ import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.models.audit_model_mixin
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
@@ -56,9 +53,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectoffstudy",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="subjectoffstudy",
@@ -72,9 +67,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectoffstudy",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="subjectoffstudy",