Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to ophyd-async 0.6.0 #796

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Update to ophyd-async 0.6.0 #796

merged 2 commits into from
Sep 20, 2024

Conversation

DiamondJoseph
Copy link
Contributor

Fixes #794

Instructions to reviewer on how to test:

  1. Do thing x
  2. Confirm thing y happens

Checks for reviewer

  • Would the PR title make sense to a scientist on a set of release notes
  • If a new device has been added does it follow the standards
  • If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
  • Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

Copy link

codecov bot commented Sep 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.91%. Comparing base (cc5ccf1) to head (157720a).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #796   +/-   ##
=======================================
  Coverage   94.90%   94.91%           
=======================================
  Files         115      115           
  Lines        4675     4677    +2     
=======================================
+ Hits         4437     4439    +2     
  Misses        238      238           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@DominicOram DominicOram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One comment, otherwise looks good.

src/dodal/devices/tetramm.py Show resolved Hide resolved
@DominicOram
Copy link
Contributor

Given the tests are on 3.10 only and mention timeouts I'm going to bet that they're to do with TimeoutError and asyncio.TimeoutError being different in 3.10. Probably caused by bluesky/ophyd-async#573

@DiamondJoseph
Copy link
Contributor Author

TimeoutError and asyncio.TimeoutError being different in 3.10. Probably caused by bluesky/ophyd-async#573

For now I've imported TimeoutError from asyncio: in 3.10 this will be the asyncio.TimeoutError, in >3.10 this returns the builting TimeoutError. Either TypeChecking will shout at us or there's this ticket to remove the import after 3.10

@olliesilvester olliesilvester merged commit 3f59ce0 into main Sep 20, 2024
18 checks passed
@olliesilvester olliesilvester deleted the update-ophyd-async branch September 20, 2024 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to ophyd-async 0.6.0
3 participants