Skip to content

Commit

Permalink
Pin to bluesky alpha release rather than git branch (#157)
Browse files Browse the repository at this point in the history
* Pin to bluesky alpha release rather than git branch

* Update bluesky pin

* Pre-declare in test

* Remove flyer from pre-declare and simplify test
  • Loading branch information
callumforrester authored Mar 25, 2024
1 parent fd6b8ab commit 64a5dba
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tests/core/test_flyer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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")
Expand Down

0 comments on commit 64a5dba

Please sign in to comment.