chore: drop py3.8-3.9, add py3.13 (#228)

Author: wpbonelli

.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: |
@@ -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: |

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"]

pixi.lock

@@ -26,7 +26,7 @@ pytest-cov = "*"
 pytest-dotenv = "*"
 pytest-order = "*"
 pytest-xdist = "*"
-python = "3.9.*"
+python = "3.10.*"
 requests = "*"
 ruff = "*"
 

pixi.toml

@@ -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/_compiler_language_files.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/_file_utils.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/_usgs_src_update.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)
 

pymake/utils/download.py

@@ -19,14 +19,13 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering :: Hydrology",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
     "numpy",
     "requests",