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

Milestone/release 0.5rc #519

Merged
merged 27 commits into from
Feb 19, 2020
Merged

Milestone/release 0.5rc #519

merged 27 commits into from
Feb 19, 2020

Conversation

terrorfisch
Copy link
Member

  • write more docs
  • write more TODO

@terrorfisch
First draft of a scope based parameter representation
bb44f30
@terrorfisch
Remove Condition and Sequencer (tests not updated)
f2ded70
@terrorfisch
Remove InstructionBlock and MultiChannelProgram
ea505b5
@terrorfisch
Remove is_interruptable
1d4e29c
@terrorfisch
Remote object.__init__ call (I did not undestand the problem it created)
4c0afa7
@terrorfisch
Update pulse template tests
fdfc9ad
@terrorfisch
Remove Instruction block usage
69011aa
@terrorfisch
Fix test imports (tests do still fail because they are InstructionBlo…
e3f6700 
…ck/Sequencer based)
@terrorfisch
Fix backward compability sequencing
24e552f
@terrorfisch
Replaced MultichannelProgram by Loop in hardware/setup.py
9fc11e3 
Conflicts:
	qupulse/hardware/setup.py
@terrorfisch
Re-remove instruction block
81178f6
@terrorfisch
Do not depend on implicit Parameter conversion
3216d89
@terrorfisch
Only calc FrozenDict hash if required
d3a78f0
@terrorfisch
Partial conversion to scope based parameter usage
ae5eb48
@terrorfisch
Merge branch 'issues/514/remove_old_sequencer' into issues/512/scope_…
d0f2ad6 
…ansatz

# Conflicts:
#	qupulse/pulses/loop_pulse_template.py
@terrorfisch
Update loop_pulse_template.py and measurement.py
9d8a68e
@terrorfisch
Merge branch 'milestone/release_0.5'
73231d0 
Conflicts:
	qupulse/_program/_loop.py
	qupulse/hardware/setup.py
	qupulse/pulses/loop_pulse_template.py
	qupulse/pulses/mapping_pulse_template.py
	qupulse/pulses/parameters.py
	qupulse/pulses/pulse_template.py
	qupulse/pulses/repetition_pulse_template.py
	qupulse/pulses/sequence_pulse_template.py
	qupulse/utils/types.py
	tests/_program/loop_tests.py
	tests/pulses/loop_pulse_template_tests.py
	tests/pulses/pulse_template_tests.py
	tests/pulses/repetition_pulse_template_tests.py
@terrorfisch
Stitch everything together
3a006eb
@terrorfisch
Merge setup_tests fix
b5acfe0 
Conflicts:
	tests/hardware/setup_tests.py
@terrorfisch
More parameter scope tests
9451eaa
@terrorfisch
More scope tests
35450cf
@terrorfisch
Change abstract Frozen mapping
4bc7c99
@terrorfisch
Merge remote-tracking branch 'origin/milestone/release_0.5rc' into mi…
323c611 
…lestone/release_0.5rc
@terrorfisch
Add two frozen dict variants
ddf6a9c
@terrorfisch
Add is_simulator to dummy module
d423b88
@terrorfisch
Replace frozendict by frozen mapping where appropriate
51451b9
@terrorfisch
Fix all tests
af8c049
@coveralls
Copy link

coveralls commented Feb 19, 2020 •
edited
Loading

Pull Request Test Coverage Report for Build 2089

  • 1160 of 1330 (87.22%) changed or added relevant lines in 28 files are covered.
  • 15 unchanged lines in 5 files lost coverage.
  • Overall coverage increased (+0.07%) to 85.781%
Changes Missing Coverage Covered Lines Changed/Added Lines %
qupulse/hardware/awgs/tektronix.py 1 2 50.0%
qupulse/pulses/repetition_pulse_template.py 13 14 92.86%
qupulse/pulses/loop_pulse_template.py 20 22 90.91%
qupulse/pulses/pulse_template.py 22 24 91.67%
qupulse/hardware/awgs/base.py 23 26 88.46%
qupulse/utils/types.py 74 78 94.87%
qupulse/hardware/setup.py 24 32 75.0%
qupulse/pulses/parameters.py 50 58 86.21%
qupulse/hardware/awgs/zihdawg.py 10 22 45.45%
qupulse/_program/seqc.py 106 119 89.08%
Files with Coverage Reduction New Missed Lines %
qupulse/_program/_loop.py 1 85.64%
qupulse/pulses/parameters.py 1 91.9%
qupulse/pulses/plotting.py 2 87.95%
qupulse/hardware/awgs/tabor.py 4 75.14%
qupulse/utils/tree.py 7 87.98%
Totals Coverage Status
Change from base Build 1988: 0.07%
Covered Lines: 6105
Relevant Lines: 6996
💛 - Coveralls

@terrorfisch terrorfisch changed the base branch from master to milestone/release_0.5 February 19, 2020 11:54
@terrorfisch terrorfisch merged commit 70f8e66 into milestone/release_0.5 Feb 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@terrorfisch @coveralls