From db094cc18213c02e101bfcf959be837d3242453a Mon Sep 17 00:00:00 2001
From: Joseph Hughes <jdhughes99+1@gmail.com>
Date: Sun, 6 Sep 2026 06:30:31 -0500
Subject: [PATCH 1/2] ci: bump actions off node 20

GitHub is forcing actions/checkout and astral-sh/setup-uv onto node 24
because the pinned majors still target node 20, which is deprecated.
Bumping them clears the warning before the forcing is withdrawn.
upload-artifact is bumped for the same reason.

modflowpy/install-modflow-action has no major past v1, and
orhun/git-cliff-action and pypa/gh-action-pypi-publish are current.
---
 .github/workflows/ci.yml      | 20 ++++++++++----------
 .github/workflows/release.yml | 16 ++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 45433d0..ef5e915 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,10 +22,10 @@ jobs:
     steps:
 
     - name: Checkout repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Setup uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
       with:
         cache-dependency-glob: "**/pyproject.toml"
         
@@ -43,10 +43,10 @@ jobs:
         shell: bash
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Setup uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: false
 
@@ -73,10 +73,10 @@ jobs:
         shell: bash
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           cache-dependency-glob: "**/pyproject.toml"
           python-version: ${{ matrix.python-version }}
@@ -113,10 +113,10 @@ jobs:
         shell: bash
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           cache-dependency-glob: "**/pyproject.toml"
           python-version: ${{ matrix.python-version }}
@@ -154,10 +154,10 @@ jobs:
         shell: bash
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           cache-dependency-glob: "**/pyproject.toml"
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c97543c..eae2b4b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -65,13 +65,13 @@ jobs:
           fi
 
       - name: Checkout source branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.ref_name }}
           fetch-depth: 0
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           cache-dependency-glob: "**/pyproject.toml"
 
@@ -200,7 +200,7 @@ jobs:
     steps:
 
       - name: Checkout main branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           ref: main
           fetch-depth: 0
@@ -251,12 +251,12 @@ jobs:
     steps:
 
       - name: Checkout main branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           ref: main
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: false
 
@@ -267,7 +267,7 @@ jobs:
         run: uvx twine check --strict dist/*
 
       - name: Upload package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: dist
           path: dist
@@ -290,13 +290,13 @@ jobs:
     steps:
 
       - name: Checkout main branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           ref: main
           fetch-depth: 0
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           cache-dependency-glob: "**/pyproject.toml"
 

From 7c4c707a2b8c39c8f80fdf7ed1e22cfebdf2e5c2 Mon Sep 17 00:00:00 2001
From: Joseph Hughes <jdhughes99+1@gmail.com>
Date: Sun, 6 Sep 2026 06:34:14 -0500
Subject: [PATCH 2/2] ci: run the pre-idm tests through uv

Unlike the other two test jobs, the pre-idm job invoked pytest directly
rather than through uv, so it depended on the virtual environment being on
PATH. Bumping setup-uv dropped that, and the job failed with 'pytest:
command not found' on every platform and python version.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef5e915..3495daf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -138,7 +138,7 @@ jobs:
       - name: Run autotests
         working-directory: ./autotest
         shell: bash -l {0}
-        run: pytest -v -n auto -m "not mf6"     
+        run: uv run pytest -v -n auto -m "not mf6"
         
   autotest_mf6_examples:
     name: modflowapi mf6 examples autotests