Skip to content

Update tests with complex amp pulses (backport #1217)#1257

Merged
coruscating merged 2 commits into
stable/0.5from
mergify/bp/stable/0.5/pr-1217
Aug 28, 2023
Merged

Update tests with complex amp pulses (backport #1217)#1257
coruscating merged 2 commits into
stable/0.5from
mergify/bp/stable/0.5/pr-1217

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Aug 25, 2023

This is an automatic backport of pull request #1217 done by Mergify.
Cherry-pick of ad8aa79 has failed:

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

You are currently cherry-picking commit ad8aa79.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/calibration/test_calibrations.py

no changes added to commit (use "git add" and/or "git commit -a")

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

This PR removes complex amplitudes from pulses in tests after
Qiskit/qiskit#10357.

(cherry picked from commit ad8aa79)

# Conflicts:
#	test/calibration/test_calibrations.py
@coruscating coruscating merged commit f76b889 into stable/0.5 Aug 28, 2023
@coruscating coruscating deleted the mergify/bp/stable/0.5/pr-1217 branch August 28, 2023 16:08
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