Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TST: adjustments to np.trapz->np.trapezoid renaming #15986

Merged
merged 1 commit into from
Feb 4, 2024
Merged

TST: adjustments to np.trapz->np.trapezoid renaming #15986

merged 1 commit into from
Feb 4, 2024

Conversation

neutrinoceros
Copy link
Contributor

Description

This fixes new instabilities seen in devdeps CI (for instance https://github.com/astropy/astropy/actions/runs/7771887655/job/21193705886?pr=15985)

xref numpy/numpy#25738

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

@github-actions github-actions bot added the units label Feb 4, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 4, 2024

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.

@neutrinoceros neutrinoceros changed the title TST: adjustments to np.trapz->np.trapzoid renaming" TST: adjustments to np.trapz->np.trapezoid renaming" Feb 4, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 4, 2024

👋 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?

@neutrinoceros neutrinoceros force-pushed the tst/numpy2/trapezoid branch 3 times, most recently from f0ea179 to 6fb74b5 Compare February 4, 2024 12:10
@neutrinoceros
Copy link
Contributor Author

I missed test for masked quantities. I'll come back to this later today.

@neutrinoceros neutrinoceros changed the title TST: adjustments to np.trapz->np.trapezoid renaming" TST: adjustments to np.trapz->np.trapezoid renaming Feb 4, 2024
@neutrinoceros neutrinoceros force-pushed the tst/numpy2/trapezoid branch 2 times, most recently from 8040b7d to 027a096 Compare February 4, 2024 13:29
@neutrinoceros neutrinoceros marked this pull request as ready for review February 4, 2024 14:05
mhvk
mhvk approved these changes Feb 4, 2024
View reviewed changes
Copy link
Contributor

@mhvk mhvk left a comment

Choose a reason for hiding this comment

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

Thanks, good solution with the check_trapezoid name.

@mhvk mhvk added this to the v6.0.1 milestone Feb 4, 2024
@mhvk mhvk added the 💤 backport-v6.0.x on-merge: backport to v6.0.x label Feb 4, 2024
@mhvk mhvk enabled auto-merge February 4, 2024 15:57
@mhvk mhvk merged commit 6185442 into astropy:main Feb 4, 2024
30 of 34 checks passed
@lumberbot-app Lumberbot (App)

This comment was marked as resolved.

Sign in to view
@neutrinoceros neutrinoceros deleted the tst/numpy2/trapezoid branch February 4, 2024 16:07
@neutrinoceros
Copy link
Contributor Author

I'll take care of the manual bp

neutrinoceros pushed a commit to neutrinoceros/astropy that referenced this pull request Feb 4, 2024
@mhvk @neutrinoceros
Merge pull request astropy#15986 from neutrinoceros/tst/numpy2/trapezoid
683ea37 
TST: adjustments to np.trapz->np.trapezoid renaming
(cherry picked from commit 6185442)
@neutrinoceros neutrinoceros mentioned this pull request Feb 4, 2024
Merged
mhvk added a commit that referenced this pull request Feb 4, 2024
@mhvk
Merge pull request #15988 from neutrinoceros/bp/6.0.x/15986
99f0d29 
Backport PR #15986 on branch v6.0.x (TST: adjustments to np.trapz->np.trapezoid renaming)
@neutrinoceros
Copy link
Contributor Author

Actually I think I didn't need to keep the warning filter, as the deprecation was not released yet. I'll clean it up in a follow up PR.

@mhvk
Copy link
Contributor

mhvk commented Feb 4, 2024

Ah, good point! That we did just because they had earlier decided to deprecate...

@neutrinoceros neutrinoceros mentioned this pull request Feb 4, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mhvk mhvk mhvk approved these changes

Assignees
No one assigned
Labels
no-changelog-entry-needed numpy-dev Still Needs Manual Backport units utils.masked 💤 backport-v6.0.x on-merge: backport to v6.0.x
Projects
None yet
Milestone
v6.0.1
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@neutrinoceros @mhvk