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

generalize MultiType, add OR and AND subclasses #3917

Merged
merged 11 commits into from
Feb 18, 2022

Conversation

jakeogh
Copy link
Contributor

@jakeogh jakeogh commented Feb 11, 2022

Generalize MultiType to allow the OR and AND cases, fix for QCoDeS/Qcodes_contrib_drivers#115

@jakeogh jakeogh force-pushed the MultiType_with_default_combiner_arg branch from 24ede3d to a7d0c02 Compare February 11, 2022 08:47
@jenshnielsen
Copy link
Collaborator

Thanks, Left a few comments inline

@codecov
Copy link

codecov bot commented Feb 17, 2022

Codecov Report

Merging #3917 (404fcb9) into master (9cc11fe) will decrease coverage by 0.26%.
The diff coverage is 96.15%.

@@            Coverage Diff             @@
##           master    #3917      +/-   ##
==========================================
- Coverage   66.07%   65.81%   -0.27%     
==========================================
  Files         228      228              
  Lines       31160    31423     +263     
==========================================
+ Hits        20590    20681      +91     
- Misses      10570    10742     +172     

@jenshnielsen
Copy link
Collaborator

bors merge

@bors
Copy link
Contributor

bors bot commented Feb 18, 2022

👎 Rejected by too few approved reviews

@jenshnielsen
Copy link
Collaborator

@jakeogh thanks for your contribution. I reformatted the code using our current style and added a changelog entry to make this ready to merge

@jenshnielsen
Copy link
Collaborator

bors merge

@bors
Copy link
Contributor

bors bot commented Feb 18, 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.

@bors bors bot merged commit b13c585 into microsoft:master Feb 18, 2022
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.

2 participants