ophyd-async 0.13.2__tar.gz → 0.13.3__tar.gz

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.13.2
+Version: 0.13.3
 Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
 License: BSD 3-Clause License
@@ -49,7 +49,7 @@ Requires-Dist: colorlog
 Requires-Dist: pydantic>=2.0
 Requires-Dist: pydantic-numpy
 Requires-Dist: stamina>=23.1.0
-Requires-Dist: scanspec>=1.0a1
+Requires-Dist: scanspec>=0.8
 Requires-Dist: velocity-profile
 Provides-Extra: sim
 Requires-Dist: h5py; extra == "sim"
@@ -88,6 +88,7 @@ Requires-Dist: pytest-forked; extra == "dev"
 Requires-Dist: pytest-rerunfailures; extra == "dev"
 Requires-Dist: pytest-timeout; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: scanspec>=1.0a1; extra == "dev"
 Requires-Dist: sphinx-autobuild; extra == "dev"
 Requires-Dist: sphinx-autodoc2; extra == "dev"
 Requires-Dist: sphinxcontrib-mermaid; extra == "dev"

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "pydantic>=2.0",
     "pydantic-numpy",
     "stamina>=23.1.0",
-    "scanspec>=1.0a1",
+    "scanspec>=0.8",
     "velocity-profile",
 ]
 dynamic = ["version"]
@@ -60,6 +60,7 @@ dev = [
     "pytest-rerunfailures",
     "pytest-timeout",
     "ruff",
+    "scanspec>=1.0a1",
     "sphinx-autobuild",
     "sphinx-autodoc2",
     "sphinxcontrib-mermaid",

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/src/ophyd_async/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.13.2'
-__version_tuple__ = version_tuple = (0, 13, 2)
+__version__ = version = '0.13.3'
+__version_tuple__ = version_tuple = (0, 13, 3)
 
-__commit_id__ = commit_id = 'gc5aa76fc4'
+__commit_id__ = commit_id = 'gabcdf5983'

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/src/ophyd_async/epics/motor.py

@@ -107,18 +107,27 @@ class Motor(
         self.user_readback.set_name(name)
 
     async def check_motor_limit(self, abs_start_pos: float, abs_end_pos: float):
-        """Check the motor limit with the absolute positions."""
+        """Check the positions are within limits.
+
+        Will raise a MotorLimitsException if the given absolute positions will be
+        outside the motor soft limits.
+        """
         motor_lower_limit, motor_upper_limit, egu = await asyncio.gather(
             self.low_limit_travel.get_value(),
             self.high_limit_travel.get_value(),
             self.motor_egu.get_value(),
         )
+
+        # EPICS motor record treats limits of 0, 0 as no limit
+        if motor_lower_limit == 0 and motor_upper_limit == 0:
+            return
+
         if (
             not motor_upper_limit >= abs_start_pos >= motor_lower_limit
             or not motor_upper_limit >= abs_end_pos >= motor_lower_limit
         ):
             raise MotorLimitsException(
-                f"Motor trajectory for requested fly/move is from "
+                f"{self.name} motor trajectory for requested fly/move is from "
                 f"{abs_start_pos}{egu} to "
                 f"{abs_end_pos}{egu} but motor limits are "
                 f"{motor_lower_limit}{egu} <= x <= {motor_upper_limit}{egu} "

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/src/ophyd_async/epics/pmac/_pmac_trajectory.py

@@ -72,7 +72,6 @@ class PmacTrajectoryTriggerLogic(FlyerController):
         self.scantime = np.sum(trajectory.durations)
         use_axis = {axis + 1: False for axis in range(len(CS_LETTERS))}
 
-        size = 0
         for motor, number in motor_info.motor_cs_index.items():
             use_axis[number + 1] = True
             await self.pmac.trajectory.positions[number + 1].set(
@@ -81,13 +80,12 @@ class PmacTrajectoryTriggerLogic(FlyerController):
             await self.pmac.trajectory.velocities[number + 1].set(
                 trajectory.velocities[motor]
             )
-            size += len(trajectory.positions[motor])
 
         coros = [
             self.pmac.trajectory.profile_cs_name.set(motor_info.cs_port),
             self.pmac.trajectory.time_array.set(trajectory.durations),
             self.pmac.trajectory.user_array.set(trajectory.user_programs),
-            self.pmac.trajectory.points_to_build.set(size),
+            self.pmac.trajectory.points_to_build.set(len(trajectory.durations)),
             self.pmac.trajectory.calculate_velocities.set(False),
         ] + [
             self.pmac.trajectory.use_axis[number].set(use)

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/src/ophyd_async.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.13.2
+Version: 0.13.3
 Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
 License: BSD 3-Clause License
@@ -49,7 +49,7 @@ Requires-Dist: colorlog
 Requires-Dist: pydantic>=2.0
 Requires-Dist: pydantic-numpy
 Requires-Dist: stamina>=23.1.0
-Requires-Dist: scanspec>=1.0a1
+Requires-Dist: scanspec>=0.8
 Requires-Dist: velocity-profile
 Provides-Extra: sim
 Requires-Dist: h5py; extra == "sim"
@@ -88,6 +88,7 @@ Requires-Dist: pytest-forked; extra == "dev"
 Requires-Dist: pytest-rerunfailures; extra == "dev"
 Requires-Dist: pytest-timeout; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: scanspec>=1.0a1; extra == "dev"
 Requires-Dist: sphinx-autobuild; extra == "dev"
 Requires-Dist: sphinx-autodoc2; extra == "dev"
 Requires-Dist: sphinxcontrib-mermaid; extra == "dev"

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/src/ophyd_async.egg-info/requires.txt

@@ -6,7 +6,7 @@ colorlog
 pydantic>=2.0
 pydantic-numpy
 stamina>=23.1.0
-scanspec>=1.0a1
+scanspec>=0.8
 velocity-profile
 
 [ca]
@@ -42,6 +42,7 @@ pytest-forked
 pytest-rerunfailures
 pytest-timeout
 ruff
+scanspec>=1.0a1
 sphinx-autobuild
 sphinx-autodoc2
 sphinxcontrib-mermaid

{ophyd_async-0.13.2 → ophyd_async-0.13.3}/tests/epics/test_motor.py

@@ -155,7 +155,7 @@ async def test_set_with_zero_velocity(sim_motor: motor.Motor) -> None:
         (10, 9.99, -9.99),  # Goes above upper_limit
     ],
 )
-async def test_set_motor_limits_error(
+async def test_move_outside_motor_limits_causes_error(
     sim_motor: motor.Motor,
     position,
     upper_limit,
@@ -168,6 +168,16 @@ async def test_set_motor_limits_error(
         await sim_motor.set(position)
 
 
+async def test_given_limits_of_0_0_then_move_causes_no_error(
+    sim_motor: motor.Motor,
+):
+    set_mock_value(sim_motor.velocity, 10)
+    set_mock_value(sim_motor.low_limit_travel, 0)
+    set_mock_value(sim_motor.high_limit_travel, 0)
+    await sim_motor.set(100)
+    assert (await sim_motor.user_setpoint.get_value()) == 100
+
+
 @pytest.mark.parametrize(
     "setpoint, velocity, timeout",
     [