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

Reformat pyext to avoid merge conflicts #13147

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

jakelishman
Copy link
Member

Summary

Since we're still in a phase of adding many new extension modules to pyext, the current structure of the file is causing problems with most commits hitting merge conflicts in the use block. This changes the style of the file so that each new module takes only a single line, which is more friendly to avoiding merge conflicts, and fixing them when they arise.

Details and comments

I don't feel super strongly about this, just it's been a slight annoyance I've seen a few people have, and I just did too.

@jakelishman jakelishman added type: qa Issues and PRs that relate to testing and code quality Changelog: None Do not include in changelog Rust This PR or issue is related to Rust code in the repository labels Sep 13, 2024
@jakelishman jakelishman requested a review from a team as a code owner September 13, 2024 10:34
@qiskit-bot
Copy link
Collaborator

One or more of the following people are relevant to this code:

  • @Qiskit/terra-core
  • @kevinhartman
  • @mtreinish

Copy link
Contributor

@ElePT ElePT left a comment

Choose a reason for hiding this comment

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

As a merge conflict victim, I'd be in favor of the change :)

@coveralls
Copy link

coveralls commented Sep 13, 2024

Pull Request Test Coverage Report for Build 10945790303

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 34 of 34 (100.0%) changed or added relevant lines in 1 file are covered.
  • 26 unchanged lines in 5 files lost coverage.
  • Overall coverage decreased (-0.03%) to 88.764%

Files with Coverage Reduction New Missed Lines %
crates/accelerate/src/two_qubit_decompose.rs 1 91.45%
qiskit/transpiler/passes/synthesis/unitary_synthesis.py 2 88.26%
crates/qasm2/src/lex.rs 4 91.98%
qiskit/synthesis/two_qubit/xx_decompose/decomposer.py 7 90.91%
crates/qasm2/src/parse.rs 12 96.69%
Totals Coverage Status
Change from base Build 10945433225: -0.03%
Covered Lines: 73461
Relevant Lines: 82760

💛 - Coveralls

@jakelishman
Copy link
Member Author

Huh, that lint failure is a true lint failure - that function doesn't exist, but I'm curious why lint didn't fail on #12959, which is what actually removed it. I'll fix it in a separate PR.

Since we're still in a phase of adding many new extension modules to
`pyext`, the current structure of the file is causing problems with most
commits hitting merge conflicts in the `use` block.  This changes the
style of the file so that each new module takes only a single line,
which is more friendly to avoiding merge conflicts, and fixing them when
they arise.
@jakelishman
Copy link
Member Author

Ok, rebased and now this should pass lint.

@jakelishman jakelishman added this pull request to the merge queue Sep 19, 2024
Merged via the queue into Qiskit:main with commit e97f31b Sep 19, 2024
15 checks passed
@jakelishman jakelishman deleted the reduce-conflicts branch September 19, 2024 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: None Do not include in changelog Rust This PR or issue is related to Rust code in the repository type: qa Issues and PRs that relate to testing and code quality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants