Merge pull request #237 from modflowpy/v1.5.0

Release 1.5.0

Author: wpbonelli

.github/workflows/ci.yml

@@ -42,6 +42,18 @@ jobs:
         shell: ${{ matrix.shell }}
 
     steps:
+      - name: Free Disk Space (Ubuntu)
+        if: runner.os == 'Linux'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
       - name: Checkout repo
         uses: actions/checkout@v4
 
@@ -55,9 +67,9 @@ jobs:
         uses: ts-graphviz/setup-graphviz@v2
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].2
+        uses: prefix-dev/[email protected].8
         with:
-          pixi-version: v0.34.0
+          pixi-version: v0.42.1
           manifest-path: "pixi.toml"
 
       - name: pixi post-install
@@ -106,7 +118,7 @@ jobs:
           pixi run coverage-report
   
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
@@ -133,6 +145,18 @@ jobs:
         shell: ${{ matrix.shell }}
 
     steps:
+      - name: Free Disk Space (Ubuntu)
+        if: runner.os == 'Linux'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
       - name: Checkout repo
         uses: actions/checkout@v4
 
@@ -146,9 +170,9 @@ jobs:
         uses: ts-graphviz/setup-graphviz@v2
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].2
+        uses: prefix-dev/[email protected].8
         with:
-          pixi-version: v0.34.0
+          pixi-version: v0.42.1
           manifest-path: "pixi.toml"
 
       - name: pixi post-install
@@ -182,7 +206,7 @@ jobs:
           pixi run coverage-report
   
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

.github/workflows/pymake-linting-install.yml

@@ -24,9 +24,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].2
+        uses: prefix-dev/[email protected].8
         with:
-          pixi-version: v0.34.0
+          pixi-version: v0.42.1
           manifest-path: "pixi.toml"
 
       - name: Lint

.github/workflows/pymake-requests.yml

@@ -31,9 +31,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].2
+        uses: prefix-dev/[email protected].8
         with:
-          pixi-version: v0.34.0
+          pixi-version: v0.42.1
           manifest-path: "pixi.toml"
 
       - name: pixi post-install
@@ -42,6 +42,8 @@ jobs:
           pixi run postinstall
 
       - name: Run pytest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           pixi run autotest-request
 
@@ -57,7 +59,7 @@ jobs:
           pixi run coverage-report
   
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: pyproject.toml
 
@@ -111,7 +111,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: '3.10'
 
       - name: Install Python dependencies
         run: |
@@ -120,7 +120,7 @@ jobs:
           pip install ".[test]"
 
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v8
+        uses: dawidd6/action-download-artifact@v9
 
       - name: Draft release
         env:
@@ -158,7 +158,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: '3.10'
 
       - name: Install Python dependencies
         run: |

.gitignore

@@ -85,4 +85,6 @@ venv/
 **/.DS_Store
 
 # environment files
-**.env
+**.env
+
+.trash/

README.md

@@ -2,7 +2,7 @@
 
 Python package for building MODFLOW-based programs from source files.
 
-### Version 1.4.0
+### Version 1.5.0
 
 [![PyPI Version](https://img.shields.io/pypi/v/mfpymake.png)](https://pypi.python.org/pypi/mfpymake)
 [![Anaconda Version](https://anaconda.org/conda-forge/mfpymake/badges/version.svg)](https://anaconda.org/conda-forge/mfpymake)  

autotest/test_build.py

@@ -15,11 +15,14 @@
 test_ostag = get_ostag()
 test_fc_env = os.environ.get("FC")
 if "win" in test_ostag:
-    meson_exclude = ("mt3dms", "vs2dt", "triangle", "gridgen", "sutra")
+    meson_exclude = ["mt3dms", "vs2dt", "triangle", "gridgen", "sutra"]
 elif "win" not in test_ostag and test_fc_env in ("ifort",):
-    meson_exclude = ("mf2000", "mf2005", "swtv4", "mflgr", "sutra")
+    meson_exclude = ["mf2000", "mf2005", "swtv4", "mflgr", "sutra"]
 else:
-    meson_exclude = ("sutra",)
+    meson_exclude = ["sutra"]
+if "win" in test_ostag and test_fc_env in ("ifort",):
+    meson_exclude += ["mf2000", "mf2005", "swtv4", "mflgr"]
+
 targets_meson = [t for t in targets if t not in meson_exclude]
 
 make_exclude = ("libmf6", "gridgen", "mf2000", "swtv4", "mflgr")

autotest/test_mf6_existing_meson.py

@@ -2,7 +2,6 @@
 import sys
 from pathlib import Path
 from platform import system
-from typing import List
 
 import pytest
 from modflow_devtools.misc import set_dir
@@ -15,13 +14,13 @@
 
 
 @pytest.fixture(scope="module")
-def targets() -> List[Path]:
+def targets() -> list[Path]:
     target = TARGET_NAME
     ext, shared_ext = get_binary_suffixes()
-    executables = [target, "zbud6", "mf5to6", "libmf6"]
-    for idx, _ in enumerate(executables[:3]):
+    executables = [target, "zbud6", "libmf6"]
+    for idx, _ in enumerate(executables[:-1]):
         executables[idx] += ext
-    executables[3] += shared_ext
+    executables[-1] += shared_ext
     return executables