mypy

Author: wpbonelli

autotest/test_misc.py

@@ -43,10 +43,11 @@ def test_set_env():
             assert environ.get(key) is None
 
 
-_repos_path = environ.get("REPOS_PATH")
-if _repos_path is None:
-    _repos_path = Path(__file__).parent.parent.parent.parent
-_repos_path = Path(_repos_path).expanduser().absolute()
+_repos_path_str = environ.get("REPOS_PATH")
+if _repos_path_str is None:
+    _repos_path: Path = Path(__file__).parent.parent.parent.parent
+else:
+    _repos_path = Path(_repos_path_str).expanduser().absolute()
 _testmodels_repo_path = _repos_path / "modflow6-testmodels"
 _testmodels_repo_paths_mf6 = sorted((_testmodels_repo_path / "mf6").glob("test*"))
 _testmodels_repo_paths_mf5to6 = sorted((_testmodels_repo_path / "mf5to6").glob("test*"))
@@ -132,7 +133,7 @@ def get_expected_model_dirs(path, pattern="mfsim.nam") -> list[Path]:
 
 
 def get_expected_namefiles(path, pattern="mfsim.nam") -> list[Path]:
-    folders = []
+    folders: list[Path] = []
     for root, dirs, _ in os.walk(path):
         for d in dirs:
             p = Path(root) / d

autotest/test_snapshots.py

@@ -6,7 +6,9 @@
 from _pytest.config import ExitCode
 
 proj_root = Path(__file__).parents[1]
-module_path = Path(inspect.getmodulename(__file__))
+_module_name = inspect.getmodulename(__file__)
+assert _module_name is not None
+module_path = Path(_module_name)
 snapshot_array = np.array([1.1, 2.2, 3.3])
 snapshots_path = proj_root / "autotest" / "__snapshots__"
 

autotest/test_zip.py

@@ -2,6 +2,7 @@
 import shutil
 import sys
 import zipfile
+from collections.abc import Generator
 from pathlib import Path
 from pprint import pprint
 from shutil import which
@@ -15,7 +16,9 @@
 
 ext, _ = get_suffixes(sys.platform)
 exe_stem = "pytest"
-exe_path = Path(which(exe_stem))
+_exe_which = which(exe_stem)
+assert _exe_which is not None, f"{exe_stem} not found in PATH"
+exe_path = Path(_exe_which)
 exe_name = f"{exe_stem}{ext}"
 
 
@@ -38,7 +41,7 @@ def test_compressall(function_tmpdir):
 
 
 @pytest.fixture(scope="module")
-def empty_archive(module_tmpdir) -> Path:
+def empty_archive(module_tmpdir) -> Generator[Path, None, None]:
     # https://stackoverflow.com/a/25195628/6514033
     data = b"PK\x05\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"  # noqa: E501
     path = module_tmpdir / "empty.zip"
@@ -53,7 +56,7 @@ def test_extractall_empty(empty_archive, function_tmpdir):
 
 
 @pytest.fixture(scope="module")
-def archive(module_tmpdir) -> Path:
+def archive(module_tmpdir) -> Generator[Path, None, None]:
     zip_path = module_tmpdir / "nonempty.zip"
     shutil.copy(exe_path, module_tmpdir)
     with set_dir(module_tmpdir):

modflow_devtools/make_registry.py

@@ -74,7 +74,7 @@
         action="store_true",
         help=(
             "Generate separate files (registry.toml, models.toml, examples.toml) "
-            "for 1.x compatibility. Default is consolidated.",
+            "for 1.x compatibility. Default is consolidated."
         ),
     )
     parser.add_argument(

modflow_devtools/models/__init__.py

@@ -64,7 +64,7 @@ class LocalRegistry(Registry):
 
     def __init__(self) -> None:
         # Initialize Pydantic parent with empty data (no meta for local registries)
-        super().__init__(meta=None, files={}, models={}, examples={})
+        super().__init__(_meta=None, files={}, models={}, examples={})
         # Initialize non-Pydantic tracking variable
         self._paths = set()
 
@@ -139,7 +139,9 @@ def copy_to(
             return None
 
         # Get actual file paths from FileEntry objects
-        file_paths = [self.files[name].path for name in file_names]
+        file_paths = [
+            p for name in file_names if (p := self.files[name].path) is not None
+        ]
 
         # create the workspace if needed
         workspace = Path(workspace).expanduser().absolute()
@@ -203,7 +205,7 @@ def __init__(
         retries: int = 3,
     ):
         # Initialize Pydantic parent with empty data (will be populated by _load())
-        super().__init__(meta=None, files={}, models={}, examples={})
+        super().__init__(_meta=None, files={}, models={}, examples={})
 
         # Initialize non-Pydantic instance variables
         self._registry_path = Path(__file__).parent.parent / "registry"
@@ -530,10 +532,10 @@ def index(
             models_file_path = output_dir / PoochRegistry.models_file_name
             examples_file_path = output_dir / PoochRegistry.examples_file_name
 
-            with registry_file_path.open("ab+") as registry_file:
+            with registry_file_path.open("ab+") as f:
                 tomli_w.dump(
                     remap(dict(sorted(files.items())), visit=drop_none_or_empty),
-                    registry_file,
+                    f,
                 )
 
             with models_file_path.open("ab+") as models_file:
@@ -628,12 +630,12 @@ def get_examples() -> dict[str, list[str]]:
     return DEFAULT_REGISTRY.examples
 
 
-def get_models() -> dict[str, str]:
+def get_models() -> dict[str, list[str]]:
     """Get a map of model names to input files."""
     return DEFAULT_REGISTRY.models
 
 
-def get_files() -> dict[str, dict[str, str]]:
+def get_files() -> dict[str, FileEntry]:
     """
     Get a map of file names to URLs. Note that this mapping
     contains no information on which files belong to which

modflow_devtools/models/sync.py

@@ -176,18 +176,21 @@ def get_sync_status(bootstrap_path: Path | str | None = None) -> dict:
         source_name = source_meta.name
         refs = source_meta.refs if source_meta.refs else []
 
+        cached_refs: list[str] = []
+        missing_refs: list[str] = []
+
         source_status = {
             "repo": source_meta.repo,
             "configured_refs": refs,
-            "cached_refs": [],
-            "missing_refs": [],
+            "cached_refs": cached_refs,
+            "missing_refs": missing_refs,
         }
 
         for ref_name in refs:
             if (source_name, ref_name) in cached_registries:
-                source_status["cached_refs"].append(ref_name)
+                cached_refs.append(ref_name)
             else:
-                source_status["missing_refs"].append(ref_name)
+                missing_refs.append(ref_name)
 
         status[source_name] = source_status
 

scripts/update_version.py

@@ -43,7 +43,7 @@ def update_docs_config(version: Version):
 
 def update_version(
     timestamp: datetime = datetime.now(),
-    version: Version = None,
+    version: Version | None = None,
 ):
     lock_path = Path(_version_txt_path.name + ".lock")
     lock = FileLock(lock_path)
@@ -52,7 +52,7 @@ def update_version(
         version = (
             version
             if version
-            else Version(previous.major, previous.minor, previous.micro)
+            else Version(f"{previous.major}.{previous.minor}.{previous.micro}")
         )
 
         update_version_txt(version)