diff --git a/src/mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py b/src/mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py index eb2b77868..73ba10085 100644 --- a/src/mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py +++ b/src/mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py @@ -1,7 +1,7 @@ from __future__ import annotations import time -from datetime import datetime, timedelta, timezone +from datetime import UTC, datetime, timedelta import numpy as np from dodal.devices.detector import DetectorParams @@ -93,7 +93,7 @@ def create_goniometer_axes( def get_start_and_predicted_end_time(time_expected: float) -> tuple[str, str]: time_format = r"%Y-%m-%dT%H:%M:%SZ" - start = datetime.fromtimestamp(time.time(), tz=timezone.utc) + start = datetime.fromtimestamp(time.time(), tz=UTC) end_est = start + timedelta(seconds=time_expected) return start.strftime(time_format), end_est.strftime(time_format) diff --git a/tests/conftest.py b/tests/conftest.py index c1d2706a9..f2f5dd3cc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,7 +14,6 @@ import numpy import numpy as np import pytest -from bluesky.protocols import Movable, Status from bluesky.run_engine import RunEngine from bluesky.simulators import RunEngineSimulator from bluesky.utils import Msg diff --git a/tests/unit_tests/beamlines/i04/test_thawing.py b/tests/unit_tests/beamlines/i04/test_thawing.py index afd809eaa..4b56b72ba 100644 --- a/tests/unit_tests/beamlines/i04/test_thawing.py +++ b/tests/unit_tests/beamlines/i04/test_thawing.py @@ -210,7 +210,6 @@ def test_thaw_and_stream_adds_murko_callback_and_produces_expected_messages( RE: RunEngine, ): patch_murko_instance = patch_murko_callback.return_value - from bluesky.protocols import Locatable RE( thaw_and_stream_to_redis( 10, diff --git a/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py b/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py index c12461cf4..f2112f9e2 100644 --- a/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py +++ b/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py @@ -1,5 +1,4 @@ from datetime import datetime -from ophyd_async.fastcs.panda import HDFPanda from unittest.mock import MagicMock, patch import numpy as np @@ -9,7 +8,7 @@ from bluesky.simulators import RunEngineSimulator, assert_message_and_return_remaining from dodal.common.types import UpdatingPathProvider from dodal.devices.fast_grid_scan import PandAGridScanParams -from ophyd_async.fastcs.panda import SeqTable, SeqTrigger +from ophyd_async.fastcs.panda import HDFPanda, SeqTable, SeqTrigger from mx_bluesky.hyperion.device_setup_plans.setup_panda import ( MM_TO_ENCODER_COUNTS, @@ -28,7 +27,7 @@ def run_simulating_setup_panda_functions( plan: str, panda: HDFPanda, sim_run_engine: RunEngineSimulator, - mock_load_device=MagicMock + mock_load_device=MagicMock, ): num_of_sets = 0 num_of_waits = 0 @@ -184,8 +183,7 @@ def test_setup_panda_correctly_configures_table( ) -def test_wait_between_setting_table_and_arming_panda(RE: RunEngine, - panda): +def test_wait_between_setting_table_and_arming_panda(RE: RunEngine, panda): bps_wait_done = False def handle_wait(*args, **kwargs): diff --git a/tests/unit_tests/hyperion/device_setup_plans/test_utils.py b/tests/unit_tests/hyperion/device_setup_plans/test_utils.py index d1684191b..29617c51f 100644 --- a/tests/unit_tests/hyperion/device_setup_plans/test_utils.py +++ b/tests/unit_tests/hyperion/device_setup_plans/test_utils.py @@ -4,8 +4,8 @@ from bluesky import plan_stubs as bps from bluesky.utils import FailedStatus from dodal.beamlines import i03 -from ophyd_async.core import get_mock_put from ophyd.status import Status +from ophyd_async.core import get_mock_put from mx_bluesky.hyperion.device_setup_plans.utils import ( start_preparing_data_collection_then_do_plan, diff --git a/tests/unit_tests/hyperion/experiment_plans/conftest.py b/tests/unit_tests/hyperion/experiment_plans/conftest.py index 55f4d2fef..f0eb33442 100644 --- a/tests/unit_tests/hyperion/experiment_plans/conftest.py +++ b/tests/unit_tests/hyperion/experiment_plans/conftest.py @@ -4,8 +4,7 @@ import pytest from bluesky.utils import Msg - -from dodal.devices.aperturescatterguard import ApertureValue, ApertureScatterguard +from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue from dodal.devices.backlight import Backlight from dodal.devices.detector.detector_motion import DetectorMotion from dodal.devices.fast_grid_scan import ZebraFastGridScan @@ -17,7 +16,9 @@ from ophyd.sim import NullStatus from ophyd_async.core import AsyncStatus, DeviceCollector, set_mock_value -from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import GridDetectThenXRayCentreComposite +from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import ( + GridDetectThenXRayCentreComposite, +) from mx_bluesky.hyperion.experiment_plans.robot_load_and_change_energy import ( RobotLoadAndEnergyChangeComposite, ) @@ -224,7 +225,9 @@ def fake_read(obj, initial_positions, _): @pytest.fixture -def simple_beamline(detector_motion, eiger, oav, smargon, synchrotron, test_config_files, dcm): +def simple_beamline( + detector_motion, eiger, oav, smargon, synchrotron, test_config_files, dcm +): magic_mock = MagicMock(autospec=True) with DeviceCollector(mock=True): diff --git a/tests/unit_tests/hyperion/experiment_plans/test_pin_centre_then_xray_centre_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_pin_centre_then_xray_centre_plan.py index a63a93c8c..9f66053c0 100644 --- a/tests/unit_tests/hyperion/experiment_plans/test_pin_centre_then_xray_centre_plan.py +++ b/tests/unit_tests/hyperion/experiment_plans/test_pin_centre_then_xray_centre_plan.py @@ -4,13 +4,15 @@ from bluesky.run_engine import RunEngine from bluesky.simulators import RunEngineSimulator, assert_message_and_return_remaining from bluesky.utils import Msg -from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue -from dodal.devices.backlight import Backlight, BacklightPosition +from dodal.devices.aperturescatterguard import ApertureValue +from dodal.devices.backlight import BacklightPosition from dodal.devices.detector.detector_motion import ShutterState from dodal.devices.smargon import Smargon from dodal.devices.synchrotron import SynchrotronMode -from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import GridDetectThenXRayCentreComposite +from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import ( + GridDetectThenXRayCentreComposite, +) from mx_bluesky.hyperion.experiment_plans.pin_centre_then_xray_centre_plan import ( create_parameters_for_grid_detection, pin_centre_then_xray_centre_plan, @@ -58,7 +60,9 @@ def test_when_pin_centre_xray_centre_called_then_plan_runs_correctly( RE = RunEngine() RE( pin_centre_then_xray_centre_plan( - grid_detect_devices, test_pin_centre_then_xray_centre_params, test_config_files + grid_detect_devices, + test_pin_centre_then_xray_centre_params, + test_config_files, ) )