(DiamondLightSource/dodal#271) Changes after rebasing

setup.cfg

@@ -35,7 +35,7 @@ install_requires =
     xarray
     doct
     databroker
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@65287cc1c67b095f9071452b9236dc4cfdbf0d4b
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@12bbf4cd438456186f8ca694789b20b0708063f8
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
 

src/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py

@@ -1,6 +1,9 @@
 import json
 
 import bluesky.plan_stubs as bps
+from dodal.beamlines.beamline_parameters import (
+    GDABeamlineParameters,
+)
 from dodal.devices.DCM import DCM, fixed_offset_from_beamline_params
 from dodal.devices.focusing_mirror import (
     FocusingMirror,
@@ -13,9 +16,6 @@
 )
 
 from hyperion.log import LOGGER
-from hyperion.parameters.beamline_parameters import (
-    GDABeamlineParameters,
-)
 
 MIRROR_VOLTAGE_GROUP = "MIRROR_VOLTAGE_GROUP"
 DCM_GROUP = "DCM_GROUP"

tests/conftest.py

@@ -8,6 +8,7 @@
 from bluesky.run_engine import RunEngine
 from bluesky.utils import Msg
 from dodal.beamlines import beamline_utils, i03
+from dodal.beamlines.beamline_parameters import GDABeamlineParameters
 from dodal.devices.aperturescatterguard import AperturePositions
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
@@ -39,7 +40,6 @@
     NEXUS_LOGGER,
     set_up_logging_handlers,
 )
-from hyperion.parameters.beamline_parameters import GDABeamlineParameters
 from hyperion.parameters.external_parameters import from_file as raw_params_from_file
 from hyperion.parameters.plan_specific.grid_scan_with_edge_detect_params import (
     GridScanWithEdgeDetectInternalParameters,
@@ -582,7 +582,8 @@ def mock_message_generator(
     ) -> Callable[..., Generator[Msg, object, object]]:
         """Returns a callable that returns a generator yielding a Msg object recording the call arguments.
         This can be used to mock methods returning a bluesky plan or portion thereof, call it from within a unit test
-        using the RunEngineSimulator, and then perform asserts on the message to verify in-order execution of the plan"""
+        using the RunEngineSimulator, and then perform asserts on the message to verify in-order execution of the plan
+        """
 
         def mock_method(*args, **kwargs):
             yield Msg(function_name, None, *args, **kwargs)

tests/unit_tests/device_setup_plans/test_dcm_pitch_roll_mirror_adjuster.py

@@ -3,6 +3,7 @@
 
 import pytest
 from bluesky.run_engine import RunEngine
+from dodal.beamlines.beamline_parameters import GDABeamlineParameters
 from dodal.devices.DCM import DCM
 from dodal.devices.focusing_mirror import (
     DEMAND_ACCEPTED_OK,
@@ -19,7 +20,6 @@
     adjust_dcm_pitch_roll_vfm_from_lut,
     adjust_mirror_stripe,
 )
-from hyperion.parameters.beamline_parameters import GDABeamlineParameters
 
 
 def test_apply_and_wait_for_voltages_to_settle_happy_path(