Skip to content

Commit 22b287d

Browse files
chore(deps): Update dependencies (#1122)
Update dependencies manually while awaiting #1089 to pick up updates to ScanSpec that allow us to use Pydantic 2.11 and changes to our own observability-utils and bluesky-stomp.
1 parent 026633f commit 22b287d

File tree

7 files changed

+99
-86
lines changed

7 files changed

+99
-86
lines changed

dev-requirements.txt

Lines changed: 78 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ accessible-pygments==0.0.5
22
aioca==1.8.1
33
aiofiles==24.1.0
44
aiohappyeyeballs==2.6.1
5-
aiosignal==1.3.2
5+
aiohttp==3.12.14
6+
aiosignal==1.4.0
67
alabaster==1.0.0
78
annotated-types==0.7.0
89
anyio==4.9.0
9-
asgiref==3.8.1
10+
asgiref==3.9.1
1011
attrs==25.3.0
1112
babel==2.17.0
1213
beautifulsoup4==4.13.4
1314
bidict==0.23.1
14-
bluesky==1.13.1
15-
bluesky-stomp==0.1.6
16-
certifi==2025.1.31
15+
bluesky==1.14.2
16+
bluesky-stomp==0.1.7
17+
certifi==2025.7.14
1718
cffi==1.17.1
1819
cfgv==3.4.0
1920
charset-normalizer==3.4.2
@@ -22,36 +23,37 @@ colorama==0.4.6
2223
colorlog==6.9.0
2324
compress-pickle==2.1.0
2425
contourpy==1.3.2
25-
copier==9.7.1
26-
coverage==7.8.2
27-
cryptography==45.0.3
26+
copier==9.8.0
27+
coverage==7.9.2
28+
cryptography==45.0.5
2829
cycler==0.12.1
2930
dataclasses-json==0.6.7
30-
deepdiff==8.4.2
31+
deepdiff==8.5.0
3132
deepmerge==2.0
3233
Deprecated==1.2.18
3334
distlib==0.3.9
34-
dls-dodal==1.46.0
35+
dls-dodal==1.51.0
3536
dnspython==2.7.0
3637
docopt==0.6.2
3738
docutils==0.21.2
38-
dunamai==1.23.1
39+
dunamai==1.25.0
3940
email_validator==2.2.0
4041
epicscorelibs==7.0.7.99.1.2a1
4142
event-model==1.23
42-
fastapi==0.115.12
43-
fastapi-cli==0.0.7
43+
fastapi==0.116.1
44+
fastapi-cli==0.0.8
45+
fastapi-cloud-cli==0.1.4
4446
filelock==3.18.0
4547
flexcache==0.3
4648
flexparser==0.4
47-
fonttools==4.57.0
48-
frozenlist==1.6.0
49+
fonttools==4.58.5
50+
frozenlist==1.7.0
4951
funcy==2.0
5052
gitdb==4.0.12
5153
GitPython==3.1.44
5254
googleapis-common-protos==1.70.0
5355
graypy==2.1.0
54-
grpcio==1.71.0
56+
grpcio==1.73.1
5557
h11==0.16.0
5658
historydict==1.2.6
5759
httpcore==1.0.9
@@ -60,13 +62,13 @@ httpx==0.28.1
6062
identify==2.6.12
6163
idna==3.10
6264
imagesize==1.4.1
63-
importlib_metadata==8.6.1
65+
importlib_metadata==8.7.0
6466
importlib_resources==6.5.2
6567
iniconfig==2.1.0
6668
itsdangerous==2.2.0
6769
Jinja2==3.1.6
6870
jinja2-ansible-filters==1.3.2
69-
jsonschema==4.23.0
71+
jsonschema==4.24.0
7072
jsonschema-specifications==2025.4.1
7173
jwcrypto==1.5.6
7274
kiwisolver==1.4.8
@@ -79,33 +81,33 @@ mdit-py-plugins==0.4.2
7981
mdurl==0.1.2
8082
mistune==3.1.3
8183
mock==5.2.0
82-
msgpack==1.1.0
84+
msgpack==1.1.1
8385
msgpack-numpy==0.4.8
84-
multidict==6.4.4
86+
multidict==6.6.3
8587
mypy_extensions==1.1.0
8688
myst-parser==4.0.1
87-
networkx==3.4.2
89+
networkx==3.5
8890
nodeenv==1.9.1
8991
nose2==0.15.1
9092
numpy==2.2.6
91-
observability-utils==0.1.4
92-
opencv-python-headless==4.11.0.86
93-
opentelemetry-api==1.32.1
94-
opentelemetry-distro==0.53b1
95-
opentelemetry-exporter-otlp==1.32.1
96-
opentelemetry-exporter-otlp-proto-common==1.32.1
97-
opentelemetry-exporter-otlp-proto-grpc==1.32.1
98-
opentelemetry-exporter-otlp-proto-http==1.32.1
99-
opentelemetry-instrumentation==0.53b1
100-
opentelemetry-instrumentation-asgi==0.53b1
101-
opentelemetry-instrumentation-fastapi==0.53b1
102-
opentelemetry-proto==1.32.1
103-
opentelemetry-sdk==1.32.1
104-
opentelemetry-semantic-conventions==0.53b1
105-
opentelemetry-util-http==0.53b1
106-
ophyd==1.10.6
107-
ophyd-async==0.10.0a3
108-
orderly-set==5.4.1
93+
observability-utils==0.1.5
94+
opencv-python-headless==4.12.0.88
95+
opentelemetry-api==1.35.0
96+
opentelemetry-distro==0.56b0
97+
opentelemetry-exporter-otlp==1.35.0
98+
opentelemetry-exporter-otlp-proto-common==1.35.0
99+
opentelemetry-exporter-otlp-proto-grpc==1.35.0
100+
opentelemetry-exporter-otlp-proto-http==1.35.0
101+
opentelemetry-instrumentation==0.56b0
102+
opentelemetry-instrumentation-asgi==0.56b0
103+
opentelemetry-instrumentation-fastapi==0.56b0
104+
opentelemetry-proto==1.35.0
105+
opentelemetry-sdk==1.35.0
106+
opentelemetry-semantic-conventions==0.56b0
107+
opentelemetry-util-http==0.56b0
108+
ophyd==1.10.7
109+
ophyd-async==0.11
110+
orderly-set==5.5.0
109111
orjson==3.10.18
110112
p4p==4.2.0
111113
packaging==25.0
@@ -115,50 +117,54 @@ picobox==4.0.0
115117
pika==1.3.2
116118
pillow==11.3.0
117119
Pint==0.24.4
118-
pipdeptree==2.26.1
120+
pipdeptree==2.27.0
119121
platformdirs==4.3.8
120-
pluggy==1.5.0
122+
pluggy==1.6.0
121123
plumbum==1.9.0
122124
ply==3.11
123125
pre_commit==4.2.0
124126
prompt_toolkit==3.0.51
125-
propcache==0.3.1
126-
protobuf==5.29.5
127+
propcache==0.3.2
128+
protobuf==6.31.1
127129
pvxslibs==1.3.3
128130
py==1.11.0
129131
pycparser==2.22
130-
pydantic==2.10.6
131-
pydantic-extra-types==2.10.4
132-
pydantic-settings==2.9.1
133-
pydantic_core==2.27.2
132+
pydantic==2.11.7
133+
pydantic-extra-types==2.10.5
134+
pydantic-settings==2.10.1
135+
pydantic_core==2.33.2
134136
pydantic_numpy==8.0.1
135137
pydata-sphinx-theme==0.16.1
136-
pyepics==3.5.7
137-
Pygments==2.19.1
138+
pyepics==3.5.8
139+
Pygments==2.19.2
138140
PyJWT==2.10.1
139141
pyparsing==3.2.3
140-
pyright==1.1.401
141-
pytest==8.3.5
142+
pyright==1.1.403
143+
pytest==8.4.1
142144
pytest-asyncio==1.0.0
143-
pytest-cov==6.1.1
145+
pytest-cov==6.2.1
144146
python-dateutil==2.9.0.post0
145-
python-dotenv==1.1.0
147+
python-dotenv==1.1.1
146148
python-multipart==0.0.20
147149
PyYAML==6.0.2
150+
pyzmq==26.3.0
148151
questionary==2.1.0
149152
redis==6.2.0
150153
referencing==0.36.2
151154
requests==2.32.4
152155
responses==0.25.7
153156
rich==14.0.0
154-
rich-toolkit==0.14.3
157+
rich-toolkit==0.14.8
158+
rignore==0.6.2
155159
roman-numerals-py==3.1.0
156-
rpds-py==0.24.0
157-
ruamel.yaml==0.18.10
160+
rpds-py==0.26.0
161+
ruamel.yaml==0.18.14
158162
ruamel.yaml.clib==0.2.12
159-
ruff==0.11.7
160-
scanspec==0.7.8
163+
ruff==0.12.3
164+
scanspec==0.8.0
161165
semver==3.0.4
166+
sentry-sdk==2.32.0
167+
setuptools==80.9.0
162168
setuptools_dso==2.12.2
163169
shellingham==1.5.4
164170
six==1.17.0
@@ -180,33 +186,33 @@ sphinxcontrib-jsmath==1.0.1
180186
sphinxcontrib-openapi==0.8.4
181187
sphinxcontrib-qthelp==2.0.0
182188
sphinxcontrib-serializinghtml==2.0.0
183-
starlette==0.46.2
189+
starlette==0.47.1
184190
stomp.py==8.2.0
185191
super-state-machine==2.0.2
186-
tomlkit==0.13.2
192+
tomlkit==0.13.3
187193
toolz==1.0.0
188194
tox==3.28.0
189195
tox-direct==0.4
190196
tqdm==4.67.1
191-
typer==0.15.2
192-
types-mock==5.2.0.20250306
193-
types-PyYAML==6.0.12.20250402
194-
types-requests==2.32.0.20250328
197+
typer==0.16.0
198+
types-mock==5.2.0.20250516
199+
types-PyYAML==6.0.12.20250516
200+
types-requests==2.32.4.20250611
195201
types-urllib3==1.26.25.14
196202
typing-inspect==0.9.0
197-
typing-inspection==0.4.0
198-
typing_extensions==4.13.2
203+
typing-inspection==0.4.1
204+
typing_extensions==4.14.1
199205
ujson==5.10.0
200206
urllib3==2.5.0
201-
uvicorn==0.34.2
207+
uvicorn==0.35.0
202208
uvloop==0.21.0
203-
virtualenv==20.30.0
204-
watchfiles==1.0.5
209+
virtualenv==20.31.2
210+
watchfiles==1.1.0
205211
wcwidth==0.2.13
206212
websocket-client==1.8.0
207213
websockets==15.0.1
208214
workflows==3.2
209215
wrapt==1.17.2
210-
yarl==1.20.0
211-
zipp==3.21.0
212-
zocalo==1.2.0
216+
yarl==1.20.1
217+
zipp==3.23.0
218+
zocalo==1.3.0

docs/reference/openapi.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ components:
139139
title: Name
140140
type: string
141141
schema:
142+
additionalProperties: true
142143
description: Schema of the plan's parameters
143144
title: Schema
144145
type: object
@@ -231,6 +232,7 @@ components:
231232
title: Name
232233
type: string
233234
params:
235+
additionalProperties: true
234236
description: Values for parameters to plan, if any
235237
title: Params
236238
type: object
@@ -348,7 +350,7 @@ info:
348350
name: Apache 2.0
349351
url: https://www.apache.org/licenses/LICENSE-2.0.html
350352
title: BlueAPI Control
351-
version: 1.0.1
353+
version: 1.0.2
352354
openapi: 3.1.0
353355
paths:
354356
/config/oidc:

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ 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",
2323
"click>=8.2.0",
2424
"fastapi>=0.112.0",
2525
"uvicorn",
2626
"requests",
27-
"dls-dodal>=1.46.0",
27+
"dls-dodal>=1.51.0",
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

src/blueapi/service/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
from .runner import WorkerDispatcher
5757

5858
#: API version to publish in OpenAPI schema
59-
REST_API_VERSION = "1.0.1"
59+
REST_API_VERSION = "1.0.2"
6060

6161
LICENSE_INFO: dict[str, str] = {
6262
"name": "Apache 2.0",

tests/system_tests/devices.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
]
3535
},
3636
{
37-
"name": "sim",
37+
"name": "stage",
3838
"protocols": [
3939
{
4040
"name": "Readable",

0 commit comments

Comments
 (0)