From efad00a99449f793f9000f60f3ea33c2820f7e21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Nov 2025 14:17:03 +0000 Subject: [PATCH 1/3] Bump ophyd-async[ca] from 0.13.6 to 0.13.7 Bumps [ophyd-async[ca]](https://github.com/bluesky/ophyd-async) from 0.13.6 to 0.13.7. - [Release notes](https://github.com/bluesky/ophyd-async/releases) - [Commits](https://github.com/bluesky/ophyd-async/compare/v0.13.6...v0.13.7) --- updated-dependencies: - dependency-name: ophyd-async[ca] dependency-version: 0.13.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c84bcda9..663279f3 100644 --- a/pyproject.toml +++ b/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.13.7", # Device abstraction. When changing, also change in doc/conf.py "lmfit", # Fitting "matplotlib", # Plotting "msgpack-numpy", # Encoding kafka messages From a860b8ecb93cc682e2fc9c18c7424f8e8186c5ff Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Wed, 19 Nov 2025 15:53:13 +0000 Subject: [PATCH 2/3] fix failing test by using dial lims --- tests/devices/test_block.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/devices/test_block.py b/tests/devices/test_block.py index e63d391d..2fd3a1c6 100644 --- a/tests/devices/test_block.py +++ b/tests/devices/test_block.py @@ -365,8 +365,8 @@ async def test_block_mot_set_outside_limits(mot_block): 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) + set_mock_value(mot_block.dial_high_limit_travel, 15) + set_mock_value(mot_block.dial_low_limit_travel, 5) with pytest.raises(err): await mot_block.set(20) From 0dea01ff83b3115dac77332cc668dd2b8576bb4e Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Wed, 19 Nov 2025 15:58:04 +0000 Subject: [PATCH 3/3] remove conditional import as behaviour now changed --- tests/devices/test_block.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/devices/test_block.py b/tests/devices/test_block.py index 2fd3a1c6..1dd85487 100644 --- a/tests/devices/test_block.py +++ b/tests/devices/test_block.py @@ -4,8 +4,8 @@ import bluesky.plan_stubs as bps import bluesky.plans as bp -import ophyd_async import pytest +from ophyd_async.epics.motor import MotorLimitsError from ophyd_async.testing import get_mock_put, set_mock_value from ibex_bluesky_core.devices.block import ( @@ -353,21 +353,11 @@ 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) - with pytest.raises(err): + with pytest.raises(MotorLimitsError): await mot_block.set(20)