Fix venv creation to detect corrupted venvs.

Author: jsirois

CHANGES.md

@@ -1,6 +1,10 @@
 # Release Notes
 
-## 0.32.2
+## 0.31.3
+
+Fix venv creation to detect corrupted venvs (via system Python upgrades or un-installs).
+
+## 0.31.2
 
 Fix venv creation to handle `#!/bin/sh` re-director script re-writes. These are Python scripts with
 `#!/bin/sh` re-director headers that work around shebang-length limitations.

dev_cmd/__init__.py

@@ -1,4 +1,4 @@
 # Copyright 2024 John Sirois.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = "0.31.2"
+__version__ = "0.31.3"

dev_cmd/model.py

@@ -5,6 +5,7 @@
 
 import os
 import re
+import sys
 from dataclasses import dataclass, field
 from enum import Enum
 from pathlib import PurePath
@@ -146,6 +147,11 @@ def update_path(self, env: MutableMapping[str, str]) -> None:
         path = env.pop("PATH", None)
         env["PATH"] = (self.bin_path + os.pathsep + path) if path else self.bin_path
 
+    def is_valid(self) -> bool:
+        if not os.path.isfile(self.python):
+            return False
+        return "win32" == sys.platform or os.access(self.python, os.R_OK | os.X_OK)
+
 
 @dataclass(frozen=True)
 class VenvConfig:

dev_cmd/venv.py

@@ -412,21 +412,27 @@ def _extra_requirements_args() -> Iterator[list[str]]:
     with layout_file.open() as in_fp:
         data = json.load(in_fp)
 
+    def rebuild():
+        print(
+            color.yellow(f"Venv for --python {python} at {venv_dir} is out of date, rebuilding."),
+            file=sys.stderr,
+        )
+        shutil.rmtree(venv_dir)
+        return ensure(venv_config=venv_config, python_config=python_config, rebuild_if_needed=False)
+
     print(
         color.color(f"Using venv at {venv_dir} for {env_description}.", fg="gray"), file=sys.stderr
     )
     try:
-        return Venv(
+        venv = Venv(
             dir=venv_dir.as_posix(),
             python=data["python"],
             marker_environment=data["marker-environment"],
         )
+        if not venv.is_valid():
+            return rebuild()
+        return venv
     except KeyError:
         if not rebuild_if_needed:
             raise
-        print(
-            color.yellow(f"Venv for --python {python} at {venv_dir} is out of date, rebuilding."),
-            file=sys.stderr,
-        )
-        shutil.rmtree(venv_dir)
-        return ensure(venv_config=venv_config, python_config=python_config, rebuild_if_needed=False)
+        return rebuild()