From 166d8b6cdfc7c3814d6588d0b3bd23b0f1f2daca Mon Sep 17 00:00:00 2001 From: jlarsen Date: Wed, 21 Aug 2024 14:28:24 -0700 Subject: [PATCH] more updates to CI --- .github/workflows/ci.yml | 17 ++++++++++++----- autotest/conftest.py | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcaa64f..2b3a131 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -199,22 +199,29 @@ jobs: pip install git+https://git@github.com/modflowpy/flopy@develop pip install .[test] - - name: Install modflow6 nightly build - uses: modflowpy/install-modflow-action@v1 - with: - path: ${{ github.workspace }}/autotest - repo: modflow6-nightly-build + - name: update flopy for mf6-examples run: | get-modflow :flopy python -m flopy.mf6.utils.generate_classes --ref develop --no-backup + - name: Install modflow6 for modflow6-examples + uses: modflowpy/install-modflow-action@v1 + with: + path: ${{ github.workspace }}/modflow6-examples/autotest + - name: Build mf6-examples working-directory: modflow6-examples/autotest run: | pytest -v -n=auto --init test_scripts.py + - name: Install modflow6 nightly build + uses: modflowpy/install-modflow-action@v1 + with: + path: ${{ github.workspace }}/autotest + repo: modflow6-nightly-build + - name: Run autotests working-directory: ./autotest shell: bash -l {0} diff --git a/autotest/conftest.py b/autotest/conftest.py index adbb9f6..28bbed9 100644 --- a/autotest/conftest.py +++ b/autotest/conftest.py @@ -60,7 +60,7 @@ def pytest_generate_tests(metafunc): mf6_examples_path = get_mf6_examples_path() # grouping... - exclude = ["ex-gwt-gwtgwt-mt3dms-p10", "ex-prt-mp7-p02", "ex-prt-mp7-p04"] + exclude = ["ex-gwt-gwtgwt-mt3dms-p10", "mp7-p02", "mp7-p04"] namfiles = [ str(p) for p in mf6_examples_path.rglob("mfsim.nam")