Skip to content

Update HamiltonianGate path and add tolerance to PulseBackend (backport #1280)#1366

Closed
mergify[bot] wants to merge 4 commits into
stable/0.5from
mergify/bp/stable/0.5/pr-1280
Closed

Update HamiltonianGate path and add tolerance to PulseBackend (backport #1280)#1366
mergify[bot] wants to merge 4 commits into
stable/0.5from
mergify/bp/stable/0.5/pr-1280

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Jan 23, 2024

This is an automatic backport of pull request #1280 done by Mergify.
Cherry-pick of 73d0a03 has failed:

On branch mergify/bp/stable/0.5/pr-1280
Your branch is up to date with 'origin/stable/0.5'.

You are currently cherry-picking commit 73d0a03.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   qiskit_experiments/test/pulse_backend.py
	modified:   releasenotes/notes/0.3/cleanup-cr-hamiltonian-experiment-7f47c51d26941f16.yaml
	modified:   test/library/calibration/test_rabi.py
	modified:   test/library/calibration/test_rough_frequency.py
	modified:   test/library/characterization/test_cross_resonance_hamiltonian.py
	modified:   test/library/characterization/test_multi_state_discrimination.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   qiskit_experiments/test/__init__.py
	deleted by us:   test/library/calibration/test_half_angle.py
	both modified:   test/library/calibration/test_rough_amplitude.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

)

### Summary

After `qiskit.extensions` was deprecated in
Qiskit/qiskit#10725, this PR updates the path of
`HamiltonianGate` so tests against Qiskit main pass again. This also
adds `atol` and `rtol` tolerance parameters to `PulseBackend` for
speeding up slow tests.

(cherry picked from commit 73d0a03)

# Conflicts:
#	qiskit_experiments/test/__init__.py
#	test/library/calibration/test_half_angle.py
#	test/library/calibration/test_rough_amplitude.py
@mergify mergify Bot added the conflicts label Jan 23, 2024
@coruscating
Copy link
Copy Markdown
Collaborator

Not needed since failing tests were addressed in #1365.

@mergify mergify Bot deleted the mergify/bp/stable/0.5/pr-1280 branch January 25, 2024 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant