From 91720f37d47c46becaa2e78b5e703bcaf07b6424 Mon Sep 17 00:00:00 2001
From: Bonelli <wbonelli@contractor.usgs.gov>
Date: Thu, 19 Mar 2026 09:10:26 -0400
Subject: [PATCH] chore(dependencies): add devtools optional dep groups, add
 bounds

---
 .github/workflows/ci.yml | 20 ++++++++++++++------
 pyproject.toml           |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c39a56..4d8a205 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,9 +85,7 @@ jobs:
         run: uv sync --all-extras
 
       - name: Install Python dependencies
-        run: |
-          uv pip install git+https://git@github.com/Deltares/xmipy@develop
-          uv pip install git+https://git@github.com/MODFLOW-ORG/modflow-devtools@develop
+        run: uv pip install git+https://git@github.com/Deltares/xmipy@develop
 
       - name: Install modflow executables
         uses: modflowpy/install-modflow-action@v1
@@ -95,6 +93,10 @@ jobs:
           path: ${{ github.workspace }}/autotest
           repo: modflow6-nightly-build
 
+      # temporary. devtools 2.x will autosync, but 1.x needs opt-in.
+      - name: Sync devtools
+        run: uv run mf sync
+
       - name: Run autotests
         working-directory: ./autotest
         shell: bash -l {0}
@@ -126,9 +128,7 @@ jobs:
         run: uv sync --all-extras
 
       - name: Install Python dependencies
-        run: |
-          uv pip install git+https://git@github.com/Deltares/xmipy@develop
-          uv pip install git+https://git@github.com/MODFLOW-ORG/modflow-devtools@develop
+        run: uv pip install git+https://git@github.com/Deltares/xmipy@develop
 
       - name: Install modflow executables
         uses: modflowpy/install-modflow-action@v1
@@ -137,6 +137,10 @@ jobs:
           repo: executables
           tag: "14.0"
 
+      # temporary. devtools 2.x will autosync, but 1.x needs opt-in.
+      - name: Sync devtools
+        run: uv run mf sync
+
       - name: Run autotests
         working-directory: ./autotest
         shell: bash -l {0}
@@ -173,6 +177,10 @@ jobs:
           path: ${{ github.workspace }}/autotest
           repo: modflow6-nightly-build
 
+      # temporary. devtools 2.x will autosync, but 1.x needs opt-in.
+      - name: Sync devtools
+        run: uv run mf sync
+
       - name: Run autotests
         working-directory: ./autotest
         shell: bash -l {0}
diff --git a/pyproject.toml b/pyproject.toml
index f3bcbab..12de60e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,7 +42,7 @@ dependencies = [
 dev = ["modflowapi[test,lint]"]
 test = [
     "filelock",
-    "modflow-devtools>=1.7.0",
+    "modflow-devtools[test,dfn,models]>=1.9.1,<2",
     "pytest!=8.1.0",
     "pytest-order",
     "pytest-xdist",