ducktools-pythonfinder 0.7.6__tar.gz → 0.7.8__tar.gz

{ducktools_pythonfinder-0.7.6/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ducktools-pythonfinder
-Version: 0.7.6
+Version: 0.7.8
 Summary: Cross platform tool to find available python installations
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-pythonfinder

ducktools_pythonfinder-0.7.8/src/ducktools/pythonfinder/_version.py

@@ -0,0 +1,2 @@
+__version__ = "0.7.8"
+__version_tuple__ = (0, 7, 8)

{ducktools_pythonfinder-0.7.6 → ducktools_pythonfinder-0.7.8}/src/ducktools/pythonfinder/linux/__init__.py

@@ -28,14 +28,14 @@ import itertools
 from _collections_abc import Iterator
 
 from ..shared import PythonInstall, get_folder_pythons, get_uv_pythons, get_uv_python_path
-from .pyenv_search import get_pyenv_pythons
+from .pyenv_search import get_pyenv_pythons, get_pyenv_root
 
 
 def get_path_pythons() -> Iterator[PythonInstall]:
     exe_names = set()
 
     path_folders = os.environ.get("PATH", "").split(":")
-    pyenv_root = os.environ.get("PYENV_ROOT")
+    pyenv_root = get_pyenv_root()
     uv_root = get_uv_python_path()
 
     excluded_folders = [pyenv_root, uv_root]

{ducktools_pythonfinder-0.7.6 → ducktools_pythonfinder-0.7.8}/src/ducktools/pythonfinder/linux/pyenv_search.py

@@ -31,28 +31,46 @@ import os
 import os.path
 from _collections_abc import Iterator
 
-from ducktools.lazyimporter import LazyImporter, ModuleImport
+from ducktools.lazyimporter import LazyImporter, FromImport, ModuleImport
 
 from ..shared import PythonInstall, get_install_details, FULL_PY_VER_RE, version_str_to_tuple
 
 _laz = LazyImporter(
     [
         ModuleImport("re"),
+        FromImport("subprocess", "run"),
     ]
 )
 
 # pyenv folder name for pypy
 PYPY_VER_RE = r"^pypy(?P<pyversion>\d{1,2}\.\d+)-(?P<pypyversion>[\d\.]*)$"
 
-PYENV_VERSIONS_FOLDER = os.path.join(os.environ.get("PYENV_ROOT", ""), "versions")
+
+def get_pyenv_root() -> str | None:
+    # Check if the environment variable exists, if so use that
+    # As a backup try to run pyenv to obtain the root folder
+    pyenv_root = os.environ.get("PYENV_ROOT")
+    if not pyenv_root:
+        try:
+            output = _laz.run(["pyenv", "root"], capture_output=True, text=True)
+        except FileNotFoundError:
+            return None
+
+        pyenv_root = output.stdout.strip()
+
+    return pyenv_root
 
 
 def get_pyenv_pythons(
-    versions_folder: str | os.PathLike = PYENV_VERSIONS_FOLDER,
+    versions_folder: str | os.PathLike | None = None,
     *,
     query_executables: bool = True,
 ) -> Iterator[PythonInstall]:
-    if not os.path.exists(versions_folder):
+    if versions_folder is None:
+        if pyenv_root := get_pyenv_root():
+            versions_folder = os.path.join(pyenv_root, "versions")
+
+    if versions_folder is None or not os.path.exists(versions_folder):
         return
 
     # Sorting puts standard python versions before alternate implementations

{ducktools_pythonfinder-0.7.6 → ducktools_pythonfinder-0.7.8}/src/ducktools/pythonfinder/venv.py

@@ -175,27 +175,21 @@ class PythonVEnv(Prefab):
         :param cfg_path: Path to a virtualenv config file
         :return: PythonVEnv with details relative to that config file
         """
-        parent_path, version_str, parent_exe = None, None, None
         venv_base = os.path.dirname(cfg_path)
 
         with open(cfg_path, 'r') as f:
+            conf = {}
             for line in f:
-                key, value = (item.strip() for item in line.split("="))
+                key, _, value = [item.strip() for item in line.partition("=")]
+                conf[key] = value
 
-                if key == "home":
-                    parent_path = value
-                elif key in {"version", "version_info"}:
-                    # venv and uv use different key names :)
-                    version_str = value
-                elif key == "executable":
-                    parent_exe = value
+        parent_path = conf.get("home")
+        version_str = conf.get("version", conf.get("version_info"))
+        parent_exe = conf.get("executable", conf.get("base-executable"))
 
-                if parent_path and version_str and parent_exe:
-                    break
-
-            if parent_path is None or version_str is None:
-                # Not a valid venv
-                raise InvalidVEnvError(f"Path or version not defined in {cfg_path}")
+        if parent_path is None or version_str is None:
+            # Not a valid venv
+            raise InvalidVEnvError(f"Path or version not defined in {cfg_path}")
 
         if sys.platform == "win32":
             venv_exe = os.path.join(venv_base, "Scripts", "python.exe")

{ducktools_pythonfinder-0.7.6 → ducktools_pythonfinder-0.7.8}/src/ducktools/pythonfinder/win32/pyenv_search.py

@@ -29,15 +29,24 @@ from _collections_abc import Iterator
 from ..shared import PythonInstall, get_install_details
 
 
-PYENV_VERSIONS_FOLDER = os.path.join(os.environ.get("PYENV_ROOT", ""), "versions")
+def get_pyenv_root() -> str | None:
+    # Check if the environment variable exists, if so use that
+    # Windows PYENV does not have the `pyenv root` command to use as a backup.
+    pyenv_root = os.environ.get("PYENV_ROOT")
+    return pyenv_root
 
 
 def get_pyenv_pythons(
-    versions_folder: str | os.PathLike = PYENV_VERSIONS_FOLDER,
+    versions_folder: str | os.PathLike | None = None,
     *,
     query_executables: bool = True,
 ) -> Iterator[PythonInstall]:
-    if not os.path.exists(versions_folder):
+
+    if versions_folder is None:
+        if pyenv_root := get_pyenv_root():
+            versions_folder = os.path.join(pyenv_root, "versions")
+
+    if versions_folder is None or not os.path.exists(versions_folder):
         return
 
     for p in os.scandir(versions_folder):

{ducktools_pythonfinder-0.7.6 → ducktools_pythonfinder-0.7.8/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ducktools-pythonfinder
-Version: 0.7.6
+Version: 0.7.8
 Summary: Cross platform tool to find available python installations
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-pythonfinder

{ducktools_pythonfinder-0.7.6 → ducktools_pythonfinder-0.7.8}/tests/test_pyenv.py

@@ -25,6 +25,7 @@ import sys
 import os
 import os.path
 import textwrap
+import types
 from pathlib import Path
 
 import pytest
@@ -36,18 +37,39 @@ from ducktools.pythonfinder import details_script
 if sys.platform == "win32":
     from ducktools.pythonfinder.win32.pyenv_search import (
         get_pyenv_pythons,
-        PYENV_VERSIONS_FOLDER,
+        get_pyenv_root,
     )
 else:
     from ducktools.pythonfinder.linux.pyenv_search import (
         get_pyenv_pythons,
-        PYENV_VERSIONS_FOLDER,
+        get_pyenv_root,
     )
 
 
 details_text = Path(details_script.__file__).read_text()
 
 
+def test_get_pyenv_root_env():
+    fake_path = "path/to/pyenv"
+    with patch.dict(os.environ, {"PYENV_ROOT": fake_path}):
+        assert get_pyenv_root() == fake_path
+
+
+@pytest.mark.skipif(sys.platform == "win32", reason="Test for non-Windows only")
+def test_get_pyenv_root_backup():
+    with patch.dict(os.environ) as patched:
+        if "PYENV_ROOT" in patched:
+            del patched["PYENV_ROOT"]
+
+        from ducktools.pythonfinder.linux.pyenv_search import _laz
+        with patch.object(_laz, "run") as run_mock:
+            run_mock.return_value = types.SimpleNamespace(stdout="path/to/pyenv\n")
+            pyenv_root = get_pyenv_root()
+            run_mock.assert_called_with(["pyenv", "root"], text=True, capture_output=True)
+
+    assert pyenv_root == "path/to/pyenv"
+
+
 def test_no_versions_folder():
     with patch("os.path.exists") as exists_mock:
         exists_mock.return_value = False
@@ -59,18 +81,20 @@ def test_mock_versions_folder():
 
     out_ver = "3.12.1"
     if sys.platform == "win32":
-        out_executable = os.path.join(PYENV_VERSIONS_FOLDER, out_ver, "python.exe")
+        versions_folder = os.path.join("c:", "fake", "versions")
+        out_executable = os.path.join(versions_folder, out_ver, "python.exe")
     else:
-        out_executable = os.path.join(PYENV_VERSIONS_FOLDER, out_ver, "bin/python")
+        versions_folder = "~/fake/versions"
+        out_executable = os.path.join(versions_folder, out_ver, "bin/python")
 
     mock_dir_entry.name = out_ver
-    mock_dir_entry.path = os.path.join(PYENV_VERSIONS_FOLDER, out_ver)
+    mock_dir_entry.path = os.path.join(versions_folder, out_ver)
 
     with patch("os.path.exists") as exists_mock, patch("os.scandir") as scandir_mock:
         exists_mock.return_value = True
         scandir_mock.return_value = iter([mock_dir_entry])
 
-        python_versions = list(get_pyenv_pythons())
+        python_versions = list(get_pyenv_pythons(versions_folder="~/fake/versions"))
 
     assert python_versions == [PythonInstall.from_str(version=out_ver, executable=out_executable, managed_by="pyenv")]
 

{ducktools_pythonfinder-0.7.6 → ducktools_pythonfinder-0.7.8}/tests/test_venv_finder.py

@@ -127,8 +127,9 @@ def test_found_parent(with_venvs, this_python, this_venv):
     parent = venv_ex.get_parent_install()
     assert os.path.dirname(parent.executable) == os.path.dirname(this_python.executable)
 
-    # venv version str works same as parent
-    assert venv_ex.version_str == parent.version_str
+    # venvs created by the venv module don't record prerelease details in the version
+    # That's not my fault that's venv!
+    assert venv_ex.version[:3] == parent.version[:3]
 
 
 def test_found_parent_cache(with_venvs, this_python):

ducktools_pythonfinder-0.7.6/src/ducktools/pythonfinder/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.7.6"
-__version_tuple__ = (0, 7, 6)