Skip to content

Update tests with complex amp pulses#1217

Merged
coruscating merged 2 commits into
qiskit-community:mainfrom
coruscating:update-complex-amp-pulse
Jul 7, 2023
Merged

Update tests with complex amp pulses#1217
coruscating merged 2 commits into
qiskit-community:mainfrom
coruscating:update-complex-amp-pulse

Conversation

@coruscating
Copy link
Copy Markdown
Collaborator

Summary

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

Copy link
Copy Markdown
Collaborator

@nkanazawa1989 nkanazawa1989 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@coruscating coruscating added this pull request to the merge queue Jul 7, 2023
Merged via the queue into qiskit-community:main with commit ad8aa79 Jul 7, 2023
@coruscating coruscating added the backport stable potential The issue or PR might be minimal and/or import enough to backport to stable label Aug 25, 2023
mergify Bot pushed a commit that referenced this pull request Aug 25, 2023
### 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 added a commit that referenced this pull request Aug 28, 2023
This is an automatic backport of pull request #1217 done by
[Mergify](https://mergify.com).
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

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

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](https://dashboard.mergify.com) you
can:

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

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

---------

Co-authored-by: Helena Zhang <Helena.Zhang@ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport stable potential The issue or PR might be minimal and/or import enough to backport to stable

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants