diff --git a/src/haven/devices/detectors/xspress.py b/src/haven/devices/detectors/xspress.py index 882419b9..12d63467 100644 --- a/src/haven/devices/detectors/xspress.py +++ b/src/haven/devices/detectors/xspress.py @@ -11,7 +11,12 @@ TriggerInfo, ) from ophyd_async.epics import adcore -from ophyd_async.epics.adcore._utils import ADBaseDataType, convert_ad_dtype_to_np, NDAttributeParam, NDAttributeDataType +from ophyd_async.epics.adcore._utils import ( + ADBaseDataType, + NDAttributeDataType, + NDAttributeParam, + convert_ad_dtype_to_np, +) from ophyd_async.epics.core import epics_signal_rw, epics_signal_x from .area_detectors import HavenDetector, default_path_provider diff --git a/src/haven/run_engine.py b/src/haven/run_engine.py index 23615a93..26200813 100644 --- a/src/haven/run_engine.py +++ b/src/haven/run_engine.py @@ -1,5 +1,5 @@ -from uuid import uuid4 as uuid import logging +from uuid import uuid4 as uuid import databroker import IPython @@ -10,6 +10,7 @@ from bluesky_kafka import Publisher from haven import load_config + from .catalog import tiled_client from .exceptions import ComponentNotFound from .instrument import beamline diff --git a/src/haven/tests/test_preprocessors.py b/src/haven/tests/test_preprocessors.py index 0337825a..94945f19 100644 --- a/src/haven/tests/test_preprocessors.py +++ b/src/haven/tests/test_preprocessors.py @@ -13,7 +13,12 @@ @pytest.fixture() def RE(): - return run_engine(use_bec=False, connect_databroker=False, connect_tiled=False) + return run_engine( + use_bec=False, + connect_databroker=False, + connect_tiled=False, + connect_kafka=False, + ) @pytest.mark.xfail diff --git a/src/haven/tests/test_run_engine.py b/src/haven/tests/test_run_engine.py index 88e5b328..f4868266 100644 --- a/src/haven/tests/test_run_engine.py +++ b/src/haven/tests/test_run_engine.py @@ -23,19 +23,31 @@ def test_subscribers_garbage_collection(monkeypatch, aps): """ monkeypatch.setattr(databroker, "catalog", {"bluesky": databroker.temp()}) - RE = run_engine(use_bec=False, connect_tiled=False) + RE = run_engine( + use_bec=False, connect_tiled=False, connect_databroker=True, connect_kafka=False + ) assert len(RE.dispatcher.cb_registry.callbacks) == 12 gc.collect() assert len(RE.dispatcher.cb_registry.callbacks) == 12 def test_run_engine_preprocessors(aps): - RE = run_engine(use_bec=False, connect_databroker=False, connect_tiled=False) + RE = run_engine( + use_bec=False, + connect_databroker=False, + connect_tiled=False, + connect_kafka=False, + ) assert len(RE.preprocessors) > 0 def test_run_engine_created(aps): - RE = run_engine(use_bec=False, connect_databroker=False, connect_tiled=False) + RE = run_engine( + use_bec=False, + connect_databroker=False, + connect_tiled=False, + connect_kafka=False, + ) assert isinstance(RE, RunEngine) diff --git a/src/queueserver/launch_queueserver.py b/src/queueserver/launch_queueserver.py index c4dcd9d5..62644deb 100644 --- a/src/queueserver/launch_queueserver.py +++ b/src/queueserver/launch_queueserver.py @@ -1,9 +1,12 @@ +import logging import os import subprocess from pathlib import Path from haven import load_config +log = logging.getLogger(__name__) + def launch_queueserver(): # Derive environmental variables diff --git a/src/queueserver/queueserver_startup.py b/src/queueserver/queueserver_startup.py index f8660658..dda4ac78 100755 --- a/src/queueserver/queueserver_startup.py +++ b/src/queueserver/queueserver_startup.py @@ -39,10 +39,7 @@ # Create a run engine RE = run_engine( - connect_databroker=False, - connect_tiled=False, - connect_kafka=True, - use_bec=False + connect_databroker=False, connect_tiled=False, connect_kafka=True, use_bec=False ) # Import devices