Merge pull request #271 from ISISComputingGroup/update_ophyd_async

Update ophyd-async to v0.13.4; drop python 3.10; add python 3.13

Author: rerpha

.github/workflows/Lint-and-test.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu-latest", "windows-latest" ]
-        version: ['3.10', '3.11', '3.12']
+        version: ['3.11', '3.12', '3.13']
       fail-fast: false
     steps:
       - uses: actions/checkout@v5

doc/conf.py

@@ -79,7 +79,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.12.3/", None),
+    "ophyd_async": ("https://blueskyproject.io/ophyd-async/v0.13.4/", None),
     "event_model": ("https://blueskyproject.io/event-model/main/", None),
     "scipp": ("https://scipp.github.io/", None),
     "scippneutron": ("https://scipp.github.io/scippneutron/", None),

pyproject.toml

@@ -8,7 +8,7 @@ name = "ibex-bluesky-core"  # REQUIRED, is the only field that cannot be marked
 dynamic = ["version"]
 description = "Core bluesky plan stubs & devices for use at ISIS"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license-files = ["LICENSE"]
 
 authors = [
@@ -33,15 +33,15 @@ classifiers = [
   # that you indicate you support Python 3. These classifiers are *not*
   # checked by "pip install". See instead "requires-python" key in this file.
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: 3 :: Only",
 ]
 
 dependencies = [
   "bluesky",  # Bluesky framework
-  "ophyd-async[ca] == 0.12.3",  # Device abstraction. When changing, also change in doc/conf.py
+  "ophyd-async[ca] == 0.13.4",  # Device abstraction. When changing, also change in doc/conf.py
   "matplotlib",  # Plotting
   "lmfit",  # Fitting
   "scipy",  # Definitions of erf/erfc functions

src/ibex_bluesky_core/devices/block.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import logging
-import sys
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Generic, TypeVar
@@ -58,8 +57,6 @@
 # looking at the global moving flag.
 GLOBAL_MOVING_FLAG_PRE_WAIT = 0.1
 
-aio_timeout_error = asyncio.exceptions.TimeoutError if sys.version_info < (3, 11) else TimeoutError
-
 
 @dataclass(kw_only=True, frozen=True)
 class BlockWriteConfig(Generic[T]):
@@ -286,7 +283,7 @@ async def set_and_settle(setpoint: T) -> None:
         else:
             try:
                 await set_and_settle(value)
-            except aio_timeout_error as e:
+            except TimeoutError as e:
                 logger.info(
                     "block set %s value=%s failed with %s, but continuing anyway because "
                     "continue_on_failed_write is set.",

tests/devices/test_block.py

@@ -1,6 +1,4 @@
 # pyright: reportMissingParameterType=false
-import asyncio
-import sys
 from contextlib import nullcontext
 from unittest.mock import ANY, MagicMock, call, patch
 
@@ -25,11 +23,6 @@
 )
 from tests.conftest import MOCK_PREFIX
 
-if sys.version_info < (3, 11):
-    aio_timeout_error = asyncio.exceptions.TimeoutError
-else:
-    aio_timeout_error = TimeoutError
-
 
 async def _make_block(clazz):
     block = clazz(float, MOCK_PREFIX, "float_block")
@@ -192,7 +185,7 @@ async def test_block_set_with_timeout():
 
     set_mock_value(block.readback, 10)
 
-    with pytest.raises(aio_timeout_error):
+    with pytest.raises(TimeoutError):
         await block.set(20)
 
     func.assert_called_once_with(20, 10)
@@ -234,7 +227,7 @@ async def test_block_set_waiting_for_global_moving_flag_timeout():
 
     set_mock_value(block.global_moving, True)
     with patch("ibex_bluesky_core.devices.block.asyncio.sleep") as mock_aio_sleep:
-        with pytest.raises(aio_timeout_error):
+        with pytest.raises(TimeoutError):
             await block.set(10)
         # Only check first call, as wait_for_value from ophyd_async gives us a few more...
         assert mock_aio_sleep.mock_calls[0] == call(GLOBAL_MOVING_FLAG_PRE_WAIT)
@@ -359,33 +352,36 @@ async def test_block_mot_set_within_limits(mot_block):
     get_mock_put(mot_block.user_setpoint).assert_called_once_with(20, wait=True)
 
 
-@pytest.mark.skipif(
-    ophyd_async._version.version_tuple < (0, 13, 2),
-    reason="Exception only raised in ophyd_async >= 0.13.2",
-)
 async def test_block_mot_set_outside_limits(mot_block):
     # Local import as API not available in older ophyd_async versions
-    from ophyd_async.epics.motor import MotorLimitsException  # noqa PLC0415
+    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.high_limit_travel, 15)
     set_mock_value(mot_block.low_limit_travel, 5)
-    with pytest.raises(MotorLimitsException):
+    with pytest.raises(err):
         await mot_block.set(20)
 
 
 @pytest.mark.parametrize("timeout_is_error", [True, False])
 async def test_block_failing_write(timeout_is_error):
     block = await _block_with_write_config(BlockWriteConfig(timeout_is_error=timeout_is_error))
 
-    get_mock_put(block.setpoint).side_effect = aio_timeout_error
+    get_mock_put(block.setpoint).side_effect = TimeoutError
 
-    with pytest.raises(aio_timeout_error) if timeout_is_error else nullcontext():
+    with pytest.raises(TimeoutError) if timeout_is_error else nullcontext():
         await block.set(1)
 
 
 async def test_block_failing_write_with_default_write_config(writable_block):
-    get_mock_put(writable_block.setpoint).side_effect = aio_timeout_error
-    with pytest.raises(aio_timeout_error):
+    get_mock_put(writable_block.setpoint).side_effect = TimeoutError
+    with pytest.raises(TimeoutError):
         await writable_block.set(1)