Skip to content

TST: Add Sersic2D to NON_FINITE_LM_MODELS - #18381

Merged
neutrinoceros merged 1 commit into
astropy:mainfrom
pllim:hack-fix-gh-18333
Jul 2, 2025
Merged

neutrinoceros merged 1 commit into
astropy:mainfrom
pllim:hack-fix-gh-18333

Conversation

@pllim

@pllim pllim commented Jul 2, 2025

Copy link
Copy Markdown
Member

Description

This pull request is to add Sersic2D to NON_FINITE_LM_MODELS in modeling tests and undo scipy max pin for Windows.

  • 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.

in modeling tests and undo scipy max pin for Windows.
@pllim pllim added this to the v7.1.1 milestone Jul 2, 2025
@pllim
pllim requested a review from neutrinoceros July 2, 2025 13:12
@pllim
pllim requested a review from a team as a code owner July 2, 2025 13:12
@pllim pllim added testing Affects-dev PRs and issues that do not impact an existing Astropy release Windows no-changelog-entry-needed backport-v7.1.x labels Jul 2, 2025
@github-actions

github-actions Bot commented Jul 2, 2025

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 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?
  • 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.

@neutrinoceros neutrinoceros left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

CI is happy, so I have nothing to complain about, but I don't know if this fix is correct. I would still like package maintainers to weigh in.

@neutrinoceros

Copy link
Copy Markdown
Contributor

Alright then, let's roll with it. Thanks @WilliamJamieson

@neutrinoceros
neutrinoceros merged commit 7ee167b into astropy:main Jul 2, 2025
@lumberbot-app

lumberbot-app Bot commented Jul 2, 2025

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v7.1.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 7ee167b45c738acaba61ee7ba8df2141d5848069
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #18381: TST: Add Sersic2D to NON_FINITE_LM_MODELS'
  1. Push to a named branch:
git push YOURFORK v7.1.x:auto-backport-of-pr-18381-on-v7.1.x
  1. Create a PR against branch v7.1.x, I would have named this PR:

"Backport PR #18381 on branch v7.1.x (TST: Add Sersic2D to NON_FINITE_LM_MODELS)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@neutrinoceros

Copy link
Copy Markdown
Contributor

I'll backport this manually

neutrinoceros added a commit to neutrinoceros/astropy that referenced this pull request Jul 2, 2025
…E_LM_MODELS)

(cherry picked from commit 7ee167b)
@neutrinoceros

Copy link
Copy Markdown
Contributor

backport at #18382

neutrinoceros added a commit to neutrinoceros/astropy that referenced this pull request Jul 2, 2025
…E_LM_MODELS)

(cherry picked from commit 7ee167b)
@pllim
pllim deleted the hack-fix-gh-18333 branch July 2, 2025 15:08
@pllim

pllim commented Jul 2, 2025

Copy link
Copy Markdown
Member Author

Thanks, all!

pllim added a commit that referenced this pull request Jul 2, 2025
Backport PR #18381 on `v7.1.x` (TST: Add Sersic2D to NON_FINITE_LM_MODELS)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Affects-dev PRs and issues that do not impact an existing Astropy release installation modeling no-changelog-entry-needed testing Windows

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants