Merge branch 'release/0.3.17' into main

clinicedc · Jan 6, 2024 · 2b1cae0 · 2b1cae0
2 parents 7c6f413 + faa70c3
commit 2b1cae0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/edc_timepoint/tests/consents.py b/edc_timepoint/tests/consents.py
@@ -1,8 +1,8 @@
-from edc_consent.consent import Consent
+from edc_consent.consent_definition import ConsentDefinition
 from edc_constants.constants import FEMALE, MALE
 from edc_protocol import Protocol
 
-v1 = Consent(
+v1 = ConsentDefinition(
     "edc_timepoint.subjectconsent",
     version="1",
     start=Protocol().study_open_datetime,

diff --git a/edc_timepoint/tests/models.py b/edc_timepoint/tests/models.py
@@ -6,7 +6,7 @@
 from edc_metadata.model_mixins.creates import CreatesMetadataModelMixin
 from edc_model.models import BaseUuidModel
 from edc_registration.model_mixins import UpdatesOrCreatesRegistrationModelMixin
-from edc_sites.models import SiteModelMixin
+from edc_sites.model_mixins import SiteModelMixin
 from edc_visit_schedule.model_mixins import OffScheduleModelMixin, OnScheduleModelMixin
 from edc_visit_tracking.model_mixins import VisitModelMixin