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

Update Black (2025 style) #13193

Merged
merged 2 commits into from
Feb 3, 2025
Merged

Update Black (2025 style) #13193

merged 2 commits into from
Feb 3, 2025

Conversation

notatallshaw
Copy link
Member

Copy link
Member

@ichard26 ichard26 left a comment

Choose a reason for hiding this comment

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

LGTM. It's neat to see the changes I approved years ago finally reach the stable style.

I'll note that we should probably add this commit to the .git-blame-ignore-revs file, but I'll do that before merging. I'll leave this open for objections for the time being.

@ichard26 ichard26 added the skip news Does not need a NEWS file entry (eg: trivial changes) label Feb 3, 2025
@ichard26
Copy link
Member

ichard26 commented Feb 3, 2025

I squashed all of the commits to a single one and then added it to .git-blame-ignore-revs. It does dawn on me that the .pre-commit-config.yaml changes shouldn't be ignored, but it's not a huge deal. It'll get overwritten once the next release of Black comes out anyway.

@ichard26 ichard26 enabled auto-merge February 3, 2025 17:08
@ichard26 ichard26 merged commit 7e9c87a into pypa:main Feb 3, 2025
31 checks passed
@sbidoul
Copy link
Member

sbidoul commented Feb 3, 2025

@ichard26 if possible please don't merge until 25.0.1 is out (no big deal with this one, though).

@notatallshaw
Copy link
Member Author

Yeah, I'd specifically avoided merging while 25.0 release is still open.

@ichard26
Copy link
Member

ichard26 commented Feb 3, 2025

Sorry about that! I understood the keeping main quiet as avoid merging any feature/bugfix/user-facing changes. I get that any change can destabilize the bugfix release, I'll avoid merging anything until after 25.0.1 👍

@sbidoul
Copy link
Member

sbidoul commented Feb 3, 2025

No worries, this one looks really harmless, and the option to cherry pick is still there in any case.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 19, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bot:chronographer:provided skip news Does not need a NEWS file entry (eg: trivial changes)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants