dls-dodal 1.55.1__tar.gz → 1.56.0__tar.gz

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         runs-on: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
         include:
           # Include one that runs in the dev environment
           - runs-on: "ubuntu-latest"

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
         types: [python]
         require_serial: false
 
-  - repo: https://github.com/thoughtworks/talisman
-    rev: v1.37.0
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.28.0
     hooks:
-      - id: talisman-commit
+      - id: gitleaks

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.55.1
+Version: 1.56.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async[ca,pva]>=0.13.0
-Requires-Dist: bluesky
+Requires-Dist: bluesky==1.14.2
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/conftest.py

@@ -14,6 +14,12 @@ from ophyd_async.core import (
     PathInfo,
     PathProvider,
 )
+from tests.devices.i10.test_data import LOOKUP_TABLE_PATH
+from tests.devices.unit_tests.test_daq_configuration import MOCK_DAQ_CONFIG_PATH
+from tests.test_data import (
+    TEST_DISPLAY_CONFIG,
+    TEST_OAV_ZOOM_LEVELS_XML,
+)
 
 from dodal.common.beamlines import beamline_utils
 from dodal.common.visit import (
@@ -23,12 +29,11 @@ from dodal.common.visit import (
 )
 from dodal.log import LOGGER, GELFTCPHandler, set_up_all_logging_handlers
 
-MOCK_DAQ_CONFIG_PATH = "tests/devices/unit_tests/test_daq_configuration"
 mock_paths = [
     ("DAQ_CONFIGURATION_PATH", MOCK_DAQ_CONFIG_PATH),
-    ("ZOOM_PARAMS_FILE", "tests/devices/unit_tests/test_jCameraManZoomLevels.xml"),
-    ("DISPLAY_CONFIG", "tests/devices/unit_tests/test_display.configuration"),
-    ("LOOK_UPTABLE_DIR", "tests/devices/i10/lookupTables/"),
+    ("ZOOM_PARAMS_FILE", TEST_OAV_ZOOM_LEVELS_XML),
+    ("DISPLAY_CONFIG", TEST_DISPLAY_CONFIG),
+    ("LOOK_UPTABLE_DIR", LOOKUP_TABLE_PATH),
 ]
 mock_attributes_table = {
     "i03": mock_paths,
@@ -119,8 +124,8 @@ def failed_status(failure: Exception) -> Status:
     return status
 
 
-@pytest.fixture
-async def RE():
+@pytest.fixture(scope="session", autouse=True)
+async def _ensure_running_bluesky_event_loop():
     RE = RunEngine()
     # make sure the event loop is thoroughly up and running before we try to create
     # any ophyd_async devices which might need it
@@ -129,4 +134,8 @@ async def RE():
         await asyncio.sleep(0)
         if time.monotonic() > timeout:
             raise TimeoutError("This really shouldn't happen but just in case...")
-    yield RE
+
+
+@pytest.fixture()
+async def RE():
+    yield RunEngine()

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/docs/how-to/coverage.md

@@ -3,6 +3,10 @@
 
 Code coverage is reported to the command line and to a `cov.xml` file by the command `tox -e tests`. The file is uploaded to the Codecov service in CI.
 
+If you are using VSCode IDE, you can also check code coverage by right-clicking on the test icon and selecting `Run with coverage`. This will re-run the test and highlight line numbers in your file:
+- Green = covered by tests
+- Red = not covered (and ideally should be tested)
+
 ## Adding a Codecov Token
 
 If the repo is not hosted in DiamondLightSource, then you need to visit `https://app.codecov.io/account/gh/<org_name>/org-upload-token` to generate a token for your org, and store it as a secret named `CODECOV_TOKEN` in `https://github.com/organizations/<org_name>/settings/secrets/actions`

dls_dodal-1.56.0/docs/how-to/create-device.md

@@ -0,0 +1,66 @@
+Creating a new device
+---------------------
+
+Devices in dodal use the ophyd-async framework for hardware abstraction at Diamond Light Source. Before starting, [review where your code should live](../reference/device-standards.rst#where_to_put_devices) to avoid duplication and ensure maintainability.
+
+Reusing an existing class
+=========================
+
+Before creating a new device, always check if a suitable class already exists in dodal or ophyd-async. This helps avoid duplication, ensures maintainability, and leverages tested code.
+
+- **Motors:** Use [Motor](https://github.com/bluesky/ophyd-async/blob/main/src/ophyd_async/epics/motor.py) for EPICS motor records.
+- **Storage ring signals:** Use [Synchrotron](https://github.com/DiamondLightSource/dodal/blob/main/src/dodal/devices/synchrotron.py).
+- **AreaDetectors:** Use [StandardDetector](https://github.com/bluesky/ophyd-async/tree/main/src/ophyd_async/epics/adcore) or [adcore](https://github.com/bluesky/ophyd-async/tree/main/src/ophyd_async/epics/adcore).
+
+If a compatible device class exists:
+- Use it and add it to the [beamline](./create-beamline.rst) to avoid re-implementation and share improvements.
+- You can use ophyd-async's [DeviceVector](https://blueskyproject.io/ophyd-async/main/explanations/decisions/0006-procedural-device-definitions.html) to handle a collection of identical devices.   
+- If a device class only differs by PV address, request an alias in the EPICS IOC support module with the relevant controls support team.  
+- If that's not possible (e.g. proprietary support), add configurability to the dodal device class, ensuring defaults match existing patterns and that `dodal connect` still works for current devices.
+- Avoid dynamic attribute assignment (e.g. dicts of motors) as it hinders type checking and plan writing.  
+- Use static attributes and type hints for better IDE support and maintainability.
+
+Many device classes in `dodal.devices.motors` represent physical relationships between motors, such as `Stage` and `XYStage`.  
+
+For example, only use `XYStage` for two perpendicular motors (e.g. X and Y axes on a sample table):
+- Do not use `XYStage` for unrelated motors or for motors that move in the same axis (e.g. coarse and fine adjustment).
+- Only a device that represents a group of motors with a physical relationship, should be defined in `motor`.
+- If your class define an `XYStage` but you need extra signals or behaviour, extend the `XYStage` class outside the `motor` module.
+
+**Only if no suitable class exists**, create a new device that connects to the required signals. During review, refactor to align with existing devices if needed, using inheritance or composition to deduplicate code.  
+
+Writing a device class
+======================
+
+To develop a new device, get an initial, working version of your code into the main branch as early as possible. Test it at the beamline, then continuously make and merge small changes into main. This approach prevents pull requests from becoming long-standing issues.
+
+- **Follow the [ophyd-async device implementation guide](https://blueskyproject.io/ophyd-async/main/tutorials/implementing-devices.html)** to structure your device code.
+- **Choose the right base class** by consulting the [base class guide](https://blueskyproject.io/ophyd-async/main/how-to/choose-right-baseclass.html), If your device needs to move, you'll need to extend the Movable protocol. For detailed guidance on when and how to do this, refer to the [movable device guide](https://blueskyproject.io/ophyd-async/main/explanations/when-to-extend-movable.html). 
+- **Write thorough unit tests** for all expected use cases. Reference the [ophyd-async device test guide](https://blueskyproject.io/ophyd-async/main/tutorials/implementing-devices.html) for best practices.
+- **Validate your device on the beamline** and keep notes of any issues for later fixes.
+- **Make use of type annotations** so that pyright will validate that you are passing around values that ophyd-async will accept.
+- Use `dodal connect <beamline>` to check device connectivity and `cainfo <PV address>` to confirm PVs and datatypes. You can check a PV's datatype by using the `cainfo <PV address>` command. If the datatype is an enum, `caget -d 31 <PV address>` will also display the available enums that the PV takes. Common enums are defined in `ophyd-async.core` for devices to use, but you can define custom ones when suitable (inheriting from `ophyd_async.core` `StrictEnum`, `SupersetEnum` or `SubsetEnum`). The values should be capitalised e.g `ON = "On"`. If the PV expects upper case for the enum (e.g `ON = "ON"`), please speak to the relevant controls engineer(s) to get this changed if possible. For more infomation, please visit [here](https://blueskyproject.io/ophyd-async/main/explanations/decisions/0008-signal-types.html).
+
+**Device best practices for Bluesky plans:**
+
+- Interact with devices in plans only through the Bluesky [messages protocol](https://blueskyproject.io/bluesky/main/msg.html), such as `yield from bps.abs_set(...)` or `yield Msg("set", ...)`.
+- Avoid calling device methods directly inside plans (e.g. `device.do_thing()`), as this breaks the abstraction and can lead to unpredictable behaviour.
+
+Example of what **not** to do:
+```python
+class MyDevice(Device):
+    def do_thing(...):
+        ...
+
+def my_plan():
+    yield from bps.set(...)
+    device.do_thing()  # This is bad: do not call device methods directly in plans
+```
+
+**Tip:**
+
+- If you are unsure how to represent a PV as a Signal, seek feedback early (for example, by opening a draft PR).
+- Whenever possible, merge with existing devices—comprehensive tests help ensure changes do not break current functionality.
+- Document any device-specific quirks or limitations for future maintainers.
+
+For further guidance, see the [ophyd-async documentation](https://blueskyproject.io/ophyd-async/main/how-to/choose-interfaces-for-devices.html).

dls_dodal-1.56.0/docs/how-to/run-tests.md

@@ -0,0 +1,61 @@
+(using-pytest)=
+
+# Running tests
+
+Tests can be ran locally via command line or VSCode IDE.
+
+## With VSCode
+
+When using the VSCode IDE, it should automatically detect all of your tests and display one of the following icons next to each of them:
+- Grey circle (not run yet)
+- Green circle with a tick (test passed)
+- Red circle with a cross (test failed)
+
+You can also check code coverage by right-clicking on the test icon and selecting `Run with coverage`. This will re-run the test and highlight line numbers in your file:
+- Green = covered by tests
+- Red = not covered (and ideally should be tested)
+
+To view all tests inside dodal, use the `Test Explorer` panel (flask icon) in VSCode. It displays all of your tests in a hierarchy, which you can run individually or in groups. It also shows the pass/fail icons mentioned above. Clicking on an item will run all tests beneath it in the hierarchy.
+
+If you find that your tests are being skipped or not recognised by `pytest`, check for any syntax errors as this will block the tests being found. You can also check to see if there is an error output at the very bottom of the `Test Explorer` panel. This is usually caused by invalid syntax in your test file, or by circular dependencies in the code you are testing.
+
+## Command line
+
+### Unit tests
+
+`pytest` will find functions in the project that [look like tests][look like tests], and run them to check for errors. 
+
+When you have some fully working tests then you can run it with coverage:
+
+```
+$ tox -e tests
+```
+
+It will also report coverage to the command line and to `cov.xml`.
+
+[look like tests]: https://docs.pytest.org/explanation/goodpractices.html#test-discovery
+[pytest]: https://pytest.org/
+
+### System tests locally
+
+The system tests require the ``example-services`` project:
+
+```commandline
+git clone git@github.com:epics-containers/example-services.git
+```
+
+Then you need to launch some of the example ioc containers. Please note, this requires docker-compose not 
+podman-compose:
+
+```commandline
+module load docker-compose
+cd example-services
+. ./environment.sh
+podman compose up -d bl01t-di-cam-01 bl01t-mo-sim-01 ca-gateway
+```
+
+Once this is done, then the system tests can be run:
+
+```commandline
+tox -e system-report
+```

dls_dodal-1.56.0/docs/how-to/write-tests.md

@@ -0,0 +1,119 @@
+# Writing Tests in This Python Project
+
+Testing is essential to maintain the integrity and reliability of the codebase. Follow the guidelines below to write tests for this project effectively.
+
+## Test Organization
+
+- **Unit Tests**: Place unit tests for individual components in the `tests` directory, but take care to mirror the file structure of the `src` folder with the corresponding code files. Use the `test_*.py` naming convention for test files.
+- **System Tests**: Tests that interact with DLS infrastructure, network, and filesystem should be placed in the top-level `systems_test` folder. This separation ensures that these tests are easily identifiable and can be run independently from unit tests.
+
+## Writing a test for a device
+We aim for high test coverage in dodal with small, modular test functions. To achieve this, we need to test the relevant methods by writing tests for the class/method we are creating or changing, checking for the expected behaviour. We shouldn't need to write tests for parent classes unless we alter their behaviour.
+
+Below, a `StandardReadable` example device is defined which also implements the `Stageable` protocol.
+
+```Python
+from bluesky import RunEngine
+from bluesky.protocols import Stageable
+from ophyd_async.core import AsyncStatus, OnOff, StandardReadable
+from ophyd_async.epics.core import epics_signal_rw
+
+
+class MyDevice(StandardReadable, Stageable):
+    """
+    Example device demostrating how to test stage, unstage and read methods.
+    """
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        """
+        Constructor for setting up instance of device.
+
+        Parameters:
+            prefix: Base PV used for connecting signals.
+            name: Name of the device.
+        """
+        with self.add_children_as_readables():
+            self.signal_a = epics_signal_rw(float, prefix + "A")
+            self.signal_b = epics_signal_rw(OnOff, prefix + "B")
+
+        super().__init__(name)
+
+    @AsyncStatus.wrap
+    async def stage(self):
+        """
+        Setup device by moving signal_a to ON.
+        """
+        await asyncio.gather(super().stage(), self.signal_b.set(OnOff.ON))
+
+    @AsyncStatus.wrap
+    async def unstage(self):
+        """
+        Once device is finished, set signal_b back to OFF.
+        """
+        await asyncio.gather(super().stage(), self.signal_b.set(OnOff.OFF))
+```
+
+In this example, we need to test the `stage` and `unstage` methods. For more complex devices, it is also a good idea to test the `read` method to confirm that we get the expected read signals back when this method is called.
+
+We use [pytest](https://docs.pytest.org/en/stable/contents.html) for writing tests in dodal. A core part of this library is the use of fixtures. A fixture is a function decorated with `@pytest.fixture` that provides setup/teardown or reusable test data for your tests. It is defined once and can be reused across multiple tests. Fixtures are mainly used to define devices and then inject them into each test.
+
+To help set up a device, they are created with the `init_devices(mock=True)` function from `ophyd_async.core`, which automatically initialises the device in mock mode. The `RunEngine` fixture is passed when creating a device to ensure there is an event loop available when connecting signals. This fixture is defined in `dodal/tests/conftest.py`, which is a special file recognised by `pytest`. It defines fixtures that are automatically available to any test in the same directory (and its subdirectories) without needing to import them. This is useful for defining common setup code once without duplicating it across test files.
+
+In order for `pytest` to detect something as a test, a function should begin with `test_*`. The test function should be self-descriptive about what it is testing, and it is acceptable (even encouraged) to have longer names for test functions for clarity.
+
+```Python
+import asyncio
+
+import pytest
+from bluesky import RunEngine
+from bluesky import plan_stubs as bps
+from ophyd_async.core import OnOff, init_devices
+from ophyd_async.testing import assert_reading, get_mock_put, partial_reading
+from dodal.device.my_device import  MyDevice
+
+
+# RunEngine is needed to make sure there is an event loop when creating device.
+@pytest.fixture
+async def sim_my_device(RE: RunEngine) -> MyDevice:
+    async with init_devices(mock=True):
+        sim_my_device = MyDevice("TEST:")
+    return sim_my_device
+
+
+def test_my_device_stage(sim_my_device: MyDevice, RE: RunEngine) -> None:
+    RE(bps.stage(sim_my_device, wait=True), wait=True)
+    get_mock_put(sim_my_device.signal_b).assert_called_once_with(OnOff.ON, wait=True)
+
+
+def test_my_device_unstage(sim_my_device: MyDevice, RE: RunEngine) -> None:
+    RE(bps.unstage(sim_my_device, wait=True), wait=True)
+    get_mock_put(sim_my_device.signal_b).assert_called_once_with(OnOff.OFF, wait=True)
+
+```
+
+You should test the output of a device when the device has many signals read and you want to ensure the correct ones are read at the correct times, or when the `read` method of it or one of its signals (e.g. a DerivedSignal) requires testing. Functions are defined in `ophyd-async` to aid with this. `assert_reading` allows us to compare the readings generated from a `Readable` device to the expected results.
+
+```Python
+async def test_my_device_read(sim_my_device: MyDevice, RE: RunEngine) -> None:
+    prefix = sim_my_device.name
+    await assert_reading(
+        sim_my_device,
+        {
+            f"{prefix}-signal_a": partial_reading(OnOff.ON),
+            f"{prefix}-signal_b": partial_reading(0),
+        },
+    )
+```
+
+`partial_reading` wraps the value given in a mapping like `{"value": ANY}`, so we are actually checking that the reading matches the expected structure.
+
+```Python
+    prefix = sim_my_device.name
+    await assert_reading(
+        sim_my_device,
+        {
+            f"{prefix}-signal_a" : {"value": OnOff.ON},
+            f"{prefix}-signal_b" : {"value": 0},
+        }
+    )
+```

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/docs/reference/standards.rst

@@ -29,7 +29,7 @@ Supported Python Versions
 As a standard for the python versions to support, we should be matching the deprecation policy at 
 https://numpy.org/neps/nep-0029-deprecation_policy.html.
 
-Currently supported versions are: 3.11, 3.12. (As of the last edit of this document.)
+Currently supported versions are: 3.11, 3.12, 3.13. (As of the last edit of this document.)
 
 .. _documentation_standards:
 

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "click",
     "ophyd",
     "ophyd-async[ca,pva]>=0.13.0",
-    "bluesky",
+    "bluesky==1.14.2",  # https://github.com/bluesky/bluesky/issues/1938
     "pyepics",
     "dataclasses-json",
     "pillow",

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.55.1
+Version: 1.56.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async[ca,pva]>=0.13.0
-Requires-Dist: bluesky
+Requires-Dist: bluesky==1.14.2
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 .copier-answers.yml
 .gitignore
 .pre-commit-config.yaml
-.talismanrc
 Dockerfile
 LICENSE
 README.md
@@ -112,6 +111,7 @@ src/dodal/beamlines/i09.py
 src/dodal/beamlines/i09_1.py
 src/dodal/beamlines/i09_2.py
 src/dodal/beamlines/i10.py
+src/dodal/beamlines/i11.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i18.py
 src/dodal/beamlines/i19_1.py
@@ -132,15 +132,16 @@ src/dodal/common/coordination.py
 src/dodal/common/crystal_metadata.py
 src/dodal/common/data_util.py
 src/dodal/common/device_utils.py
+src/dodal/common/enums.py
 src/dodal/common/maths.py
 src/dodal/common/types.py
 src/dodal/common/udc_directory_provider.py
 src/dodal/common/visit.py
+src/dodal/common/watcher_utils.py
 src/dodal/common/beamlines/__init__.py
 src/dodal/common/beamlines/beamline_parameters.py
 src/dodal/common/beamlines/beamline_utils.py
 src/dodal/common/beamlines/device_helpers.py
-src/dodal/devices/CTAB.py
 src/dodal/devices/__init__.py
 src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
@@ -148,11 +149,14 @@ src/dodal/devices/apple2_undulator.py
 src/dodal/devices/backlight.py
 src/dodal/devices/baton.py
 src/dodal/devices/bimorph_mirror.py
+src/dodal/devices/collimation_table.py
 src/dodal/devices/common_dcm.py
+src/dodal/devices/controllers.py
 src/dodal/devices/cryostream.py
 src/dodal/devices/diamond_filter.py
 src/dodal/devices/eiger.py
 src/dodal/devices/eiger_odin.py
+src/dodal/devices/eurotherm.py
 src/dodal/devices/fast_grid_scan.py
 src/dodal/devices/fluorescence_detector_motion.py
 src/dodal/devices/flux.py
@@ -250,6 +254,11 @@ src/dodal/devices/i10/slits.py
 src/dodal/devices/i10/rasor/rasor_current_amp.py
 src/dodal/devices/i10/rasor/rasor_motors.py
 src/dodal/devices/i10/rasor/rasor_scaler_cards.py
+src/dodal/devices/i11/cyberstar_blower.py
+src/dodal/devices/i11/diff_stages.py
+src/dodal/devices/i11/mythen.py
+src/dodal/devices/i11/nx100robot.py
+src/dodal/devices/i11/spinner.py
 src/dodal/devices/i13_1/__init__.py
 src/dodal/devices/i13_1/merlin.py
 src/dodal/devices/i13_1/merlin_controller.py
@@ -258,6 +267,7 @@ src/dodal/devices/i18/diode.py
 src/dodal/devices/i19/__init__.py
 src/dodal/devices/i19/beamstop.py
 src/dodal/devices/i19/blueapi_device.py
+src/dodal/devices/i19/diffractometer.py
 src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
@@ -324,6 +334,9 @@ src/dodal/plans/verify_undulator_gap.py
 src/dodal/plans/wrapped.py
 src/dodal/plans/preprocessors/__init__.py
 src/dodal/plans/preprocessors/verify_undulator_gap.py
+src/dodal/testing/__init__.py
+src/dodal/testing/electron_analyser/__init__.py
+src/dodal/testing/electron_analyser/device_factory.py
 system_tests/__init__.py
 system_tests/test_adsim.py
 system_tests/test_cli.py
@@ -331,7 +344,6 @@ system_tests/test_oav_system.py
 system_tests/test_oav_to_redis_system.py
 tests/__init__.py
 tests/conftest.py
-tests/constants.py
 tests/fake_beamline.py
 tests/fake_beamline_all_devices_raise_exception.py
 tests/fake_beamline_broken_dependency.py
@@ -353,6 +365,7 @@ tests/common/test_crystal_metadata.py
 tests/common/test_maths.py
 tests/common/test_udc_directory_provider.py
 tests/common/test_visit.py
+tests/common/test_watcher_utils.py
 tests/common/beamlines/__init__.py
 tests/common/beamlines/test_beamline_parameters.py
 tests/common/beamlines/test_beamline_utils.py
@@ -367,16 +380,20 @@ tests/devices/i04/__init__.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
 tests/devices/i10/test_i10Apple2.py
-tests/devices/i10/lookupTables/IDEnergy2GapCalibrations.csv
-tests/devices/i10/lookupTables/IDEnergy2PhaseCalibrations.csv
-tests/devices/i10/lookupTables/expectedIDEnergy2GapCalibrationsIdd.pkl
-tests/devices/i10/lookupTables/expectedIDEnergy2GapCalibrationsIdu.pkl
-tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidd.pkl
-tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidu.pkl
+tests/devices/i10/test_data/IDEnergy2GapCalibrations.csv
+tests/devices/i10/test_data/IDEnergy2PhaseCalibrations.csv
+tests/devices/i10/test_data/__init__.py
+tests/devices/i10/test_data/expectedIDEnergy2GapCalibrationsIdd.pkl
+tests/devices/i10/test_data/expectedIDEnergy2GapCalibrationsIdu.pkl
+tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidd.pkl
+tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidu.pkl
+tests/devices/i11/test_i11devices.py
+tests/devices/i11/test_mythen.py
 tests/devices/i13_1/test_merlin.py
 tests/devices/i18/test_kb_mirror.py
 tests/devices/i19/__init__.py
 tests/devices/i19/test_beamstop.py
+tests/devices/i19/test_diffractometer.py
 tests/devices/i19/test_shutter.py
 tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
@@ -384,7 +401,7 @@ tests/devices/i22/test_metadataholder.py
 tests/devices/mx_phase1/__init__.py
 tests/devices/mx_phase1/test_beamstop.py
 tests/devices/unit_tests/__init__.py
-tests/devices/unit_tests/test_OAVCentring.json
+tests/devices/unit_tests/test.png
 tests/devices/unit_tests/test_aperture.py
 tests/devices/unit_tests/test_aperture_scatterguard.py
 tests/devices/unit_tests/test_apple2_undulator.py
@@ -393,21 +410,18 @@ tests/devices/unit_tests/test_backlight.py
 tests/devices/unit_tests/test_bart_robot.py
 tests/devices/unit_tests/test_baton.py
 tests/devices/unit_tests/test_beam_converter.py
-tests/devices/unit_tests/test_beamline_undulator_to_gap_lookup_table.txt
 tests/devices/unit_tests/test_bimorph_mirror.py
-tests/devices/unit_tests/test_display.configuration
+tests/devices/unit_tests/test_controllers.py
 tests/devices/unit_tests/test_eiger.py
 tests/devices/unit_tests/test_focusing_mirror.py
 tests/devices/unit_tests/test_gridscan.py
 tests/devices/unit_tests/test_hutch_shutter.py
-tests/devices/unit_tests/test_jCameraManZoomLevels.xml
-tests/devices/unit_tests/test_lookup_table.txt
-tests/devices/unit_tests/test_lookup_table_2.txt
 tests/devices/unit_tests/test_motors.py
 tests/devices/unit_tests/test_odin.py
 tests/devices/unit_tests/test_positioner.py
 tests/devices/unit_tests/test_pressure_jump_cell.py
 tests/devices/unit_tests/test_qbpm.py
+tests/devices/unit_tests/test_scintillator.py
 tests/devices/unit_tests/test_slits.py
 tests/devices/unit_tests/test_smargon.py
 tests/devices/unit_tests/test_status.py
@@ -432,18 +446,26 @@ tests/devices/unit_tests/current_amplifier/test_sr570.py
 tests/devices/unit_tests/detector/test_det_dim_constants.py
 tests/devices/unit_tests/detector/test_det_resolution.py
 tests/devices/unit_tests/detector/test_detector.py
+tests/devices/unit_tests/detector/test_data/__init__.py
+tests/devices/unit_tests/detector/test_data/test_det_dist_converter.txt
 tests/devices/unit_tests/electron_analyser/__init__.py
 tests/devices/unit_tests/electron_analyser/conftest.py
+tests/devices/unit_tests/electron_analyser/test_detector.py
 tests/devices/unit_tests/electron_analyser/test_util.py
-tests/devices/unit_tests/electron_analyser/util.py
 tests/devices/unit_tests/electron_analyser/abstract/__init__.py
 tests/devices/unit_tests/electron_analyser/abstract/test_base_detector.py
 tests/devices/unit_tests/electron_analyser/abstract/test_base_driver_io.py
 tests/devices/unit_tests/electron_analyser/abstract/test_base_region.py
+tests/devices/unit_tests/electron_analyser/helper_util/__init__.py
+tests/devices/unit_tests/electron_analyser/helper_util/assert_func.py
+tests/devices/unit_tests/electron_analyser/helper_util/sequence.py
 tests/devices/unit_tests/electron_analyser/specs/__init__.py
 tests/devices/unit_tests/electron_analyser/specs/test_detector.py
 tests/devices/unit_tests/electron_analyser/specs/test_driver_io.py
 tests/devices/unit_tests/electron_analyser/specs/test_region.py
+tests/devices/unit_tests/electron_analyser/test_data/__init__.py
+tests/devices/unit_tests/electron_analyser/test_data/specs_sequence.seq
+tests/devices/unit_tests/electron_analyser/test_data/vgscienta_sequence.seq
 tests/devices/unit_tests/electron_analyser/vgscienta/__init__.py
 tests/devices/unit_tests/electron_analyser/vgscienta/test_detector.py
 tests/devices/unit_tests/electron_analyser/vgscienta/test_driver_io.py
@@ -470,24 +492,42 @@ tests/devices/unit_tests/oav/test_snapshot_image_processing.py
 tests/devices/unit_tests/oav/test_snapshots.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect_utils.py
+tests/devices/unit_tests/oav/test_data/__init__.py
+tests/devices/unit_tests/oav/test_data/oav_snapshot_expected.png
+tests/devices/unit_tests/oav/test_data/oav_snapshot_test.png
+tests/devices/unit_tests/oav/test_data/test_OAVCentring.json
 tests/devices/unit_tests/p60/test_lab_xray_source.py
 tests/devices/unit_tests/p99/test_p99_stage.py
+tests/devices/unit_tests/test_daq_configuration/__init__.py
+tests/devices/unit_tests/test_daq_configuration/domain/__init__.py
 tests/devices/unit_tests/test_daq_configuration/domain/beamlineParameters
 tests/devices/unit_tests/test_daq_configuration/lookup/BeamLineEnergy_DCM_Pitch_converter.txt
 tests/devices/unit_tests/test_daq_configuration/lookup/BeamLineEnergy_DCM_Roll_converter.txt
+tests/devices/unit_tests/test_daq_configuration/lookup/__init__.py
+tests/devices/unit_tests/test_data/__init__.py
+tests/devices/unit_tests/test_data/test_beamline_undulator_to_gap_lookup_table.txt
+tests/devices/unit_tests/test_data/test_lookup_table.txt
 tests/devices/unit_tests/util/__init__.py
 tests/devices/unit_tests/util/test_adjuster_plans.py
 tests/devices/unit_tests/util/test_beamline_specific_utils.py
 tests/devices/unit_tests/util/test_lookup_tables.py
 tests/devices/unit_tests/util/test_save_panda.py
+tests/devices/unit_tests/util/test_data/__init__.py
+tests/devices/unit_tests/util/test_data/test_beamline_dcm_roll_converter.txt
+tests/devices/unit_tests/util/test_data/test_beamline_dcm_roll_converter_non_monotonic.txt
+tests/devices/unit_tests/util/test_data/test_beamline_dcm_roll_converter_reversed.txt
 tests/fake_zocalo/README.rst
 tests/fake_zocalo/__init__.py
 tests/fake_zocalo/__main__.py
 tests/fake_zocalo/dls_start_fake_zocalo.sh
+tests/plan_stubs/__init__.py
 tests/plan_stubs/test_data_session.py
 tests/plan_stubs/test_motor_util_plans.py
 tests/plan_stubs/test_topup_plan.py
 tests/plan_stubs/test_wrapped_stubs.py
+tests/plan_stubs/test_data/__init__.py
+tests/plan_stubs/test_data/topup_long_delay.txt
+tests/plan_stubs/test_data/topup_short_params.txt
 tests/plans/conftest.py
 tests/plans/test_bimorph.py
 tests/plans/test_compliance.py
@@ -497,19 +537,12 @@ tests/plans/test_verify_undulator_gap_plan.py
 tests/plans/test_wrapped.py
 tests/plans/test_preprocessors/test_verify_undulator_gap.py
 tests/preprocessors/test_filesystem_metadata.py
+tests/test_data/__init__.py
 tests/test_data/bad_beamlineParameters
 tests/test_data/i04_beamlineParameters
-tests/test_data/test_beamline_dcm_roll_converter.txt
-tests/test_data/test_beamline_dcm_roll_converter_non_monotonic.txt
-tests/test_data/test_beamline_dcm_roll_converter_reversed.txt
 tests/test_data/test_beamline_parameters.txt
-tests/test_data/test_det_dist_converter.txt
-tests/test_data/topup_long_delay.txt
-tests/test_data/topup_short_params.txt
-tests/test_data/electron_analyser/specs_sequence.seq
-tests/test_data/electron_analyser/vgscienta_sequence.seq
-tests/test_data/test_images/oav_snapshot_expected.png
-tests/test_data/test_images/oav_snapshot_test.png
+tests/test_data/test_display.configuration
+tests/test_data/test_oav_zoom_levels.xml
 tests/unit_tests/__init__.py
 tests/unit_tests/test_cli.py
 tests/unit_tests/test_log.py

{dls_dodal-1.55.1 → dls_dodal-1.56.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,7 +1,7 @@
 click
 ophyd
 ophyd-async[ca,pva]>=0.13.0
-bluesky
+bluesky==1.14.2
 pyepics
 dataclasses-json
 pillow