Skip to content

Black suddenly wants to add a bunch of commas?#15254

Merged
pllim merged 1 commit into
astropy:mainfrom
WilliamJamieson:feature/pyproject-black
Aug 30, 2023
Merged

Black suddenly wants to add a bunch of commas?#15254
pllim merged 1 commit into
astropy:mainfrom
WilliamJamieson:feature/pyproject-black

Conversation

@WilliamJamieson
Copy link
Copy Markdown
Contributor

@WilliamJamieson WilliamJamieson commented Aug 30, 2023 •
edited
Loading

Description

As part of transitioning from using the setup.cfg file to using the pyproject.toml file for project configuration in #15247, black for reasons which are unclear to me decided that it wants to alter other code despite the fact that no alterations to the configuration for black have been made. @astrofrog in #15247 (comment) requested that these changes be separated from the main changes proposed by #15247. This PR makes all these automated changes proposed by black as the triggered by #15247, as these changes are apparently fine without the main changes from #15247.

  • By checking this box, the PR author has requested that maintainers do NOT use the "Squash and Merge" button. Maintainers should respect this when possible; however, the final decision is at the discretion of the maintainer that merges the PR.

@WilliamJamieson WilliamJamieson requested review from a team, dhomeier and taldcroft as code owners August 30, 2023 14:08
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 30, 2023

Thank you for your contribution to Astropy! 🌌 This checklist is meant to remind the package maintainers who will review this pull request of some common things to look for.

  • Do the proposed changes actually accomplish desired goals?
  • Do the proposed changes follow the Astropy coding guidelines?
  • Are tests added/updated as required? If so, do they follow the Astropy testing guidelines?
  • Are docs added/updated as required? If so, do they follow the Astropy documentation guidelines?
  • Is rebase and/or squash necessary? If so, please provide the author with appropriate instructions. Also see instructions for rebase and squash.
  • Did the CI pass? If no, are the failures related? If you need to run daily and weekly cron jobs as part of the PR, please apply the "Extra CI" label. Codestyle issues can be fixed by the bot.
  • Is a change log needed? If yes, did the change log check pass? If no, add the "no-changelog-entry-needed" label. If this is a manual backport, use the "skip-changelog-checks" label unless special changelog handling is necessary.
  • Is this a big PR that makes a "What's new?" entry worthwhile and if so, is (1) a "what's new" entry included in this PR and (2) the "whatsnew-needed" label applied?
  • Is a milestone set? Milestone must be set but we cannot check for it on Actions; do not let the green checkmark fool you.
  • At the time of adding the milestone, if the milestone set requires a backport to release branch(es), apply the appropriate "backport-X.Y.x" label(s) before merge.

@WilliamJamieson WilliamJamieson mentioned this pull request Aug 30, 2023
Merged
1 task
nstarman
nstarman approved these changes Aug 30, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@nstarman nstarman left a comment

Choose a reason for hiding this comment

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

I'd prefer it if black didn't do this, but all these changes are fine and consistent with our code style.

@WilliamJamieson WilliamJamieson mentioned this pull request Aug 30, 2023
Closed
@pllim pllim added this to the v6.0 milestone Aug 30, 2023
@pllim pllim added the black Related to `black` styling label Aug 30, 2023
pllim
pllim approved these changes Aug 30, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@pllim pllim left a comment

Choose a reason for hiding this comment

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

Approving based on reply on psf/black#3859 . Thanks for tracking it down and separating it out to a different PR!

@pllim
Copy link
Copy Markdown
Member

pllim commented Aug 30, 2023

devdeps failure is unrelated.

`np.lib.arraysetops` is now private.

@pllim pllim merged commit 8beec6d into astropy:main Aug 30, 2023
@WilliamJamieson WilliamJamieson deleted the feature/pyproject-black branch August 30, 2023 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pllim pllim pllim approved these changes

@nstarman nstarman nstarman approved these changes

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

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

@astrofrog astrofrog Awaiting requested review from astrofrog

Assignees

No one assigned

Labels

black Related to `black` styling coordinates cosmology io.ascii nddata no-changelog-entry-needed timeseries units

Projects

Cosmology, the Expansion
Status: Done

Milestone

v6.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@WilliamJamieson @pllim @nstarman