Skip to content

Commit 4cba476

Browse files
chore(deps): Update dodal to 1.55.1 and ophyd-async to 0.13.0 (#1152)
Co-authored-by: Joseph Ware <[email protected]>
1 parent 3a3335c commit 4cba476

File tree

3 files changed

+67
-4
lines changed

3 files changed

+67
-4
lines changed

dev-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dataclasses-json==0.6.7
3131
deepdiff==8.5.0
3232
deepmerge==2.0
3333
distlib==0.4.0
34-
dls-dodal==1.54.0
34+
dls-dodal==1.55.1
3535
dnspython==2.7.0
3636
docopt==0.6.2
3737
docutils==0.21.2
@@ -105,7 +105,7 @@ opentelemetry-sdk==1.36.0
105105
opentelemetry-semantic-conventions==0.57b0
106106
opentelemetry-util-http==0.57b0
107107
ophyd==1.10.7
108-
ophyd-async==0.12.3
108+
ophyd-async==0.13.0
109109
orderly-set==5.5.0
110110
orjson==3.11.1
111111
p4p==4.2.1
@@ -160,7 +160,7 @@ rpds-py==0.26.0
160160
ruamel.yaml==0.18.14
161161
ruamel.yaml.clib==0.2.12
162162
ruff==0.12.7
163-
scanspec==0.8.0
163+
scanspec==1.0a1
164164
semver==3.0.4
165165
sentry-sdk==2.34.1
166166
setuptools_dso==2.12.2

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies = [
2424
"fastapi>=0.112.0",
2525
"uvicorn",
2626
"requests",
27-
"dls-dodal>=1.54.0",
27+
"dls-dodal>=1.55.1",
2828
"super-state-machine", # https://github.com/DiamondLightSource/blueapi/issues/553
2929
"GitPython",
3030
"event-model==1.23", # https://github.com/DiamondLightSource/blueapi/issues/684

tests/system_tests/plans.json

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,40 @@
167167
"title": "Concat",
168168
"type": "object"
169169
},
170+
"ConstantDuration_Reference_": {
171+
"additionalProperties": false,
172+
"description": "A special spec used to hold information about the duration of each frame.",
173+
"properties": {
174+
"constant_duration": {
175+
"description": "The value at each point",
176+
"title": "Constant Duration",
177+
"type": "number"
178+
},
179+
"spec": {
180+
"anyOf": [
181+
{
182+
"$ref": "#/$defs/Spec"
183+
},
184+
{
185+
"type": "null"
186+
}
187+
],
188+
"default": null,
189+
"description": "Spec contaning the path to be followed"
190+
},
191+
"type": {
192+
"const": "ConstantDuration",
193+
"default": "ConstantDuration",
194+
"title": "Type",
195+
"type": "string"
196+
}
197+
},
198+
"required": [
199+
"constant_duration"
200+
],
201+
"title": "ConstantDuration",
202+
"type": "object"
203+
},
170204
"DifferenceOf_Reference_": {
171205
"additionalProperties": false,
172206
"description": "A point is in DifferenceOf(a, b) if in a and not in b.\n\nTypically created with the ``-`` operator.\n\n>>> r = Range(\"x\", 0.5, 2.5) - Range(\"x\", 1.5, 3.5)\n>>> r.mask({\"x\": np.array([0, 1, 2, 3, 4])})\narray([False, True, False, False, False])",
@@ -255,6 +289,27 @@
255289
"title": "Ellipse",
256290
"type": "object"
257291
},
292+
"Fly_Reference_": {
293+
"additionalProperties": false,
294+
"description": "Spec that represents a fly scan.",
295+
"properties": {
296+
"spec": {
297+
"$ref": "#/$defs/Spec",
298+
"description": "Spec contaning the path to be followed"
299+
},
300+
"type": {
301+
"const": "Fly",
302+
"default": "Fly",
303+
"title": "Type",
304+
"type": "string"
305+
}
306+
},
307+
"required": [
308+
"spec"
309+
],
310+
"title": "Fly",
311+
"type": "object"
312+
},
258313
"IntersectionOf_Reference_": {
259314
"additionalProperties": false,
260315
"description": "A point is in IntersectionOf(a, b) if in both a and b.\n\nTypically created with the ``&`` operator.\n\n>>> r = Range(\"x\", 0.5, 2.5) & Range(\"x\", 1.5, 3.5)\n>>> r.mask({\"x\": np.array([0, 1, 2, 3, 4])})\narray([False, False, True, False, False])",
@@ -629,6 +684,8 @@
629684
"discriminator": {
630685
"mapping": {
631686
"Concat": "#/$defs/Concat_Reference_",
687+
"ConstantDuration": "#/$defs/ConstantDuration_Reference_",
688+
"Fly": "#/$defs/Fly_Reference_",
632689
"Line": "#/$defs/Line_Reference_",
633690
"Mask": "#/$defs/Mask_Reference_",
634691
"Product": "#/$defs/Product_Reference_",
@@ -666,6 +723,12 @@
666723
{
667724
"$ref": "#/$defs/Line_Reference_"
668725
},
726+
{
727+
"$ref": "#/$defs/Fly_Reference_"
728+
},
729+
{
730+
"$ref": "#/$defs/ConstantDuration_Reference_"
731+
},
669732
{
670733
"$ref": "#/$defs/Static_Reference_"
671734
},

0 commit comments

Comments
 (0)