PyPI - dls-dodal - Versions diffs - 1.39.0__tar.gz → 1.40.0__tar.gz - Mend

dls-dodal 1.39.0tar.gz → 1.40.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (426) hide show

{dls_dodal-1.39.0 → dls_dodal-1.40.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.39.0
+Version: 1.40.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

{dls_dodal-1.39.0 → dls_dodal-1.40.0}/conftest.py RENAMED Viewed

@@ -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.40.0}/pyproject.toml RENAMED Viewed

@@ -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",

{dls_dodal-1.39.0 → dls_dodal-1.40.0}/src/dls_dodal.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.39.0
+Version: 1.40.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

{dls_dodal-1.39.0 → dls_dodal-1.40.0}/src/dls_dodal.egg-info/SOURCES.txt RENAMED Viewed

@@ -95,6 +95,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 +191,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 +258,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 +279,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 +310,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.40.0}/src/dls_dodal.egg-info/requires.txt RENAMED Viewed

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async==0.9.0a1
+ophyd-async>=0.9.0a2
 bluesky
 pyepics
 dataclasses-json

{dls_dodal-1.39.0 → dls_dodal-1.40.0}/src/dodal/_version.py RENAMED Viewed

@@ -12,5 +12,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.40.0'
+__version_tuple__ = version_tuple = (1, 40, 0)

{dls_dodal-1.39.0 → dls_dodal-1.40.0}/src/dodal/beamlines/__init__.py RENAMED Viewed

@@ -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.40.0}/src/dodal/beamlines/adsim.py RENAMED Viewed

@@ -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.40.0}/src/dodal/beamlines/b01_1.py RENAMED Viewed

@@ -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,
     )

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

dls-dodal 1.39.0tar.gz → 1.40.0tar.gz