Skip to content

Commit

Permalink
Merge pull request #787 from danielballan/tiled-dep
Browse files Browse the repository at this point in the history
Bump tiled dep to v0.1.0a110
  • Loading branch information
danielballan authored Dec 13, 2023
2 parents f72d40d + 3f68d4b commit fb6551d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 9 additions & 1 deletion databroker/tests/test_broker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion requirements-client.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mongoquery
msgpack >=1.0.0
orjson
tiled[client] >=0.1.0a107
tiled[client] >=0.1.0a110
2 changes: 1 addition & 1 deletion requirements-server.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit fb6551d

Please sign in to comment.