Skip to content

Commit ff30272

Browse files
committed
chore(deps): Update ScanSpec and unpin dependencies
1 parent 026633f commit ff30272

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

dev-requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ accessible-pygments==0.0.5
22
aioca==1.8.1
33
aiofiles==24.1.0
44
aiohappyeyeballs==2.6.1
5+
aiohttp==3.12.13
56
aiosignal==1.3.2
67
alabaster==1.0.0
78
annotated-types==0.7.0
@@ -157,8 +158,9 @@ rpds-py==0.24.0
157158
ruamel.yaml==0.18.10
158159
ruamel.yaml.clib==0.2.12
159160
ruff==0.11.7
160-
scanspec==0.7.8
161+
scanspec==0.8.0
161162
semver==3.0.4
163+
setuptools==80.9.0
162164
setuptools_dso==2.12.2
163165
shellingham==1.5.4
164166
six==1.17.0

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dependencies = [
1515
"bluesky[plotting]>=1.13.1", # plotting includes matplotlib, required for BestEffortCallback in run plans
1616
"ophyd-async",
1717
"aioca",
18-
"pydantic(>=2.0,<=2.10.6)", # https://github.com/DiamondLightSource/blueapi/issues/908
19-
"scanspec>=0.7.8",
18+
"pydantic>=2.0",
19+
"scanspec>=0.8.0",
2020
"pydantic-settings",
2121
"stomp-py",
2222
"PyYAML>=6.0.2",

tests/system_tests/plans.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
},
332332
"Mask_Reference_": {
333333
"additionalProperties": false,
334-
"description": "Restrict Spec to only midpoints that fall inside the given Region.\n\nTypically created with the ``&`` operator. It also pushes down the\n``& | ^ -`` operators to its `Region` to avoid the need for brackets on\ncombinations of Regions.\n\nIf a Region spans multiple Frames objects, they will be squashed together.\n\n.. example_spec::\n\n from scanspec.regions import Circle\n from scanspec.specs import Line\n\n spec = Line(\"y\", 1, 3, 3) * Line(\"x\", 3, 5, 5) & Circle(\"x\", \"y\", 4, 2, 1.2)\n\nSee Also: `why-squash-can-change-path`",
334+
"description": "Restrict Spec to only midpoints that fall inside the given Region.\n\nTypically created with the ``&`` operator. It also pushes down the\n``& | ^ -`` operators to its `Region` to avoid the need for brackets on\ncombinations of Regions.\n\nIf a Region spans multiple Dimension objects, they will be squashed together.\n\n.. example_spec::\n\n from scanspec.regions import Circle\n from scanspec.specs import Line\n\n spec = Line(\"y\", 1, 3, 3) * Line(\"x\", 3, 5, 5) & Circle(\"x\", \"y\", 4, 2, 1.2)\n\nSee Also: `why-squash-can-change-path`",
335335
"properties": {
336336
"spec": {
337337
"$ref": "#/$defs/Spec",
@@ -593,7 +593,7 @@
593593
},
594594
"gap": {
595595
"default": true,
596-
"description": "If False and the slowest of the stack of Frames is snaked then the end and start of consecutive iterations of Spec will have no gap",
596+
"description": "If False and the slowest of the stack of Dimension is snaked then the end and start of consecutive iterations of Spec will have no gap",
597597
"title": "Gap",
598598
"type": "boolean"
599599
},
@@ -749,7 +749,7 @@
749749
},
750750
"Squash_Reference_": {
751751
"additionalProperties": false,
752-
"description": "Squash a stack of Frames together into a single expanded Frames object.\n\nSee Also:\n `why-squash-can-change-path`\n\n.. example_spec::\n\n from scanspec.specs import Line, Squash\n\n spec = Squash(Line(\"y\", 1, 2, 3) * Line(\"x\", 0, 1, 4))",
752+
"description": "Squash a stack of Dimension together into a single expanded Dimension object.\n\nSee Also:\n `why-squash-can-change-path`\n\n.. example_spec::\n\n from scanspec.specs import Line, Squash\n\n spec = Squash(Line(\"y\", 1, 2, 3) * Line(\"x\", 0, 1, 4))",
753753
"properties": {
754754
"spec": {
755755
"$ref": "#/$defs/Spec",
@@ -864,7 +864,7 @@
864864
},
865865
"Zip_Reference_": {
866866
"additionalProperties": false,
867-
"description": "Run two Specs in parallel, merging their midpoints together.\n\nTypically formed using `Spec.zip`.\n\nStacks of Frames are merged by:\n\n- If right creates a stack of a single Frames object of size 1, expand it to\n the size of the fastest Frames object created by left\n- Merge individual Frames objects together from fastest to slowest\n\nThis means that Zipping a Spec producing stack [l2, l1] with a Spec\nproducing stack [r1] will assert len(l1)==len(r1), and produce\nstack [l2, l1.zip(r1)].\n\n.. example_spec::\n\n from scanspec.specs import Line\n\n spec = Line(\"z\", 1, 2, 3) * Line(\"y\", 3, 4, 5).zip(Line(\"x\", 4, 5, 5))",
867+
"description": "Run two Specs in parallel, merging their midpoints together.\n\nTypically formed using `Spec.zip`.\n\nStacks of Dimension are merged by:\n\n- If right creates a stack of a single Dimension object of size 1, expand it to\n the size of the fastest Dimension object created by left\n- Merge individual Dimension objects together from fastest to slowest\n\nThis means that Zipping a Spec producing stack [l2, l1] with a Spec\nproducing stack [r1] will assert len(l1)==len(r1), and produce\nstack [l2, l1.zip(r1)].\n\n.. example_spec::\n\n from scanspec.specs import Line\n\n spec = Line(\"z\", 1, 2, 3) * Line(\"y\", 3, 4, 5).zip(Line(\"x\", 4, 5, 5))",
868868
"properties": {
869869
"left": {
870870
"$ref": "#/$defs/Spec",

0 commit comments

Comments
 (0)