Skip to content

[Update] Numpy 2x #182

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.

Sign up for GitHub

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

Draft
FlorianDeconinck wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

[Update] Numpy 2x #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aaeafa2
Force update to 2.x
FlorianDeconinck Mar 3, 2026
efa7bb2
[TMP] Update CI
FlorianDeconinck Mar 3, 2026
a7fc84c
[TMP] Update upstream dependancies
FlorianDeconinck Mar 3, 2026
c51be71
[TMP] Update pyfv3
FlorianDeconinck Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/main_unit_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
uses: actions/checkout@v6
with:
submodules: 'recursive'
repository: NOAA-GFDL/pace
repository: floriandeconinck/pace
path: pace
ref: develop
ref: update/numpy_2x

- name: 'Setup Python ${{ inputs.python_version && inputs.python_version || env.python_default }}'
uses: actions/setup-python@v6
Expand All @@ -54,13 +54,6 @@ jobs:
- name: Install mpi (MPICH flavor)
run: pip install mpich

- name: Install numpy==1.26.4
# Front-load installing numpy to force its usage in the radiation
# scheme of pySHiELD.
# TODO: This is an ugly hack and it should be cleaned up latest once
# we add support for numpy >= 2.0
run: pip install numpy==1.26.4

- name: "External trigger: Remove existing component in pace/develop"
if: ${{ inputs.component_name }}
run: rm -rf ${GITHUB_WORKSPACE}/pace/${{inputs.component_name}}
Expand Down
2 changes: 1 addition & 1 deletion NDSL
Open in desktop
Submodule NDSL updated 114 files
2 changes: 1 addition & 1 deletion pyFV3
Open in desktop
Submodule pyFV3 updated 4 files
+10 −5 .github/workflows/translate.yaml
+34 −51 pyfv3/stencils/fv_dynamics.py
+1 −1 pyproject.toml
+2 −1 tests/mpi/test_doubly_periodic.py
2 changes: 1 addition & 1 deletion pySHiELD
Open in desktop
Submodule pySHiELD updated 19 files
+1 −1 .github/workflows/pace_tests.yaml
+12 −14 .github/workflows/translate.yaml
+0 −1 .pre-commit-config.yaml
+2 −2 examples/notebook/utilities.py
+9 −3 pyproject.toml
+5 −12 pyshield/radiation/state.py
+3 −3 pyshield/stencils/pbl/_config.py
+20 −20 pyshield/stencils/pbl/mfpblt.py
+23 −23 pyshield/stencils/pbl/mfscu.py
+101 −78 pyshield/stencils/pbl/satmedmfvdiff.py
+2 −2 tests/integration/test_all.py
+1 −1 tests/integration/test_gfdl_cld_mp.py
+1 −1 tests/integration/test_gfs_mp.py
+3 −3 tests/integration/test_radiation_driver.py
+1 −1 tests/integration/test_samfshalconv.py
+1 −1 tests/integration/test_satmedmf.py
+1 −1 tests/integration/test_sfc.py
+4 −4 tests/savepoint/translate/translate_pbl_subtests.py
+0 −19 tox.ini
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def local_pkg(name: str, relative_path: str) -> str:
local_pkg("pyshield", "pySHiELD"),
"dacite",
"f90nml",
"numpy < 2.0.0",
"numpy >= 2",
"xarray",
"zarr < 3.0.0",
]
Expand Down
Loading