-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Conversation
One or more of the following people are relevant to this code:
|
There was a problem hiding this 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 :)
Pull Request Test Coverage Report for Build 10945790303Warning: 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
💛 - Coveralls |
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.
368bf4a
to
97bdcb4
Compare
Ok, rebased and now this should pass lint. |
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 theuse
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.