Skip to content

Commit 5c73783

Browse files
Move numtracker in compose file to a more obscure port and pin scanspec
1 parent dca41bd commit 5c73783

File tree

5 files changed

+141
-3
lines changed

5 files changed

+141
-3
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,6 @@ lockfiles/
7171

7272
# Editor/IDE project files
7373
.idea/
74+
75+
# Example IOCs
76+
example-services/

dev-requirements.txt

Lines changed: 135 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,218 @@
1+
accessible-pygments==0.0.5
12
aioca==2.0a4
23
aiofiles==24.1.0
34
aiohappyeyeballs==2.6.1
45
aiohttp==3.12.15
56
aiosignal==1.4.0
7+
alabaster==1.0.0
68
annotated-types==0.7.0
9+
anyio==4.9.0
10+
asgiref==3.9.1
711
attrs==25.3.0
12+
babel==2.17.0
13+
beautifulsoup4==4.13.4
814
bidict==0.23.1
915
bluesky==1.14.2
16+
bluesky-stomp==0.1.7
1017
certifi==2025.7.14
18+
cffi==1.17.1
19+
cfgv==3.4.0
1120
charset-normalizer==3.4.2
1221
click==8.2.1
22+
colorama==0.4.6
1323
colorlog==6.9.0
1424
compress-pickle==2.1.0
25+
contourpy==1.3.3
26+
copier==9.8.0
27+
coverage==7.10.1
28+
cryptography==45.0.5
1529
cycler==0.12.1
1630
dataclasses-json==0.6.7
1731
deepdiff==8.5.0
32+
deepmerge==2.0
33+
distlib==0.4.0
1834
dls-dodal==1.54.0
35+
dnspython==2.7.0
1936
docopt==0.6.2
37+
docutils==0.21.2
38+
dunamai==1.25.0
39+
email_validator==2.2.0
2040
epicscorelibs==7.0.7.99.1.2
2141
event-model==1.23
42+
fastapi==0.116.1
43+
fastapi-cli==0.0.8
44+
fastapi-cloud-cli==0.1.5
45+
filelock==3.18.0
2246
flexcache==0.3
2347
flexparser==0.4
48+
fonttools==4.59.0
2449
frozenlist==1.7.0
50+
funcy==2.0
51+
gitdb==4.0.12
52+
GitPython==3.1.45
53+
googleapis-common-protos==1.70.0
2554
graypy==2.1.0
55+
grpcio==1.74.0
56+
h11==0.16.0
2657
historydict==1.2.6
58+
httpcore==1.0.9
59+
httptools==0.6.4
60+
httpx==0.28.1
61+
identify==2.6.12
2762
idna==3.10
63+
imagesize==1.4.1
2864
importlib_metadata==8.7.0
2965
importlib_resources==6.5.2
66+
iniconfig==2.1.0
67+
itsdangerous==2.2.0
68+
Jinja2==3.1.6
69+
jinja2-ansible-filters==1.3.2
3070
jsonschema==4.25.0
3171
jsonschema-specifications==2025.4.1
72+
jwcrypto==1.5.6
73+
kiwisolver==1.4.8
3274
lz4==4.4.4
75+
markdown-it-py==3.0.0
76+
MarkupSafe==3.0.2
3377
marshmallow==3.26.1
78+
matplotlib==3.10.5
79+
mdit-py-plugins==0.4.2
80+
mdurl==0.1.2
81+
mistune==3.1.3
82+
mock==5.2.0
3483
msgpack==1.1.1
3584
msgpack-numpy==0.4.8
3685
multidict==6.6.3
3786
mypy_extensions==1.1.0
87+
myst-parser==4.0.1
3888
networkx==3.5
89+
nodeenv==1.9.1
3990
nose2==0.15.1
4091
numpy==2.2.6
92+
observability-utils==0.1.5
4193
opencv-python-headless==4.12.0.88
4294
opentelemetry-api==1.36.0
95+
opentelemetry-distro==0.57b0
96+
opentelemetry-exporter-otlp==1.36.0
97+
opentelemetry-exporter-otlp-proto-common==1.36.0
98+
opentelemetry-exporter-otlp-proto-grpc==1.36.0
99+
opentelemetry-exporter-otlp-proto-http==1.36.0
100+
opentelemetry-instrumentation==0.57b0
101+
opentelemetry-instrumentation-asgi==0.57b0
102+
opentelemetry-instrumentation-fastapi==0.57b0
103+
opentelemetry-proto==1.36.0
104+
opentelemetry-sdk==1.36.0
105+
opentelemetry-semantic-conventions==0.57b0
106+
opentelemetry-util-http==0.57b0
43107
ophyd==1.10.7
44108
ophyd-async==0.12.3
45109
orderly-set==5.5.0
110+
orjson==3.11.1
46111
p4p==4.2.1
47112
packaging==25.0
113+
pathlib2==2.3.7.post1
114+
pathspec==0.12.1
115+
picobox==4.0.0
48116
pika==1.3.2
49117
pillow==11.3.0
50118
Pint==0.24.4
119+
pipdeptree==2.28.0
51120
platformdirs==4.3.8
121+
pluggy==1.6.0
122+
plumbum==1.9.0
52123
ply==3.11
124+
pre_commit==4.2.0
125+
prompt_toolkit==3.0.51
53126
propcache==0.3.2
127+
protobuf==6.31.1
54128
pvxslibs==1.4.0
129+
py==1.11.0
130+
pycparser==2.22
55131
pydantic==2.11.7
132+
pydantic-extra-types==2.10.5
133+
pydantic-settings==2.10.1
56134
pydantic_core==2.33.2
57135
pydantic_numpy==8.0.1
136+
pydata-sphinx-theme==0.16.1
58137
pyepics==3.5.8
138+
Pygments==2.19.2
139+
PyJWT==2.10.1
59140
pyparsing==3.2.3
141+
pyright==1.1.403
142+
pytest==8.4.1
143+
pytest-asyncio==1.1.0
144+
pytest-cov==6.2.1
145+
python-dateutil==2.9.0.post0
146+
python-dotenv==1.1.1
147+
python-multipart==0.0.20
60148
PyYAML==6.0.2
61149
pyzmq==26.3.0
150+
questionary==2.1.0
62151
redis==6.2.0
63152
referencing==0.36.2
64153
requests==2.32.4
154+
responses==0.25.7
155+
rich==14.1.0
156+
rich-toolkit==0.14.9
157+
rignore==0.6.4
158+
roman-numerals-py==3.1.0
65159
rpds-py==0.26.0
66160
ruamel.yaml==0.18.14
67161
ruamel.yaml.clib==0.2.12
68-
scanspec==0.8.1
162+
ruff==0.12.7
163+
scanspec==0.8.0
69164
semver==3.0.4
165+
sentry-sdk==2.34.1
70166
setuptools_dso==2.12.2
167+
shellingham==1.5.4
168+
six==1.17.0
169+
smmap==5.0.2
170+
sniffio==1.3.1
171+
snowballstemmer==3.0.1
172+
soupsieve==2.7
173+
Sphinx==8.2.3
174+
sphinx-autobuild==2024.10.3
175+
sphinx-click==6.0.0
176+
sphinx-copybutton==0.5.2
177+
sphinx_design==0.6.1
178+
sphinx_mdinclude==0.6.2
179+
sphinxcontrib-applehelp==2.0.0
180+
sphinxcontrib-devhelp==2.0.0
181+
sphinxcontrib-htmlhelp==2.1.0
182+
sphinxcontrib-httpdomain==1.8.1
183+
sphinxcontrib-jsmath==1.0.1
184+
sphinxcontrib-openapi==0.8.4
185+
sphinxcontrib-qthelp==2.0.0
186+
sphinxcontrib-serializinghtml==2.0.0
71187
stamina==25.1.0
188+
starlette==0.47.2
72189
stomp.py==8.2.0
190+
super-state-machine==2.0.2
73191
tenacity==9.1.2
192+
tomlkit==0.13.3
74193
toolz==1.0.0
194+
tox==3.28.0
195+
tox-direct==0.4
75196
tqdm==4.67.1
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
201+
types-urllib3==1.26.25.14
76202
typing-inspect==0.9.0
77203
typing-inspection==0.4.1
78204
typing_extensions==4.14.1
205+
ujson==5.10.0
79206
urllib3==2.5.0
207+
uvicorn==0.35.0
208+
uvloop==0.21.0
209+
virtualenv==20.32.0
210+
watchfiles==1.1.0
211+
wcwidth==0.2.13
80212
websocket-client==1.8.0
213+
websockets==15.0.1
81214
workflows==3.2
215+
wrapt==1.17.2
82216
yarl==1.20.1
83217
zipp==3.23.0
84218
zocalo==1.3.0

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies = [
2525
"uvicorn",
2626
"requests",
2727
"dls-dodal>=1.54.0",
28+
"scanspec<=0.8.0", # https://github.com/bluesky/scanspec/issues/179
2829
"super-state-machine", # https://github.com/DiamondLightSource/blueapi/issues/553
2930
"GitPython",
3031
"event-model==1.23", # https://github.com/DiamondLightSource/blueapi/issues/684

tests/system_tests/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
numtracker:
33
image: ghcr.io/diamondlightsource/numtracker:1.0.1
44
ports:
5-
- "8001:8000"
5+
- "8406:8000"
66
post_start:
77
- command: /app/numtracker client configure adsim --directory '/tmp/' --scan '{instrument}-{scan_number}' --detector '{instrument}-{scan_number}-{detector}' --number 43
88

tests/system_tests/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ stomp:
1414
enabled: true
1515
url: tcp://localhost:61613/
1616
numtracker:
17-
url: http://localhost:8001/graphql
17+
url: http://localhost:8406/graphql

0 commit comments

Comments
 (0)