diff --git a/src/dodal/aliases.py b/src/dodal/aliases.py index cb9c5da023..275b1db165 100644 --- a/src/dodal/aliases.py +++ b/src/dodal/aliases.py @@ -1,9 +1,6 @@ from collections.abc import Callable +from typing import TypeAlias -try: - from typing import TypeAlias -except ImportError: - from typing import TypeAlias from ophyd.device import Device as OphydV1Device from ophyd_async.core import Device as OphydV2Device diff --git a/src/dodal/beamlines/i22.py b/src/dodal/beamlines/i22.py index 7e5d1c6772..e50cfe6df6 100644 --- a/src/dodal/beamlines/i22.py +++ b/src/dodal/beamlines/i22.py @@ -134,7 +134,7 @@ def dcm() -> DoubleCrystalMonochromator: usage="Bragg", type="silicon", reflection=(3, 1, 1), - # todo update + # todo update d_spacing values to match the reflection maths d_spacing=(3.13475, "nm"), ) diff --git a/src/dodal/beamlines/p38.py b/src/dodal/beamlines/p38.py index 9c737c4d2b..4773574547 100644 --- a/src/dodal/beamlines/p38.py +++ b/src/dodal/beamlines/p38.py @@ -109,15 +109,15 @@ def i0( # -# def slits_1( -# wait_for_connection: bool = True, -# fake_with_ophyd_sim: bool = True, -# ) -> Slits: -# return numbered_slits( -# 1, -# wait_for_connection, -# fake_with_ophyd_sim, -# ) +def slits_1( + wait_for_connection: bool = True, + fake_with_ophyd_sim: bool = True, +) -> Slits: + return numbered_slits( + 1, + wait_for_connection, + fake_with_ophyd_sim, + ) def slits_2( diff --git a/tests/common/beamlines/test_device_instantiation.py b/tests/common/beamlines/test_device_instantiation.py index 87146f5a3e..50a8f70302 100644 --- a/tests/common/beamlines/test_device_instantiation.py +++ b/tests/common/beamlines/test_device_instantiation.py @@ -42,13 +42,10 @@ def test_devices_are_identical(RE, module_and_devices_for_beamline): Ensures that for every beamline all device functions are singletons to prevent duplicate instantiation. """ bl_mod, devices_a = module_and_devices_for_beamline - # if bl_mod.BL == "i22": - # pytest.skip("i22 uses the new setup") devices_b, _ = make_all_devices( bl_mod, include_skipped=True, fake_with_ophyd_sim=True, ) - print(devices_b) for device_name in devices_a.keys(): assert devices_a[device_name] is devices_b[device_name]