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.

Sign up for GitHub

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

Jump to bottom

Update: zhinst instrument driver stubs #3969

Merged
merged 4 commits into from
Mar 1, 2022
Merged

Update: zhinst instrument driver stubs #3969

merged 4 commits into from
Mar 1, 2022

Conversation

tobiasah
Copy link
Contributor

@tobiasah tobiasah commented Mar 1, 2022

Update driver stubs for Zurich Instruments devices.

With the latest release of LabOne 22.02 the QCoDeS driver for our instruments changed quite a bit. Not only did we add
support for all of our devices but also we changed the import statements.

This PR maps the existing stubs to the correct imports and adds new files for the newly supported device.

@jenshnielsen
Copy link
Collaborator

@tobiasah Thanks ;) I can see that you closed zhinst/zhinst-qcodes#4
If I remember correctly that was the last remaining usecase for the old QCoDeS driver so perhaps we should remove that one soon too

@jenshnielsen
Copy link
Collaborator

jenshnielsen commented Mar 1, 2022 •
edited

Should we update setup.cfg to ensuer that we depend on the 0.3 series of zhinst-qcodes?
I.e. here https://github.com/QCoDeS/Qcodes/blob/master/setup.cfg#L73

@tobiasah
Copy link
Contributor Author

tobiasah commented Mar 1, 2022

I updated the setup.cfg
Thanks for the hint

@codecov
Copy link

codecov bot commented Mar 1, 2022 •
edited

Codecov Report

Merging #3969 (0728701) into master (8cef747) will increase coverage by 0.00%.
The diff coverage is 75.00%.

@@           Coverage Diff           @@
##           master    #3969   +/-   ##
=======================================
  Coverage   65.83%   65.83%           
=======================================
  Files         228      232    +4     
  Lines       31466    31490   +24     
=======================================
+ Hits        20716    20732   +16     
- Misses      10750    10758    +8

@jenshnielsen
Copy link
Collaborator

@tobiasah I pushed a pr with a few small tweaks here https://github.com/tobiasah/Qcodes/pull/1 which should merge into this branch/pr before we merge it

@jenshnielsen
Copy link
Collaborator

bors merge

@bors
Copy link
Contributor

bors bot commented Mar 1, 2022

👎 Rejected by too few approved reviews

jenshnielsen
jenshnielsen approved these changes Mar 1, 2022
View reviewed changes
Copy link
Collaborator

@jenshnielsen jenshnielsen left a comment

Choose a reason for hiding this comment

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

bors merge

@bors
Copy link
Contributor

bors bot commented Mar 1, 2022

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@jenshnielsen
Copy link
Collaborator

bors merge

@bors
Copy link
Contributor

bors bot commented Mar 1, 2022

Stopped waiting for PR status (Github check) without running due to duplicate requests to run. You may check Bors to see that this PR is included in a batch by one of the other requests.

@bors
Copy link
Contributor

bors bot commented Mar 1, 2022

Build succeeded:

@bors bors bot merged commit 10f7706 into microsoft:master Mar 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jenshnielsen jenshnielsen jenshnielsen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tobiasah @jenshnielsen