Skip to content

Commit b58c799

Browse files
committed
Update ophyd-async
1 parent 3fd7956 commit b58c799

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
intersphinx_mapping = {
8080
"python": ("https://docs.python.org/3", None),
8181
"bluesky": ("https://blueskyproject.io/bluesky/main/", None),
82-
"ophyd_async": ("https://blueskyproject.io/ophyd-async/v0.12.3/", None),
82+
"ophyd_async": ("https://blueskyproject.io/ophyd-async/v0.13.4/", None),
8383
"event_model": ("https://blueskyproject.io/event-model/main/", None),
8484
"scipp": ("https://scipp.github.io/", None),
8585
"scippneutron": ("https://scipp.github.io/scippneutron/", None),

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ classifiers = [
4141

4242
dependencies = [
4343
"bluesky", # Bluesky framework
44-
"ophyd-async[ca] == 0.12.3", # Device abstraction. When changing, also change in doc/conf.py
44+
"ophyd-async[ca] == 0.13.4", # Device abstraction. When changing, also change in doc/conf.py
4545
"matplotlib", # Plotting
4646
"lmfit", # Fitting
4747
"scipy", # Definitions of erf/erfc functions

tests/devices/test_block.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,19 +359,22 @@ async def test_block_mot_set_within_limits(mot_block):
359359
get_mock_put(mot_block.user_setpoint).assert_called_once_with(20, wait=True)
360360

361361

362-
@pytest.mark.skipif(
363-
ophyd_async._version.version_tuple < (0, 13, 2),
364-
reason="Exception only raised in ophyd_async >= 0.13.2",
365-
)
366362
async def test_block_mot_set_outside_limits(mot_block):
367363
# Local import as API not available in older ophyd_async versions
368-
from ophyd_async.epics.motor import MotorLimitsException # noqa PLC0415
364+
if ophyd_async._version.version_tuple >= (0, 13, 5):
365+
from ophyd_async.epics.motor import MotorLimitsError # noqa PLC0415
366+
367+
err = MotorLimitsError
368+
else:
369+
from ophyd_async.epics.motor import MotorLimitsException # noqa PLC0415
370+
371+
err = MotorLimitsException
369372

370373
set_mock_value(mot_block.user_setpoint, 10)
371374
set_mock_value(mot_block.velocity, 10)
372375
set_mock_value(mot_block.high_limit_travel, 15)
373376
set_mock_value(mot_block.low_limit_travel, 5)
374-
with pytest.raises(MotorLimitsException):
377+
with pytest.raises(err):
375378
await mot_block.set(20)
376379

377380

0 commit comments

Comments
 (0)