release(1.2.8): update mf6 version

Also added latest version of gsflow (v 2.3.0) and mfusg_gsi (v2.1.1).
modflowpy · Jun 30, 2023 · b01eee3 · b01eee3
1 parent 2233ffc
commit b01eee3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/.github/common/install-python.sh b/.github/common/install-python.sh
@@ -2,7 +2,7 @@
 
 python -m pip install --upgrade pip
 pip install wheel
-pip install pytest pytest-cov pytest-xdist pytest-dependency flaky coverage
+pip install pytest pytest-cov pytest-xdist pytest-dependency pytest-benchmark pytest-cases pytest-dotenv pytest-virtualenv flaky coverage
 pip install appdirs matplotlib
 pip install https://github.com/modflowpy/flopy/zipball/develop
 pip install https://github.com/MODFLOW-USGS/modflow-devtools/zipball/develop

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -47,19 +47,22 @@ jobs:
 
       - name: test on Linux
         if: runner.os == 'Linux'
+        working-directory: ./autotest
         run: |
-          pytest -v -n=auto --dist=loadfile -m="base or regression" --durations=0 --cov=pymake --cov-report=xml autotest/
+          pytest -v -n=auto --dist=loadfile -m="base or regression" --durations=0 --cov=pymake --cov-report=xml
 
       - name: test on MacOS
         if: runner.os == 'macOS'
+        working-directory: ./autotest
         run: |
-          pytest -v -n=auto --dist=loadfile -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/
+          pytest -v -n=auto --dist=loadfile -m="base" --durations=0 --cov=pymake --cov-report=xml
 
       - name: test on Windows
         if: runner.os == 'Windows'
+        working-directory: ./autotest
         shell: cmd
         run: |
-          pytest -v -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/
+          pytest -v -m="base" --durations=0 --cov=pymake --cov-report=xml
 
       - name: Print coverage report before upload
         run: |

diff --git a/.github/workflows/pymake-gcc.yml b/.github/workflows/pymake-gcc.yml
@@ -46,8 +46,9 @@ jobs:
           .github/common/download-examples.sh
 
       - name: Run pytest
+        working-directory: ./autotest
         run: |
-          pytest -v --dist=loadfile -n=auto -m="base or regression" --durations=0 --cov=pymake --cov-report=xml autotest/
+          pytest -v --dist=loadfile -n=auto -m="base or regression" --durations=0 --cov=pymake --cov-report=xml
 
       - name: Print coverage report before upload
         run: |
@@ -102,8 +103,9 @@ jobs:
           .github/common/download-examples.sh
 
       - name: Run pytest
+        working-directory: ./autotest
         run: |
-          pytest -v --dist=loadfile -n=auto -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/
+          pytest -v --dist=loadfile -n=auto -m="base" --durations=0 --cov=pymake --cov-report=xml
 
       - name: Print coverage report before upload
         run: |

diff --git a/.github/workflows/pymake-requests.yml b/.github/workflows/pymake-requests.yml
@@ -31,13 +31,15 @@ jobs:
           .github/common/install-python.sh
 
       - name: Run pytest
+        working-directory: ./autotest
         run: |
-          pytest -v -n=auto -m requests --durations=0 --cov=pymake --cov-report=xml autotest/
+          pytest -v -n=auto -m requests --durations=0 --cov=pymake --cov-report=xml
 
       - name: Run scheduled tests
         if: ${{ github.event_name == 'schedule' }}
+        working-directory: ./autotest
         run: |
-          pytest -v -m="schedule" --durations=0 --cov=pymake --cov-report=xml autotest/
+          pytest -v -m="schedule" --durations=0 --cov=pymake --cov-report=xml
 
       - name: Print coverage report before upload
         run: |

diff --git a/pymake/utils/usgsprograms.txt b/pymake/utils/usgsprograms.txt
@@ -22,6 +22,6 @@ mfnwt1.1.4 ,  1.1.4      ,  False  , https://water.usgs.gov/water-resources/soft
 mfnwt      ,  1.3.0      ,  True   , https://water.usgs.gov/water-resources/software/MODFLOW-NWT/MODFLOW-NWT_1.3.0.zip              , MODFLOW-NWT         , src                 ,    True           , True         , False
 mfusg_gsi  ,  2.1.1      ,  True   , https://www.gsienv.com/wp-content/uploads/2023/04/USG-Transport-V_2.1.1.zip                    , .                   , USGT-v2-1-1-source  ,    True           , True         , False
 gsflow     ,  2.3.0      ,  True   , https://water.usgs.gov/water-resources/software/gsflow/gsflow_2.3.0.zip                        , gsflow_2.3.0        , src                 ,    True           , False        , False
-mf6dev     ,  6.4.3.dev0 ,  False  , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip                        , modflow6-develop    , src                 ,    True           , False        , False
-zbud6dev   ,  6.4.3.dev0 ,  False  , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip                        , modflow6-develop    , utils/zonebudget/src,    True           , False        , False
-libmf6dev  ,  6.4.3.dev0 ,  False  , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip                        , modflow6-develop    , srcbmi              ,    True           , False        , True
+mf6dev     ,  6.4.2.post ,  False  , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip                        , modflow6-develop    , src                 ,    True           , False        , False
+zbud6dev   ,  6.4.2.post ,  False  , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip                        , modflow6-develop    , utils/zonebudget/src,    True           , False        , False
+libmf6dev  ,  6.4.2.post ,  False  , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip                        , modflow6-develop    , srcbmi              ,    True           , False        , True