ducktools-pythonfinder 0.4.6__tar.gz → 0.5.0__tar.gz

{ducktools_pythonfinder-0.4.6/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-pythonfinder
-Version: 0.4.6
+Version: 0.5.0
 Summary: Cross platform tool to find available python installations
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-pythonfinder
@@ -77,13 +77,19 @@ The module provides two main functions for searching for local python installs:
 * `get_python_installs` is a generator that will yield each python version it discovers
 * `list_python_installs` will take the python versions discovered by `get_python_installs`
   and return a sorted list from newest to oldest python version discovered.
+  * For the purposes of sorting, prerelease versions are considered older than any released
+    version.
 
 On Windows these methods will search the registry for PEP514 recorded python installs
-before checking for any `pyenv-win` installs that have not been registered.
+before checking for any `pyenv-win` installs that have not been registered. Finally, if
+`uv` is available it will try to find Python installs managed by `uv`.
 
-On Linux and MacOS this will search for `pyenv` installs first and then for any
-`python*` binaries found on `path`. For those found on `path` they will be made
-to run a small script to identify the version.
+On Linux and MacOS this will search for `pyenv` installs first, 
+if `uv` is available it will then try to find `uv` managed python installs. 
+Finally it will search `PATH` for any other `python*` binaries that might be available.
+
+If a python install is found twice (for instance a pyenv install in the windows registry)
+it will only be returned the first time it is found.
 
 The python installs will be returned as instances of `PythonInstall` which will
 contain version info and executable path along with some other useful metadata.

{ducktools_pythonfinder-0.4.6 → ducktools_pythonfinder-0.5.0}/README.md

@@ -49,13 +49,19 @@ The module provides two main functions for searching for local python installs:
 * `get_python_installs` is a generator that will yield each python version it discovers
 * `list_python_installs` will take the python versions discovered by `get_python_installs`
   and return a sorted list from newest to oldest python version discovered.
+  * For the purposes of sorting, prerelease versions are considered older than any released
+    version.
 
 On Windows these methods will search the registry for PEP514 recorded python installs
-before checking for any `pyenv-win` installs that have not been registered.
+before checking for any `pyenv-win` installs that have not been registered. Finally, if
+`uv` is available it will try to find Python installs managed by `uv`.
 
-On Linux and MacOS this will search for `pyenv` installs first and then for any
-`python*` binaries found on `path`. For those found on `path` they will be made
-to run a small script to identify the version.
+On Linux and MacOS this will search for `pyenv` installs first, 
+if `uv` is available it will then try to find `uv` managed python installs. 
+Finally it will search `PATH` for any other `python*` binaries that might be available.
+
+If a python install is found twice (for instance a pyenv install in the windows registry)
+it will only be returned the first time it is found.
 
 The python installs will be returned as instances of `PythonInstall` which will
 contain version info and executable path along with some other useful metadata.

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

@@ -0,0 +1,2 @@
+__version__ = "0.5.0"
+__version_tuple__ = (0, 5, 0)

{ducktools_pythonfinder-0.4.6 → ducktools_pythonfinder-0.5.0}/src/ducktools/pythonfinder/linux/__init__.py

@@ -27,7 +27,7 @@ import os.path
 import itertools
 from _collections_abc import Iterator
 
-from ..shared import PythonInstall, get_folder_pythons
+from ..shared import PythonInstall, get_folder_pythons, get_uv_pythons
 from .pyenv_search import get_pyenv_pythons
 
 
@@ -57,7 +57,11 @@ def get_path_pythons() -> Iterator[PythonInstall]:
 def get_python_installs():
     listed_pythons = set()
 
-    for py in itertools.chain(get_pyenv_pythons(), get_path_pythons()):
+    for py in itertools.chain(
+        get_pyenv_pythons(),
+        get_uv_pythons(),
+        get_path_pythons(),
+    ):
         if py.executable not in listed_pythons:
             yield py
             listed_pythons.add(py.executable)

{ducktools_pythonfinder-0.4.6 → ducktools_pythonfinder-0.5.0}/src/ducktools/pythonfinder/shared.py

@@ -26,6 +26,8 @@ import sys
 import os
 import os.path
 
+from _collections_abc import Iterator
+
 from ducktools.classbuilder import slotclass, Field, SlotFields
 from ducktools.lazyimporter import LazyImporter, ModuleImport, FromImport
 
@@ -112,6 +114,9 @@ class DetailsScript:
                     self._source_code = f.read()
             elif os.path.splitext(archive_path := sys.argv[0])[1].startswith(".pyz"):
                 script_path = os.path.relpath(details_script.__file__, archive_path)
+                if sys.platform == "win32":
+                    # Windows paths have backslashes, these do not work in zipfiles
+                    script_path = script_path.replace("\\", "/")
                 script = _laz.zipfile.Path(archive_path, script_path)
                 self._source_code = script.read_text()
             else:
@@ -226,7 +231,8 @@ def get_install_details(executable: str) -> PythonInstall | None:
 
 
 def get_folder_pythons(
-    base_folder: str | os.PathLike, basenames: tuple[str] = ("python", "pypy")
+    base_folder: str | os.PathLike,
+    basenames: tuple[str] = ("python", "pypy")
 ):
     regexes = [_python_exe_regex(name) for name in basenames]
 
@@ -240,3 +246,59 @@ def get_folder_pythons(
                 install = get_install_details(file_path.path)
                 if install:
                     yield install
+
+
+# UV Specific finder
+def _get_uv_python_path() -> str | None:
+    try:
+        uv_python_find = _laz.subprocess.run(
+            ["uv", "python", "dir"],
+            check=True,
+            text=True,
+            capture_output=True
+        )
+    except _laz.subprocess.CalledProcessError:
+        uv_python_dir = None
+    else:
+        # remove newline
+        uv_python_dir = uv_python_find.stdout.strip()
+
+    return uv_python_dir
+
+
+def _implementation_from_uv_dir(direntry: os.DirEntry) -> PythonInstall | None:
+    python_exe = "python.exe" if sys.platform == "win32" else "bin/python"
+    python_path = os.path.join(direntry, python_exe)
+
+    install: PythonInstall | None = None
+
+    if os.path.exists(python_path):
+        try:
+            implementation, version, platform, arch, _ = direntry.name.split("-")
+        except ValueError:
+            # Directory name format has changed
+            # Slow backup - ask python itself
+            install = get_install_details(python_path)
+        else:
+            if implementation == "cpython":
+                install = PythonInstall.from_str(
+                    version=version,
+                    executable=python_path,
+                    architecture="32bit" if arch in {"i686", "armv7"} else "64bit",
+                    implementation=implementation,
+                )
+            else:
+                # Get additional alternate implementation details
+                install = get_install_details(python_path)
+
+    return install
+
+
+def get_uv_pythons() -> Iterator[PythonInstall]:
+    # This takes some shortcuts over the regular pythonfinder
+    # As the UV folders give the python version and the implementation
+    if uv_python_path := _get_uv_python_path():
+        with os.scandir(uv_python_path) as fld:
+            for f in fld:
+                if f.is_dir() and (install := _implementation_from_uv_dir(f)):
+                    yield install

{ducktools_pythonfinder-0.4.6 → ducktools_pythonfinder-0.5.0}/src/ducktools/pythonfinder/win32/__init__.py

@@ -25,14 +25,18 @@ from __future__ import annotations
 from _collections_abc import Iterator
 import itertools
 
-from ..shared import PythonInstall
+from ..shared import PythonInstall, get_uv_pythons
 from .pyenv_search import get_pyenv_pythons
 from .registry_search import get_registered_pythons
 
 
 def get_python_installs() -> Iterator[PythonInstall]:
     listed_installs = set()
-    for py in itertools.chain(get_registered_pythons(), get_pyenv_pythons()):
+    for py in itertools.chain(
+        get_registered_pythons(),
+        get_pyenv_pythons(),
+        get_uv_pythons(),
+    ):
         if py.executable not in listed_installs:
             yield py
             listed_installs.add(py.executable)

{ducktools_pythonfinder-0.4.6 → ducktools_pythonfinder-0.5.0/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-pythonfinder
-Version: 0.4.6
+Version: 0.5.0
 Summary: Cross platform tool to find available python installations
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-pythonfinder
@@ -77,13 +77,19 @@ The module provides two main functions for searching for local python installs:
 * `get_python_installs` is a generator that will yield each python version it discovers
 * `list_python_installs` will take the python versions discovered by `get_python_installs`
   and return a sorted list from newest to oldest python version discovered.
+  * For the purposes of sorting, prerelease versions are considered older than any released
+    version.
 
 On Windows these methods will search the registry for PEP514 recorded python installs
-before checking for any `pyenv-win` installs that have not been registered.
+before checking for any `pyenv-win` installs that have not been registered. Finally, if
+`uv` is available it will try to find Python installs managed by `uv`.
 
-On Linux and MacOS this will search for `pyenv` installs first and then for any
-`python*` binaries found on `path`. For those found on `path` they will be made
-to run a small script to identify the version.
+On Linux and MacOS this will search for `pyenv` installs first, 
+if `uv` is available it will then try to find `uv` managed python installs. 
+Finally it will search `PATH` for any other `python*` binaries that might be available.
+
+If a python install is found twice (for instance a pyenv install in the windows registry)
+it will only be returned the first time it is found.
 
 The python installs will be returned as instances of `PythonInstall` which will
 contain version info and executable path along with some other useful metadata.

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

@@ -1,2 +0,0 @@
-__version__ = "0.4.6"
-__version_tuple__ = (0, 4, 6)