dls-dodal 1.39.0__tar.gz → 1.41.0__tar.gz

dls_dodal-1.41.0/.github/scripts/check_test_durations.py

@@ -0,0 +1,30 @@
+import json
+import sys
+
+# Get report filename and threshold from command-line arguments
+REPORT_FILE = sys.argv[1] if len(sys.argv) > 1 else "report.json"
+THRESHOLD = float(sys.argv[2]) if len(sys.argv) > 2 else 1.0
+
+try:
+    with open(REPORT_FILE) as f:
+        data = json.load(f)
+except FileNotFoundError:
+    print(f"❌ Error: Report file '{REPORT_FILE}' not found.")
+    sys.exit(1)
+except json.JSONDecodeError:
+    print(f"❌ Error: Failed to parse JSON in '{REPORT_FILE}'.")
+    sys.exit(1)
+
+slow_tests = [
+    (t["nodeid"], t["call"]["duration"])
+    for t in data.get("tests", [])
+    if "call" in t and t["call"]["duration"] > THRESHOLD
+]
+
+if slow_tests:
+    print(f"❌ The following tests exceeded the {THRESHOLD:.2f}s threshold:")
+    for test, duration in slow_tests:
+        print(f" - {test}: {duration:.2f}s")
+    sys.exit(1)
+
+print("✅ All tests ran within the acceptable time limit.")

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/.github/workflows/_test.yml

@@ -50,13 +50,24 @@ jobs:
           python-version: ${{ inputs.python-version }}
           pip-install: ".[dev]"
 
-      - name: Run tests
-        run: tox -e tests
+      - name: Run unit tests
+        run: tox -e unit-report
+
+      - name: Check unit test durations
+        run: |
+          python .github/scripts/check_test_durations.py unit-report.json 1
+
+      - name: Run system tests
+        run: tox -e system-report
+
+      - name: Check system test durations
+        run: |
+          python .github/scripts/check_test_durations.py system-report.json 5
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
           name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
-          files: cov.xml
+          files: ./unit_cov.xml,./system_cov.xml
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/.gitignore

@@ -74,3 +74,7 @@ lockfiles/
 
 # pycharm project files
 .idea/
+
+
+# custom CI setup 
+report.json

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.39.0
+Version: 1.41.0
 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.9.0a1
+Requires-Dist: ophyd-async>=0.9.0a2
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -238,6 +238,7 @@ Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 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"
@@ -245,10 +246,11 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pyright==1.1.394; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-json-report; extra == "dev"
 Requires-Dist: pytest-random-order; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx<7.4.6; extra == "dev"

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/conftest.py

@@ -38,6 +38,7 @@ mock_attributes_table = {
     "s03": mock_paths,
     "i04": mock_paths,
     "s04": mock_paths,
+    "i19_1": mock_paths,
     "i24": mock_paths,
 }
 

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/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.9.0a1",
+    "ophyd-async >= 0.9.0a2",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -45,6 +45,7 @@ dev = [
     "black",
     "diff-cover",
     "import-linter",
+    "ispyb",
     "mypy",
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
@@ -54,10 +55,11 @@ dev = [
     "pre-commit",
     "psutil",
     "pydata-sphinx-theme>=0.12",
-    "pyright",
+    "pyright==1.1.394",          # See https://github.com/DiamondLightSource/dodal/issues/1079
     "pytest",
     "pytest-asyncio",
     "pytest-cov",
+    "pytest-json-report",
     "pytest-random-order",
     "ruff",
     "sphinx<7.4.6",              #  pinned due to https://github.com/sphinx-doc/sphinx/issues/12660
@@ -141,7 +143,7 @@ legacy_tox_ini = """
 [tox]
 skipsdist=True
 
-[testenv:{pre-commit,type-checking,tests,docs}]
+[testenv:{pre-commit,type-checking,tests,docs,unit-report,system-report}]
 # Don't create a virtualenv for the command, requires tox-direct plugin
 direct = True
 passenv = *
@@ -156,6 +158,8 @@ commands =
     type-checking: pyright src tests {posargs}
     pre-commit: pre-commit run --all-files --show-diff-on-failure {posargs}
     docs: sphinx-{posargs:build -E} -T docs build/html
+    unit-report: pytest -m 'not (s03 or adsim)' --cov=dodal --cov-report term --cov-report xml:unit_cov.xml --json-report --json-report-file=unit-report.json tests {posargs}
+    system-report: pytest -m 'not (s03 or adsim)' --cov=dodal --cov-report term --cov-report xml:system_cov.xml --json-report --json-report-file=system-report.json system_tests {posargs}
 """
 
 [tool.ruff]

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.39.0
+Version: 1.41.0
 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.9.0a1
+Requires-Dist: ophyd-async>=0.9.0a2
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -238,6 +238,7 @@ Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 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"
@@ -245,10 +246,11 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pyright==1.1.394; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-json-report; extra == "dev"
 Requires-Dist: pytest-random-order; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx<7.4.6; extra == "dev"

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ pyproject.toml
 .github/actions/install_requirements/action.yml
 .github/pages/index.html
 .github/pages/make_switcher.py
+.github/scripts/check_test_durations.py
 .github/workflows/_check.yml
 .github/workflows/_dist.yml
 .github/workflows/_docs.yml
@@ -95,6 +96,9 @@ src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
 src/dodal/beamlines/i10.py
 src/dodal/beamlines/i13_1.py
+src/dodal/beamlines/i18.py
+src/dodal/beamlines/i19_1.py
+src/dodal/beamlines/i19_2.py
 src/dodal/beamlines/i20_1.py
 src/dodal/beamlines/i22.py
 src/dodal/beamlines/i23.py
@@ -188,6 +192,12 @@ src/dodal/devices/i13_1/__init__.py
 src/dodal/devices/i13_1/merlin.py
 src/dodal/devices/i13_1/merlin_controller.py
 src/dodal/devices/i13_1/merlin_io.py
+src/dodal/devices/i18/KBMirror.py
+src/dodal/devices/i18/diode.py
+src/dodal/devices/i18/table.py
+src/dodal/devices/i18/thor_labs_stage.py
+src/dodal/devices/i19/__init__.py
+src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
 src/dodal/devices/i22/dcm.py
 src/dodal/devices/i22/fswitch.py
@@ -249,6 +259,7 @@ src/dodal/plans/wrapped.py
 system_tests/__init__.py
 system_tests/test_adsim.py
 system_tests/test_aperturescatterguard_system.py
+system_tests/test_cli.py
 system_tests/test_eiger_system.py
 system_tests/test_gridscan_system.py
 system_tests/test_oav_system.py
@@ -269,7 +280,6 @@ tests/fake_beamline_disordered_dependencies.py
 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_utils.py
 tests/beamlines/__init__.py
 tests/beamlines/unit_tests/__init__.py
@@ -301,6 +311,11 @@ tests/devices/i10/lookupTables/expectedIDEnergy2GapCalibrationsIdu.pkl
 tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidd.pkl
 tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidu.pkl
 tests/devices/i13_1/test_merlin.py
+tests/devices/i18/test_kb_mirror.py
+tests/devices/i18/test_table.py
+tests/devices/i18/test_thor_labs_stage.py
+tests/devices/i19/__init__.py
+tests/devices/i19/test_shutter.py
 tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
 tests/devices/i22/test_metadataholder.py

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async==0.9.0a1
+ophyd-async>=0.9.0a2
 bluesky
 pyepics
 dataclasses-json
@@ -23,6 +23,7 @@ scanspec>=0.7.3
 black
 diff-cover
 import-linter
+ispyb
 mypy
 myst-parser
 ophyd_async[sim]
@@ -30,10 +31,11 @@ pipdeptree
 pre-commit
 psutil
 pydata-sphinx-theme>=0.12
-pyright
+pyright==1.1.394
 pytest
 pytest-asyncio
 pytest-cov
+pytest-json-report
 pytest-random-order
 ruff
 sphinx<7.4.6

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/src/dodal/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.39.0'
-__version_tuple__ = version_tuple = (1, 39, 0)
+__version__ = version = '1.41.0'
+__version_tuple__ = version_tuple = (1, 41, 0)

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/src/dodal/beamlines/__init__.py

@@ -11,6 +11,8 @@ from pathlib import Path
 _BEAMLINE_NAME_OVERRIDES = {
     "i13-1": "i13_1",
     "i20-1": "i20_1",
+    "i19-1": "i19_1",
+    "i19-2": "i19_2",
     "s03": "i03",
     "p46": "training_rig",
     "p47": "training_rig",

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/src/dodal/beamlines/adsim.py

@@ -8,6 +8,7 @@ from dodal.common.beamlines.beamline_utils import (
     set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.adsim import SimStage
 from dodal.log import set_beamline as set_log_beamline
@@ -70,6 +71,6 @@ def det() -> SimDetector:
     return SimDetector(
         f"{PREFIX.beamline_prefix}-DI-CAM-01:",
         path_provider=get_path_provider(),
-        drv_suffix="DET:",
-        hdf_suffix="HDF:",
+        drv_suffix=DET_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
     )

{dls_dodal-1.39.0 → dls_dodal-1.41.0}/src/dodal/beamlines/b01_1.py

@@ -9,7 +9,7 @@ from dodal.common.beamlines.beamline_utils import (
     set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.common.beamlines.device_helpers import HDF5_PREFIX
+from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -57,6 +57,6 @@ def manta() -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-02:",
         path_provider=get_path_provider(),
-        drv_suffix="CAM:",
-        hdf_suffix=HDF5_PREFIX,
+        drv_suffix=CAM_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
     )