diff --git a/src/dodal/plan_stubs/__init__.py b/src/dodal/plan_stubs/__init__.py index be28526889..5519ae3e28 100644 --- a/src/dodal/plan_stubs/__init__.py +++ b/src/dodal/plan_stubs/__init__.py @@ -2,12 +2,14 @@ from .data_session_metadata import attach_data_session_metadata_decorator from .motor_util_plans import ( MoveTooLarge, + check_and_cache_values, home_and_reset_decorator, home_and_reset_wrapper, move_and_reset_wrapper, ) __all__ = [ + "check_and_cache_values", "check_topup_and_wait_if_necessary", "wait_for_topup_complete", "attach_data_session_metadata_decorator", diff --git a/src/dodal/plan_stubs/motor_util_plans.py b/src/dodal/plan_stubs/motor_util_plans.py index 80d0e93611..5033f1c7fd 100644 --- a/src/dodal/plan_stubs/motor_util_plans.py +++ b/src/dodal/plan_stubs/motor_util_plans.py @@ -23,7 +23,7 @@ def __init__( super().__init__(*args) -def _check_and_cache_values( +def check_and_cache_values( devices_and_positions: dict[AnyDevice, float], smallest_move: float, maximum_move: float, @@ -87,7 +87,7 @@ def move_and_reset_wrapper( on. If false it is left up to the caller to wait on them. Defaults to True. """ - initial_positions = yield from _check_and_cache_values( + initial_positions = yield from check_and_cache_values( device_and_positions, smallest_move, maximum_move ) diff --git a/tests/plans/test_motor_util_plans.py b/tests/plan_stubs/test_motor_util_plans.py similarity index 99% rename from tests/plans/test_motor_util_plans.py rename to tests/plan_stubs/test_motor_util_plans.py index dc4a761ca2..8b462cd5fe 100644 --- a/tests/plans/test_motor_util_plans.py +++ b/tests/plan_stubs/test_motor_util_plans.py @@ -14,9 +14,9 @@ from ophyd_async.epics.motor import Motor from dodal.devices.util.test_utils import patch_motor -from dodal.plans.motor_util_plans import ( +from dodal.plan_stubs import ( MoveTooLarge, - _check_and_cache_values, + check_and_cache_values, home_and_reset_wrapper, ) diff --git a/tests/plans/test_topup_plan.py b/tests/plan_stubs/test_topup_plan.py similarity index 99% rename from tests/plans/test_topup_plan.py rename to tests/plan_stubs/test_topup_plan.py index 2b9fcce512..4838a0c4b0 100644 --- a/tests/plans/test_topup_plan.py +++ b/tests/plan_stubs/test_topup_plan.py @@ -7,7 +7,7 @@ from dodal.beamlines import i03 from dodal.devices.synchrotron import Synchrotron, SynchrotronMode -from dodal.plans.check_topup import ( +from dodal.plan_stubs import ( check_topup_and_wait_if_necessary, wait_for_topup_complete, )