Skip to content

Ruff fix isort - #14843

Merged
nstarman merged 4 commits into
astropy:mainfrom
nstarman:ruff-fix-isort
May 18, 2023
Merged

nstarman merged 4 commits into
astropy:mainfrom
nstarman:ruff-fix-isort

Conversation

@nstarman

@nstarman nstarman commented May 18, 2023 •

Copy link
Copy Markdown
Member

Apparently we made a mistake in the isort -> ruff transition and stopped enforcing isort properly!

BTW, I approve the cosmology corrections 😆

nstarman added 4 commits May 17, 2023 22:30
Signed-off-by: Nathaniel Starkman <[email protected]>
Signed-off-by: Nathaniel Starkman <[email protected]>
Signed-off-by: Nathaniel Starkman <[email protected]>
Signed-off-by: Nathaniel Starkman <[email protected]>
@github-actions

Copy link
Copy Markdown
Contributor

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 "When to rebase and squash commits".
  • 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.

@github-actions

Copy link
Copy Markdown
Contributor

👋 Thank you for your draft pull request! Do you know that you can use [ci skip] or [skip ci] in your commit messages to skip running continuous integration tests until you are ready?

@pllim pllim left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks uncontroversial enough. Thanks!

@pllim

pllim commented May 18, 2023

Copy link
Copy Markdown
Member

Do we at least want to backport to v5.3.x to lower risk of backport conflicts?

Once the milestone is sorted out (pun?), we can merge.

@nstarman nstarman modified the milestones: v6.0, v5.3 May 18, 2023
@nstarman

Copy link
Copy Markdown
Member Author

Do we at least want to backport to v5.3.x to lower risk of backport conflicts?

Agreed!

@nstarman
nstarman merged commit 80f5a71 into astropy:main May 18, 2023
@nstarman
nstarman deleted the ruff-fix-isort branch May 18, 2023 19:56
@pllim

pllim commented May 18, 2023

Copy link
Copy Markdown
Member

@meeseeksdev backport to v5.3.x

@lumberbot-app

This comment was marked as resolved.

@pllim

pllim commented May 18, 2023

Copy link
Copy Markdown
Member

Argh, I guess not. @nstarman , are you interested in a manual backport? If not, we can move the milestone back. Thanks!

@nstarman

Copy link
Copy Markdown
Member Author

I'll give it a look.

@nstarman

Copy link
Copy Markdown
Member Author

We could do it, but only if we backport the .ruff.toml file.

@pllim

pllim commented May 22, 2023

Copy link
Copy Markdown
Member

👀 Well, if you find out that fixing .ruff.toml isn't easy in v5.3.x branch, then we don't have to. Though... we just cut v5.3.x not that long ago. Has it diverged from main that much already?!

@nstarman

Copy link
Copy Markdown
Member Author

We split .ruff.toml out from pyproject.toml, so it's really only diverged at that point.

@pllim

pllim commented May 30, 2023

Copy link
Copy Markdown
Member

@nstarman , I am just going to change the milestone, since v5.3 is already released. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants