From 627ffc3245ab85ccad838c968813f9023daa165d Mon Sep 17 00:00:00 2001
From: Joseph Ware <53935796+DiamondJoseph@users.noreply.github.com>
Date: Fri, 25 Oct 2024 14:24:22 +0100
Subject: [PATCH] Pin bluesky libaries (#688)

---
 dev-requirements.txt         | 170 +++++++++++++++++------------------
 docs/reference/asyncapi.yaml |  20 ++---
 pyproject.toml               |   5 +-
 3 files changed, 96 insertions(+), 99 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 68b3ecac7..24ff1d64c 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,108 +1,104 @@
 accessible-pygments==0.0.5
-aioca==1.7
+aioca==1.8
 aiofiles==24.1.0
-aiohappyeyeballs==2.4.0
-aiohttp==3.10.5
+aiohappyeyeballs==2.4.3
+aiohttp==3.10.10
 aiosignal==1.3.1
 alabaster==1.0.0
 annotated-types==0.7.0
-anyio==4.4.0
+anyio==4.6.2.post1
 appdirs==1.4.4
 asciitree==0.3.3
 asttokens==2.4.1
-async-timeout==4.0.3
 attrs==24.2.0
 babel==2.16.0
 beautifulsoup4==4.12.3
 bidict==0.23.1
-bluesky==1.13.0a4
+black==24.10.0
+bluesky==1.13.0a3
 bluesky-kafka==0.10.0
 bluesky-live==0.0.8
 bluesky-stomp==0.1.2
 boltons==24.0.0
-bump-pydantic==0.8.0
 cachetools==5.5.0
 caproto==1.1.1
 certifi==2024.8.30
 cfgv==3.4.0
-charset-normalizer==3.3.2
+chardet==5.2.0
+charset-normalizer==3.4.0
 click==8.1.7
-cloudpickle==3.0.0
+cloudpickle==3.1.0
 colorama==0.4.6
 colorlog==6.8.2
 comm==0.2.2
 compress-pickle==2.1.0
-confluent-kafka==2.5.3
+confluent-kafka==2.6.0
 contourpy==1.3.0
-copier==9.3.1
-coverage==7.6.1
+copier==9.4.1
+coverage==7.6.4
 cycler==0.12.1
-dask==2024.9.0
+dask==2024.10.0
 databroker==1.2.5
 dataclasses-json==0.6.7
 decorator==5.1.1
+deepdiff==8.0.1
 deepmerge==2.0
-distlib==0.3.8
+Deprecated==1.2.14
+diff_cover==9.2.0
+distlib==0.3.9
 dls-bluesky-core==0.0.4
-dls-dodal==1.31.1
-dnspython==2.6.1
+dls-dodal==1.33.0
+dnspython==2.7.0
 docopt==0.6.2
 doct==1.1.0
 docutils==0.21.2
 dunamai==1.22.0
-email_validator==2.2.0
 entrypoints==0.4
-epicscorelibs==7.0.7.99.0.2
+epicscorelibs==7.0.7.99.1.1
 event-model==1.21.0
-exceptiongroup==1.2.2
 executing==2.1.0
-fastapi==0.114.2
-fastapi-cli==0.0.5
+fastapi==0.115.3
 fasteners==0.19
-filelock==3.16.0
+filelock==3.16.1
 flexcache==0.3
 flexparser==0.3.1
-fonttools==4.53.1
-frozenlist==1.4.1
-fsspec==2024.9.0
+fonttools==4.54.1
+frozenlist==1.5.0
+fsspec==2024.10.0
 funcy==2.0
 gitdb==4.0.11
 GitPython==3.1.43
 graypy==2.1.0
 h11==0.14.0
-h5py==3.11.0
+h5py==3.12.1
 HeapDict==1.0.1
 historydict==1.2.6
-httpcore==1.0.5
-httptools==0.6.1
+httpcore==1.0.6
 httpx==0.27.2
-humanize==4.10.0
+humanize==4.11.0
 identify==2.6.1
 idna==3.10
-imageio==2.35.1
+imageio==2.36.0
 imagesize==1.4.1
-importlib_metadata==8.5.0
+importlib_metadata==8.4.0
 importlib_resources==6.4.5
 iniconfig==2.0.0
 intake==0.6.4
 ipython==8.18.0
 ipywidgets==8.1.5
-itsdangerous==2.2.0
 jedi==0.19.1
 Jinja2==3.1.4
 jinja2-ansible-filters==1.3.2
 jsonschema==4.23.0
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
 jupyterlab_widgets==3.0.13
 kiwisolver==1.4.7
 ldap3==2.9.1
-libcst==1.4.0
-livereload==2.7.0
 locket==1.0.0
 lz4==4.3.3
 markdown-it-py==3.0.0
-MarkupSafe==2.1.5
-marshmallow==3.22.0
+MarkupSafe==3.0.2
+marshmallow==3.23.0
 matplotlib==3.9.2
 matplotlib-inline==0.1.7
 mdit-py-plugins==0.4.2
@@ -113,22 +109,24 @@ mongoquery==1.4.2
 msgpack==1.1.0
 msgpack-numpy==0.4.8
 multidict==6.1.0
-mypy==1.11.2
+mypy==1.13.0
 mypy-extensions==1.0.0
 myst-parser==4.0.0
-networkx==3.3
+networkx==3.4.2
 nodeenv==1.9.1
 nose2==0.15.1
-nslsii==0.10.3
-numcodecs==0.13.0
+nslsii==0.10.5
+numcodecs==0.13.1
 numpy==1.26.4
 opencv-python-headless==4.10.0.84
+opentelemetry-api==1.27.0
 ophyd==1.9.0
-ophyd-async==0.5.2
-orjson==3.10.7
-p4p==4.1.12
+ophyd-async==0.6.0
+orderly-set==5.2.2
+orjson==3.10.10
+p4p==4.2.0
 packaging==24.1
-pandas==2.2.2
+pandas==2.2.3
 parso==0.8.4
 partd==1.4.2
 pathlib2==2.3.7.post1
@@ -136,67 +134,67 @@ pathspec==0.12.1
 pexpect==4.9.0
 picobox==4.0.0
 pika==1.3.2
-pillow==10.4.0
+pillow==11.0.0
 PIMS==0.7
 Pint==0.24.3
-pipdeptree==2.23.3
-platformdirs==4.3.3
+pipdeptree==2.23.4
+platformdirs==4.3.6
 pluggy==1.5.0
-plumbum==1.8.3
+plumbum==1.9.0
 ply==3.11
-pre-commit==3.8.0
+pre_commit==4.0.1
 prettytable==3.11.0
 prompt-toolkit==3.0.36
-psutil==6.0.0
+propcache==0.2.0
+psutil==6.1.0
 ptyprocess==0.7.0
 pure_eval==0.2.3
-pvxslibs==1.3.1
+pvxslibs==1.3.2
 py==1.11.0
 pyasn1==0.6.1
-pycryptodome==3.20.0
-pydantic==2.9.1
-pydantic-extra-types==2.9.0
-pydantic-settings==2.5.2
-pydantic_core==2.23.3
+pycryptodome==3.21.0
+pydantic==2.9.2
+pydantic-settings==2.6.0
+pydantic_core==2.23.4
 pydantic_numpy==5.0.2
-pydata-sphinx-theme==0.15.4
+pydata-sphinx-theme==0.16.0
 pyepics==3.5.7
 Pygments==2.18.0
-pymongo==4.8.0
+pymongo==4.10.1
 pyOlog==4.5.0
-pyparsing==3.1.4
+pyparsing==3.2.0
+pyright==1.1.386
 pytest==8.3.3
 pytest-asyncio==0.24.0
 pytest-cov==5.0.0
+pytest-random-order==1.1.1
 python-dateutil==2.9.0.post0
 python-dotenv==1.0.1
-python-multipart==0.0.9
 pytz==2024.2
 PyYAML==6.0.2
-pyyaml-include==2.1
 questionary==2.0.1
-redis==5.0.8
-redis-json-dict==0.2.0
+redis==5.2.0
+redis-json-dict==0.2.1
 referencing==0.35.1
 requests==2.32.3
 responses==0.25.3
-rich==13.7.1
 rpds-py==0.20.0
 ruamel.yaml==0.18.6
-ruamel.yaml.clib==0.2.8
-ruff==0.6.5
-scanspec==0.7.2
+ruamel.yaml.clib==0.2.12
+ruff==0.7.1
+scanspec==0.7.6
 semver==3.0.2
+setuptools==75.2.0
 setuptools-dso==2.11
-shellingham==1.5.4
 six==1.16.0
 slicerator==1.1.0
 smmap==5.0.1
 sniffio==1.3.1
 snowballstemmer==2.2.0
 soupsieve==2.6
-Sphinx==8.0.2
-sphinx-autobuild==2024.9.3
+Sphinx==8.1.3
+sphinx-autobuild==2024.10.3
+sphinx-autodoc-typehints==2.3.0
 sphinx-click==6.0.0
 sphinx-copybutton==0.5.2
 sphinx_design==0.6.1
@@ -206,47 +204,45 @@ sphinxcontrib-devhelp==2.0.0
 sphinxcontrib-htmlhelp==2.1.0
 sphinxcontrib-httpdomain==1.8.1
 sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-mermaid==1.0.0
 sphinxcontrib-openapi==0.8.4
 sphinxcontrib-qthelp==2.0.0
 sphinxcontrib-serializinghtml==2.0.0
 stack-data==0.6.3
-starlette==0.38.5
+starlette==0.41.0
 stomp-py==8.1.2
 suitcase-mongo==0.6.0
 suitcase-msgpack==0.3.0
 suitcase-utils==0.5.4
 super-state-machine==2.0.2
-tifffile==2024.8.30
-tomli==2.0.1
-toolz==0.12.1
-tornado==6.4.1
+tifffile==2024.9.20
+toolz==1.0.0
 tox==3.28.0
 tox-direct==0.4
 tqdm==4.66.5
 traitlets==5.14.3
-typer==0.12.4
+types-aiofiles==24.1.0.20240626
 types-mock==5.1.0.20240425
 types-PyYAML==6.0.12.20240917
-types-requests==2.32.0.20240914
+types-requests==2.32.0.20241016
 types-urllib3==1.26.25.14
 typing-inspect==0.9.0
 typing_extensions==4.12.2
-tzdata==2024.1
+tzdata==2024.2
 tzlocal==5.2
-ujson==5.10.0
 urllib3==2.2.3
-uvicorn==0.30.6
-uvloop==0.19.0
-virtualenv==20.26.4
+uvicorn==0.32.0
+virtualenv==20.27.0
 watchfiles==0.24.0
 wcwidth==0.2.13
 websocket-client==1.8.0
-websockets==13.0.1
+websockets==13.1
 widgetsnbextension==4.0.13
 workflows==2.27
-xarray==2024.9.0
-yarl==1.11.1
+wrapt==1.16.0
+xarray==2024.10.0
+yarl==1.16.0
 zarr==2.18.3
 zict==2.2.0
 zipp==3.20.2
-zocalo==1.1.0
+zocalo==1.1.1
diff --git a/docs/reference/asyncapi.yaml b/docs/reference/asyncapi.yaml
index 576daee58..963998e35 100644
--- a/docs/reference/asyncapi.yaml
+++ b/docs/reference/asyncapi.yaml
@@ -45,7 +45,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/run_start.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/run_start.json"
     taggedStopDocument:
       messageId: runStop
       summary: Indicates the completion of a Bluesky run based on a previously specified Plan; describes end conditions and metadata
@@ -57,7 +57,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/run_stop.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/run_stop.json"
     taggedDescriptorDocument:
       messageId: eventStreamDescriptor
       summary: Describes the devices to be within a scientifically related stream of measurements
@@ -69,7 +69,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/event_descriptor.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/event_descriptor.json"
     taggedEventDocument:
       messageId: dataEvent
       summary: Describes a point measurement for a number of scientifically related devices
@@ -81,7 +81,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/event.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/event.json"
     taggedEventPage:
       messageId: eventPage
       deprecated: true
@@ -94,7 +94,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/event_page.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/event_page.json"
     taggedResourceDocument:
       messageId: resource
       summary: Describes an external resource (file, database entry etc.) that is to be referenced by later datum
@@ -106,7 +106,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/resource.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/resource.json"
     taggedDatumDocument:
       messageId: datum
       summary: Describes how to access a point measurement within an external resource
@@ -118,7 +118,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/datum.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/datum.json"
     taggedDatumPage:
       messageId: datumPage
       deprecated: true
@@ -131,7 +131,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/datum_page.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/datum_page.json"
     taggedResourceStream:
       messageId: streamResource
       summary: Describes an external resource (file, database entry etc.) that is to be referenced by later Stream Datum
@@ -143,7 +143,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/stream_resource.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/stream_resource.json"
     taggedDatumStream:
       messageId: streamDatum
       summary: Describes how to access a slice of an external resource
@@ -155,7 +155,7 @@ components:
           name:
             type: string
           doc:
-            $ref: "https://raw.githubusercontent.com/bluesky/event-model/master/event_model/schemas/stream_datum.json"
+            $ref: "https://raw.githubusercontent.com/bluesky/event-model/refs/tags/v1.21.0/event_model/schemas/stream_datum.json"
     workerStateEvent:
       messageId: stateEvent
       headers:
diff --git a/pyproject.toml b/pyproject.toml
index ea16df3a0..c55616ba4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ classifiers = [
 ]
 description = "Lightweight bluesky-as-a-service wrapper application. Also usable as a library."
 dependencies = [
-    "bluesky",
+    "bluesky==1.13.0a3",
     "ophyd",
     "nslsii",
     "pyepics",
@@ -29,9 +29,10 @@ dependencies = [
     "requests",
     "dls-bluesky-core",     #requires ophyd-async
     "dls-dodal>=1.31.0",
-    "super-state-machine",  # See GH issue 553
+    "super-state-machine",  # https://github.com/DiamondLightSource/blueapi/issues/553
     "GitPython",
     "bluesky-stomp>=0.1.2",
+    "event-model==1.21",    # https://github.com/DiamondLightSource/blueapi/issues/684
 ]
 dynamic = ["version"]
 license.file = "LICENSE"