Skip to content

Backport PR #15929 on branch v6.0.x (BUG: fix compatibility with numpy 2.0 for ndarray suclasses overriding ndarray.sort and ndarray.argsort)#15953

Merged
pllim merged 1 commit intoastropy:v6.0.xfrom
pllim:manual-backport-pr15929-v6.0.x
Jan 25, 2024
Merged

Backport PR #15929 on branch v6.0.x (BUG: fix compatibility with numpy 2.0 for ndarray suclasses overriding ndarray.sort and ndarray.argsort)#15953
pllim merged 1 commit intoastropy:v6.0.xfrom
pllim:manual-backport-pr15929-v6.0.x

Conversation

@pllim
Copy link
Copy Markdown
Member

@pllim pllim commented Jan 25, 2024

Description

Manual attempt of #15952 to backport #15929 onto v6.0.x

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

…t_stable

BUG: fix compatibility with numpy 2.0 for ndarray suclasses overriding ndarray.sort and ndarray.argsort
@pllim pllim added numpy-dev skip-changelog-checks Tells bot to skip changlog checks skip-basebranch-check Skip base branch check for direct backports labels Jan 25, 2024
@pllim pllim added this to the v6.0.1 milestone Jan 25, 2024
@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 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.

@pllim
Copy link
Copy Markdown
Member Author

pllim commented Jan 25, 2024

Wait, what? What is RTD doing?

ERROR: Cannot install astropy, astropy 0.1.dev105+g41cf80a

@pllim
Copy link
Copy Markdown
Member Author

pllim commented Jan 25, 2024

I don't see how RTD is affected by this patch. I am just gonna merge.

@pllim pllim merged commit 75fbc4f into astropy:v6.0.x Jan 25, 2024
@pllim pllim deleted the manual-backport-pr15929-v6.0.x branch January 25, 2024 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Manual Backport numpy-dev skip-basebranch-check Skip base branch check for direct backports skip-changelog-checks Tells bot to skip changlog checks units utils.masked

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant