appease ruff

Author: wpbonelli

autotest/test_build.py

@@ -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_cli_cmds.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_gridgen.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_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,7 +14,7 @@
 
 
 @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"]
@@ -90,9 +89,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:

autotest/test_requests.py

@@ -65,9 +65,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"
+    )
 
 
 @pytest.mark.dependency("latest_version")

pymake/utils/_compiler_language_files.py

@@ -22,7 +22,7 @@ def _get_fortran_files(srcfiles, extensions=False):
         list of fortran files or unique fortran file extensions
 
     """
-    if isinstance(srcfiles, (str,)):
+    if isinstance(srcfiles, str):
         srcfiles = [srcfiles]
     files_out = []
     for srcfile in srcfiles:

pymake/utils/_file_utils.py

@@ -20,7 +20,7 @@ def _get_extra_exclude_files(external_file):
     if external_file is None:
         files = None
     else:
-        if isinstance(external_file, (list, tuple)):
+        if isinstance(external_file, list | tuple):
             files = external_file
         elif os.path.isfile(external_file):
             efpth = os.path.dirname(external_file)

pymake/utils/_usgs_src_update.py

@@ -666,7 +666,7 @@ def _update_vs2dt_files(srcdir, fc, cc, arch, double):
 
 
 def _update_mf6_files(
-    srcdir: Union[str, os.PathLike],
+    srcdir: str | os.PathLike,
     fc: str,
     cc: str,
     arch: str,
@@ -699,7 +699,7 @@ def _update_mf6_files(
 
 
 def _update_libmf6_files(
-    srcdir: Union[str, os.PathLike],
+    srcdir: str | os.PathLike,
     fc: str,
     cc: str,
     arch: str,
@@ -733,7 +733,7 @@ def _update_libmf6_files(
 
 # common source file replacement functions
 def _update_mf6_external_dependencies(
-    srcdir: Union[str, os.PathLike],
+    srcdir: str | os.PathLike,
     target: str = "mf6",
 ) -> None:
     """

pymake/utils/download.py

@@ -143,7 +143,7 @@ def compressall(
         if dir_pths is None:
             dir_pths = []
         else:
-            if isinstance(dir_pths, (str, Path)):
+            if isinstance(dir_pths, str | Path):
                 dir_pths = [dir_pths]
 
         # convert find to a list if a str (a tuple is allowed)
@@ -862,7 +862,7 @@ def getmfexes(
         download_dir = os.path.join(".", "download_dir")
         if isinstance(exes, str):
             exes = tuple(exes)
-        elif isinstance(exes, (int, float)):
+        elif isinstance(exes, int | float):
             msg = "exes keyword must be a string or a list/tuple of strings"
             raise TypeError(msg)
 
@@ -944,7 +944,7 @@ def getmfnightly(
         download_dir = os.path.join(".", "download_dir")
         if isinstance(exes, str):
             exes = tuple(exes)
-        elif isinstance(exes, (int, float)):
+        elif isinstance(exes, int | float):
             msg = "exes keyword must be a string or a list/tuple of strings"
             raise TypeError(msg)