Closed wvlothuizen closed 2 years ago
@MiguelSMoreira doesn't look too difficult to backport
@wvlothuizen it was silly of me to attempt merging of develop onto local, with all the recent changes done on develop, should have been the other way around.
That's a good point, most of the changes made were for automated calibrations (some changes of thresholds, conditions, etc for common experiments) and preventing the use of matplotlib interactively. Most other changes are relatively minor. However, I am intrigued how GitHub is able to track the changes, for example, to CCL Transmon, here since that class was 'renamed' to HAL_Transmon. Is git smart enough to track changes across files that were renamed, or is this PR done against a not-up-to-date version of develop (doesn't appear to be the case)?
Regarding the changes presented, note that Github normally shows a three-dot diff that can be confusing if you're not aware: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests#three-dot-and-two-dot-git-diff-comparisons
Merging #684 (0303a43) into develop (54b57f9) will decrease coverage by
0.01%
. The diff coverage is11.42%
.
@@ Coverage Diff @@
## develop #684 +/- ##
===========================================
- Coverage 35.77% 35.76% -0.02%
===========================================
Files 297 297
Lines 64740 64787 +47
===========================================
+ Hits 23162 23168 +6
- Misses 41578 41619 +41
Impacted Files | Coverage Δ | |
---|---|---|
...d/instrument_drivers/meta_instrument/HAL_Device.py | 4.61% <0.00%> (-0.07%) |
:arrow_down: |
...rivers/meta_instrument/inspire_dependency_graph.py | 0.00% <0.00%> (ø) |
|
...vers/meta_instrument/qubit_objects/qubit_object.py | 19.04% <ø> (ø) |
|
pycqed/analysis/measurement_analysis.py | 49.31% <33.33%> (-0.01%) |
:arrow_down: |
...vers/meta_instrument/qubit_objects/HAL_Transmon.py | 18.09% <33.33%> (+0.05%) |
:arrow_up: |
pycqed/analysis_v2/base_analysis.py | 75.43% <100.00%> (+0.05%) |
:arrow_up: |
pycqed/analysis/analysis_toolbox.py | 42.96% <0.00%> (+0.06%) |
:arrow_up: |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update 54b57f9...0303a43. Read the comment docs.
just a test to see what we would get