diff --git a/Dockerfile b/Dockerfile index 7bebeb155..664319bec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bluesky/tiled:v0.1.0a107 as base +FROM ghcr.io/bluesky/tiled:v0.1.0a110 as base FROM base as builder diff --git a/databroker/tests/test_broker.py b/databroker/tests/test_broker.py index d58eb78f2..43781fea5 100644 --- a/databroker/tests/test_broker.py +++ b/databroker/tests/test_broker.py @@ -28,6 +28,7 @@ from bluesky import __version__ as bluesky_version from bluesky.plans import count from bluesky.plan_stubs import trigger_and_read, configure, one_shot +import bluesky.plan_stubs as bps from bluesky.preprocessors import (monitor_during_wrapper, run_decorator, baseline_wrapper, @@ -98,7 +99,14 @@ def test_no_events(db, RE): if packaging.version.parse(bluesky_version) < packaging.version.parse("1.11.0"): pytest.skip("This test relies on the pre-declare streams feature added in bluesky 1.11") RE.subscribe(db.insert) - uid, = get_uids(RE(count([]))) + + + def test_plan(): + yield from bps.open_run() + yield from bps.declare_stream(name='primary') + yield from bps.close_run() + + uid, = get_uids(RE(test_plan())) header = db[uid] header.table() diff --git a/requirements-client.txt b/requirements-client.txt index 9d7940328..959021597 100644 --- a/requirements-client.txt +++ b/requirements-client.txt @@ -1,4 +1,4 @@ mongoquery msgpack >=1.0.0 orjson -tiled[client] >=0.1.0a107 +tiled[client] >=0.1.0a110 diff --git a/requirements-server.txt b/requirements-server.txt index 3b76e72f0..af0bb6554 100644 --- a/requirements-server.txt +++ b/requirements-server.txt @@ -13,7 +13,7 @@ pytz rich starlette suitcase-mongo >=0.4.0 -tiled[server] >=0.1.0a105 +tiled[server] >=0.1.0a110 toolz typer tzlocal diff --git a/requirements-test.txt b/requirements-test.txt index 7dc58da75..449d17ae8 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -16,6 +16,6 @@ sphinx suitcase-jsonl >=0.1.0b2 suitcase-mongo >=0.4.0 suitcase-msgpack >=0.2.2 -tiled[all] >=0.1.0a105 +tiled[all] >=0.1.0a110 ujson vcrpy