Skip to content

Commit ebfae80

Browse files
authored
chore(dependencies): add devtools bounds, optional dep groups, sync step (#90)
* update devtools lower and upper bounds * add devtools optional dependency groups * sync new devtools APIs in CI (temporary til v2)
1 parent 0839cb7 commit ebfae80

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,18 @@ jobs:
8585
run: uv sync --all-extras
8686

8787
- name: Install Python dependencies
88-
run: |
89-
uv pip install git+https://git@github.com/Deltares/xmipy@develop
90-
uv pip install git+https://git@github.com/MODFLOW-ORG/modflow-devtools@develop
88+
run: uv pip install git+https://git@github.com/Deltares/xmipy@develop
9189

9290
- name: Install modflow executables
9391
uses: modflowpy/install-modflow-action@v1
9492
with:
9593
path: ${{ github.workspace }}/autotest
9694
repo: modflow6-nightly-build
9795

96+
# temporary. devtools 2.x will autosync, but 1.x needs opt-in.
97+
- name: Sync devtools
98+
run: uv run mf sync
99+
98100
- name: Run autotests
99101
working-directory: ./autotest
100102
shell: bash -l {0}
@@ -126,9 +128,7 @@ jobs:
126128
run: uv sync --all-extras
127129

128130
- name: Install Python dependencies
129-
run: |
130-
uv pip install git+https://git@github.com/Deltares/xmipy@develop
131-
uv pip install git+https://git@github.com/MODFLOW-ORG/modflow-devtools@develop
131+
run: uv pip install git+https://git@github.com/Deltares/xmipy@develop
132132

133133
- name: Install modflow executables
134134
uses: modflowpy/install-modflow-action@v1
@@ -137,6 +137,10 @@ jobs:
137137
repo: executables
138138
tag: "14.0"
139139

140+
# temporary. devtools 2.x will autosync, but 1.x needs opt-in.
141+
- name: Sync devtools
142+
run: uv run mf sync
143+
140144
- name: Run autotests
141145
working-directory: ./autotest
142146
shell: bash -l {0}
@@ -173,6 +177,10 @@ jobs:
173177
path: ${{ github.workspace }}/autotest
174178
repo: modflow6-nightly-build
175179

180+
# temporary. devtools 2.x will autosync, but 1.x needs opt-in.
181+
- name: Sync devtools
182+
run: uv run mf sync
183+
176184
- name: Run autotests
177185
working-directory: ./autotest
178186
shell: bash -l {0}

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies = [
4242
dev = ["modflowapi[test,lint]"]
4343
test = [
4444
"filelock",
45-
"modflow-devtools>=1.7.0",
45+
"modflow-devtools[test,dfn,models]>=1.9.1,<2",
4646
"pytest!=8.1.0",
4747
"pytest-order",
4848
"pytest-xdist",

0 commit comments

Comments
 (0)