qiboteam / qibolab

Quantum hardware module and drivers for Qibo.
https://qibo.science
Apache License 2.0
41 stars 10 forks source link

Merge main to 0.2 #812

Closed stavros11 closed 5 months ago

stavros11 commented 5 months ago

Just merging main and fixing the conflicts. Most conflicts were in the QM files.

In principle I could push directly to the 0.2 branch, but I thought it is better to let people know. @alecandido feel free to merge directly. The diff is large because it's been a while we did not update this.

codecov[bot] commented 5 months ago

Codecov Report

Attention: 114 lines in your changes are missing coverage. Please review.

Comparison is base (51d7cf7) 63.14% compared to head (5b6bbb4) 64.26%.

Files Patch % Lines
src/qibolab/instruments/qm/controller.py 74.05% 48 Missing :warning:
src/qibolab/instruments/qm/acquisition.py 69.89% 28 Missing :warning:
src/qibolab/instruments/qblox/controller.py 0.00% 9 Missing :warning:
src/qibolab/instruments/zhinst.py 78.57% 9 Missing :warning:
src/qibolab/instruments/qm/config.py 88.33% 7 Missing :warning:
src/qibolab/instruments/qblox/cluster_qrm_rf.py 0.00% 5 Missing :warning:
src/qibolab/instruments/qblox/acquisition.py 66.66% 3 Missing :warning:
src/qibolab/instruments/qm/sweepers.py 0.00% 2 Missing :warning:
src/qibolab/channels.py 80.00% 1 Missing :warning:
src/qibolab/instruments/qm/devices.py 98.18% 1 Missing :warning:
... and 1 more
Additional details and impacted files ```diff @@ Coverage Diff @@ ## 0.2 #812 +/- ## ========================================== + Coverage 63.14% 64.26% +1.12% ========================================== Files 53 54 +1 Lines 5581 5835 +254 ========================================== + Hits 3524 3750 +226 - Misses 2057 2085 +28 ``` | [Flag](https://app.codecov.io/gh/qiboteam/qibolab/pull/812/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=qiboteam) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/qiboteam/qibolab/pull/812/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=qiboteam) | `64.26% <80.64%> (+1.12%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=qiboteam#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

alecandido commented 5 months ago

I will leave it here for a while, in case anyone wanted to take a look. But I will not review myself. Then I'll just merge.

alecandido commented 5 months ago

Ok, enough time, I'm merging ;)