dls-dodal 1.33.0__tar.gz → 1.34.1__tar.gz

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/.copier-answers.yml

@@ -1,9 +1,11 @@
 # Changes here will be overwritten by Copier
-_commit: 2.2.0
+_commit: 2.5.0
 _src_path: gh:DiamondLightSource/python-copier-template
 author_email: dominic.oram@diamond.ac.uk
 author_name: Dominic Oram
+component_lifecycle: production
 component_owner: group:data-acquisition
+component_type: library
 description: Ophyd devices and other utils that could be used across DLS beamlines
 distribution_name: dls-dodal
 docker: false

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/.github/CONTRIBUTING.md

@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
 
 This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
 
-For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/2.2.0/how-to.html).
+For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/2.5.0/how-to.html).

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/.github/pages/make_switcher.py

@@ -1,3 +1,5 @@
+"""Make switcher.json to allow docs to switch between different versions."""
+
 import json
 import logging
 from argparse import ArgumentParser
@@ -6,6 +8,7 @@ from subprocess import CalledProcessError, check_output
 
 
 def report_output(stdout: bytes, label: str) -> list[str]:
+    """Print and return something received frm stdout."""
     ret = stdout.decode().strip().split("\n")
     print(f"{label}: {ret}")
     return ret
@@ -52,14 +55,12 @@ def get_versions(ref: str, add: str | None) -> list[str]:
     return versions
 
 
-def write_json(path: Path, repository: str, versions: str):
+def write_json(path: Path, repository: str, versions: list[str]):
+    """Write the JSON switcher to path."""
     org, repo_name = repository.split("/")
-    pages_url = f"https://{org}.github.io"
-    if repo_name != f"{org}.github.io":
-        # Only add the repo name if it isn't the source for the org pages site
-        pages_url += f"/{repo_name}"
     struct = [
-        {"version": version, "url": f"{pages_url}/{version}/"} for version in versions
+        {"version": version, "url": f"https://{org}.github.io/{repo_name}/{version}/"}
+        for version in versions
     ]
     text = json.dumps(struct, indent=2)
     print(f"JSON switcher:\n{text}")
@@ -67,6 +68,7 @@ def write_json(path: Path, repository: str, versions: str):
 
 
 def main(args=None):
+    """Parse args and write switcher."""
     parser = ArgumentParser(
         description="Make a versions.json file from gh-pages directories"
     )

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/.github/workflows/_pypi.yml

@@ -15,3 +15,5 @@ jobs:
 
       - name: Publish to PyPI using trusted publishing
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          attestations: false

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/.github/workflows/_release.yml

@@ -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@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
+        uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         runs-on: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python-version: ["3.10", "3.11"] # add 3.12 when p4p #145 is fixed
+        python-version: ["3.10", "3.11", "3.12"]
         include:
           # Include one that runs in the dev environment
           - runs-on: "ubuntu-latest"

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/.gitignore

@@ -57,6 +57,7 @@ tmp/
 # Sphinx documentation
 docs/_build/
 docs/reference/generated/
+docs/_api
 
 # PyBuilder
 target/

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/Dockerfile

@@ -1,7 +1,7 @@
 # The devcontainer should use the developer target and run as root with podman
 # or docker with user namespaces.
 ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} as developer
+FROM python:${PYTHON_VERSION} AS developer
 
 # Add any system dependencies for the developer/build environment here
 RUN apt-get update && apt-get install -y --no-install-recommends \

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.33.0
+Version: 1.34.1
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async<0.7,>=0.6
+Requires-Dist: ophyd-async<0.8,>=0.7.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -263,7 +263,7 @@ Requires-Dist: types-aiofiles; extra == "dev"
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/DiamondLightSource/dodal/branch/main/graph/badge.svg)](https://codecov.io/gh/DiamondLightSource/dodal)
 [![PyPI](https://img.shields.io/pypi/v/dls-dodal.svg)](https://pypi.org/project/dls-dodal)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 # dodal
 

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/README.md

@@ -1,7 +1,7 @@
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/DiamondLightSource/dodal/branch/main/graph/badge.svg)](https://codecov.io/gh/DiamondLightSource/dodal)
 [![PyPI](https://img.shields.io/pypi/v/dls-dodal.svg)](https://pypi.org/project/dls-dodal)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 # dodal
 

dls_dodal-1.34.1/docs/_api.rst

@@ -0,0 +1,16 @@
+:orphan:
+
+..
+   This page is not included in the TOC tree, but must exist so that the
+   autosummary pages are generated for dodal and all its
+   subpackages
+
+API
+===
+
+.. autosummary::
+    :toctree: _api
+    :template: custom-module-template.rst
+    :recursive:
+
+    dodal

dls_dodal-1.34.1/docs/_templates/custom-module-template.rst

@@ -0,0 +1,37 @@
+{{ ('``' + fullname + '``') | underline }}
+
+{%- set filtered_members = [] %}
+{%- for item in members %}
+    {%- if item in functions + classes + exceptions + attributes %}
+        {% set _ = filtered_members.append(item) %}
+    {%- endif %}
+{%- endfor %}
+
+.. automodule:: {{ fullname }}
+    :members:
+
+    {% block modules %}
+    {% if modules %}
+    .. rubric:: Submodules
+
+    .. autosummary::
+        :toctree:
+        :template: custom-module-template.rst
+        :recursive:
+    {% for item in modules %}
+        {{ item }}
+    {%- endfor %}
+    {% endif %}
+    {% endblock %}
+
+    {% block members %}
+    {% if filtered_members %}
+    .. rubric:: Members
+
+    .. autosummary::
+        :nosignatures:
+    {% for item in filtered_members %}
+        {{ item }}
+    {%- endfor %}
+    {% endif %}
+    {% endblock %}

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/docs/conf.py

@@ -1,8 +1,9 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
+"""Configuration file for the Sphinx documentation builder.
+
+This file only contains a selection of the most common options. For a full
+list see the documentation:
+https://www.sphinx-doc.org/en/master/usage/configuration.html
+"""
 
 import sys
 from inspect import isclass
@@ -33,6 +34,7 @@ else:
 extensions = [
     # Use this for generating API docs
     "sphinx.ext.autodoc",
+    # and making summary tables at the top of API docs
     "sphinx.ext.autosummary",
     # This can parse google style docstrings
     "sphinx.ext.napoleon",
@@ -91,6 +93,12 @@ autodoc_preserve_defaults = True
 autosummary_generate = True
 autosummary_imported_members = False
 
+# Document only what is in __all__
+autosummary_ignore_module_all = False
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ["_templates"]
+
 # Output graphviz directive produced images in a scalable format
 graphviz_output_format = "svg"
 

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/docs/how-to/create-beamline.rst

@@ -11,7 +11,7 @@ Each beamline should have its own file in the ``doodal.beamlines`` folder, in wh
 beamline are instantiated. The file should be named after the colloquial name for the beamline. For example:
 
 * ``i03.py``
-* ``i04_1.py``
+* ``i20_1.py``
 * ``vmxi.py``
 
 Beamline modules (in ``dodal.beamlines``) are code-as-configuration. They define the set of devices and common device

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

@@ -0,0 +1,8 @@
+# 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.

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/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.10, 3.11.
+Currently supported versions are: 3.10, 3.11, 3.12. (As of the last edit of this document.)
 
 .. _documentation_standards:
 

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/docs/reference.md

@@ -6,7 +6,7 @@ Technical reference material including APIs and release notes.
 :maxdepth: 1
 :glob:
 
-reference/*
+API <_api/dodal>
 genindex
 Release Notes <https://github.com/DiamondLightSource/dodal/releases>
 ```

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/pyproject.toml

@@ -15,7 +15,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async>=0.6,<0.7",
+    "ophyd-async>=0.7.0a1,<0.8",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -24,10 +24,10 @@ dependencies = [
     "requests",
     "graypy",
     "pydantic>=2.0",
-    "opencv-python-headless", # For pin-tip detection.
-    "aioca",                  # Required for CA support with ophyd-async.
-    "p4p",                    # Required for PVA support with ophyd-async.
-    "numpy<2.0",              # Unpin when https://github.com/bluesky/ophyd-async/issues/387 resolved
+    "opencv-python-headless",    # For pin-tip detection.
+    "aioca",                     # Required for CA support with ophyd-async.
+    "p4p",                       # Required for PVA support with ophyd-async.
+    "numpy<2.0",                 # Unpin when https://github.com/bluesky/ophyd-async/issues/387 resolved
     "aiofiles",
     "aiohttp",
     "redis",
@@ -91,6 +91,7 @@ dodal = ["*.txt"]
 version_file = "src/dodal/_version.py"
 
 [tool.pyright]
+typeCheckingMode = "standard"
 reportMissingImports = false # Ignore missing stubs in imported modules
 
 [tool.pytest.ini_options]
@@ -115,7 +116,7 @@ filterwarnings = [
     "ignore::DeprecationWarning:wheel",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
-testpaths = "docs src tests"
+testpaths = "docs src tests system_tests"
 
 [tool.coverage.report]
 exclude_also = [
@@ -176,3 +177,4 @@ lint.select = [
 # See https://github.com/DiamondLightSource/python-copier-template/issues/154
 # Remove this line to forbid private member access in tests
 "tests/**/*" = ["SLF001"]
+"system_tests/**/*" = ["SLF001"]

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.33.0
+Version: 1.34.1
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async<0.7,>=0.6
+Requires-Dist: ophyd-async<0.8,>=0.7.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -263,7 +263,7 @@ Requires-Dist: types-aiofiles; extra == "dev"
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/DiamondLightSource/dodal/branch/main/graph/badge.svg)](https://codecov.io/gh/DiamondLightSource/dodal)
 [![PyPI](https://img.shields.io/pypi/v/dls-dodal.svg)](https://pypi.org/project/dls-dodal)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 # dodal
 

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/src/dls_dodal.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ pyproject.toml
 .vscode/launch.json
 .vscode/settings.json
 .vscode/tasks.json
+docs/_api.rst
 docs/conf.py
 docs/explanations.md
 docs/genindex.md
@@ -34,6 +35,7 @@ docs/how-to.md
 docs/index.md
 docs/reference.md
 docs/tutorials.md
+docs/_templates/custom-module-template.rst
 docs/_templates/autosummary/class.rst
 docs/_templates/autosummary/module.rst
 docs/assets/zocalo.png
@@ -56,10 +58,10 @@ docs/how-to/pypi.md
 docs/how-to/run-tests.md
 docs/how-to/static-analysis.md
 docs/how-to/update-template.md
+docs/how-to/write-tests.md
 docs/how-to/zocalo.rst
 docs/images/dls-logo.svg
 docs/images/excalidraw-example.svg
-docs/reference/api.md
 docs/reference/device-standards.rst
 docs/reference/standards.rst
 docs/tutorials/get_started.rst
@@ -85,7 +87,7 @@ src/dodal/beamlines/__init__.py
 src/dodal/beamlines/b01_1.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
-src/dodal/beamlines/i04_1.py
+src/dodal/beamlines/i10.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i20_1.py
 src/dodal/beamlines/i22.py
@@ -111,10 +113,12 @@ src/dodal/devices/__init__.py
 src/dodal/devices/adsim.py
 src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
+src/dodal/devices/apple2_undulator.py
 src/dodal/devices/attenuator.py
 src/dodal/devices/backlight.py
 src/dodal/devices/cryostream.py
 src/dodal/devices/dcm.py
+src/dodal/devices/diamond_filter.py
 src/dodal/devices/eiger.py
 src/dodal/devices/eiger_odin.py
 src/dodal/devices/fast_grid_scan.py
@@ -127,6 +131,8 @@ src/dodal/devices/linkam3.py
 src/dodal/devices/logging_ophyd_device.py
 src/dodal/devices/motors.py
 src/dodal/devices/p45.py
+src/dodal/devices/pgm.py
+src/dodal/devices/qbpm.py
 src/dodal/devices/robot.py
 src/dodal/devices/s4_slit_gaps.py
 src/dodal/devices/scatterguard.py
@@ -148,6 +154,7 @@ src/dodal/devices/areadetector/__init__.py
 src/dodal/devices/areadetector/adaravis.py
 src/dodal/devices/areadetector/adsim.py
 src/dodal/devices/areadetector/adutils.py
+src/dodal/devices/areadetector/plugins/CAM.py
 src/dodal/devices/areadetector/plugins/MJPG.py
 src/dodal/devices/detector/__init__.py
 src/dodal/devices/detector/det_dim_constants.py
@@ -157,6 +164,8 @@ src/dodal/devices/detector/detector.py
 src/dodal/devices/detector/detector_motion.py
 src/dodal/devices/i03/__init__.py
 src/dodal/devices/i04/transfocator.py
+src/dodal/devices/i10/i10_apple2.py
+src/dodal/devices/i10/i10_setting_data.py
 src/dodal/devices/i20_1/__init__.py
 src/dodal/devices/i22/dcm.py
 src/dodal/devices/i22/fswitch.py
@@ -170,17 +179,18 @@ src/dodal/devices/i24/i24_detector_motion.py
 src/dodal/devices/i24/i24_vgonio.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/oav/__init__.py
-src/dodal/devices/oav/grid_overlay.py
 src/dodal/devices/oav/microns_for_zoom_levels.json
 src/dodal/devices/oav/oav_calculations.py
 src/dodal/devices/oav/oav_detector.py
-src/dodal/devices/oav/oav_errors.py
 src/dodal/devices/oav/oav_parameters.py
 src/dodal/devices/oav/oav_to_redis_forwarder.py
 src/dodal/devices/oav/utils.py
 src/dodal/devices/oav/pin_image_recognition/__init__.py
 src/dodal/devices/oav/pin_image_recognition/manual_test.py
 src/dodal/devices/oav/pin_image_recognition/utils.py
+src/dodal/devices/oav/snapshots/grid_overlay.py
+src/dodal/devices/oav/snapshots/snapshot_with_beam_centre.py
+src/dodal/devices/oav/snapshots/snapshot_with_grid.py
 src/dodal/devices/p99/__init__.py
 src/dodal/devices/p99/sample_stage.py
 src/dodal/devices/training_rig/__init__.py
@@ -201,6 +211,18 @@ src/dodal/parameters/experiment_parameter_base.py
 src/dodal/plans/check_topup.py
 src/dodal/plans/data_session_metadata.py
 src/dodal/plans/motor_util_plans.py
+system_tests/__init__.py
+system_tests/test_aperturescatterguard_system.py
+system_tests/test_eiger_system.py
+system_tests/test_gridscan_system.py
+system_tests/test_oav_system.py
+system_tests/test_oav_to_redis_system.py
+system_tests/test_slit_gaps_system.py
+system_tests/test_smargon_system.py
+system_tests/test_synchrotron_system.py
+system_tests/test_undulator_system.py
+system_tests/test_zebra_system.py
+system_tests/test_zocalo_results.py
 tests/__init__.py
 tests/conftest.py
 tests/fake_beamline.py
@@ -228,29 +250,26 @@ tests/common/beamlines/test_beamline_utils.py
 tests/common/beamlines/test_device_helpers.py
 tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
+tests/devices/test_diamond_filter.py
 tests/devices/i04/__init__.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/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
 tests/devices/i22/test_metadataholder.py
-tests/devices/system_tests/__init__.py
-tests/devices/system_tests/test_aperturescatterguard_system.py
-tests/devices/system_tests/test_eiger_system.py
-tests/devices/system_tests/test_gridscan_system.py
-tests/devices/system_tests/test_oav_system.py
-tests/devices/system_tests/test_oav_to_redis_system.py
-tests/devices/system_tests/test_slit_gaps_system.py
-tests/devices/system_tests/test_smargon_system.py
-tests/devices/system_tests/test_synchrotron_system.py
-tests/devices/system_tests/test_undulator_system.py
-tests/devices/system_tests/test_zebra_system.py
-tests/devices/system_tests/test_zocalo_results.py
 tests/devices/training_rig/test_sample_stage.py
 tests/devices/unit_tests/__init__.py
 tests/devices/unit_tests/conftest.py
 tests/devices/unit_tests/test_OAVCentring.json
 tests/devices/unit_tests/test_aperture.py
 tests/devices/unit_tests/test_aperture_scatterguard.py
+tests/devices/unit_tests/test_apple2_undulator.py
 tests/devices/unit_tests/test_attenuator.py
 tests/devices/unit_tests/test_backlight.py
 tests/devices/unit_tests/test_bart_robot.py
@@ -260,15 +279,14 @@ tests/devices/unit_tests/test_dcm.py
 tests/devices/unit_tests/test_display.configuration
 tests/devices/unit_tests/test_eiger.py
 tests/devices/unit_tests/test_focusing_mirror.py
-tests/devices/unit_tests/test_grid_overlay.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_linkam3.py
 tests/devices/unit_tests/test_lookup_table.txt
 tests/devices/unit_tests/test_lookup_table_2.txt
-tests/devices/unit_tests/test_oav.py
 tests/devices/unit_tests/test_odin.py
+tests/devices/unit_tests/test_qbpm.py
 tests/devices/unit_tests/test_shutter.py
 tests/devices/unit_tests/test_slits.py
 tests/devices/unit_tests/test_smargon.py
@@ -285,7 +303,6 @@ tests/devices/unit_tests/test_xspress3.py
 tests/devices/unit_tests/test_zebra.py
 tests/devices/unit_tests/test_zocalo_interaction.py
 tests/devices/unit_tests/test_zocalo_results.py
-tests/devices/unit_tests/areadetector/plugins/test_MJPG.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
@@ -293,9 +310,13 @@ tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_pmac.py
 tests/devices/unit_tests/oav/__init__.py
+tests/devices/unit_tests/oav/conftest.py
+tests/devices/unit_tests/oav/test_grid_overlay.py
 tests/devices/unit_tests/oav/test_oav.py
 tests/devices/unit_tests/oav/test_oav_parameters.py
 tests/devices/unit_tests/oav/test_oav_to_redis_forwarder.py
+tests/devices/unit_tests/oav/test_oav_utils.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/p99/test_p99_stage.py

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async<0.7,>=0.6
+ophyd-async<0.8,>=0.7.0a1
 bluesky
 pyepics
 dataclasses-json

dls_dodal-1.34.1/src/dodal/__init__.py

@@ -0,0 +1,11 @@
+"""Top level API.
+
+.. data:: __version__
+    :type: str
+
+    Version number as calculated by https://github.com/pypa/setuptools_scm
+"""
+
+from ._version import __version__
+
+__all__ = ["__version__"]

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/src/dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.33.0'
-__version_tuple__ = version_tuple = (1, 33, 0)
+__version__ = version = '1.34.1'
+__version_tuple__ = version_tuple = (1, 34, 1)

dls_dodal-1.34.1/src/dodal/beamline_specific_utils/i03.py

@@ -0,0 +1,17 @@
+from dataclasses import dataclass
+
+I03_BEAM_HEIGHT_UM = 20.0
+I03_BEAM_WIDTH_UM = 80.0
+
+
+@dataclass
+class BeamSize:
+    x_um: float | None
+    y_um: float | None
+
+
+def beam_size_from_aperture(aperture_size: float | None):
+    return BeamSize(
+        min(aperture_size, I03_BEAM_WIDTH_UM) if aperture_size else None,
+        I03_BEAM_HEIGHT_UM if aperture_size else None,
+    )

{dls_dodal-1.33.0 → dls_dodal-1.34.1}/src/dodal/beamlines/__init__.py

@@ -5,11 +5,10 @@ from pathlib import Path
 
 # Where beamline names (per the ${BEAMLINE} environment variable don't always
 # match up, we have to map between them bidirectionally). The most common use case is
-# beamlines with a "-"" in the name such as "i04-1", which is not valid in a Python
+# beamlines with a "-"" in the name such as "i20-1", which is not valid in a Python
 # module name. Add any new beamlines whose name differs from their module name to this
 # dictionary, which maps ${BEAMLINE} to dodal.beamlines.<MODULE NAME>
 _BEAMLINE_NAME_OVERRIDES = {
-    "i04-1": "i04_1",
     "i13-1": "i13_1",
     "i20-1": "i20_1",
     "s03": "i03",
@@ -79,7 +78,7 @@ def _module_name_overrides() -> Mapping[str, set[str]]:
 def module_name_for_beamline(beamline: str) -> str:
     """
     Get the module name for a particular beamline, it may differ from the beamline
-    name e.g. i04-1 -> i04_1
+    name e.g. i20-1 -> i20_1
 
     Args:
         beamline: The beamline name as per the ${BEAMLINE} environment variable