diff --git a/.github/workflows/main_unit_tests.yaml b/.github/workflows/main_unit_tests.yaml index f8402a51..12ba1cc9 100644 --- a/.github/workflows/main_unit_tests.yaml +++ b/.github/workflows/main_unit_tests.yaml @@ -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 @@ -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}} diff --git a/NDSL b/NDSL index 3d8fa05e..c6d5d413 160000 --- a/NDSL +++ b/NDSL @@ -1 +1 @@ -Subproject commit 3d8fa05ee7b78182afd2e749532582ffaa25b595 +Subproject commit c6d5d4134cb82cee621c6017c7a2ec10e8c3deb4 diff --git a/pyFV3 b/pyFV3 index 64ddc3a6..935fa860 160000 --- a/pyFV3 +++ b/pyFV3 @@ -1 +1 @@ -Subproject commit 64ddc3a6c12d216ce46393c414754d4651ccebda +Subproject commit 935fa8609134ebce4e16399f0eb2fb8f93a66ce3 diff --git a/pySHiELD b/pySHiELD index 66df9db1..9801c12a 160000 --- a/pySHiELD +++ b/pySHiELD @@ -1 +1 @@ -Subproject commit 66df9db174aef33a2702961299c890fc75e347dc +Subproject commit 9801c12a7a6d0788788431c8baa8c57925813a40 diff --git a/setup.py b/setup.py index f9995dfc..775c71d9 100644 --- a/setup.py +++ b/setup.py @@ -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", ]