Skip to content

Commit 8c83405

Browse files
callumforrestercallumforrester
authored
fix(deps): Unpin scanspec from alpha tag (#1213)
Ophyd-async no longer depends on an alpha release of scanspec so we don't need to either
1 parent 1523b00 commit 8c83405

2 files changed

Lines changed: 9 additions & 72 deletions

File tree

‎dev-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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==1.0a1
163+
scanspec==0.8
164164
semver==3.0.4
165165
sentry-sdk==2.34.1
166166
setuptools_dso==2.12.2

‎tests/system_tests/plans.json‎

Lines changed: 8 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "count",
55
"description": "Reads from a number of devices.\n Wraps bluesky.plans.count(det, num, delay, md=metadata) exposing only serializable\n parameters and metadata.",
6-
"schema": {
6+
"parameter_schema": {
77
"additionalProperties": false,
88
"properties": {
99
"detectors": {
@@ -52,7 +52,7 @@
5252
{
5353
"name": "spec_scan",
5454
"description": "Generic plan for reading `detectors` at every point of a ScanSpec `Spec`.\n A `Spec` is an N-dimensional path.\n ",
55-
"schema": {
55+
"parameter_schema": {
5656
"$defs": {
5757
"Circle_Reference_": {
5858
"additionalProperties": false,
@@ -167,40 +167,6 @@
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-
},
204170
"DifferenceOf_Reference_": {
205171
"additionalProperties": false,
206172
"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])",
@@ -289,27 +255,6 @@
289255
"title": "Ellipse",
290256
"type": "object"
291257
},
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-
},
313258
"IntersectionOf_Reference_": {
314259
"additionalProperties": false,
315260
"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])",
@@ -684,8 +629,6 @@
684629
"discriminator": {
685630
"mapping": {
686631
"Concat": "#/$defs/Concat_Reference_",
687-
"ConstantDuration": "#/$defs/ConstantDuration_Reference_",
688-
"Fly": "#/$defs/Fly_Reference_",
689632
"Line": "#/$defs/Line_Reference_",
690633
"Mask": "#/$defs/Mask_Reference_",
691634
"Product": "#/$defs/Product_Reference_",
@@ -723,12 +666,6 @@
723666
{
724667
"$ref": "#/$defs/Line_Reference_"
725668
},
726-
{
727-
"$ref": "#/$defs/Fly_Reference_"
728-
},
729-
{
730-
"$ref": "#/$defs/ConstantDuration_Reference_"
731-
},
732669
{
733670
"$ref": "#/$defs/Static_Reference_"
734671
},
@@ -980,7 +917,7 @@
980917
{
981918
"name": "set_absolute",
982919
"description": "\n Set a device, wrapper for `bp.abs_set`.\n\n Args:\n movable (Movable[T]): The device to set\n value (T): The new value\n group (Group | None, optional): The message group to associate with the\n setting, for sequencing. Defaults to None.\n wait (bool, optional): The group should wait until all setting is complete\n (e.g. a motor has finished moving). Defaults to False.\n\n Returns:\n MsgGenerator: Plan\n\n Yields:\n Iterator[MsgGenerator]: Bluesky messages\n ",
983-
"schema": {
920+
"parameter_schema": {
984921
"additionalProperties": false,
985922
"properties": {
986923
"movable": {
@@ -1014,7 +951,7 @@
1014951
{
1015952
"name": "set_relative",
1016953
"description": "\n Change a device, wrapper for `bp.rel_set`.\n\n Args:\n movable (Movable): The device to set\n value (T): The new value\n group (Group | None, optional): The message group to associate with the\n setting, for sequencing. Defaults to None.\n wait (bool, optional): The group should wait until all setting is complete\n (e.g. a motor has finished moving). Defaults to False.\n\n Returns:\n MsgGenerator: Plan\n\n Yields:\n Iterator[MsgGenerator]: Bluesky messages\n ",
1017-
"schema": {
954+
"parameter_schema": {
1018955
"additionalProperties": false,
1019956
"properties": {
1020957
"movable": {
@@ -1048,7 +985,7 @@
1048985
{
1049986
"name": "move",
1050987
"description": "\n Move a device, wrapper for `bp.mv`.\n\n Args:\n moves (Mapping[Movable, T]): Mapping of Movables to target positions\n group (Group | None, optional): The message group to associate with the\n setting, for sequencing. Defaults to None.\n\n Returns:\n MsgGenerator: Plan\n\n Yields:\n Iterator[MsgGenerator]: Bluesky messages\n ",
1051-
"schema": {
988+
"parameter_schema": {
1052989
"additionalProperties": false,
1053990
"properties": {
1054991
"moves": {
@@ -1071,7 +1008,7 @@
10711008
{
10721009
"name": "move_relative",
10731010
"description": "\n Move a device relative to its current position, wrapper for `bp.mvr`.\n\n Args:\n moves (Mapping[Movable, T]): Mapping of Movables to target deltas\n group (Group | None, optional): The message group to associate with the\n setting, for sequencing. Defaults to None.\n\n Returns:\n MsgGenerator: Plan\n\n Yields:\n Iterator[MsgGenerator]: Bluesky messages\n ",
1074-
"schema": {
1011+
"parameter_schema": {
10751012
"additionalProperties": false,
10761013
"properties": {
10771014
"moves": {
@@ -1094,7 +1031,7 @@
10941031
{
10951032
"name": "sleep",
10961033
"description": "\n Suspend all action for a given time, wrapper for `bp.sleep`\n\n Args:\n time (float): Time to wait in seconds\n\n Returns:\n MsgGenerator: Plan\n\n Yields:\n Iterator[MsgGenerator]: Bluesky messages\n ",
1097-
"schema": {
1034+
"parameter_schema": {
10981035
"additionalProperties": false,
10991036
"properties": {
11001037
"time": {
@@ -1112,7 +1049,7 @@
11121049
{
11131050
"name": "wait",
11141051
"description": "\n Wait for a group status to complete, wrapper for `bp.wait`.\n Does not expose move_on, as when used as a stub will not fail on Timeout.\n\n Args:\n group (Group | None, optional): The name of the group to wait for, defaults\n to None, in which case waits for all\n groups that have not yet been awaited.\n timeout (float | None, default=None): a timeout in seconds\n\n\n Returns:\n MsgGenerator: Plan\n\n Yields:\n Iterator[MsgGenerator]: Bluesky messages\n ",
1115-
"schema": {
1052+
"parameter_schema": {
11161053
"additionalProperties": false,
11171054
"properties": {
11181055
"group": {

0 commit comments

Comments
 (0)