Merge branch 'release/0.3.28' into main

edc_reference/tests/tests/test_case.py

@@ -5,7 +5,7 @@
 from edc_appointment.models import Appointment
 from edc_facility import import_holidays
 from edc_utils import get_utcnow
-from edc_visit_schedule import site_visit_schedules
+from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_tracking.constants import SCHEDULED
 from edc_visit_tracking.models import SubjectVisit
 

edc_reference/tests/tests/test_longitudinal.py

@@ -4,7 +4,7 @@
 from django.contrib.sites.models import Site
 from edc_constants.constants import NEG, POS
 from edc_utils import get_utcnow
-from edc_visit_schedule import site_visit_schedules
+from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 
 from edc_reference.models import Reference
 from edc_reference.refsets import (

edc_reference/tests/tests/test_populater.py

@@ -3,7 +3,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from edc_constants.constants import NEG, POS
 from edc_utils import get_utcnow
-from edc_visit_schedule import site_visit_schedules
+from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 
 from edc_reference.models import Reference
 from edc_reference.populater import Populater

edc_reference/tests/tests/test_reference.py

@@ -6,7 +6,7 @@
 from edc_lab.models.panel import Panel
 from edc_lab_panel.constants import CD4, FBC, VL
 from edc_utils import get_utcnow
-from edc_visit_schedule import site_visit_schedules
+from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_tracking.models import SubjectVisit
 
 from edc_reference.models import Reference, ReferenceFieldDatatypeNotFound

edc_reference/tests/tests/test_reference_with_proxy.py

@@ -1,7 +1,7 @@
 from django.contrib.sites.models import Site
 from edc_lab.models.panel import Panel
 from edc_lab_panel.constants import CD4, FBC, VL
-from edc_visit_schedule import site_visit_schedules
+from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_tracking.models import SubjectVisit
 
 from edc_reference.models import Reference

edc_reference/tests/tests/test_refset.py

@@ -2,7 +2,7 @@
 from django.contrib.sites.models import Site
 from edc_constants.constants import NEG, POS
 from edc_utils import get_utcnow
-from edc_visit_schedule import site_visit_schedules
+from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_tracking.models import SubjectVisit
 
 from edc_reference.models import Reference

pyproject.toml

@@ -6,12 +6,12 @@ version_file="_version.py"
 
 [tool.black]
 line-length = 95
-target-version = ["py310"]
+target-version = ["py311"]
 extend-exclude = '''^(.*\/)*\b(migrations)\b($|\/.*$)'''
 
 [tool.isort]
 profile = "black"
-py_version = "310"
+py_version = "311"
 skip = [".tox", ".eggs", "migrations"]
 
 [tool.coverage.run]

reference_app/visit_schedules/visit_schedule1.py

@@ -1,8 +1,7 @@
 from dateutil.relativedelta import relativedelta
 from edc_lab_panel.panels import cd4_panel, fbc_panel, vl_panel
-from edc_visit_schedule import Requisition
 from edc_visit_schedule.schedule import Schedule
-from edc_visit_schedule.visit import Crf, FormsCollection, Visit
+from edc_visit_schedule.visit import Crf, FormsCollection, Requisition, Visit
 from edc_visit_schedule.visit_schedule import VisitSchedule
 
 from ..lab_profiles import panel_one, panel_two

reference_app/visit_schedules/visit_schedule2.py

@@ -1,8 +1,7 @@
 from dateutil.relativedelta import relativedelta
 from edc_lab_panel.panels import cd4_panel, fbc_panel, vl_panel
-from edc_visit_schedule import Requisition
 from edc_visit_schedule.schedule import Schedule
-from edc_visit_schedule.visit import Crf, FormsCollection, Visit
+from edc_visit_schedule.visit import Crf, FormsCollection, Requisition, Visit
 from edc_visit_schedule.visit_schedule import VisitSchedule
 
 from ..lab_profiles import panel_one, panel_two