🎨 refactor(create): read the system exe without narrowing (#3224)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: gaborbernat

docs/changelog/3224.bugfix.rst

@@ -0,0 +1,2 @@
+Bump the ``python-discovery`` minimum to ``>=1.6`` for ``PythonInfo.system_exe``, which reports the system interpreter
+without the nullable typing of ``system_executable`` - by :user:`gaborbernat`.

pyproject.toml

@@ -49,7 +49,7 @@ dependencies = [
   "filelock>=3.16.1,<=3.19.1; python_version<'3.10'",
   "filelock>=3.24.2,<4; python_version>='3.10'",
   "platformdirs>=3.9.1,<5",
-  "python-discovery>=1.4.2",
+  "python-discovery>=1.6",
   "typing-extensions>=4.13.2; python_version<'3.11'",
 ]
 urls.Documentation = "https://virtualenv.pypa.io"

src/virtualenv/create/via_global_ref/builtin/cpython/common.py

@@ -31,7 +31,7 @@ class CPythonPosix(CPython, PosixSupports, ABC):
 
     @classmethod
     def _executables(cls, interpreter: PythonInfo) -> Generator[tuple[Path, list[str], str, str]]:
-        host_exe = Path(interpreter.system_executable)  # ty: ignore[invalid-argument-type]
+        host_exe = Path(interpreter.system_exe)
         minor = interpreter.version_info.minor
         names = [
             "python",
@@ -57,7 +57,7 @@ def _executables(cls, interpreter: PythonInfo) -> Generator[tuple[Path, list[str
             "python3.exe",
             "python3",
             # host is the venvlauncher shim on CPython 3.13+, so the alias comes from the interpreter, not from host
-            Path(interpreter.system_executable).name,  # ty: ignore[invalid-argument-type]
+            Path(interpreter.system_exe).name,
             *((f"python3.{minor}t.exe",) if interpreter.free_threaded else ()),
         }
         for path in (host.parent / n for n in names):
@@ -73,7 +73,7 @@ def _executables(cls, interpreter: PythonInfo) -> Generator[tuple[Path, list[str
 
     @classmethod
     def host_python(cls, interpreter: PythonInfo) -> Path:
-        return Path(interpreter.system_executable)  # ty: ignore[invalid-argument-type]
+        return Path(interpreter.system_exe)
 
 
 def is_mac_os_framework(interpreter: PythonInfo) -> bool:

src/virtualenv/create/via_global_ref/builtin/cpython/cpython3.py

@@ -150,7 +150,7 @@ def host_python(cls, interpreter: PythonInfo) -> Path:
 
     @classmethod
     def dll_and_pyd(cls, interpreter: PythonInfo) -> Generator[PathRefToDest]:
-        folders = [Path(interpreter.system_executable).parent]  # ty: ignore[invalid-argument-type]
+        folders = [Path(interpreter.system_exe).parent]
 
         # May be missing on some Python hosts.
         # See https://github.com/pypa/virtualenv/issues/2368

src/virtualenv/create/via_global_ref/builtin/graalpy/__init__.py

@@ -40,14 +40,14 @@ def exe_names(cls, interpreter: PythonInfo) -> set[str]:
 
     @classmethod
     def _executables(cls, interpreter: PythonInfo) -> Generator[tuple[Path, list[str], RefMust, RefWhen], None, None]:  # ty: ignore[invalid-method-override]
-        host = Path(interpreter.system_executable)  # ty: ignore[invalid-argument-type]
+        host = Path(interpreter.system_exe)
         targets = sorted(f"{name}{cls.suffix}" for name in cls.exe_names(interpreter))
         yield host, targets, RefMust.NA, RefWhen.ANY
 
     @classmethod
     def sources(cls, interpreter: PythonInfo) -> Generator[PathRefToDest]:  # ty: ignore[invalid-method-override]
         yield from super().sources(interpreter)
-        python_dir = Path(interpreter.system_executable).resolve().parent  # ty: ignore[invalid-argument-type]
+        python_dir = Path(interpreter.system_exe).resolve().parent
         if python_dir.name in {"bin", "Scripts"}:
             python_dir = python_dir.parent
 
@@ -90,7 +90,7 @@ def _native_lib(cls, lib_dir: Path, platform: str) -> Path:  # ruff:ignore[unuse
     def set_pyenv_cfg(self) -> None:
         # GraalPy needs an additional entry in pyvenv.cfg on Windows
         super().set_pyenv_cfg()
-        self.pyenv_cfg["venvlauncher_command"] = self.interpreter.system_executable  # ty: ignore[invalid-assignment]
+        self.pyenv_cfg["venvlauncher_command"] = self.interpreter.system_exe
 
 
 __all__ = [

src/virtualenv/create/via_global_ref/builtin/pypy/common.py

@@ -22,7 +22,7 @@ def can_describe(cls, interpreter: PythonInfo) -> bool:
 
     @classmethod
     def _executables(cls, interpreter: PythonInfo) -> Generator[tuple[Path, list[str], str, str]]:
-        host = Path(interpreter.system_executable)  # ty: ignore[invalid-argument-type]
+        host = Path(interpreter.system_exe)
         targets = sorted(f"{name}{PyPy.suffix}" for name in cls.exe_names(interpreter))
         yield host, targets, RefMust.NA, RefWhen.ANY
 
@@ -48,7 +48,7 @@ def sources(cls, interpreter: PythonInfo) -> Generator[PathRef]:  # ty: ignore[i
     @classmethod
     def _add_shared_libs(cls, interpreter: PythonInfo) -> Generator[Path]:
         # https://bitbucket.org/pypy/pypy/issue/1922/future-proofing-virtualenv
-        python_dir = Path(interpreter.system_executable).resolve().parent  # ty: ignore[invalid-argument-type]
+        python_dir = Path(interpreter.system_exe).resolve().parent
         yield from cls._shared_libs(python_dir)
 
     @classmethod

src/virtualenv/create/via_global_ref/builtin/rustpython/__init__.py

@@ -34,7 +34,7 @@ def exe_names(cls, interpreter: PythonInfo) -> set[str]:
 
     @classmethod
     def _executables(cls, interpreter: PythonInfo) -> Generator[tuple[Path, list[str], RefMust, RefWhen], None, None]:  # ty: ignore[invalid-method-override]
-        host = Path(interpreter.system_executable)  # ty: ignore[invalid-argument-type]
+        host = Path(interpreter.system_exe)
         targets = sorted(f"{name}{cls.suffix}" for name in cls.exe_names(interpreter))
         yield host, targets, RefMust.NA, RefWhen.ANY
 

src/virtualenv/create/via_global_ref/builtin/via_global_self_do.py

@@ -126,7 +126,7 @@ def set_pyenv_cfg(self) -> None:
         super().set_pyenv_cfg()
         self.pyenv_cfg["base-prefix"] = self.interpreter.system_prefix
         self.pyenv_cfg["base-exec-prefix"] = self.interpreter.system_exec_prefix
-        self.pyenv_cfg["base-executable"] = self.interpreter.system_executable  # ty: ignore[invalid-assignment]
+        self.pyenv_cfg["base-executable"] = self.interpreter.system_exe
 
 
 __all__ = [

src/virtualenv/create/via_global_ref/store.py

@@ -16,7 +16,7 @@ def handle_store_python(meta: ViaGlobalRefMeta, interpreter: PythonInfo) -> ViaG
 
 
 def is_store_python(interpreter: PythonInfo) -> bool:
-    parts = Path(interpreter.system_executable).parts  # ty: ignore[invalid-argument-type]
+    parts = Path(interpreter.system_exe).parts
     return (
         len(parts) > 4  # ruff:ignore[magic-value-comparison]
         and parts[-4] == "Microsoft"