Skip to content

BUG: fix compatibility with numpy@maintenance/v2.0.x#16229

Merged
mhvk merged 1 commit into
astropy:mainfrom
neutrinoceros:numpy2/adjust_units_helper
Mar 26, 2024
Merged

BUG: fix compatibility with numpy@maintenance/v2.0.x#16229
mhvk merged 1 commit into
astropy:mainfrom
neutrinoceros:numpy2/adjust_units_helper

Conversation

@neutrinoceros

@neutrinoceros neutrinoceros commented Mar 25, 2024

Copy link
Copy Markdown
Contributor

Description

Since NumPy 2.0.x was branched out, we haven't been testing it directly: devdeps now run against nightlies produced from the 2.1dev (main) branch.
As a result, NumPy 2.0.x is now in a CI blindspot, so I ran tests locally against the backport branch and found this incompatibility.

follow up to #16205

xref numpy/numpy#26033 and its backport numpy/numpy#26052

  • 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 Mar 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?
  • 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 github-actions Bot added the utils label Mar 25, 2024
@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?

@neutrinoceros

Copy link
Copy Markdown
Contributor Author

Note that I do not recommend we add a test job for the backport branch, as the release candidate is expected any day now and would be easier to test against. I also assume that this kind of failures should be rare enough that it's not worth checking for them systematically. However, running the test suite locally will be part of my morning routine until we see numpy 2.0.0rc1 😄

@neutrinoceros

Copy link
Copy Markdown
Contributor Author

Looks like this went under everyone's radar yesterday. @mhvk can you review this please ?

@mhvk mhvk 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.

This looks good!

Would it be possible, in a separate PR, to add numpy 2.0 to our workflows?

@mhvk mhvk added this to the v6.1.0 milestone Mar 26, 2024
@mhvk mhvk enabled auto-merge March 26, 2024 12:47
@mhvk mhvk merged commit cbcd150 into astropy:main Mar 26, 2024
@neutrinoceros

Copy link
Copy Markdown
Contributor Author

Would it be possible, in a separate PR, to add numpy 2.0 to our workflows?

I'm planning to do it when rc1 gets out. Possibly earlier if it takes more than a couple days from now.

@neutrinoceros neutrinoceros deleted the numpy2/adjust_units_helper branch March 26, 2024 12:52
@mhvk

mhvk commented Mar 26, 2024

Copy link
Copy Markdown
Contributor

I'm planning to do it when rc1 gets out. Possibly earlier if it takes more than a couple days from now.

Sounds good!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants