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

API: Split internal instrument.base.py module #4283

Merged
merged 10 commits into from
Jun 21, 2022

Conversation

jenshnielsen
Copy link
Collaborator

Split base into instruument.py and instrument_base.py

This matches how the parameters module now does it and has the advantage that

  1. No more ambiguous base.py
  2. Easier to work with the Instrumentbase and Instrument classes

@jenshnielsen
Copy link
Collaborator Author

To be merged after #4281 to not create a conflict

@codecov
Copy link

codecov bot commented Jun 17, 2022

Codecov Report

Merging #4283 (633d50a) into master (4b47875) will increase coverage by 0.01%.
The diff coverage is 94.18%.

@@            Coverage Diff             @@
##           master    #4283      +/-   ##
==========================================
+ Coverage   68.40%   68.41%   +0.01%     
==========================================
  Files         251      253       +2     
  Lines       30948    30962      +14     
==========================================
+ Hits        21169    21183      +14     
  Misses       9779     9779              

@jenshnielsen jenshnielsen force-pushed the api/update_interal_instruments branch from 46a0c9c to 9d2613c Compare June 17, 2022 13:01
@jenshnielsen jenshnielsen force-pushed the api/update_interal_instruments branch from b45dccf to b7fb215 Compare June 20, 2022 11:40
@jenshnielsen jenshnielsen force-pushed the api/update_interal_instruments branch from b7fb215 to 5fd7fe9 Compare June 20, 2022 14:01
qcodes/instrument/instrument_base.py Outdated Show resolved Hide resolved
qcodes/instrument/ip_to_visa.py Outdated Show resolved Hide resolved
qcodes/instrument/ip_to_visa.py Outdated Show resolved Hide resolved
jenshnielsen and others added 2 commits June 21, 2022 10:13
@jenshnielsen jenshnielsen force-pushed the api/update_interal_instruments branch from e89da5b to 633d50a Compare June 21, 2022 08:13
@jenshnielsen
Copy link
Collaborator Author

bors merge

@bors bors bot merged commit c39430f into microsoft:master Jun 21, 2022
@jenshnielsen jenshnielsen deleted the api/update_interal_instruments branch June 21, 2022 09:43
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.

None yet

2 participants