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

edc_auth/auth_updater/group_updater.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Any, List, Optional
+from typing import Any
 from warnings import warn
 
 from django.apps import apps as django_apps
@@ -36,13 +36,13 @@ class GroupUpdater:
 
     def __init__(
         self,
-        groups: Optional[dict] = None,
+        groups: dict | None = None,
         apps=None,
         verbose=None,
-        pii_models: Optional[list] = None,
-        custom_permissions_tuples: Optional[dict] = None,
+        pii_models: list | None = None,
+        custom_permissions_tuples: dict | None = None,
         warn_only=None,
-        codename_prefixes: Optional[list] = None,
+        codename_prefixes: list | None = None,
     ):
         self.apps = apps or django_apps
         self.content_type_model_cls = self.apps.get_model("contenttypes.contenttype")
@@ -102,7 +102,7 @@ class GroupUpdater:
                 group.permissions.add(permission)
 
     def get_permissions_qs_from_codenames(
-        self, codenames: List[Any], allow_multiple_objects: Optional[bool] = None
+        self, codenames: list[Any], allow_multiple_objects: bool | None = None
     ):
         """Returns a list of permission model instances for the given
         codenames.
@@ -281,8 +281,8 @@ class GroupUpdater:
     def remove_permissions_by_codenames(
         self,
         group: Any = None,
-        codenames: List[str] = None,
-        allow_multiple_objects: Optional[bool] = None,
+        codenames: list[str] = None,
+        allow_multiple_objects: bool | None = None,
     ):
         """Remove the given codenames from the given group."""
         permissions = self.get_permissions_qs_from_codenames(

edc_auth/auth_updater/role_updater.py

@@ -1,5 +1,4 @@
 import sys
-from typing import Optional
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -15,7 +14,7 @@ class RoleUpdaterError(Exception):
 class RoleUpdater:
     def __init__(
         self,
-        roles: Optional[dict] = None,
+        roles: dict | None = None,
         verbose=None,
     ):
         self.roles = roles

edc_auth/get_app_codenames.py

@@ -70,9 +70,7 @@ def get_codename(
     autocomplete_models = autocomplete_models or []
     label_lower: str = model_cls._meta.label_lower
     model_name: str = model_cls._meta.model_name
-    if "historical" in label_lower:
-        codenames.append(f"{app_name}.view_{model_name}")
-    elif label_lower in autocomplete_models:
+    if "historical" in label_lower or label_lower in autocomplete_models:
         codenames.append(f"{app_name}.view_{model_name}")
     else:
         permissions = override_permissions or model_cls._meta.default_permissions

edc_auth/import_users.py

@@ -3,7 +3,7 @@ import os
 import re
 from datetime import datetime
 from string import Template
-from typing import Any, List, Optional
+from typing import Any
 
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
@@ -67,12 +67,12 @@ fieldnames = [
 
 def import_users(
     path: str,
-    resource_name: Optional[str] = None,
-    send_email_to_user: Optional[Any] = None,
-    resend_as_newly_created: Optional[Any] = None,
-    verbose: Optional[Any] = None,
-    export_to_file: Optional[Any] = None,
-    limit_to_username: Optional[str] = None,
+    resource_name: str | None = None,
+    send_email_to_user: Any | None = None,
+    resend_as_newly_created: Any | None = None,
+    verbose: Any | None = None,
+    export_to_file: Any | None = None,
+    limit_to_username: str | None = None,
     **kwargs,
 ):
     """Import users from a CSV file with columns:
@@ -140,20 +140,20 @@ class UserImporter:
         email: str = None,
         alternate_email: str = None,
         mobile: str = None,
-        site_names: List[str] = None,
-        role_names: List[str] = None,
+        site_names: list[str] = None,
+        role_names: list[str] = None,
         is_active: bool = None,
         is_staff: bool = None,
         resource_name: str = None,
-        created_email_template: Optional[Template] = None,
-        updated_email_template: Optional[Template] = None,
-        send_email_to_user: Optional[Any] = None,
-        test_email_address: Optional[Any] = None,
-        resend_as_new: Optional[Any] = None,
-        nwords: Optional[int] = None,
+        created_email_template: Template | None = None,
+        updated_email_template: Template | None = None,
+        send_email_to_user: Any | None = None,
+        test_email_address: Any | None = None,
+        resend_as_new: Any | None = None,
+        nwords: int | None = None,
         **kwargs,
     ):
-        self._messages: List[str] = []
+        self._messages: list[str] = []
         self._user = None
         self.created = False
         self.password = None
@@ -236,7 +236,7 @@ class UserImporter:
                 self._user.save()
         return self._user
 
-    def update_user_sites(self, site_names: List[str]) -> None:
+    def update_user_sites(self, site_names: list[str]) -> None:
         self.user.userprofile.sites.clear()
         for site_name in site_names:
             try:
@@ -250,7 +250,7 @@ class UserImporter:
             else:
                 self.user.userprofile.sites.add(site)
 
-    def update_user_roles(self, role_names: List[str]) -> None:
+    def update_user_roles(self, role_names: list[str]) -> None:
         self.user.userprofile.roles.clear()
         role_names.extend(required_role_names)
         for role_name in role_names:
@@ -277,7 +277,7 @@ class UserImporter:
             to=(self.test_email_address or self.user.email,),
         )
 
-    def get_username(self) -> Optional[str]:
+    def get_username(self) -> str | None:
         if self.first_name and self.last_name:
             last_name = "".join(self.last_name.split(" ")).lower()
             return f"{self.first_name.lower()[0]}{last_name}"

edc_auth/models/role.py

@@ -50,6 +50,7 @@ class Role(BaseUuidModel):
         return (self.name,)
 
     class Meta(BaseUuidModel.Meta):
-        indexes = BaseUuidModel.Meta.indexes + [
-            models.Index(fields=["display_name", "display_index"])
-        ]
+        indexes = (
+            *BaseUuidModel.Meta.indexes,
+            models.Index(fields=["display_name", "display_index"]),
+        )

edc_auth/password_setter.py

@@ -1,5 +1,4 @@
 from string import Template
-from typing import List, Optional
 
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
@@ -26,8 +25,8 @@ class PasswordSetter:
     def __init__(
         self,
         super_username: str,
-        alternate_email: Optional[str] = None,
-        nwords: Optional[int] = None,
+        alternate_email: str | None = None,
+        nwords: int | None = None,
         **kwargs,
     ) -> None:
         self.administrator_fullname = self.get_administrator_fullname(super_username)
@@ -48,7 +47,7 @@ class PasswordSetter:
         users = User.objects.filter(is_active=True, is_staff=True, is_superuser=False)
         self._reset(users)
 
-    def reset_by_groups(self, group_names: List[str] = None) -> None:
+    def reset_by_groups(self, group_names: list[str] = None) -> None:
         users = User.objects.filter(
             groups__name__in=group_names,
             is_active=True,
@@ -57,7 +56,7 @@ class PasswordSetter:
         )
         self._reset(users)
 
-    def reset_users(self, usernames: List[str]) -> None:
+    def reset_users(self, usernames: list[str]) -> None:
         users = User.objects.filter(username__in=usernames, is_active=True, is_staff=True)
         self._reset(users)
 
@@ -65,7 +64,7 @@ class PasswordSetter:
         usernames = [username]
         self.reset_users(usernames)
 
-    def reset_by_sites(self, site_names: List[str] = None) -> None:
+    def reset_by_sites(self, site_names: list[str] = None) -> None:
         users = User.objects.filter(
             userprofile__sites__name__in=site_names,
             is_active=True,
@@ -74,7 +73,7 @@ class PasswordSetter:
         )
         self._reset(users)
 
-    def _reset(self, users: List[User]) -> None:
+    def _reset(self, users: list[User]) -> None:
         for user in users:
             password = self.password_generator.get_password()
             user.set_password(password)

edc_auth/send_new_credentials_to_user.py

@@ -1,4 +1,3 @@
-from typing import Optional
 from urllib.parse import urlparse
 
 from django.core.mail.message import EmailMessage
@@ -10,7 +9,7 @@ from edc_protocol.research_protocol_config import ResearchProtocolConfig
 from .import_users import change_user_template
 
 
-def change_password(user, nwords: Optional[int] = None) -> str:
+def change_password(user, nwords: int | None = None) -> str:
     nwords = nwords or 4
     pwdgen = PasswordGenerator(nwords=nwords)
     password = pwdgen.get_password()
@@ -19,7 +18,7 @@ def change_password(user, nwords: Optional[int] = None) -> str:
     return password
 
 
-def send_new_credentials_to_user(user, nwords: Optional[int] = None) -> EmailMessage:
+def send_new_credentials_to_user(user, nwords: int | None = None) -> EmailMessage:
     body = change_user_template
     site_names = "\n - ".join([s.name for s in user.userprofile.sites.all()])
     role_names = "\n - ".join([r.display_name for r in user.userprofile.roles.all()])

edc_auth/site_auths.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import sys
+from collections.abc import Callable
 from copy import deepcopy
-from typing import Callable, Tuple
 from warnings import warn
 
 from django.apps import apps as django_apps
@@ -206,7 +206,7 @@ class SiteAuths:
         self.registry[key].update({name: existing_group_names})
 
     def add_custom_permissions_tuples(
-        self, model: str, codename_tuples: Tuple[Tuple[str, str], ...]
+        self, model: str, codename_tuples: tuple[tuple[str, str], ...]
     ):
         try:
             self.registry["custom_permissions_tuples"][model]
@@ -278,7 +278,7 @@ class SiteAuths:
         return self.registry["pre_update_funcs"]
 
     @property
-    def post_update_funcs(self) -> Tuple[str, Callable]:
+    def post_update_funcs(self) -> tuple[str, Callable]:
         return self.registry["post_update_funcs"]
 
     @property

edc_consent/actions.py

@@ -6,11 +6,10 @@ from edc_utils import get_utcnow
 def verify_consent(request=None, consent_obj=None):
     if consent_obj.is_verified:
         return None
-    else:
-        consent_obj.is_verified = True
-        consent_obj.is_verified_datetime = get_utcnow()
-        consent_obj.verified_by = request.user.username
-        consent_obj.save(update_fields=["is_verified", "is_verified_datetime", "verified_by"])
+    consent_obj.is_verified = True
+    consent_obj.is_verified_datetime = get_utcnow()
+    consent_obj.verified_by = request.user.username
+    consent_obj.save(update_fields=["is_verified", "is_verified_datetime", "verified_by"])
     return consent_obj
 
 

edc_consent/consent_definition.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import KW_ONLY, dataclass, field
 from datetime import datetime
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -27,9 +27,7 @@ if TYPE_CHECKING:
     from .consent_definition_extension import ConsentDefinitionExtension
     from .stubs import ConsentLikeModel
 
-    class SubjectScreening(
-        ScreeningModelMixin, EligibilityModelMixin, BaseUuidModel
-    ): ...  # noqa
+    class SubjectScreening(ScreeningModelMixin, EligibilityModelMixin, BaseUuidModel): ...
 
 
 @dataclass(order=True)
@@ -84,13 +82,13 @@ class ConsentDefinition:
             raise ConsentDefinitionError(f"Invalid gender. Got {self.gender}.")
         if not self.start.tzinfo:
             raise ConsentDefinitionError(f"Naive datetime not allowed. Got {self.start}.")
-        elif str(self.start.tzinfo).upper() != "UTC":
+        if str(self.start.tzinfo).upper() != "UTC":
             raise ConsentDefinitionError(
                 f"Start date must be UTC. Got {self.start} / {self.start.tzinfo}."
             )
         if not self.end.tzinfo:
             raise ConsentDefinitionError(f"Naive datetime not allowed Got {self.end}.")
-        elif str(self.end.tzinfo).upper() != "UTC":
+        if str(self.end.tzinfo).upper() != "UTC":
             raise ConsentDefinitionError(
                 f"End date must be UTC. Got {self.end} / {self.start.tzinfo}."
             )
@@ -110,13 +108,13 @@ class ConsentDefinition:
             raise ConsentDefinitionError(
                 f"Model class must be a proxy. See {self.name}. Got {model_cls}"
             )
-        elif not isinstance(model_cls.objects, (ConsentObjectsByCdefManager,)):
+        if not isinstance(model_cls.objects, (ConsentObjectsByCdefManager,)):
             raise ConsentDefinitionError(
                 "Incorrect 'objects' model manager for consent model. "
                 f"Expected {ConsentObjectsByCdefManager}. See {self.name}.  "
                 f"Got {model_cls.objects.__class__}"
             )
-        elif not isinstance(model_cls.on_site, (CurrentSiteByCdefManager,)):
+        if not isinstance(model_cls.on_site, (CurrentSiteByCdefManager,)):
             raise ConsentDefinitionError(
                 "Incorrect 'on_site' model manager for consent model. "
                 f"Expected {CurrentSiteByCdefManager}. See {self.name}.  "
@@ -170,7 +168,7 @@ class ConsentDefinition:
         return consent_obj
 
     @property
-    def model_cls(self) -> Type[ConsentLikeModel]:
+    def model_cls(self) -> type[ConsentLikeModel]:
         return django_apps.get_model(self.model)
 
     @property
@@ -229,5 +227,4 @@ class ConsentDefinition:
         )
         if previous_consent.count() > 0:
             return previous_consent.last()
-        else:
-            raise ObjectDoesNotExist("Previous consent does not exist")
+        raise ObjectDoesNotExist("Previous consent does not exist")

edc_consent/consent_definition_extension.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import KW_ONLY, dataclass, field
 from datetime import datetime
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -72,7 +72,7 @@ class ConsentDefinitionExtension:
         self.sort_index = self.name
         if not self.start.tzinfo:
             raise ConsentDefinitionError(f"Naive datetime not allowed. Got {self.start}.")
-        elif str(self.start.tzinfo) != "UTC":
+        if str(self.start.tzinfo) != "UTC":
             raise ConsentDefinitionError(f"Start date must be UTC. Got {self.start}.")
         self.extends.check_date_within_study_period()
 
@@ -98,7 +98,7 @@ class ConsentDefinitionExtension:
         return visits
 
     @property
-    def model_cls(self) -> Type[ConsentExtensionLikeModel]:
+    def model_cls(self) -> type[ConsentExtensionLikeModel]:
         return django_apps.get_model(self.model)
 
     @property

edc_consent/form_validators/__init__.py

@@ -1,4 +1,4 @@
 from .consent_definition_form_validator_mixin import ConsentDefinitionFormValidatorMixin
 from .subject_consent_form_validator import SubjectConsentFormValidatorMixin
 
-__all__ = ["SubjectConsentFormValidatorMixin", "ConsentDefinitionFormValidatorMixin"]
+__all__ = ["ConsentDefinitionFormValidatorMixin", "SubjectConsentFormValidatorMixin"]

edc_consent/model_mixins/__init__.py

@@ -4,8 +4,8 @@ from .consent_version_model_mixin import ConsentVersionModelMixin
 from .requires_consent_fields_model_mixin import RequiresConsentFieldsModelMixin
 
 __all__ = [
+    "ConsentExtensionModelMixin",
     "ConsentModelMixin",
-    "RequiresConsentFieldsModelMixin",
     "ConsentVersionModelMixin",
-    "ConsentExtensionModelMixin",
+    "RequiresConsentFieldsModelMixin",
 ]

edc_consent/model_mixins/consent_version_model_mixin.py

@@ -69,7 +69,7 @@ class ConsentVersionModelMixin(models.Model):
                 f"to 'create' consent version '{cdef.version}'. Expected "
                 f"'{cdef.model}'. Got '{self._meta.label_lower}'."
             )
-        elif cdef.updates and self._meta.label_lower != cdef.updates.updated_by.model:
+        if cdef.updates and self._meta.label_lower != cdef.updates.updated_by.model:
             raise ConsentDefinitionModelError(
                 f"Incorrect model to update a consent. This model cannot be used "
                 f"to 'update' consent version '{cdef.version}'. Expected "

edc_consent/modeladmin_mixins/consent_model_admin_mixin.py

@@ -72,8 +72,7 @@ class ConsentModelAdminMixin:
             return (
                 fields + ("consent_datetime", "identity", "confirm_identity") + readonly_fields
             )
-        else:
-            return fields + readonly_fields
+        return fields + readonly_fields
 
     def get_search_fields(self, request) -> tuple[str, ...]:
         search_fields: tuple[str] = super().get_search_fields(request)

edc_consent/modelform_mixins/consent_modelform_mixin/consent_modelform_validation_mixin.py

@@ -121,8 +121,7 @@ class ConsentModelFormValidationMixin:
                 )
                 if "identity" in self.cleaned_data:
                     raise forms.ValidationError({"identity": msg})
-                else:
-                    raise forms.ValidationError({"__all__": msg})
+                raise forms.ValidationError({"__all__": msg})
 
     def validate_identity_plus_version_is_unique(self) -> None:
         """Enforce a unique constraint on personal identity number
@@ -146,8 +145,7 @@ class ConsentModelFormValidationMixin:
             )
             if "identity" in self.cleaned_data:
                 raise forms.ValidationError({"identity": msg})
-            else:
-                raise forms.ValidationError({"__all__": msg})
+            raise forms.ValidationError({"__all__": msg})
 
     def validate_identity_with_unique_fields(self) -> None:
         cleaned_data = self.cleaned_data
@@ -189,7 +187,7 @@ class ConsentModelFormValidationMixin:
         gender = self.cleaned_data.get("gender")
         if gender not in self.consent_definition.gender:
             raise forms.ValidationError(
-                "Gender of consent can only be " "'%(gender_of_consent)s'. Got '%(gender)s'.",
+                "Gender of consent can only be '%(gender_of_consent)s'. Got '%(gender)s'.",
                 params={
                     "gender_of_consent": "' or '".join(self.consent_definition.gender),
                     "gender": gender,

edc_consent/site_consents.py

@@ -71,14 +71,14 @@ class SiteConsents:
                     f"Updates unregistered consent definition. See {cdef.name}. "
                     f"Got {cdef.updates.name}"
                 )
-            elif cdef.updates and cdef.updates.updated_by is None:
+            if cdef.updates and cdef.updates.updated_by is None:
                 raise ConsentDefinitionError(
                     f"Cdef mismatch with consent definition configured to update another. "
                     f"'{cdef.name}' is configured to update "
                     f"'{cdef.updates.name}' but '{cdef.updates.name}' "
                     f"updated_by is None. "
                 )
-            elif cdef.updates and cdef.updates.updated_by != cdef:
+            if cdef.updates and cdef.updates.updated_by != cdef:
                 raise ConsentDefinitionError(
                     f"Cdef mismatch with consent definition configured to update another. "
                     f"'{cdef.name}' is configured to update "
@@ -164,7 +164,7 @@ class SiteConsents:
                     f"'{consent_definition.version}' "
                     f"of consent on or after report_datetime='{dte}'?"
                 )
-            elif consent_definition.start <= to_utc(report_datetime) <= consent_definition.end:
+            if consent_definition.start <= to_utc(report_datetime) <= consent_definition.end:
                 # ensures the higher version is returned if there is overlap
                 pass
             elif (
@@ -284,8 +284,7 @@ class SiteConsents:
                 raise ConsentDefinitionDoesNotExist(
                     f"There are no consent definitions using this model. Got {model}."
                 )
-            else:
-                errror_messages.append(f"model={model}")
+            errror_messages.append(f"model={model}")
         return cdefs, errror_messages
 
     @staticmethod
@@ -303,16 +302,13 @@ class SiteConsents:
                         if model == screening_model:
                             if cdef not in cdefs:
                                 cdefs.append(cdef)
-                else:
-                    if model == cdef.screening_model:
-                        cdefs.append(cdef)
+                elif model == cdef.screening_model:
+                    cdefs.append(cdef)
             if not cdefs:
                 raise ConsentDefinitionDoesNotExist(
-                    "There are no consent definitions using this screening model."
-                    f"Got {model}."
+                    f"There are no consent definitions using this screening model.Got {model}."
                 )
-            else:
-                errror_messages.append(f"model={model}")
+            errror_messages.append(f"model={model}")
         return cdefs, errror_messages
 
     def _filter_cdefs_by_report_datetime_or_raise(
@@ -336,9 +332,8 @@ class SiteConsents:
                     f"consent definition. Got {date_string}. {using_msg}. "
                     f"Possible consent definitions are: {consent_definitions}. "
                 )
-            else:
-                date_string = formatted_date(report_datetime)
-                errror_messages.append(f"report_datetime={date_string}")
+            date_string = formatted_date(report_datetime)
+            errror_messages.append(f"report_datetime={date_string}")
         return cdefs, errror_messages
 
     def _filter_cdefs_by_version_or_raise(

edc_consent/stubs.py

@@ -11,7 +11,7 @@ from .model_mixins import ConsentModelMixin
 class ConsentModelStub(Protocol):
     subject_identifier: str
     report_datetime: datetime
-    ...  # noqa
+    ...
 
 
 class ConsentLikeModel(
@@ -19,4 +19,4 @@ class ConsentLikeModel(
     ConsentModelMixin,
     NonUniqueSubjectIdentifierModelMixin,
     BaseUuidModel,
-): ...  # noqa
+): ...

edc_consent/utils.py

@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 
     from .model_mixins import ConsentModelMixin
 
-    class ConsentModel(ConsentModelMixin, BaseUuidModel): ...  # noqa
+    class ConsentModel(ConsentModelMixin, BaseUuidModel): ...
 
 
 class InvalidInitials(Exception):

edc_constants/utils.py

@@ -1,9 +1,7 @@
-from typing import Optional, Tuple
-
 from .constants import QUESTION_RETIRED
 
 
-def get_display(choices, label) -> Optional[str]:
+def get_display(choices, label) -> str | None:
     """Returns the display value of a choices tuple for label."""
     for choice in choices:
         store_value, display_value = choice
@@ -12,7 +10,7 @@ def get_display(choices, label) -> Optional[str]:
     return None
 
 
-def append_question_retired_choice(choices) -> Tuple[Tuple[str, str], ...]:
+def append_question_retired_choice(choices) -> tuple[tuple[str, str], ...]:
     choices = list(choices)
     choices.append((QUESTION_RETIRED, QUESTION_RETIRED))
     choices = tuple(choices)

edc_crf/crf_form_validator_mixins.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.core.exceptions import ObjectDoesNotExist
 
@@ -83,7 +83,7 @@ class CrfFormValidatorMixin(BaseFormValidatorMixin):
         return get_related_visit(self, related_visit_model_attr=self.related_visit_model_attr)
 
     @property
-    def related_visit_model_cls(self) -> Type[RelatedVisitModel]:
+    def related_visit_model_cls(self) -> type[RelatedVisitModel]:
         """Returns a subject visit model instance or None"""
         return get_related_visit(
             self, related_visit_model_attr=self.related_visit_model_attr

edc_crf/model_mixins/crf_no_manager_model_mixin.py

@@ -31,8 +31,8 @@ class CrfNoManagerModelMixin(
 
     class Meta:
         abstract = True
-        indexes = [
+        indexes = (
             models.Index(fields=["subject_visit", "site"]),
             models.Index(fields=["subject_visit", "report_datetime"]),
-        ]
+        )
         default_permissions = ("add", "change", "delete", "view", "export", "import")

edc_crf/model_mixins/crf_status_model_mixin.py

@@ -29,8 +29,8 @@ class CrfStatusModelMixin(models.Model):
 
     crf_status_comments = models.TextField(
         verbose_name=_("Any comments related to status of this CRF"),
-        null=True,
         blank=True,
+        default="",
         help_text=_("for example, why some data is still pending"),
     )
 

edc_crf/models/crf_status.py

@@ -21,16 +21,14 @@ class CrfStatus(
         verbose_name = "CRF Status"
         verbose_name_plural = "CRF Status"
         indexes = (
-            BaseUuidModel.Meta.indexes
-            + NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + [
-                Index(
-                    fields=[
-                        "schedule_name",
-                        "visit_schedule_name",
-                        "visit_code",
-                        "visit_code_sequence",
-                    ]
-                )
-            ]
+            *BaseUuidModel.Meta.indexes,
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            Index(
+                fields=[
+                    "schedule_name",
+                    "visit_schedule_name",
+                    "visit_code",
+                    "visit_code_sequence",
+                ]
+            ),
         )

edc_crf/update_crf_status_command.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from django.apps import apps as django_apps
 
 from edc_constants.constants import INCOMPLETE
@@ -8,7 +6,7 @@ from .model_mixins import CrfStatusModelMixin
 from .update_crf_status_for_instance import update_crf_status_for_instance
 
 
-def update_crf_status_command(app_label: Optional[str] = None) -> None:
+def update_crf_status_command(app_label: str | None = None) -> None:
     if app_label:
         app_configs = [django_apps.get_app_config(app_label)]
     else: