Skip to content

Bump numpy & scipy#15706

Merged
pllim merged 2 commits into
astropy:mainfrom
nstarman:bump-numpy-scipy
Dec 18, 2023
Merged

Bump numpy & scipy#15706
pllim merged 2 commits into
astropy:mainfrom
nstarman:bump-numpy-scipy

Conversation

@nstarman
Copy link
Copy Markdown
Member

@nstarman nstarman commented Dec 10, 2023 •
edited
Loading

Cherry picking from #15603.

  • 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
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 10, 2023

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.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 10, 2023

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

mhvk
mhvk reviewed Dec 11, 2023
View reviewed changes
Copy link
Copy Markdown
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.

Looks good modulo the two copy&paste errors. If we're updating recommended packages, should matplotlib be updated too? Or is the scipy update a consequence of the numpy one?

Comment thread tox.ini Outdated
neutrinoceros
neutrinoceros requested changes Dec 11, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@neutrinoceros neutrinoceros left a comment

Choose a reason for hiding this comment

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

LGTM, but I think we still need to update NUMPY_TARGET_VERSION in setup.py too:

astropy/setup.py

Line 74 in 72c0947

ext.define_macros.append(("NPY_TARGET_VERSION", "NPY_1_21_API_VERSION"))

eerovaher
eerovaher requested changes Dec 11, 2023
View reviewed changes
Comment thread astropy/utils/compat/numpycompat.py Outdated
@pllim pllim added this to the v6.1.0 milestone Dec 11, 2023
@pllim
Copy link
Copy Markdown
Member

pllim commented Dec 11, 2023

Does this follow https://github.com/astropy/astropy-APEs/blob/main/APE18.rst ? I don't have time to check right now but we need to make sure. Thanks!

@neutrinoceros
Copy link
Copy Markdown
Contributor

neutrinoceros commented Dec 11, 2023

Does this follow astropy/astropy-APEs@main/APE18.rst ?

@pllim : close enough. numpy<1.23 and scipy<1.8 will very soon be legacy, following NEP 29 (followed by APE18), and we'll definitely be out of their respective support time-windows by the time 6.1 is about to be released !

@nstarman nstarman marked this pull request as ready for review December 15, 2023 04:06
mhvk
mhvk approved these changes Dec 15, 2023
View reviewed changes
Copy link
Copy Markdown
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.

Looks all good!

Comment thread astropy/units/structured.py Outdated
@nstarman nstarman force-pushed the bump-numpy-scipy branch 2 times, most recently from d2ff5ac to 09ce1a9 Compare December 15, 2023 16:12
@nstarman nstarman mentioned this pull request Dec 15, 2023
Merged
1 task
eerovaher
eerovaher reviewed Dec 15, 2023
View reviewed changes
Comment thread astropy/units/tests/test_quantity_non_ufuncs.py
@nstarman nstarman requested a review from eerovaher December 15, 2023 17:49
eerovaher
eerovaher reviewed Dec 15, 2023
View reviewed changes
Comment thread docs/changes/15706.other.rst Outdated
@nstarman @eerovaher
Bump scipy minversion to 1.8
de41823 
Signed-off-by: nstarman <[email protected]>
Co-authored-by: Eero Vaher <[email protected]>
@nstarman nstarman requested a review from eerovaher December 18, 2023 16:05
@pllim
Copy link
Copy Markdown
Member

pllim commented Dec 18, 2023

@saimn or @astrofrog , is this okay to merge now or you think it is going to complicate backports?

@saimn
Copy link
Copy Markdown
Contributor

saimn commented Dec 18, 2023

Not many changes so should be fine.

@pllim pllim merged commit 6a870d6 into astropy:main Dec 18, 2023
@pllim
Copy link
Copy Markdown
Member

pllim commented Dec 18, 2023

OK, merged. Thanks, all!

@nstarman nstarman deleted the bump-numpy-scipy branch December 18, 2023 21:06
@neutrinoceros neutrinoceros mentioned this pull request Feb 21, 2024
Closed
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

@neutrinoceros neutrinoceros neutrinoceros approved these changes

@eerovaher eerovaher eerovaher approved these changes

@taldcroft taldcroft Awaiting requested review from taldcroft taldcroft is a code owner

@saimn saimn Awaiting requested review from saimn saimn is a code owner

Assignees

No one assigned

Labels

installation io.fits table testing utils

Projects

None yet

Milestone

v6.1.0

Development

Successfully merging this pull request may close these issues.

6 participants

@nstarman @pllim @neutrinoceros @saimn @mhvk @eerovaher