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

NEP29 and NumPy v2 pins #6039

Merged
merged 3 commits into from
Jul 3, 2024
Merged

NEP29 and NumPy v2 pins #6039

merged 3 commits into from
Jul 3, 2024

Conversation

trexfeathers
Copy link
Contributor

🚀 Pull Request

Description

  • NEP29
  • NumPy v2
    • Demo Numpy v2 #6035 has proven that it will be a medium/large task to get all our tests supporting NumPy v2
    • We expect to have some slots to work on this for Iris v3.11 - 🐓 v3.11.x #5571
    • So we need a pin in the meantime, and I expect also a patch release

The lock files already fit between these two pins so I have not refreshed those.


Consult Iris pull request check list


Add any of the below labels to trigger actions on this PR:

  • benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts

Copy link

codecov bot commented Jul 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.77%. Comparing base (d0801aa) to head (02fa42b).
Report is 61 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6039   +/-   ##
=======================================
  Coverage   89.77%   89.77%           
=======================================
  Files          90       90           
  Lines       22984    22984           
  Branches     5031     5031           
=======================================
  Hits        20634    20634           
  Misses       1619     1619           
  Partials      731      731           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@trexfeathers
Copy link
Contributor Author

trexfeathers commented Jul 2, 2024

As well as getting the v2 pin onto main, which will set us up correctly for future testing then future releasing, note that I am also intending to cut a 3.9.0post0 release. Once this PR is merged, I will therefore be cherry-picking the squash commit onto the v3.9.x release branch.

@bjlittle bjlittle self-assigned this Jul 3, 2024
@bjlittle
Copy link
Member

bjlittle commented Jul 3, 2024

As well as getting the v2 pin onto main, which will set us up correctly for future testing then future releasing, note that I am also intending to cut a 3.9.0post0 release. Once this PR is merged, I will therefore be cherry-picking the squash commit onto the v3.9.x release branch.

Yup, good move.

Remember to update the community on #5850 with our intentions 👍

@bjlittle bjlittle merged commit 9d90530 into SciTools:main Jul 3, 2024
21 checks passed
@trexfeathers
Copy link
Contributor Author

Thanks @bjlittle!

@pp-mo pp-mo mentioned this pull request Jul 5, 2024
1 task
@trexfeathers
Copy link
Contributor Author

As well as getting the v2 pin onto main, which will set us up correctly for future testing then future releasing, note that I am also intending to cut a 3.9.0post0 release. Once this PR is merged, I will therefore be cherry-picking the squash commit onto the v3.9.x release branch.

Yup, good move.

Remember to update the community on #5850 with our intentions 👍

I've basically run out of time before we cut the next release candidate anyway (see 3.10) - I'm unavailable to work on this next week. Based on lack of user feedback so far the impact is limited. Discussed with @SciTools/peloton this morning and this seemed acceptable to those present.

tkknight added a commit to tkknight/iris that referenced this pull request Jul 18, 2024
* upstream/main:
  Quieter datum warning (SciTools#6050)
  Allow MeshCoord to have a coord-system (SciTools#6016)
  Bump scitools/workflows from 2024.07.1 to 2024.07.2 (SciTools#6053)
  Faster concatenation of cubes with `AuxCoordFactory`s (SciTools#6038)
  Shorten cube iterator tests (SciTools#6041)
  Bump scitools/workflows from 2024.07.0 to 2024.07.1 (SciTools#6045)
  Bump scitools/workflows from 2024.06.5 to 2024.07.0 (SciTools#6034)
  Update test_Saver__ugrid.py (SciTools#6017)
  NEP29 and NumPy v2 pins (SciTools#6039)
  Adapt setup.py for pypa/setuptools@2db55275f. (SciTools#6036)
  Replace DelegatedConda with Delegated (SciTools#5963)
  Enable type hint checking (SciTools#5956)
  Bump scitools/workflows from 2024.06.4 to 2024.06.5 (SciTools#6026)
  Do not realize cell measures and ancillary variables in concatenate (SciTools#6010)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6022)
  Bump scitools/workflows from 2024.06.3 to 2024.06.4 (SciTools#6018)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants