Update for bluesky 1.13, remove dls-bluesky-core (#645)

dev-requirements.txt

@@ -1,8 +1,8 @@
 accessible-pygments==0.0.5
-aioca==1.8
+aioca==1.8.1
 aiofiles==24.1.0
 aiohappyeyeballs==2.4.3
-aiohttp==3.10.10
+aiohttp==3.11.0
 aiosignal==1.3.1
 alabaster==1.0.0
 annotated-types==0.7.0
@@ -11,47 +11,40 @@ appdirs==1.4.4
 asciitree==0.3.3
 asgiref==3.8.1
 asttokens==2.4.1
-async-timeout==4.0.3
 attrs==24.2.0
-autodoc_pydantic==2.2.0
 babel==2.16.0
 beautifulsoup4==4.12.3
 bidict==0.23.1
-black==24.10.0
-bluesky==1.13.0a3
+bluesky==1.13
 bluesky-kafka==0.10.0
 bluesky-live==0.0.8
 bluesky-stomp==0.1.2
-boltons==24.0.0
-bump-pydantic==0.8.0
+boltons==24.1.0
 cachetools==5.5.0
 caproto==1.1.1
 certifi==2024.8.30
 cfgv==3.4.0
-chardet==5.2.0
 charset-normalizer==3.4.0
 click==8.1.7
 cloudpickle==3.1.0
 colorama==0.4.6
-colorlog==6.8.2
+colorlog==6.9.0
 comm==0.2.2
 compress-pickle==2.1.0
 confluent-kafka==2.6.0
-contourpy==1.3.0
+contourpy==1.3.1
 copier==9.4.1
 coverage==7.6.4
 cycler==0.12.1
-dask==2024.10.0
+dask==2024.11.2
 databroker==1.2.5
 dataclasses-json==0.6.7
 decorator==5.1.1
 deepdiff==8.0.1
 deepmerge==2.0
 Deprecated==1.2.14
-diff_cover==9.2.0
 distlib==0.3.9
-dls-bluesky-core==0.0.4
-dls-dodal==1.33.0
+dls-dodal==1.36.0
 dnspython==2.7.0
 docopt==0.6.2
 doct==1.1.0
@@ -60,59 +53,55 @@ dunamai==1.22.0
 email_validator==2.2.0
 entrypoints==0.4
 epicscorelibs==7.0.7.99.1.1
-event-model==1.21.0
-exceptiongroup==1.2.2
+event-model==1.22.1
 executing==2.1.0
-fastapi==0.115.3
+fastapi==0.115.5
 fastapi-cli==0.0.5
 fasteners==0.19
 filelock==3.16.1
 flexcache==0.3
-flexparser==0.3.1
+flexparser==0.4
 fonttools==4.54.1
 frozenlist==1.5.0
 fsspec==2024.10.0
 funcy==2.0
 gitdb==4.0.11
 GitPython==3.1.43
-googleapis-common-protos==1.65.0
+googleapis-common-protos==1.66.0
 graypy==2.1.0
-grpcio==1.66.2
+grpcio==1.67.1
 h11==0.14.0
 h5py==3.12.1
 HeapDict==1.0.1
 historydict==1.2.6
 httpcore==1.0.6
-httptools==0.6.1
+httptools==0.6.4
 httpx==0.27.2
 humanize==4.11.0
-identify==2.6.1
+identify==2.6.2
 idna==3.10
 imageio==2.36.0
 imagesize==1.4.1
-importlib_metadata==8.4.0
+importlib_metadata==8.5.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
+jedi==0.19.2
 Jinja2==3.1.4
 jinja2-ansible-filters==1.3.2
-jsonpointer==3.0.0
 jsonschema==4.23.0
 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==3.0.2
-marshmallow==3.23.0
+marshmallow==3.23.1
 matplotlib==3.9.2
 matplotlib-inline==0.1.7
 mdit-py-plugins==0.4.2
@@ -123,36 +112,37 @@ mongoquery==1.4.2
 msgpack==1.1.0
 msgpack-numpy==0.4.8
 multidict==6.1.0
-mypy==1.13.0 
+mypy==1.13.0
 mypy-extensions==1.0.0
 myst-parser==4.0.0
 networkx==3.4.2
 nodeenv==1.9.1
 nose2==0.15.1
-nslsii==0.10.5
-numcodecs==0.13.1
+nslsii==0.10.7
+numcodecs==0.14.0
 numpy==1.26.4
 observability-utils==0.1.4
+opencv-python==4.10.0.84
 opencv-python-headless==4.10.0.84
-opentelemetry-api==1.27.0
-opentelemetry-distro==0.48b0
-opentelemetry-exporter-otlp==1.27.0
-opentelemetry-exporter-otlp-proto-common==1.27.0
-opentelemetry-exporter-otlp-proto-grpc==1.27.0
-opentelemetry-exporter-otlp-proto-http==1.27.0
-opentelemetry-instrumentation==0.48b0
-opentelemetry-instrumentation-asgi==0.48b0
-opentelemetry-instrumentation-fastapi==0.48b0
-opentelemetry-proto==1.27.0
-opentelemetry-sdk==1.27.0
-opentelemetry-semantic-conventions==0.48b0
-opentelemetry-util-http==0.48b0
+opentelemetry-api==1.28.1
+opentelemetry-distro==0.49b1
+opentelemetry-exporter-otlp==1.28.1
+opentelemetry-exporter-otlp-proto-common==1.28.1
+opentelemetry-exporter-otlp-proto-grpc==1.28.1
+opentelemetry-exporter-otlp-proto-http==1.28.1
+opentelemetry-instrumentation==0.49b1
+opentelemetry-instrumentation-asgi==0.49b1
+opentelemetry-instrumentation-fastapi==0.49b1
+opentelemetry-proto==1.28.1
+opentelemetry-sdk==1.28.1
+opentelemetry-semantic-conventions==0.49b1
+opentelemetry-util-http==0.49b1
 ophyd==1.9.0
-ophyd-async==0.6.0
+ophyd-async==0.8.0a4
 orderly-set==5.2.2
-orjson==3.10.10
+orjson==3.10.11
 p4p==4.2.0
-packaging==24.1
+packaging==24.2
 pandas==2.2.3
 parso==0.8.4
 partd==1.4.2
@@ -163,17 +153,17 @@ picobox==4.0.0
 pika==1.3.2
 pillow==11.0.0
 PIMS==0.7
-Pint==0.24.3
+Pint==0.24.4
 pipdeptree==2.23.4
 platformdirs==4.3.6
 pluggy==1.5.0
 plumbum==1.9.0
 ply==3.11
 pre_commit==4.0.1
-prettytable==3.11.0
+prettytable==3.12.0
 prompt-toolkit==3.0.36
 propcache==0.2.0
-protobuf==4.25.5
+protobuf==5.28.3
 psutil==6.1.0
 ptyprocess==0.7.0
 pure_eval==0.2.3
@@ -182,8 +172,8 @@ py==1.11.0
 pyasn1==0.6.1
 pycryptodome==3.21.0
 pydantic==2.9.2
-pydantic-extra-types==2.9.0
-pydantic-settings==2.6.0
+pydantic-extra-types==2.10.0
+pydantic-settings==2.6.1
 pydantic_core==2.23.4
 pydantic_numpy==5.0.2
 pydata-sphinx-theme==0.16.0
@@ -192,32 +182,31 @@ Pygments==2.18.0
 pymongo==4.10.1
 pyOlog==4.5.0
 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
+pytest-cov==6.0.0
 python-dateutil==2.9.0.post0
 python-dotenv==1.0.1
-python-multipart==0.0.9
+python-multipart==0.0.17
 pytz==2024.2
 PyYAML==6.0.2
-pyyaml-include==2.1
 questionary==2.0.1
 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
+rich==13.9.4
+rpds-py==0.21.0
 ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.12
-ruff==0.7.1
+ruff==0.7.3
 scanspec==0.7.6
 semver==3.0.2
+setuptools==75.5.0
 setuptools-dso==2.11
 shellingham==1.5.4
+shortuuid==1.0.13
 six==1.16.0
 slicerator==1.1.0
 smmap==5.0.1
@@ -226,39 +215,32 @@ snowballstemmer==2.2.0
 soupsieve==2.6
 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-jsonschema==1.19.1
-sphinx-pydantic==0.1.1
 sphinx_design==0.6.1
 sphinx_mdinclude==0.6.2
 sphinxcontrib-applehelp==2.0.0
 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.41.0
-stomp-py==8.1.2
+starlette==0.41.2
+stomp.py==8.2.0
 suitcase-mongo==0.6.0
 suitcase-msgpack==0.3.0
 suitcase-utils==0.5.4
 super-state-machine==2.0.2
 tifffile==2024.9.20
-tomli==2.0.1
 toolz==1.0.0
-tornado==6.4.1
 tox==3.28.0
 tox-direct==0.4
-tqdm==4.66.5
+tqdm==4.67.0
 traitlets==5.14.3
-typer==0.12.4
-types-aiofiles==24.1.0.20240626
+typer==0.13.0
 types-mock==5.1.0.20240425
 types-PyYAML==6.0.12.20240917
 types-requests==2.32.0.20241016
@@ -270,18 +252,18 @@ tzlocal==5.2
 ujson==5.10.0
 urllib3==2.2.3
 uvicorn==0.32.0
-uvloop==0.19.0
-virtualenv==20.27.0
+uvloop==0.21.0
+virtualenv==20.27.1
 watchfiles==0.24.0
 wcwidth==0.2.13
 websocket-client==1.8.0
-websockets==13.1
+websockets==14.1
 widgetsnbextension==4.0.13
-workflows==2.27
+workflows==2.28
 wrapt==1.16.0
 xarray==2024.10.0
-yarl==1.16.0
+yarl==1.17.1
 zarr==2.18.3
 zict==2.2.0
-zipp==3.20.2
+zipp==3.21.0
 zocalo==1.1.1

docs/explanations/lifecycle.md

@@ -6,8 +6,8 @@ of being written, loaded and run. Take the following plan.
     from typing import Any, List, Mapping, Optional, Union
     
     import bluesky.plans as bp
-    from blueapi.core import MsgGenerator
-    from dls_bluesky_core.core import inject
+    from bluesky.utils import MsgGenerator
+    from dodal.common import inject
     from bluesky.protocols import Readable