Skip to content

Fix mpl circuit drawer with fold=-1 hanging with ControlFlow ops (backport #12016) #12036

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

Merged
merged 6 commits into from
Mar 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 18, 2024

Summary

Fixes #12012

Details and comments

This PR fixes a hang in the mpl circuit drawer when fold is set to -1 and there are ControlFlow ops in the circuit.


This is an automatic backport of pull request #12016 done by [Mergify](https://mergify.com).

)

* Fix typing-extensions

* Fix control flow with fold minus one

(cherry picked from commit 43381ae)

# Conflicts:
#	test/visual/mpl/circuit/test_circuit_matplotlib_drawer.py
@mergify mergify bot requested review from nonhermitian and a team as code owners March 18, 2024 18:02
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Mar 18, 2024
Copy link
Contributor Author

mergify bot commented Mar 18, 2024

Cherry-pick of 43381ae has failed:

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

You are currently cherry-picking commit 43381ae1b.
  (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/visualization/circuit/matplotlib.py
	new file:   releasenotes/notes/fix-control-flow-fold-minus-one-f2af168a5313385f.yaml
	new file:   test/visual/mpl/circuit/references/control_flow_fold_minus_one.png

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/visual/mpl/circuit/test_circuit_matplotlib_drawer.py

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

@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:

@github-actions github-actions bot added the Changelog: Bugfix Include in the "Fixed" section of the changelog label Mar 18, 2024
@coveralls
Copy link

coveralls commented Mar 18, 2024

Pull Request Test Coverage Report for Build 8376275249

Details

  • 0 of 1 (0.0%) changed or added relevant line in 1 file are covered.
  • 19 unchanged lines in 3 files lost coverage.
  • Overall coverage increased (+0.01%) to 86.853%

Changes Missing Coverage Covered Lines Changed/Added Lines %
qiskit/visualization/circuit/matplotlib.py 0 1 0.0%
Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/expr.rs 1 94.03%
crates/qasm2/src/lex.rs 6 92.11%
crates/qasm2/src/parse.rs 12 97.15%
Totals Coverage Status
Change from base Build 8206600256: 0.01%
Covered Lines: 74991
Relevant Lines: 86342

💛 - Coveralls

1ucian0
1ucian0 previously approved these changes Mar 19, 2024
@1ucian0 1ucian0 enabled auto-merge March 19, 2024 11:01
@1ucian0 1ucian0 removed the conflicts used by mergify when there are conflicts in a port label Mar 19, 2024
@1ucian0 1ucian0 added this to the 0.46.2 milestone Mar 20, 2024
@1ucian0 1ucian0 added this pull request to the merge queue Mar 22, 2024
Merged via the queue into stable/0.46 with commit 08f5812 Mar 22, 2024
@mergify mergify bot deleted the mergify/bp/stable/0.46/pr-12016 branch March 22, 2024 08:28
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants