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.

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

Qiskit gates not qelib1.inc are now defined when dumped (backport #9777) #9778

Merged
merged 4 commits into from
Mar 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 10, 2023

This is an automatic backport of pull request #9777 done by Mergify.
Cherry-pick of 5a62949 has failed:

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

You are currently cherry-picking commit 5a62949dd.
  (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/circuit/quantumcircuit.py
	new file:   releasenotes/notes/fix_9559-ec05304e52ff841f.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/python/circuit/test_circuit_qasm.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

* non-standard gates

* Qiskit gates not qelib1.inc are now defined when dumped

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 5a62949)

# Conflicts:
#	test/python/circuit/test_circuit_qasm.py
@mergify mergify bot requested a review from a team as a code owner March 10, 2023 22:40
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Mar 10, 2023
@qiskit-bot
Copy link
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the the following people are requested to review this:

  • @Qiskit/terra-core

@1ucian0
Copy link
Member

1ucian0 commented Mar 11, 2023

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Mar 11, 2023

refresh

✅ Pull request refreshed

@1ucian0 1ucian0 added Changelog: Bugfix Include in the "Fixed" section of the changelog automerge mod: qasm2 Relating to OpenQASM 2 import or export labels Mar 11, 2023
@1ucian0 1ucian0 self-assigned this Mar 11, 2023
@1ucian0
Copy link
Member

1ucian0 commented Mar 11, 2023

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Mar 11, 2023

refresh

✅ Pull request refreshed

@1ucian0 1ucian0 merged commit 881e0d9 into stable/0.23 Mar 11, 2023
@mergify mergify bot deleted the mergify/bp/stable/0.23/pr-9777 branch March 11, 2023 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: Bugfix Include in the "Fixed" section of the changelog conflicts used by mergify when there are conflicts in a port mod: qasm2 Relating to OpenQASM 2 import or export
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants