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.

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

Adapt satpy to numpy 2 #2579

Merged
merged 8 commits into from
Oct 11, 2023
Merged

Adapt satpy to numpy 2 #2579

merged 8 commits into from
Oct 11, 2023

Conversation

mraspaud
Copy link
Member

@mraspaud mraspaud commented Sep 21, 2023

This PR should fix satpy for numpy 2, at least for the parts we have control over.
See also storpipfugl/pykdtree#97
and skyfielders/python-skyfield#898

@codecov
Copy link

codecov bot commented Sep 21, 2023

Codecov Report

Merging #2579 (700ac96) into main (cefe7f8) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #2579   +/-   ##
=======================================
  Coverage   94.92%   94.92%           
=======================================
  Files         352      352           
  Lines       51285    51285           
=======================================
  Hits        48684    48684           
  Misses       2601     2601           
Flag Coverage Δ
behaviourtests 4.28% <0.00%> (ø)
unittests 95.54% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
satpy/readers/aapp_mhs_amsub_l1c.py 95.94% <100.00%> (ø)
satpy/readers/hdf4_utils.py 96.49% <100.00%> (ø)
satpy/readers/utils.py 92.95% <ø> (ø)
satpy/tests/reader_tests/test_utils.py 100.00% <100.00%> (ø)
satpy/tests/writer_tests/test_cf.py 95.53% <ø> (ø)
satpy/writers/cf_writer.py 94.89% <100.00%> (ø)

@coveralls
Copy link

coveralls commented Sep 21, 2023

Pull Request Test Coverage Report for Build 6469981287

  • 9 of 9 (100.0%) changed or added relevant lines in 4 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 95.498%

Totals Coverage Status
Change from base Build 6469397126: 0.0%
Covered Lines: 48807
Relevant Lines: 51108

💛 - Coveralls

@mraspaud mraspaud changed the title Fix cf tests for numpy 2 Adapt satpy to numpy 2 Sep 21, 2023
@djhoese
Copy link
Member

djhoese commented Sep 21, 2023

Should we merge this and then just wait for skyfield to fix things? Or add an xfail for skyfield-based tests?

@mraspaud
Copy link
Member Author

The issue seems to be standing still since a couple of weeks, so I'm not too optimistic...maybe xfail is a good idea

@djhoese
Copy link
Member

djhoese commented Oct 6, 2023

As discussed in general on slack a week or so ago, with NEP 29 we could justify dropping (setting a lower limit) to numpy 1.20. I'd say this is a good PR to include that in. Thoughts?

@mraspaud
Copy link
Member Author

On it

@mraspaud
Copy link
Member Author

@djhoese fixed

setup.py Outdated Show resolved Hide resolved
Co-authored-by: David Hoese <david.hoese@ssec.wisc.edu>
@mraspaud mraspaud added this to the v0.44.0 milestone Oct 10, 2023
@mraspaud mraspaud merged commit 6e83727 into pytroll:main Oct 11, 2023
19 of 20 checks passed
@mraspaud mraspaud deleted the fix-cf-numpy2 branch October 11, 2023 06:07
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