Skip to content

Backport PR #15948 on branch v6.0.x (RFC: make all MaskedNDArray.__wrap_array__'s helper functions return a (result, mask, out) tuple (fix compat with numpy dev))#15951

Merged
pllim merged 1 commit intoastropy:v6.0.xfrom
meeseeksmachine:auto-backport-of-pr-15948-on-v6.0.x
Jan 25, 2024

Conversation

@meeseeksmachine
Copy link
Copy Markdown

Backport PR #15948: RFC: make all MaskedNDArray.wrap_array's helper functions return a (result, mask, out) tuple (fix compat with numpy dev)

…'s helper functions return a (result, mask, out) tuple (fix compat with numpy dev)
@lumberbot-app lumberbot-app bot added this to the v6.0.1 milestone Jan 25, 2024
@lumberbot-app lumberbot-app bot added units Affects-dev PRs and issues that do not impact an existing Astropy release no-changelog-entry-needed numpy-dev utils.masked backport-v6.0.x labels 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 pllim requested a review from mhvk January 25, 2024 19:10
@pllim
Copy link
Copy Markdown
Member

pllim commented Jan 25, 2024

@mhvk , just to make sure, is this safe to backport (i.e., no user-facing API or behavior changes)?

@pllim
Copy link
Copy Markdown
Member

pllim commented Jan 25, 2024

Not like we have a choice if we want 6.0.1 to be compatible with numpy 2.0. So merging but if someone disagrees, we can revert.

@pllim pllim merged commit e5a3ce6 into astropy:v6.0.x Jan 25, 2024
@mhvk
Copy link
Copy Markdown
Contributor

mhvk commented Jan 25, 2024

Indeed, this has no user-facing changes! Thanks for checking and merging!

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 no-changelog-entry-needed numpy-dev units utils.masked

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants