Merge pull request #222 from modflowpy/v1.4.0

Release 1.4.0

Author: wpbonelli

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
           - {os: macos-latest, FC: gcc, FC_V: 13, shell: bash}
           - {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh}
           # test latest python and intel-classic
-          - {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7, shell: bash}
+          - {os: ubuntu-22.04, FC: intel-classic, FC_V: 2021.7, shell: bash}
           - {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash}
           - {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh}
           # test latest python and previous gcc
@@ -55,7 +55,7 @@ jobs:
         uses: ts-graphviz/setup-graphviz@v2
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].1
+        uses: prefix-dev/[email protected].2
         with:
           pixi-version: v0.34.0
           manifest-path: "pixi.toml"
@@ -66,7 +66,7 @@ jobs:
           pixi run postinstall
 
       - name: Setup ${{ matrix.FC }} ${{ matrix.FC_V }} on ${{ matrix.os }}
-        uses: fortran-lang/setup-fortran@main
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: ${{ matrix.FC }}
           version: ${{ matrix.FC_V }}
@@ -125,7 +125,7 @@ jobs:
           - {os: macos-latest, FC: gcc, FC_V: 13, shell: bash}
           - {os: windows-latest, FC: gcc, FC_V: 13, shell: pwsh}
           # test latest python and intel
-          - {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7, shell: bash}
+          - {os: ubuntu-22.04, FC: intel-classic, FC_V: 2021.7, shell: bash}
           - {os: macos-13, FC: intel-classic, FC_V: 2021.7, shell: bash}
           - {os: windows-2019, FC: intel-classic, FC_V: 2021.7, shell: pwsh}
     defaults:
@@ -146,7 +146,7 @@ jobs:
         uses: ts-graphviz/setup-graphviz@v2
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].1
+        uses: prefix-dev/[email protected].2
         with:
           pixi-version: v0.34.0
           manifest-path: "pixi.toml"
@@ -157,7 +157,7 @@ jobs:
           pixi run postinstall
 
       - name: Setup ${{ matrix.FC }} ${{ matrix.FC_V }} on ${{ matrix.os }}
-        uses: fortran-lang/setup-fortran@main
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: ${{ matrix.FC }}
           version: ${{ matrix.FC_V }}

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

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].1
+        uses: prefix-dev/[email protected].2
         with:
           pixi-version: v0.34.0
           manifest-path: "pixi.toml"
@@ -35,6 +35,9 @@ jobs:
       - name: Check format
         run: pixi run check-format
 
+      - name: Check spelling
+        run: pixi run check-spelling
+
   pymake_setup:
     name: standard installation
     runs-on: ubuntu-latest

.github/workflows/pymake-requests.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].1
+        uses: prefix-dev/[email protected].2
         with:
           pixi-version: v0.34.0
           manifest-path: "pixi.toml"

.github/workflows/release.yml

@@ -47,7 +47,7 @@ jobs:
           command: make-code-json
 
       - name: Upload code.md
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: code.md
           path: code.md
@@ -120,7 +120,7 @@ jobs:
           pip install ".[test]"
 
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v7
+        uses: dawidd6/action-download-artifact@v8
 
       - name: Draft release
         env:

MANIFEST.in

@@ -2,7 +2,7 @@
 
 Python package for building MODFLOW-based programs from source files.
 
-### Version 1.3.0
+### Version 1.4.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)  
@@ -101,7 +101,7 @@ options:
                         List of extra source files to exclude from the compilation. excludefiles can be either a list of files or the name of a text file that contains a list of files. (default is None)
   -so, --sharedobject   Create shared object or dll on Windows. (default is False)
   -ad APPDIR, --appdir APPDIR
-                        Target path that overides path defined target path (default is None)
+                        Target path that overrides path defined target path (default is None)
   -v, --verbose         Verbose output to terminal. (default is False)
   --keep                Keep existing executable. (default is False)
   --zip ZIP             Zip built executable. (default is None)

README.md

@@ -60,9 +60,9 @@ def test_build(function_tmpdir, target: str) -> None:
         pm.target = target
         pm.inplace = True
         fc = os.environ.get("FC", "gfortran")
-        assert (
-            pymake.build_apps(target, pm, verbose=True, clean=False) == 0
-        ), f"could not compile {target}"
+        assert pymake.build_apps(target, pm, verbose=True, clean=False) == 0, (
+            f"could not compile {target}"
+        )
 
 
 @pytest.mark.base
@@ -73,9 +73,9 @@ def test_meson_build(function_tmpdir, target: str) -> None:
     cc = os.environ.get("CC", "gcc")
     pymake.linker_update_environment(cc=cc, fc=fc)
     with set_dir(function_tmpdir):
-        assert (
-            pymake.build_apps(target, verbose=True, clean=False, meson=True) == 0
-        ), f"could not compile {target}"
+        assert pymake.build_apps(target, verbose=True, clean=False, meson=True) == 0, (
+            f"could not compile {target}"
+        )
 
 
 @pytest.mark.base

autotest/test_build.py

@@ -36,9 +36,9 @@ def run_cli_cmd(cmd: list) -> None:
         stderr = stderr.decode()
         print(stderr)
 
-    assert (
-        process.returncode == 0
-    ), f"'{' '.join(cmd)}' failed\n\tstatus code {process.returncode}\n"
+    assert process.returncode == 0, (
+        f"'{' '.join(cmd)}' failed\n\tstatus code {process.returncode}\n"
+    )
     return
 
 

autotest/test_cli_cmds.py

@@ -91,6 +91,6 @@ def test_compile(pm, target):
     ],
 )
 def test_gridgen(cmd, workspace, target):
-    assert run_gridgen(
-        cmd, workspace / "examples" / "biscayne", target
-    ), f"could not run {cmd}"
+    assert run_gridgen(cmd, workspace / "examples" / "biscayne", target), (
+        f"could not run {cmd}"
+    )

autotest/test_gridgen.py

@@ -90,9 +90,9 @@ def test_build_with_existing_meson(pm, module_tmpdir, workspace, targets):
 
         # make modflow 6 with existing meson.build file
         returncode = pymake.meson_build(workspace, fc, cc, appdir=pm.appdir)
-        assert (
-            returncode == 0
-        ), "could not build modflow 6 applications using existing meson.build file"
+        assert returncode == 0, (
+            "could not build modflow 6 applications using existing meson.build file"
+        )
 
         # check that all of the executables exist
         for executable in targets: