From 64a5dba35164a1a8689313529a7c2a87e28bf6be Mon Sep 17 00:00:00 2001 From: Callum Forrester Date: Mon, 25 Mar 2024 16:12:49 +0000 Subject: [PATCH] Pin to bluesky alpha release rather than git branch (#157) * Pin to bluesky alpha release rather than git branch * Update bluesky pin * Pre-declare in test * Remove flyer from pre-declare and simplify test --- pyproject.toml | 2 +- tests/core/test_flyer.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7741cbc47f..e24dc8a176 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ "numpy", "packaging", "pint", - "bluesky @ git+https://github.com/bluesky/bluesky.git@collect-multiple-detectors", # Pin to Bluesky branch while still under work + "bluesky>=1.13.0a3", "event-model", "p4p", "pyyaml", diff --git a/tests/core/test_flyer.py b/tests/core/test_flyer.py index cfe2dd34a9..f25a97c1af 100644 --- a/tests/core/test_flyer.py +++ b/tests/core/test_flyer.py @@ -175,6 +175,7 @@ def flying_plan(): detector.controller.disarm.assert_called_once # type: ignore yield from bps.open_run() + yield from bps.declare_stream(*detector_list, name="main_stream", collect=True) yield from bps.kickoff(flyer) for detector in detector_list: @@ -199,9 +200,8 @@ def flying_plan(): done = True yield from bps.collect( *detector_list, - stream=True, return_payload=False, - name="main_stream", + # name="main_stream", ) yield from bps.sleep(0.01) yield from bps.wait(group="complete")