clinicedc 2.0.24__py3-none-any.whl → 2.0.26__py3-none-any.whl

edc_sites/post_migrate_signals.py

@@ -6,8 +6,8 @@ style = color_style()
 
 
 def post_migrate_update_sites(sender=None, **kwargs):
-    from .site import sites as site_sites
-    from .utils import add_or_update_django_sites
+    from .site import sites as site_sites  # noqa: PLC0415
+    from .utils import add_or_update_django_sites  # noqa: PLC0415
 
     sys.stdout.write(style.MIGRATE_HEADING("Updating sites:\n"))
 

edc_sites/site.py

@@ -52,23 +52,23 @@ __all__ = [
 ]
 
 
-class SiteDoesNotExist(Exception):
+class SiteDoesNotExist(Exception):  # noqa: N818
     pass
 
 
-class AlreadyRegistered(Exception):
+class AlreadyRegistered(Exception):  # noqa: N818
     pass
 
 
-class AlreadyRegisteredName(Exception):
+class AlreadyRegisteredName(Exception):  # noqa: N818
     pass
 
 
-class AlreadyRegisteredDomain(Exception):
+class AlreadyRegisteredDomain(Exception):  # noqa: N818
     pass
 
 
-class SiteNotRegistered(Exception):
+class SiteNotRegistered(Exception):  # noqa: N818
     pass
 
 
@@ -157,7 +157,7 @@ class Sites:
             for single_site in single_sites:
                 if get_insert_uat_subdomain():
                     domain = insert_into_domain(single_site.domain, self.uat_subdomain)
-                    single_site = dataclasses.replace(single_site, domain=domain)
+                    single_site = dataclasses.replace(single_site, domain=domain)  # noqa: PLW2901
 
                 if single_site.site_id in self._registry:
                     raise AlreadyRegistered(f"Site already registered. Got `{single_site}`.")
@@ -282,8 +282,8 @@ class Sites:
     def user_may_view_other_sites(
         self,
         request: WSGIRequest = None,
-        user: User = None,
-        site_id: int = None,
+        user: User | None = None,
+        site_id: int | None = None,
     ) -> list[int]:
         return self.get_view_only_site_ids_for_user(
             request=request,

edc_sites/utils/add_or_update_django_sites.py

@@ -15,14 +15,14 @@ class UpdateDjangoSitesError(Exception):
 
 
 def get_sites():
-    from ..site import sites  # prevent circular import
+    from ..site import sites  # prevent circular import  # noqa: PLC0415
 
     return sites
 
 
 def add_or_update_django_sites(
-    apps: django_apps | None = None,
-    single_sites: list[SingleSite] | tuple[SingleSite] = None,
+    apps=None,
+    single_sites: list[SingleSite] | tuple[SingleSite] | None = None,
     verbose: bool | None = None,
 ):
     """Removes default site and adds/updates given `sites`, etc.

edc_sites/utils/valid_site_for_subject_or_raise.py

@@ -30,7 +30,10 @@ def valid_site_for_subject_or_raise(
         subject_identifier, raise_exception=True
     )
     if skip_get_current_site:
-        warn("Skipping validation of current site against registered subject site.")
+        warn(
+            "Skipping validation of current site against registered subject site.",
+            stacklevel=2,
+        )
         site_obj = registered_subject.site
     else:
         site_obj: Site = get_site_model_cls().objects.get_current()
@@ -40,15 +43,15 @@ def valid_site_for_subject_or_raise(
                 site=site_obj,
                 raise_exception=True,
             )
-        except RegisteredSubjectDoesNotExist:
+        except RegisteredSubjectDoesNotExist as e:
             if not registered_subject.site_id:
                 raise InvalidSiteForSubjectError(
                     "Site not defined for registered subject! "
                     f"Subject identifier=`{subject_identifier}`. "
-                )
+                ) from e
             raise InvalidSiteForSubjectError(
                 f"Invalid site for subject. Subject identifier=`{subject_identifier}`. "
                 f"Expected `{registered_subject.site.name}`. "
                 f"Got site_id=`{site_obj.id}`"
-            )
+            ) from e
     return site_obj

edc_sites/view_mixins.py

@@ -19,10 +19,10 @@ class SiteViewMixin:
         kwargs.update(site_profile=site_profile)
         try:
             kwargs.update(site_title=site_profile.title)
-        except AttributeError:
+        except AttributeError as e:
             if not sites.all():
                 raise SiteNotRegistered(
                     "Unable to determine site profile 'title'. No sites have been registered! "
-                )
+                ) from e
             raise
         return kwargs

edc_subject_dashboard/view_utils/subject_screening_button.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, TypeVar
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 from django.contrib.sites.models import Site
@@ -11,16 +11,18 @@ from django.utils.translation import gettext as _
 from edc_view_utils import DashboardModelButton
 
 if TYPE_CHECKING:
+    from edc_model.models import BaseUuidModel
     from edc_screening.model_mixins import ScreeningModelMixin
 
-    ScreeningModel = TypeVar("ScreeningModel", bound=ScreeningModelMixin)
+    class ScreeningModel(ScreeningModelMixin, BaseUuidModel): ...
+
 
 __all__ = ["SubjectScreeningButton"]
 
 
 @dataclass
 class SubjectScreeningButton(DashboardModelButton):
-    model_obj: ScreeningModel = None
+    model_obj: ScreeningModel | None = None
     metadata_model_obj: models.Model = field(init=False)
 
     def __post_init__(self):

edc_view_utils/dashboard_model_button.py

@@ -34,9 +34,9 @@ class DashboardModelButton(ModelButton):
 
     """
 
-    model_obj: CrfModel | RequisitionModel = field(init=False)
-    metadata_model_obj: CrfMetadata | RequisitionMetadata = None
-    appointment: Appointment = None
+    model_obj: CrfModel | RequisitionModel | None = None
+    metadata_model_obj: CrfMetadata | RequisitionMetadata | None = None
+    appointment: Appointment | None = None
     next_url_name: str = field(default="subject_dashboard_url")
     model_cls: type[CrfModel | RequisitionModel] = field(default=None, init=False)
 

edc_visit_schedule/site_visit_schedules.py

@@ -93,7 +93,8 @@ class SiteVisitSchedules:
         return visit_schedules or self.registry
 
     def get_by_consent_definition(
-        self, cdef: ConsentDefinition
+        self,
+        cdef: ConsentDefinition,
     ) -> tuple[VisitSchedule, Schedule]:
         """Returns a visit schedule instance or raises."""
         ret = []