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.
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
MNT: more compatibility with NumPy 2.0 #15235
Conversation
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.
|
👋 Thank you for your draft pull request! Do you know that you can use |
pre-commit.ci autofix |
Now we're hitting this but I am not sure how to respond to it: Do we simply update the imports or we are not supposed to touch this now?
astropy/astropy/utils/masked/function_helpers.py Line 1025 in 53188c3
astropy/astropy/utils/masked/function_helpers.py Lines 1068 to 1071 in 53188c3
|
1a3be18
to
029a509
Compare
And then
😩 |
Oh dear, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Quite a few small comments, all easy now that you found what was wrong. Indeed, easy enough I might as well do them and force-push...
b06ebd4
to
236d90d
Compare
p.s. Also added a commit that removes the use of |
Arrgg, I should have guessed given |
4000c94
to
61b6d15
Compare
That is the plan but looks like skyfield now gives trouble. |
Was |
because not all upstream dependencies are so cutting edge.
Gonna take a few hours for the exotic archs to finish running. I'll check back later. |
Oh, no. A new one?
|
Maybe it's somewhat new, but not necessarily, the latest wheel is 12hr old, so should have been used in CI here for a while now), but it might have been hidden by the other errors. |
Handle warning in test_bounds_gauss2d_lsq that is flaky and we do not really care for, so just ignore it.
a07518a
to
b6deb07
Compare
Am travelling today, so maybe you'll get to it first... And, yes, lots of renaming happening, to indicate things are private... But I think it is a one-time only reorganization... |
Everything is green now except RTD that somehow killed itself. I restarted it. 🤞 |
I am not sure about changing devdeps to pull only "tests" instead of "tests_all" but nothing we can do about that right now if we want this in, so I'll open follow-up issue for that one (#15242). |
codecov complain is unavoidable because we don't check coverage for the |
Thanks, @dhomeier . I want to kick off the dev wheel for astropy, so I am going to merge this. Can you please turn your branch into a PR here (instead of to my fork) after that? I think we need to think about why win32 emit different warnings now. Is there some real bug we have to fix? |
Thanks; don't know it it's a bug or what the Windows version is actually reading from that. import warnings
from astropy.io import ascii
from io import BytesIO
StringIO = lambda x: BytesIO(x.encode("ascii"))
warnings.resetwarnings()
x = ascii.read(StringIO("-1799E+305 0.2e-323 5200e-327"), format='no_header', fast_reader={"use_fast_converter": False})
warnings.resetwarnings()
y = ascii.read(StringIO("0." + 307 * "0" + "1"), format='no_header', fast_reader={"use_fast_converter": False}) and then check the number of warnings and the content of tables |
Alas, pytest is very broken on my Windows env and I don't have time to deal with it. I don't see this problem on WSL2. 😿 |
Yes, someone with access to a Windows machine would have to run that just manually, but if they all behave different, that might not give us much info anyway... |
@@ -184,6 +183,7 @@ def test_bounds_slsqp(self): | |||
assert intercept + 10**-5 >= bounds["intercept"][0] | |||
assert intercept - 10**-5 <= bounds["intercept"][1] | |||
|
|||
@pytest.mark.filterwarnings("ignore:The fit may be unsuccessful") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@WilliamJamieson , if you are not okay with this, please open follow-up PR. Thanks!
in_sig, out_sig = np.lib.function_base._parse_gufunc_signature( | ||
ufunc.signature.replace(" ", "") | ||
) | ||
if NUMPY_LT_2_0: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mhvk , this might not be as clean as you like based on your previous changes. If this bothers you, please open follow-up PR. Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries, that looks fine! Thanks!
@bsipocz , new dev wheels should be uploaded already. Please let me know if you cannot access them. Thanks! |
Nope, they work, I restarted everything and CI is passing now. |
Description
This pull request is to play catch up with ever changing numpy-dev.
p.s. Maybe the code can be cleaner but could use some advice from subpackage maintainers.
If we decide not to go ahead with #15234 , then we have to backport this but for now, I set the PR to not be backported.
Fixes #15233