-
Notifications
You must be signed in to change notification settings - Fork 372
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
maint: Ignore formatting changes in history #3738
maint: Ignore formatting changes in history #3738
Conversation
Not allowing to both change style and something meaningful in the same PR is definitely up to reviewers. |
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.
LGTM modulo a title change to something like "maint: Ignore formatting changes in history" since this ignores more than those two files.
Co-authored-by: Julien Jerphanion <[email protected]>
Co-authored-by: Julien Jerphanion <[email protected]>
35911ca
to
f5a2529
Compare
@jjerphan I rebased the changes, and added |
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.
Thank you for handling this!
# 7d6856e9b56fbff35a6563889a737824054cf51f | ||
# Add CondaURL (#2805) | ||
# a527511c14ade1db03b3a88cf9c603eb35469663 | ||
# bump clang-format to 13.0.1 and make it work again |
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.
# bump clang-format to 13.0.1 and make it work again | |
# bump clang-format to 13.0.1 and make it work again (PR number) |
Can we add the PR number like in the others? (some numbers are missing here and there below).
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.
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.
And I don't want to manually add PR numbers to other places - I don't see a lot of sense, and it will be more difficult to update this file later (more manual changes - less clear it is).
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.
I agree that we shouldn't do this manually, but I'm wondering why it was added automatically in some and not others? Was it because they were all not PRs?
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.
Some of them were PRs.
Until 2022-10-26
, some PRs were not squashed when merged to the main
branch.
If you squash merge, GitHub automatically adds a PR number to the commit message.
If you don't, then you get the original commit and the original commit message (so there will be no PR number).
You can notice, that the lines without PR numbers are always at the bottom of the lists, so we won't have such a problem in the future (unless someone forgets to squash when merging the PR).
|
||
# Enforce space between definitions (#3049) | ||
21675b6517ff5da3c4dc91b9083366136308db2d | ||
# Attempt to fix CI (#2637) | ||
50a627e002d8260fa2e116e5833190a135aff4e8 |
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.
This seems to be more than formatting, so should be commented?
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.
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.
Thanks!
@Hind-M @JohanMabille @jjerphan I forgot to tell you — And to make it even better, I would also recommend adding https://pre-commit.ci as an app:
We've been using it for years across several jupyter projects - it works really well. Updated: an issue: #3741 |
No description provided.