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

Fix issues with ControlFlowOp displays (backport #10842) #10917

Merged
merged 1 commit into from
Sep 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2023

This is an automatic backport of pull request #10842 done by Mergify.
Cherry-pick of 404df43 has failed:

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

You are currently cherry-picking commit 404df4327.
  (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-flow-cregbundle-transpiled-482979d57382b1dc.yaml
	modified:   test/visual/mpl/circuit/references/fold_with_conditions.png
	renamed:    test/visual/mpl/circuit/references/if_else_op.png -> test/visual/mpl/circuit/references/if_else_op_false.png
	new file:   test/visual/mpl/circuit/references/if_else_op_true.png
	new file:   test/visual/mpl/circuit/references/layout_control_flow.png
	new file:   test/visual/mpl/circuit/references/nested_layout_control_flow.png

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

@mergify mergify bot requested review from nonhermitian and a team as code owners September 29, 2023 15:09
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Sep 29, 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:

@github-actions github-actions bot added Changelog: Bugfix Include in the "Fixed" section of the changelog mod: visualization qiskit.visualization labels Sep 29, 2023
@github-actions github-actions bot added this to the 0.25.2 milestone Sep 29, 2023
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.25/pr-10842 branch from 60f1ab1 to 207278a Compare September 29, 2023 16:20
@jakelishman jakelishman removed the conflicts used by mergify when there are conflicts in a port label Sep 29, 2023
Cherry-picked version of only the MPL-drawer changes from the given
commit, since the text-drawer support for dynamic circuits is not in the
old version.

(cherry picked from commit 404df43)

Co-authored-by: Jake Lishman <[email protected]>
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.25/pr-10842 branch from 207278a to 5561cff Compare September 29, 2023 16:21
Copy link
Member

@jakelishman jakelishman left a comment

Choose a reason for hiding this comment

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

I've re-cherry-picked out only the MPL-drawer components from #10842, since the text-drawer changes aren't in the 0.25 series.

@coveralls
Copy link

Pull Request Test Coverage Report for Build 6354291019

  • 19 of 53 (35.85%) changed or added relevant lines in 1 file are covered.
  • 7 unchanged lines in 3 files lost coverage.
  • Overall coverage increased (+0.03%) to 87.263%

Changes Missing Coverage Covered Lines Changed/Added Lines %
qiskit/visualization/circuit/matplotlib.py 19 53 35.85%
Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/expr.rs 1 93.76%
crates/qasm2/src/lex.rs 3 92.42%
qiskit/visualization/circuit/matplotlib.py 3 49.74%
Totals Coverage Status
Change from base Build 6343988061: 0.03%
Covered Lines: 74150
Relevant Lines: 84973

💛 - Coveralls

@jakelishman jakelishman added this pull request to the merge queue Sep 29, 2023
Merged via the queue into stable/0.25 with commit 6046106 Sep 29, 2023
@mergify mergify bot deleted the mergify/bp/stable/0.25/pr-10842 branch September 29, 2023 19:07
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 mod: visualization qiskit.visualization
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants