diff --git a/setup.cfg b/setup.cfg index b948e3c08..03a5ed002 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ install_requires = xarray doct databroker - dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@c0e5b3a2bbffb848a6037cdc0e8e548ebab5b6f0 + dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774 scipy pyzmq diff --git a/tests/conftest.py b/tests/conftest.py index 4f864e439..bc05e7c22 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -360,7 +360,7 @@ def ophyd_pin_tip_detection(): def robot(done_status): RunEngine() # A RE is needed to start the bluesky loop robot = i03.robot(fake_with_ophyd_sim=True) - set_mock_value(robot.barcode.bare_signal, ["BARCODE"]) + set_mock_value(robot.barcode, "BARCODE") robot.set = MagicMock(return_value=done_status) return robot @@ -647,7 +647,7 @@ async def mock_complete(result): fake_composite.fast_grid_scan.position_counter.sim_put(0) # type: ignore fake_composite.smargon.x.max_velocity.sim_put(10) # type: ignore - set_mock_value(fake_composite.robot.barcode.bare_signal, ["BARCODE"]) + set_mock_value(fake_composite.robot.barcode, "BARCODE") return fake_composite diff --git a/tests/system_tests/experiment_plans/test_fgs_plan.py b/tests/system_tests/experiment_plans/test_fgs_plan.py index 13c5fb46c..bdd33024b 100644 --- a/tests/system_tests/experiment_plans/test_fgs_plan.py +++ b/tests/system_tests/experiment_plans/test_fgs_plan.py @@ -101,7 +101,7 @@ async def fxc_composite(): zocalo=zocalo, ) - await composite.robot.barcode.bare_signal._backend.put(["ABCDEFGHIJ"]) # type: ignore + await composite.robot.barcode._backend.put("ABCDEFGHIJ") # type: ignore composite.dcm.energy_in_kev.user_readback.sim_put(12.345) # type: ignore gda_beamline_parameters = GDABeamlineParameters.from_file( diff --git a/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py index 3bdc89d8d..a92ddd443 100644 --- a/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py +++ b/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py @@ -61,9 +61,6 @@ from hyperion.log import ISPYB_LOGGER from hyperion.parameters.constants import CONST from hyperion.parameters.gridscan import ThreeDGridScan -from hyperion.parameters.plan_specific.gridscan_internal_params import ( - GridscanInternalParameters, -) from tests.conftest import create_dummy_scan_spec from ...conftest import default_raw_params diff --git a/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py index 9012d14a0..d4c0bd4ef 100644 --- a/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py +++ b/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py @@ -52,7 +52,7 @@ ) from hyperion.log import ISPYB_LOGGER from hyperion.parameters.constants import CONST -from hyperion.parameters.gridscan import PandAGridscanInternalParameters, ThreeDGridScan +from hyperion.parameters.gridscan import ThreeDGridScan from ...conftest import default_raw_params from ...system_tests.external_interaction.conftest import ( diff --git a/tests/unit_tests/external_interaction/test_write_rotation_nexus.py b/tests/unit_tests/external_interaction/test_write_rotation_nexus.py index 5501719f2..b2836578b 100644 --- a/tests/unit_tests/external_interaction/test_write_rotation_nexus.py +++ b/tests/unit_tests/external_interaction/test_write_rotation_nexus.py @@ -192,8 +192,9 @@ def test_rotation_scan_nexus_output_compared_to_existing_full_compare( "sample": { "beam": {"incident_wavelength": np.isclose}, "transformations": { - "_missing": {"omega_end", "omega_increment_set"}, + "_missing": {"omega_end"}, "_ignore": {"omega"}, + "omega_increment_set": 0.1, "omega_end": lambda a, b: np.all(np.isclose(a, b, atol=1e-03)), }, "sample_omega": {