Merge pull request #295 from ISISComputingGroup/dependabot/pip/ophyd-async-ca--0.14.0

Bump ophyd-async[ca] from 0.13.6 to 0.14.0

Author: Tom-Willemsen

doc/conf.py

@@ -89,7 +89,7 @@
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
     "bluesky": ("https://blueskyproject.io/bluesky/main/", None),
-    "ophyd_async": ("https://blueskyproject.io/ophyd-async/v0.13.4/", None),
+    "ophyd_async": ("https://blueskyproject.io/ophyd-async/v0.14.0/", None),
     "event_model": ("https://blueskyproject.io/event-model/main/", None),
     "scipp": ("https://scipp.github.io/", None),
     "scippneutron": ("https://scipp.github.io/scippneutron/", None),

doc/dev/troubleshooting.md

@@ -209,7 +209,7 @@ If you forget to do this, you will get a stack trace containing:
 NotImplementedError: No PV has been set as connect() has not been called
 ```
 
-### Debug {py:obj}`~ophyd_async.core.NotConnected` errors
+### Debug {py:obj}`~ophyd_async.core.NotConnectedError` errors
 
 If {py:obj}`ophyd_async` cannot connect to a PV, you will get an error that looks like:
 

doc/devices/blocks.md

@@ -119,7 +119,7 @@ type `float`, and as such does not take a type argument (unlike the other block
 {external+bluesky:py:obj}`~bluesky.protocols.Checkable` means that moves which would eventually violate limits can be detected by
 bluesky simulators, before the plan ever runs. This can help to catch errors before
 the plan is executed against hardware. There is also limit-checking at runtime;
-a {external+ophyd_async:py:obj}`~ophyd_async.epics.motor.MotorLimitsException` will be raised
+a {external+ophyd_async:py:obj}`~ophyd_async.epics.motor.MotorLimitsError` will be raised
 at runtime if a requested position is outside the motor's limits.
 
 {external+bluesky:py:obj}`~bluesky.protocols.Stoppable` means that the motor can be asked to stop by bluesky. Plans may choose to execute

pyproject.toml

@@ -42,7 +42,7 @@ classifiers = [
 dependencies = [
   "bluesky",  # Bluesky framework
   "bluesky-kafka",  # Bluesky-kafka integration
-  "ophyd-async[ca] == 0.13.6",  # Device abstraction. When changing, also change in doc/conf.py
+  "ophyd-async[ca] == 0.14.0",  # Device abstraction. When changing, also change in doc/conf.py
   "lmfit",  # Fitting
   "matplotlib",  # Plotting
   "msgpack-numpy",  # Encoding kafka messages

src/ibex_bluesky_core/devices/block.py

@@ -484,7 +484,7 @@ def set(  # pyright: ignore
         This is needed so that type-checker correctly understands the type of set.
 
         This method will raise
-        :external+ophyd_async:py:obj:`ophyd_async.epics.motor.MotorLimitsException`
+        :external+ophyd_async:py:obj:`ophyd_async.epics.motor.MotorLimitsError`
         if the requested position was outside the motor's limits.
         """
         return super().set(value, timeout)

tests/devices/simpledae/test_controllers.py

@@ -1,5 +1,5 @@
 import pytest
-from ophyd_async.testing import get_mock_put, set_mock_value
+from ophyd_async.core import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices.dae import BeginRunExBits, RunstateEnum
 from ibex_bluesky_core.devices.simpledae import (

tests/devices/simpledae/test_reducers.py

@@ -6,7 +6,7 @@
 import numpy as np
 import pytest
 import scipp as sc
-from ophyd_async.testing import get_mock_put, set_mock_value
+from ophyd_async.core import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices.simpledae import (
     VARIANCE_ADDITION,

tests/devices/simpledae/test_simpledae.py

@@ -1,8 +1,7 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
-from ophyd_async.core import Device, StandardReadable, soft_signal_rw
-from ophyd_async.testing import set_mock_value
+from ophyd_async.core import Device, StandardReadable, set_mock_value, soft_signal_rw
 
 from ibex_bluesky_core.devices.dae import Dae, DaeCheckingSignal
 from ibex_bluesky_core.devices.simpledae import (

tests/devices/simpledae/test_waiters.py

@@ -1,7 +1,7 @@
 import asyncio
 
 import pytest
-from ophyd_async.testing import set_mock_value
+from ophyd_async.core import set_mock_value
 
 from ibex_bluesky_core.devices.simpledae import (
     GoodUahWaiter,

tests/devices/test_block.py

@@ -4,9 +4,9 @@
 
 import bluesky.plan_stubs as bps
 import bluesky.plans as bp
-import ophyd_async
 import pytest
-from ophyd_async.testing import get_mock_put, set_mock_value
+from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.epics.motor import MotorLimitsError
 
 from ibex_bluesky_core.devices.block import (
     GLOBAL_MOVING_FLAG_PRE_WAIT,
@@ -353,21 +353,13 @@ async def test_block_mot_set_within_limits(mot_block):
 
 
 async def test_block_mot_set_outside_limits(mot_block):
-    # Local import as API not available in older ophyd_async versions
-    if ophyd_async._version.version_tuple >= (0, 13, 5):
-        from ophyd_async.epics.motor import MotorLimitsError  # pyright: ignore # noqa PLC0415
-
-        err = MotorLimitsError
-    else:
-        from ophyd_async.epics.motor import MotorLimitsException  # pyright: ignore # noqa PLC0415
-
-        err = MotorLimitsException
-
     set_mock_value(mot_block.user_setpoint, 10)
     set_mock_value(mot_block.velocity, 10)
+    set_mock_value(mot_block.dial_high_limit_travel, 15)
+    set_mock_value(mot_block.dial_low_limit_travel, 5)
     set_mock_value(mot_block.high_limit_travel, 15)
     set_mock_value(mot_block.low_limit_travel, 5)
-    with pytest.raises(err):
+    with pytest.raises(MotorLimitsError):
         await mot_block.set(20)