Merge commit '1815e4f8cebccab7c6be31f31a6b1e0d96b5a016'

Author: twicki

.github/PULL_REQUEST_TEMPLATE/release-patch.md

@@ -29,4 +29,4 @@ What to do to actually release:
 What to do after a release:
 
 - [ ] update the pace PR from the pre-commit checklist to include the released version of NDSL and merge it.
-- [ ] in NDSL, merge `main` back into `develop` (potentially adding a commit to fix the issue "properly")
+- [ ] in NDSL, merge `main` back into `develop` (potentially adding a commit to fix the issue "properly") to have all changes in develop and ensure `setuptools_scm` finds the latest release tag

.github/PULL_REQUEST_TEMPLATE/release.md

@@ -22,5 +22,6 @@ What to do to actually release:
 
 What to do after a release:
 
+- [ ] merge `main` down into `develop` to ensure `setuptools_scm` finds the latest release tag
 - [ ] update the pace PR from the pre-commit checklist to include the released version of NDSL and merge it.
 - [ ] merge breaking changes in NDSL (e.g. search for deprecation warnings)

.github/workflows/fv3_translate_tests.yaml

@@ -10,10 +10,7 @@ on:
 
 jobs:
   fv3_translate_tests:
-    # TODO
-    # restore once NDSL 2026.02.00 is released and pyFV3 is updated.
-    # uses: NOAA-GFDL/pyFV3/.github/workflows/translate.yaml@develop
-    uses: romanc/pyFV3/.github/workflows/translate.yaml@noop
+    uses: twicki/pyFV3/.github/workflows/translate.yaml@update/numpy_2x
     with:
       component_trigger: true
       component_name: NDSL

.github/workflows/pace_tests.yaml

@@ -10,10 +10,7 @@ on:
 
 jobs:
   pace_main_tests:
-    # TODO
-    # restore once NDSL 2026.02.00 is released and pace is updated.
-    # uses: NOAA-GFDL/pace/.github/workflows/main_unit_tests.yaml@develop
-    uses: romanc/pace/.github/workflows/main_unit_tests.yaml@noop
+    uses: floriandeconinck/pace/.github/workflows/main_unit_tests.yaml@update/numpy_2x
     with:
       component_trigger: true
       component_name: NDSL

.github/workflows/shield_tests.yaml

@@ -10,10 +10,7 @@ on:
 
 jobs:
   shield_translate_tests:
-    # TODO
-    # restore once NDSL 2026.02.00 is released and pySHiELD is updated.
-    # uses: NOAA-GFDL/pySHiELD/.github/workflows/translate.yaml@develop
-    uses: romanc/pySHiELD/.github/workflows/translate.yaml@noop
+    uses: floriandeconinck/pySHiELD/.github/workflows/translate.yaml@update/numpy_2x
     with:
       component_trigger: true
       component_name: NDSL

.github/workflows/unit_tests.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
     name: Python ${{ matrix.python-version }}
     steps:
       - name: Checkout repository

examples/NDSL/03_orchestration_basics.ipynb

@@ -35,7 +35,7 @@
     "    orchestrate,\n",
     "    QuantityFactory,\n",
     ")\n",
-    "from ndsl.constants import X_DIM, Y_DIM, Z_DIM\n",
+    "from ndsl.constants import I_DIM, J_DIM, K_DIM\n",
     "from ndsl.dsl.typing import FloatField, Float\n",
     "from ndsl.boilerplate import get_factories_single_tile_orchestrated"
    ]
@@ -93,7 +93,7 @@
     "            domain=grid_indexing.domain_compute(),\n",
     "        )\n",
     "        self._tmp_field = quantity_factory.zeros(\n",
-    "            [X_DIM, Y_DIM, Z_DIM], \"n/a\", dtype=dtype\n",
+    "            [I_DIM, J_DIM, K_DIM], \"n/a\", dtype=dtype\n",
     "        )\n",
     "        self._n_halo = quantity_factory.sizer.n_halo\n",
     "\n",
@@ -134,9 +134,9 @@
     "    )\n",
     "    local_sum = LocalSum(stencil_factory, qty_factory)\n",
     "\n",
-    "    in_field = qty_factory.zeros([X_DIM, Y_DIM, Z_DIM], \"n/a\", dtype=dtype)\n",
+    "    in_field = qty_factory.zeros([I_DIM, J_DIM, K_DIM], \"n/a\", dtype=dtype)\n",
     "    in_field.view[:] = 2.0\n",
-    "    out_field = qty_factory.zeros([X_DIM, Y_DIM, Z_DIM], \"n/a\", dtype=dtype)\n",
+    "    out_field = qty_factory.zeros([I_DIM, J_DIM, K_DIM], \"n/a\", dtype=dtype)\n",
     "\n",
     "    # Run\n",
     "    local_sum(in_field, out_field)"

external/dace

@@ -2,9 +2,10 @@
 
 import contextlib
 from collections.abc import Callable, Generator, Iterable
+from typing import Any
 
 import numpy as np
-from numpy.lib.index_tricks import IndexExpression
+import numpy.typing as npt
 
 from ndsl.performance.timer import NullTimer, Timer
 from ndsl.types import Allocator
@@ -16,7 +17,7 @@
 )
 
 
-BufferKey = tuple[Callable, Iterable[int], type]
+BufferKey = tuple[Callable, Iterable[int], npt.DTypeLike]
 BUFFER_CACHE: dict[BufferKey, list["Buffer"]] = {}
 
 
@@ -41,7 +42,7 @@ def __init__(self, key: BufferKey, array: np.ndarray):
 
     @classmethod
     def pop_from_cache(
-        cls, allocator: Allocator, shape: Iterable[int], dtype: type
+        cls, allocator: Allocator, shape: Iterable[int], dtype: npt.DTypeLike
     ) -> Buffer:
         """Retrieve or insert then retrieve of buffer from cache.
 
@@ -78,8 +79,8 @@ def finalize_memory_transfer(self) -> None:
     def assign_to(
         self,
         destination_array: np.ndarray,
-        buffer_slice: IndexExpression = np.index_exp[:],
-        buffer_reshape: IndexExpression = None,
+        buffer_slice: Any = np.index_exp[:],
+        buffer_reshape: Any | None = None,
     ) -> None:
         """Assign internal array to destination_array.
 
@@ -95,7 +96,7 @@ def assign_to(
             )
 
     def assign_from(
-        self, source_array: np.ndarray, buffer_slice: IndexExpression = np.index_exp[:]
+        self, source_array: np.ndarray, buffer_slice: Any = np.index_exp[:]
     ) -> None:
         """Assign source_array to internal array.
 
@@ -107,7 +108,7 @@ def assign_from(
 
 @contextlib.contextmanager
 def array_buffer(
-    allocator: Allocator, shape: Iterable[int], dtype: type
+    allocator: Allocator, shape: Iterable[int], dtype: npt.DTypeLike
 ) -> Generator[Buffer, Buffer, None]:
     """
     A context manager providing a contiguous array, which may be re-used between calls.
@@ -132,7 +133,7 @@ def send_buffer(
     allocator: Callable,
     array: np.ndarray,
     timer: Timer | None = None,
-) -> np.ndarray:
+) -> Generator[np.ndarray]:
     """A context manager ensuring that `array` is contiguous in a context where it is
     being sent as data, copying into a recycled buffer array if necessary.
 
@@ -166,7 +167,7 @@ def recv_buffer(
     allocator: Callable,
     array: np.ndarray,
     timer: Timer | None = None,
-) -> np.ndarray:
+) -> Generator[np.ndarray]:
     """A context manager ensuring that array is contiguous in a context where it is
     being used to receive data, using a recycled buffer array and then copying the
     result into array if necessary.