Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,18 @@ 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
with:
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}
Expand Down Expand Up @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading