From aaeafa27cc313082d51b5041f18adf0798713129 Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Tue, 3 Mar 2026 11:33:46 -0500
Subject: [PATCH 1/6] Force update to 2.x

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f9995dfcf..775c71d91 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",
 ]

From efa7bb2b6197235fd2bb19a3e536af3d1a851f34 Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Tue, 3 Mar 2026 11:36:05 -0500
Subject: [PATCH 2/6] [TMP] Update CI

---
 .github/workflows/main_unit_tests.yaml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main_unit_tests.yaml b/.github/workflows/main_unit_tests.yaml
index f8402a513..12ba1cc90 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}}

From a7fc84c523a0ab936e60b9ba10982eaec9f5714c Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Tue, 3 Mar 2026 11:50:14 -0500
Subject: [PATCH 3/6] [TMP] Update upstream dependancies

---
 NDSL     | 2 +-
 pyFV3    | 2 +-
 pySHiELD | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NDSL b/NDSL
index 3d8fa05ee..c6d5d4134 160000
--- a/NDSL
+++ b/NDSL
@@ -1 +1 @@
-Subproject commit 3d8fa05ee7b78182afd2e749532582ffaa25b595
+Subproject commit c6d5d4134cb82cee621c6017c7a2ec10e8c3deb4
diff --git a/pyFV3 b/pyFV3
index 64ddc3a6c..d9755004f 160000
--- a/pyFV3
+++ b/pyFV3
@@ -1 +1 @@
-Subproject commit 64ddc3a6c12d216ce46393c414754d4651ccebda
+Subproject commit d9755004f166cf44279d9c65de9253618c5f93e5
diff --git a/pySHiELD b/pySHiELD
index 66df9db17..9801c12a7 160000
--- a/pySHiELD
+++ b/pySHiELD
@@ -1 +1 @@
-Subproject commit 66df9db174aef33a2702961299c890fc75e347dc
+Subproject commit 9801c12a7a6d0788788431c8baa8c57925813a40

From c51be71e354d2e70e0a38f38d8a42fbf3e359e74 Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Tue, 3 Mar 2026 11:53:28 -0500
Subject: [PATCH 4/6] [TMP] Update pyfv3

---
 pyFV3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyFV3 b/pyFV3
index d9755004f..935fa8609 160000
--- a/pyFV3
+++ b/pyFV3
@@ -1 +1 @@
-Subproject commit d9755004f166cf44279d9c65de9253618c5f93e5
+Subproject commit 935fa8609134ebce4e16399f0eb2fb8f93a66ce3

From 945718c3add3545ac6acf3fa255628431a968986 Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Fri, 3 Apr 2026 15:56:07 -0400
Subject: [PATCH 5/6] Re-link to `develop` branch

---
 NDSL     | 2 +-
 pyFV3    | 2 +-
 pySHiELD | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NDSL b/NDSL
index 13ce3cbcf..1815e4f8c 160000
--- a/NDSL
+++ b/NDSL
@@ -1 +1 @@
-Subproject commit 13ce3cbcf5e01ef6d8da52d1d99c980a92574e9d
+Subproject commit 1815e4f8cebccab7c6be31f31a6b1e0d96b5a016
diff --git a/pyFV3 b/pyFV3
index a53851bca..00b7e8ea5 160000
--- a/pyFV3
+++ b/pyFV3
@@ -1 +1 @@
-Subproject commit a53851bca49ad01e1e2dcdabe3dd321948516135
+Subproject commit 00b7e8ea5840b3add7407b07be863a31e8e08863
diff --git a/pySHiELD b/pySHiELD
index af36bcbfc..52c1331ca 160000
--- a/pySHiELD
+++ b/pySHiELD
@@ -1 +1 @@
-Subproject commit af36bcbfc0e0075fe4bd21a06fab26dc36e723b8
+Subproject commit 52c1331ca204dff027e736e2a7a468d723476c01

From f1ec40b20f54ec3d135214557b9ba60bbecd444d Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Fri, 3 Apr 2026 15:56:22 -0400
Subject: [PATCH 6/6] Restore the proper external for other `CI`

---
 .github/workflows/main_unit_tests.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/main_unit_tests.yaml b/.github/workflows/main_unit_tests.yaml
index 40720af3d..066f13c2b 100644
--- a/.github/workflows/main_unit_tests.yaml
+++ b/.github/workflows/main_unit_tests.yaml
@@ -42,9 +42,8 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: 'recursive'
-          repository: floriandeconinck/pace
+          repository: NOAA-GFDL/pace
           path: pace
-          ref: update/numpy_2x
 
       - name: 'Setup Python ${{ inputs.python_version && inputs.python_version || env.python_default }}'
         uses: actions/setup-python@v6