dls-dodal 1.65.0__tar.gz → 1.67.0__tar.gz

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/.github/workflows/_dist.yml

@@ -7,7 +7,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -18,7 +18,7 @@ jobs:
           pipx run build
 
       - name: Upload sdist and wheel as artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: dist
           path: dist

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/.github/workflows/_docs.yml

@@ -12,7 +12,7 @@ jobs:
         run: sleep 60
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -30,7 +30,7 @@ jobs:
         run: rm build/html/.doctrees/environment.pickle
 
       - name: Upload built docs artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: docs
           path: build

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/.github/workflows/_pypi.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Download dist artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: dist
           path: dist

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/.github/workflows/_release.yml

@@ -7,7 +7,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           merge-multiple: true
 
@@ -23,7 +23,7 @@ jobs:
       - name: Create GitHub Release
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/.github/workflows/_test.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -38,7 +38,7 @@ jobs:
 
       - if: inputs.python-version == 'dev'
         name: Upload dev-requirements.txt
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: dev-requirements
           path: /tmp/dev-requirements.txt
@@ -58,13 +58,13 @@ jobs:
           python .github/scripts/check_test_durations.py unit-report.json 1
 
       - name: Checkout simulated devices
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: epics-containers/example-services
           path: example-services
 
       - name: Run docker compose
-        uses: hoverkraft-tech/compose-action@v2.3.0
+        uses: hoverkraft-tech/compose-action@v2.4.1
         with:
           compose-file: "./example-services/compose.yaml"
           services: |

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/.github/workflows/_tox.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.65.0
+Version: 1.67.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
@@ -215,10 +215,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.5
+Requires-Dist: ophyd-async[ca,pva]>=v0.14.0
 Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
-Requires-Dist: dataclasses-json
 Requires-Dist: pillow
 Requires-Dist: zocalo>=1.0.0
 Requires-Dist: requests
@@ -240,7 +239,7 @@ Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: ispyb; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: ophyd_async[sim]; extra == "dev"
+Requires-Dist: ophyd_async[sim]>=v0.14.0; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/docs/how-to/create-beamline.md

@@ -23,28 +23,31 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
 
 ```python
 
+    from functools import cache
+    from pathlib import Path
+    from ophyd_async.core import PathProvider
     from ophyd_async.epics.adaravis import AravisDetector
 
-    from dodal.common.beamlines.beamline_utils import (
-        device_factory,
-        get_path_provider,
-        set_path_provider,
-    )
     from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
     from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
-    from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+    from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+    from dodal.device_manager import DeviceManager
     from dodal.devices.synchrotron import Synchrotron
     from dodal.log import set_beamline as set_log_beamline
-    from dodal.utils import BeamlinePrefix
+    from dodal.utils import BeamlinePrefix, get_beamline_name
 
     BL = get_beamline_name("s41")  # Default used when not on a live beamline
     PREFIX = BeamlinePrefix(BL)
     set_log_beamline(BL)  # Configure logging and util functions
     set_utils_beamline(BL)
 
-    # Currently we must hard-code the visit, determining the visit is WIP.
-    set_path_provider(
-        StaticVisitPathProvider(
+    devices = DeviceManager()
+    
+    @devices.fixture
+    @cache
+    def path_provider() -> PathProvider:
+        # Currently we must hard-code the visit, determining the visit is WIP.
+        return StaticVisitPathProvider(
             BL,
             # Root directory for all detectors
             Path("/dls/w41/data/YYYY/cm12345-1"),
@@ -52,7 +55,7 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
             client=RemoteDirectoryServiceClient("http://s41-control:8088/api"),
             # Else if no GDA server use a LocalDirectoryServiceClient(),
         )
-    )
+
 
     """
     Define device factory functions below this point.
@@ -63,23 +66,22 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
     """
     This decorator gives extra desirable behaviour to this factory function:
     - it may be instantiated automatically, selectively on live beamline
-        - caching and re-using the result for subsequent calls
     - it automatically names the device if no name is explicitly set
     - it may be skipped when make_all_devices is called on this module
     - it must be explicitly connected (which may be automated by tools)
         - when connected it may connect to a simulated backend
         - it may be connected concurrently (when automated by tools)
-    """"
-    @device_factory(skip = BL == "s41")
+    """
+    @devices.factory(skip = BL == "s41")
     def synchrotron() -> Synchrotron:
         return Synchrotron()
 
 
-    @device_factory()
-    def d11() -> AravisDetector:
+    @devices.factory()
+    def d11(path_provider: PathProvider) -> AravisDetector:
         return AravisDetector(
             f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
-            path_provider=get_path_provider(),
+            path_provider=path_provider,
             drv_suffix=CAM_SUFFIX,
             fileio_suffix=HDF5_SUFFIX,
         )

dls_dodal-1.67.0/docs/how-to/tidy-docs.md

@@ -0,0 +1,35 @@
+Tidying the dodal docs
+======================
+
+The dodal documentation gradually accumulates a quantity of "ghost" files in the
+`main` folder of the `gh-pages` branch that are not deleted, due to operation of 
+the `gh-pages` github action to support multiple versions of the documentation.
+
+To remedy this, create a separate workspace using `git worktree` and prune the excess pages by doing the following (replace 1.62.0 with whatever the most recent version is):
+
+```
+git worktree add ../gh-pages --checkout gh-pages
+cd ../gh-pages
+diff -rq 1.62.0 main | grep "Only in main" > diff.txt
+
+```
+
+In your favourite editor, find and replace the output in diff.txt with the following regex
+
+`Only in (main[^:] *): (.*)` replace with `$1/$2`
+
+then after saving it
+
+```commandline
+for f in `cat diff.txt`; do rm -r $f; done
+git add -u main
+git status # Check the files over to make sure this is what you expect
+git commit --no-verify
+git push
+```
+
+Once pushed, GitHub CI should automatically run and push the pages to github docs.
+
+In order to avoid potentially removing some files due to differences between main and the 
+last release, ideally do this just after a fresh release). Although any files thus missing 
+should reappear after then next PR merge.

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/docs/how-to/write-tests.md

@@ -7,7 +7,7 @@ Testing is essential to maintain the integrity and reliability of the codebase.
 - **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.
 
-Useful functions for testing that can be reused across multiple tests for common devices and for external plan repositories belong in the `dodal/testing` directory. For example, when mocking a `Motor` device, all of the signals will default to zero, which will cause errors when trying to move. The `patch_motor` and `patch_all_motors` functions, found in `dodal.testing`, will populate the mocked motor with useful default values for the signals so that it can still be used in tests.
+Useful functions for testing that can be reused across multiple tests for common devices and for external plan repositories belong in the `dodal/testing` directory.
 
 
 ## Writing a test for a device

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/pyproject.toml

@@ -14,10 +14,9 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async[ca,pva]>=0.13.5",
+    "ophyd-async[ca,pva]>=v0.14.0",
     "bluesky>=1.14.5",
     "pyepics",
-    "dataclasses-json",
     "pillow",
     "zocalo>=1.0.0",
     "requests",
@@ -49,7 +48,7 @@ dev = [
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
     "myst-parser",
-    "ophyd_async[sim]",
+    "ophyd_async[sim]>=v0.14.0",
     "pipdeptree",
     "pre-commit",
     "psutil",

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.65.0
+Version: 1.67.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
@@ -215,10 +215,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.5
+Requires-Dist: ophyd-async[ca,pva]>=v0.14.0
 Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
-Requires-Dist: dataclasses-json
 Requires-Dist: pillow
 Requires-Dist: zocalo>=1.0.0
 Requires-Dist: requests
@@ -240,7 +239,7 @@ Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: ispyb; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: ophyd_async[sim]; extra == "dev"
+Requires-Dist: ophyd_async[sim]>=v0.14.0; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ docs/how-to/move-code.md
 docs/how-to/pypi.md
 docs/how-to/run-tests.md
 docs/how-to/static-analysis.md
+docs/how-to/tidy-docs.md
 docs/how-to/update-template.md
 docs/how-to/write-tests.md
 docs/how-to/zocalo.md
@@ -88,10 +89,10 @@ src/dodal/__init__.py
 src/dodal/__main__.py
 src/dodal/_version.py
 src/dodal/cli.py
+src/dodal/device_manager.py
 src/dodal/log.py
 src/dodal/utils.py
 src/dodal/beamline_specific_utils/__init__.py
-src/dodal/beamline_specific_utils/i03.py
 src/dodal/beamline_specific_utils/i05_shared.py
 src/dodal/beamlines/README.md
 src/dodal/beamlines/__init__.py
@@ -109,6 +110,7 @@ src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
 src/dodal/beamlines/i05.py
 src/dodal/beamlines/i05_1.py
+src/dodal/beamlines/i06.py
 src/dodal/beamlines/i07.py
 src/dodal/beamlines/i09.py
 src/dodal/beamlines/i09_1.py
@@ -156,7 +158,6 @@ src/dodal/common/beamlines/device_helpers.py
 src/dodal/devices/__init__.py
 src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
-src/dodal/devices/apple2_undulator.py
 src/dodal/devices/backlight.py
 src/dodal/devices/baton.py
 src/dodal/devices/bimorph_mirror.py
@@ -215,6 +216,8 @@ src/dodal/devices/b07_1/ccmc.py
 src/dodal/devices/b07_1/enums.py
 src/dodal/devices/b16/__init__.py
 src/dodal/devices/b16/detector.py
+src/dodal/devices/beamsize/__init__.py
+src/dodal/devices/beamsize/beamsize.py
 src/dodal/devices/current_amplifiers/__init__.py
 src/dodal/devices/current_amplifiers/current_amplifier.py
 src/dodal/devices/current_amplifiers/current_amplifier_detector.py
@@ -253,22 +256,30 @@ src/dodal/devices/i02_1/fast_grid_scan.py
 src/dodal/devices/i02_1/sample_motors.py
 src/dodal/devices/i02_2/__init__.py
 src/dodal/devices/i03/__init__.py
+src/dodal/devices/i03/beamsize.py
+src/dodal/devices/i03/constants.py
 src/dodal/devices/i03/dcm.py
 src/dodal/devices/i03/undulator_dcm.py
 src/dodal/devices/i04/__init__.py
+src/dodal/devices/i04/beamsize.py
 src/dodal/devices/i04/constants.py
+src/dodal/devices/i04/max_pixel.py
 src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
 src/dodal/devices/i05/__init__.py
 src/dodal/devices/i05/enums.py
 src/dodal/devices/i07/__init__.py
 src/dodal/devices/i07/dcm.py
+src/dodal/devices/i07/id.py
 src/dodal/devices/i09/__init__.py
 src/dodal/devices/i09/enums.py
 src/dodal/devices/i09_1/__init__.py
 src/dodal/devices/i09_1/enums.py
 src/dodal/devices/i09_1_shared/__init__.py
+src/dodal/devices/i09_1_shared/hard_energy.py
 src/dodal/devices/i09_1_shared/hard_undulator_functions.py
+src/dodal/devices/i09_2_shared/__init__.py
+src/dodal/devices/i09_2_shared/i09_apple2.py
 src/dodal/devices/i10/__init__.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
@@ -308,6 +319,7 @@ src/dodal/devices/i19/diffractometer.py
 src/dodal/devices/i19/mapt_configuration.py
 src/dodal/devices/i19/pin_col_stages.py
 src/dodal/devices/i19/access_controlled/__init__.py
+src/dodal/devices/i19/access_controlled/attenuator_motor_squad.py
 src/dodal/devices/i19/access_controlled/blueapi_device.py
 src/dodal/devices/i19/access_controlled/hutch_access.py
 src/dodal/devices/i19/access_controlled/shutter.py
@@ -328,6 +340,10 @@ src/dodal/devices/i24/dual_backlight.py
 src/dodal/devices/i24/focus_mirrors.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
+src/dodal/devices/insertion_device/__init__.py
+src/dodal/devices/insertion_device/apple2_undulator.py
+src/dodal/devices/insertion_device/energy_motor_lookup.py
+src/dodal/devices/insertion_device/lookup_table_models.py
 src/dodal/devices/mx_phase1/__init__.py
 src/dodal/devices/mx_phase1/beamstop.py
 src/dodal/devices/oav/__init__.py
@@ -379,19 +395,20 @@ src/dodal/plan_stubs/wrapped.py
 src/dodal/plans/__init__.py
 src/dodal/plans/bimorph.py
 src/dodal/plans/configure_arm_trigger_and_disarm_detector.py
+src/dodal/plans/load_panda_yaml.py
 src/dodal/plans/save_panda.py
-src/dodal/plans/scanspec.py
+src/dodal/plans/spec_path.py
 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/setup.py
 src/dodal/testing/electron_analyser/__init__.py
 src/dodal/testing/electron_analyser/device_factory.py
 src/dodal/testing/fixtures/__init__.py
 src/dodal/testing/fixtures/run_engine.py
 src/dodal/testing/fixtures/utils.py
+src/dodal/testing/fixtures/devices/__init__.py
+src/dodal/testing/fixtures/devices/apple2.py
 system_tests/__init__.py
 system_tests/test_adsim.py
 system_tests/test_cli.py
@@ -408,6 +425,7 @@ tests/fake_beamline_misbehaving_builtins.py
 tests/fake_beamline_some_devices_working.py
 tests/fake_device_factory_beamline.py
 tests/test_cli.py
+tests/test_device_manager.py
 tests/test_log.py
 tests/test_utils.py
 tests/beamlines/__init__.py
@@ -428,9 +446,9 @@ tests/common/beamlines/test_beamline_utils.py
 tests/common/beamlines/test_commissioning_mode.py
 tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
+tests/devices/conftest.py
 tests/devices/test_aperture.py
 tests/devices/test_aperture_scatterguard.py
-tests/devices/test_apple2_undulator.py
 tests/devices/test_attenuator.py
 tests/devices/test_backlight.py
 tests/devices/test_bart_robot.py
@@ -507,28 +525,42 @@ tests/devices/electron_analyser/vgscienta/test_region.py
 tests/devices/i02_1/__init__.py
 tests/devices/i02_1/test_fast_grid_scan.py
 tests/devices/i03/__init__.py
+tests/devices/i03/test_beamsize.py
 tests/devices/i03/test_dcm.py
 tests/devices/i03/test_undulator_dcm.py
 tests/devices/i04/__init__.py
+tests/devices/i04/conftest.py
+tests/devices/i04/test_beamsize.py
+tests/devices/i04/test_max_pixel.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
+tests/devices/i07/IIDCalibrationTable.txt
 tests/devices/i07/__init__.py
 tests/devices/i07/test_dcm.py
+tests/devices/i07/test_id.py
 tests/devices/i09/__init__.py
 tests/devices/i09_1/__init__.py
 tests/devices/i09_1_shared/__init__.py
+tests/devices/i09_1_shared/test_hard_energy.py
 tests/devices/i09_1_shared/test_undulator_functions.py
 tests/devices/i09_1_shared/test_data/__init__.py
 tests/devices/i09_1_shared/test_data/test_lookuptable_i09_hu.txt
+tests/devices/i09_2_shared/__init__.py
+tests/devices/i09_2_shared/test_i09_apple2.py
+tests/devices/i09_2_shared/test_data/ExpectedJIDEnergy2GapCalibrations.json
+tests/devices/i09_2_shared/test_data/ExpectedJIDEnergy2PhaseCalibrations.json
+tests/devices/i09_2_shared/test_data/JIDEnergy2GapCalibrations.csv
+tests/devices/i09_2_shared/test_data/JIDEnergy2PhaseCalibrations.csv
+tests/devices/i09_2_shared/test_data/__init__.py
 tests/devices/i10/__init__.py
 tests/devices/i10/test_i10_apple2.py
 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/i10/test_data/expectedIDEnergy2GapCalibrationsIdd.json
+tests/devices/i10/test_data/expectedIDEnergy2GapCalibrationsIdu.json
+tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidd.json
+tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidu.json
 tests/devices/i11/__init__.py
 tests/devices/i11/test_i11devices.py
 tests/devices/i11/test_mythen.py
@@ -546,6 +578,8 @@ tests/devices/i19/test_diffractometer.py
 tests/devices/i19/test_mapt.py
 tests/devices/i19/test_pin_col.py
 tests/devices/i19/access_controlled/__init__.py
+tests/devices/i19/access_controlled/test_attenuator_motor_squad.py
+tests/devices/i19/access_controlled/test_attenuator_position_demand.py
 tests/devices/i19/access_controlled/test_shutter.py
 tests/devices/i22/__init__.py
 tests/devices/i22/test_dcm.py
@@ -557,6 +591,12 @@ tests/devices/i24/test_dual_backlight.py
 tests/devices/i24/test_focus_mirrors.py
 tests/devices/i24/test_pmac.py
 tests/devices/i24/test_vgonio.py
+tests/devices/insertion_device/__init__.py
+tests/devices/insertion_device/conftest.py
+tests/devices/insertion_device/test_apple2_undulator.py
+tests/devices/insertion_device/test_energy_motor_lookup.py
+tests/devices/insertion_device/test_lookup_tables_models.py
+tests/devices/insertion_device/util.py
 tests/devices/mx_phase1/__init__.py
 tests/devices/mx_phase1/test_beamstop.py
 tests/devices/oav/__init__.py
@@ -594,7 +634,6 @@ tests/devices/test_data/test_beamline_undulator_to_gap_lookup_table.txt
 tests/devices/test_data/test_lookup_table.txt
 tests/devices/util/__init__.py
 tests/devices/util/test_adjuster_plans.py
-tests/devices/util/test_beamline_specific_utils.py
 tests/devices/util/test_lookup_tables.py
 tests/devices/util/test_data/__init__.py
 tests/devices/util/test_data/test_beamline_dcm_roll_converter.txt
@@ -617,6 +656,7 @@ tests/plans/conftest.py
 tests/plans/test_bimorph.py
 tests/plans/test_compliance.py
 tests/plans/test_configure_arm_trigger_and_disarm_detector.py
+tests/plans/test_load_panda_yaml.py
 tests/plans/test_save_panda.py
 tests/plans/test_scanspec.py
 tests/plans/test_verify_undulator_gap_plan.py

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,9 +1,8 @@
 click
 ophyd
-ophyd-async[ca,pva]>=0.13.5
+ophyd-async[ca,pva]>=v0.14.0
 bluesky>=1.14.5
 pyepics
-dataclasses-json
 pillow
 zocalo>=1.0.0
 requests
@@ -26,7 +25,7 @@ import-linter
 ispyb
 mypy
 myst-parser
-ophyd_async[sim]
+ophyd_async[sim]>=v0.14.0
 pipdeptree
 pre-commit
 psutil

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.65.0'
-__version_tuple__ = version_tuple = (1, 65, 0)
+__version__ = version = '1.67.0'
+__version_tuple__ = version_tuple = (1, 67, 0)
 
-__commit_id__ = commit_id = 'g5fe631f29'
+__commit_id__ = commit_id = 'gdfd2eada3'

{dls_dodal-1.65.0 → dls_dodal-1.67.0}/src/dodal/beamlines/aithre.py

@@ -7,12 +7,19 @@ from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 ZOOM_PARAMS_FILE = "/dls_sw/i23/software/aithre/aithre_oav.xml"
 DISPLAY_CONFIG = "/dls_sw/i23/software/aithre/aithre_display.configuration"
 
+
 PREFIX = "LA18L"
 
 
 @device_factory()
 def goniometer() -> Goniometer:
-    return Goniometer(f"{PREFIX}-MO-LSR-01:")
+    return Goniometer(
+        f"{PREFIX}-MO-LSR-01:",
+        y_infix="SAMPZ",
+        z_infix="SAMPY",
+        sampy_infix="Y",
+        sampz_infix="Z",
+    )
 
 
 @device_factory()
@@ -22,8 +29,20 @@ def robot() -> LaserRobot:
 
 @device_factory()
 def oav(params: OAVConfigBeamCentre | None = None) -> OAVBeamCentreFile:
+    config = (
+        params
+        if params is not None
+        else OAVConfigBeamCentre(
+            zoom_params_file=ZOOM_PARAMS_FILE, display_config_file=DISPLAY_CONFIG
+        )
+    )
     return OAVBeamCentreFile(
         prefix=f"{PREFIX}-DI-OAV-01:",
-        config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        config=config,
         zoom_controller=NullZoomController(),
+        mjpg_x_size_pv="ArraySize0_RBV",
+        mjpg_y_size_pv="ArraySize1_RBV",
+        x_direction=-1,
+        y_direction=-1,
+        z_direction=-1,
     )