Skip to content

Fix pass-manager drawing tests for pydot 3.0 (backport #12775) #12777

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jul 16, 2024
Merged

Fix pass-manager drawing tests for pydot 3.0 (backport #12775) #12777

merged 2 commits into from
Jul 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 16, 2024

Summary

Two changes in pydot 3 changed the reference output:

  1. previously, attributes were sorted before being output. Pydot 3 stores them in declaration order. Here, we sort our attributes to maintain the closest behaviour between the two versions.

  2. Text fields (like label) that contain special characters now have their values enclosed in quote marks. This is a difference between the two versions, and we update the reference files to the new version since that's what we'll be using in CI.

Qiskit is still compatible with pydot 2 in general usage, it's just our tests that are a little more tied to the current version.

Details and comments

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

@mergify mergify bot requested review from nonhermitian and a team as code owners July 16, 2024 14:06
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Jul 16, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jul 16, 2024

Cherry-pick of c3b468c has failed:

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

You are currently cherry-picking commit c3b468c83.
  (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:   constraints.txt
	modified:   test/python/visualization/test_pass_manager_drawer.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qiskit/visualization/pass_manager_visualization.py
	both modified:   test/python/visualization/references/pass_manager_standard.dot
	both modified:   test/python/visualization/references/pass_manager_style.dot

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

@mergify mergify bot mentioned this pull request Jul 16, 2024
Merged
@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 following people are relevant to this code:

@github-actions github-actions bot added type: qa Issues and PRs that relate to testing and code quality Changelog: None Do not include in changelog mod: visualization qiskit.visualization labels Jul 16, 2024
@jakelishman
Fix pass-manager drawing tests for pydot 3.0 (#12775)
9e61ff2 
* Fix pass-manager drawing tests for pydot 3.0

Two changes in pydot 3 changed the reference output:

1. previously, attributes were sorted before being output.  Pydot 3
   stores them in declaration order.  Here, we sort our attributes to
   maintain the closest behaviour between the two versions.

2. Text fields (like `label`) that contain special characters now have
   their values enclosed in quote marks.  This is a difference between
   the two versions, and we update the reference files to the new
   version since that's what we'll be using in CI.

Qiskit is still compatible with pydot 2 in general usage, it's just our
tests that are a little more tied to the current version.

* Add test-only constraint on pydot

(cherry picked from commit c3b468c)
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.46/pr-12775 branch from bfad17a to 9e61ff2 Compare July 16, 2024 14:18
jakelishman
jakelishman previously approved these changes Jul 16, 2024
View reviewed changes
@jakelishman jakelishman enabled auto-merge July 16, 2024 14:19
@jakelishman jakelishman removed the conflicts used by mergify when there are conflicts in a port label Jul 16, 2024
@jakelishman jakelishman added this to the 0.46.3 milestone Jul 16, 2024
@coveralls
Copy link

coveralls commented Jul 16, 2024 •
edited
Loading

Pull Request Test Coverage Report for Build 9964435285

Details

  • 0 of 2 (0.0%) changed or added relevant lines in 1 file are covered.
  • 12 unchanged lines in 3 files lost coverage.
  • Overall coverage decreased (-0.01%) to 87.202%
Changes Missing Coverage Covered Lines Changed/Added Lines %
qiskit/visualization/pass_manager_visualization.py 0 2 0.0%
Files with Coverage Reduction New Missed Lines %
qiskit/visualization/pass_manager_visualization.py 1 17.65%
crates/qasm2/src/lex.rs 5 91.35%
crates/qasm2/src/parse.rs 6 97.61%
Totals Coverage Status
Change from base Build 9894870115: -0.01%
Covered Lines: 74522
Relevant Lines: 85459
💛 - Coveralls

@jakelishman jakelishman added this pull request to the merge queue Jul 16, 2024
Merged via the queue into stable/0.46 with commit 22c78f6 Jul 16, 2024
11 checks passed
@mergify mergify bot deleted the mergify/bp/stable/0.46/pr-12775 branch July 16, 2024 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakelishman jakelishman jakelishman approved these changes

@nonhermitian nonhermitian Awaiting requested review from nonhermitian nonhermitian is a code owner

Assignees
No one assigned
Labels
Changelog: None Do not include in changelog mod: visualization qiskit.visualization type: qa Issues and PRs that relate to testing and code quality
Projects
None yet
Milestone
0.46.3
Development

Successfully merging this pull request may close these issues.
3 participants
@qiskit-bot @coveralls @jakelishman