From 84033ed813100399d95b8d84a748eb52f332c43f Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Fri, 23 Oct 2020 19:02:10 -0500 Subject: [PATCH 1/2] ci(t503): update t503 autotest --- autotest/t503_test.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/autotest/t503_test.py b/autotest/t503_test.py index d7a30a7cbb..da75f33700 100644 --- a/autotest/t503_test.py +++ b/autotest/t503_test.py @@ -42,23 +42,30 @@ def download_mf6_examples(): mf6path = download_mf6_examples() distpth = os.path.join(mf6path) -# folders = sorted([f for f in os.listdir(distpth) -# if os.path.isdir(os.path.join(distpth, f))]) -exclude_models = ("gwt",) -exclude_examples = ("sagehen", "keating",) +exclude_models = ( + "lnf", +) +exclude_examples = ( + "sagehen", + "ex-gwt-keating", + "ex-gwt-moc3d-p02", + "ex-gwt-mt3dms-p01", + "ex-gwt-mt3dsupp632", + "ex-gwt-prudic2004t2", +) src_folders = [] for dirName, subdirList, fileList in os.walk(mf6path): dirBase = os.path.basename(os.path.normpath(dirName)) useModel = True for exclude in exclude_models: - if exclude in dirBase: + if exclude in dirName: useModel = False break if useModel: for exclude in exclude_examples: - if exclude in dirBase: + if exclude in dirName: useModel = False break if useModel: From 1bd99d4644e8f7ac8b6ef28e80629f50a2297c34 Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Fri, 23 Oct 2020 22:00:53 -0500 Subject: [PATCH 2/2] ci(t503): update t503 autotest --- .github/workflows/ci.yml | 2 +- autotest/t503_test.py | 8 ++++---- flopy/mf6/mfpackage.py | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7c0f96281..9a08fcbd27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,7 @@ jobs: - name: Add executables directory to path shell: bash run: | - echo "::add-path::$HOME/.local/bin" + echo "$HOME/.local/bin" >> $GITHUB_PATH - name: Run nosetests shell: bash -l {0} diff --git a/autotest/t503_test.py b/autotest/t503_test.py index da75f33700..d0322c3585 100644 --- a/autotest/t503_test.py +++ b/autotest/t503_test.py @@ -49,10 +49,10 @@ def download_mf6_examples(): exclude_examples = ( "sagehen", "ex-gwt-keating", - "ex-gwt-moc3d-p02", - "ex-gwt-mt3dms-p01", - "ex-gwt-mt3dsupp632", - "ex-gwt-prudic2004t2", + # "ex-gwt-moc3d-p02", + # "ex-gwt-mt3dms-p01", + # "ex-gwt-mt3dsupp632", + # "ex-gwt-prudic2004t2", ) src_folders = [] diff --git a/flopy/mf6/mfpackage.py b/flopy/mf6/mfpackage.py index 5b5352f0bd..00a63b436b 100644 --- a/flopy/mf6/mfpackage.py +++ b/flopy/mf6/mfpackage.py @@ -1131,6 +1131,7 @@ def write(self, fd, ext_file_action=ExtFileAction.copy_relative_paths): is_empty and self.structure.name.lower() != "exchanges" and self.structure.name.lower() != "options" + and self.structure.name.lower() != "sources" ): return if self.structure.repeating():