ducktools-pythonfinder 0.8.6__tar.gz → 0.9.0__tar.gz

{ducktools_pythonfinder-0.8.6/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducktools-pythonfinder
-Version: 0.8.6
+Version: 0.9.0
 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.8.6 → ducktools_pythonfinder-0.9.0}/src/ducktools/pythonfinder/__main__.py

@@ -35,6 +35,7 @@ _laz = LazyImporter(
         ModuleImport("argparse"),
         ModuleImport("csv"),
         ModuleImport("subprocess"),
+        ModuleImport("sysconfig"),
         ModuleImport("platform"),
         FromImport(".pythonorg_search", "PythonOrgSearch"),
         FromImport("packaging.specifiers", "SpecifierSet"),
@@ -207,7 +208,7 @@ def display_local_installs(
             version_str = f"*{version_str}"
         elif (
             sys.prefix != sys.base_prefix
-            and os.path.commonpath([install.executable, sys.base_prefix]) == sys.base_prefix
+            and install.paths.get("stdlib") == _laz.sysconfig.get_path("stdlib")
         ):
             version_str = f"**{version_str}"
 
@@ -240,7 +241,7 @@ def display_local_installs(
     if sys.platform != "win32":
         print("[] - This Python install is shadowed by another on Path")
     print("* - This is the active Python executable used to call this module")
-    print("** - This is the parent Python executable of the venv used to call this module")
+    print("** - This is a parent Python executable of the venv used to call this module")
     print()
 
     headings_str = f"| {headings[0]:<{max_version_len}s} | {headings[1]:<{max_executable_len}s} |"

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

@@ -0,0 +1,2 @@
+__version__ = "0.9.0"
+__version_tuple__ = (0, 9, 0)

{ducktools_pythonfinder-0.8.6 → ducktools_pythonfinder-0.9.0}/src/ducktools/pythonfinder/details_script.py

@@ -46,7 +46,7 @@ def version_str_to_tuple(version):
         releaselevel = "alpha"
     elif releaselevel == "b":
         releaselevel = "beta"
-    elif releaselevel == "rc":
+    elif releaselevel in {"c", "rc"}:
         releaselevel = "candidate"
     else:
         releaselevel = "final"
@@ -80,9 +80,14 @@ def get_details():
                     "graalpy_version": version_str_to_tuple(ver)
                 }
             except (NameError, ValueError):
-                metadata = {"{}_version".format(implementation): sys.implementation.version}
+                metadata = {"{}_version".format(implementation): sys.implementation.version}            
         elif implementation != "cpython":  # pragma: no cover
-            metadata = {"{}_version".format(implementation): sys.implementation.version}
+            if implementation == "micropython":
+                imp_ver = sys.implementation.version[:3]
+            else:
+                imp_ver = sys.implementation.version
+
+            metadata = {"{}_version".format(implementation): imp_ver}
         else:
             metadata = {}
             if sys.version_info >= (3, 13):
@@ -90,12 +95,21 @@ def get_details():
                 freethreaded = bool(sysconfig.get_config_var("Py_GIL_DISABLED"))
                 metadata["freethreaded"] = freethreaded
 
+    # Attempt to get the paths to stdlib etc from sysconfig
+    try:
+        import sysconfig  # Exists in 2.7 and 3.2 onwards, missing in earlier and micropython
+    except ImportError:
+        paths = {}
+    else:
+        paths = sysconfig.get_paths()
+
     install = dict(
         version=list(sys.version_info),
         executable=sys.executable,
         architecture="64bit" if (sys.maxsize > 2**32) else "32bit",
         implementation=implementation,
         metadata=metadata,
+        paths=paths,
     )
 
     return install

{ducktools_pythonfinder-0.8.6 → ducktools_pythonfinder-0.9.0}/src/ducktools/pythonfinder/linux/__init__.py

@@ -37,6 +37,14 @@ from ..shared import (
 from .pyenv_search import get_pyenv_pythons, get_pyenv_root
 
 
+KNOWN_MANAGED_PATHS = {
+    "/usr/bin": "OS",
+    "/bin": "OS",
+    "/usr/sbin": "OS",
+    "/sbin": "OS",
+}
+
+
 def get_path_pythons(*, finder: DetailFinder | None = None) -> Iterator[PythonInstall]:
     exe_names = set()
 
@@ -46,7 +54,7 @@ def get_path_pythons(*, finder: DetailFinder | None = None) -> Iterator[PythonIn
 
     excluded_folders = [pyenv_root, uv_root]
 
-    finder = DetailFinder if finder is None else finder
+    finder = DetailFinder() if finder is None else finder
 
     for fld in path_folders:
         # Don't retrieve pyenv installs
@@ -63,6 +71,9 @@ def get_path_pythons(*, finder: DetailFinder | None = None) -> Iterator[PythonIn
             continue
 
         for install in get_folder_pythons(fld, finder=finder):
+            if manager := KNOWN_MANAGED_PATHS.get(os.path.dirname(install.executable)):
+                install.managed_by = manager
+
             name = os.path.basename(install.executable)
             if name in exe_names:
                 install.shadowed = True

{ducktools_pythonfinder-0.8.6 → ducktools_pythonfinder-0.9.0}/src/ducktools/pythonfinder/pythonorg_search.py

@@ -1,18 +1,18 @@
 # ducktools-pythonfinder
 # MIT License
-# 
+#
 # Copyright (c) 2023-2025 David C Ellis
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,6 +31,7 @@ from __future__ import annotations
 
 import json
 import platform
+import re
 
 from urllib.request import urlopen
 
@@ -44,6 +45,8 @@ from ducktools.pythonfinder.shared import version_str_to_tuple
 RELEASE_PAGE = "https://www.python.org/api/v2/downloads/release/"
 RELEASE_FILE_PAGE = "https://www.python.org/api/v2/downloads/release_file/"
 
+PYTHON_RELEASE_RE = re.compile(R"Python \d+\.\d+\.\d+(?:(?:a|b|rc)\d)?")
+
 
 class UnsupportedError(Exception):
     pass
@@ -206,13 +209,16 @@ class PythonOrgSearch(Prefab):
     def releases(self) -> list[PythonRelease]:
         """Get all releases from python.org/api/v2/downloads/release"""
         if self._releases is None:
-            if self.release_page_cache:
-                data = json.loads(self.release_page_cache)
-            else:  # pragma: nocover
+            if not self.release_page_cache:
                 with urlopen(self.release_page) as req:
-                    data = json.load(req)
+                    self.release_page_cache = req.read().decode("utf8")
+
+            data = json.loads(self.release_page_cache)
 
-            self._releases = [PythonRelease.from_dict(release) for release in data]
+            self._releases = [
+                PythonRelease.from_dict(release) for release in data
+                if PYTHON_RELEASE_RE.fullmatch(release["name"])
+            ]
             self._releases.sort(key=lambda ver: ver.version_tuple, reverse=True)
 
         return self._releases
@@ -221,11 +227,11 @@ class PythonOrgSearch(Prefab):
     def release_files(self) -> list[PythonReleaseFile]:
         """Get all release files from python.org/api/v2/downloads/release"""
         if self._release_files is None:
-            if self.release_file_page_cache:
-                data = json.loads(self.release_file_page_cache)
-            else:  # pragma: nocover
+            if not self.release_file_page_cache:
                 with urlopen(self.release_file_page) as req:
-                    data = json.load(req)
+                    self.release_file_page_cache = req.read().decode("utf8")
+
+            data = json.loads(self.release_file_page_cache)
 
             self._release_files = [PythonReleaseFile.from_dict(relfile) for relfile in data]
         return self._release_files

{ducktools_pythonfinder-0.8.6 → ducktools_pythonfinder-0.9.0}/src/ducktools/pythonfinder/shared.py

@@ -80,7 +80,7 @@ else:
     CACHE_FOLDER = os.path.join(USER_FOLDER, ".cache", "ducktools", "pythonfinder")
 
 
-CACHE_VERSION = 1
+CACHE_VERSION = 2
 DETAILS_CACHE_PATH = os.path.join(CACHE_FOLDER, f"runtime_cache_v{CACHE_VERSION}.json")
 INSTALLER_CACHE_PATH = os.path.join(CACHE_FOLDER, "installer_details.json")
 
@@ -321,6 +321,7 @@ class PythonInstall(Prefab):
     implementation: str = "cpython"
     managed_by: str | None = None
     metadata: dict = attribute(default_factory=dict)
+    paths: dict[str, str] = attribute(default_factory=dict)
     shadowed: bool = attribute(default=False, serialize=False)
     _implementation_version: tuple[int, int, int, str, int] | None = attribute(default=None, private=True)
 
@@ -365,9 +366,13 @@ class PythonInstall(Prefab):
         implementation: str = "cpython",
         managed_by: str | None = None,
         metadata: dict | None = None,
+        paths: dict | None = None,
     ):
         version_tuple = version_str_to_tuple(version)
 
+        metadata = {} if metadata is None else metadata
+        paths = {} if paths is None else paths
+
         # noinspection PyArgumentList
         return cls(
             version=version_tuple,
@@ -376,6 +381,7 @@ class PythonInstall(Prefab):
             implementation=implementation,
             managed_by=managed_by,
             metadata=metadata,
+            paths=paths,
         )
 
     @classmethod
@@ -386,11 +392,14 @@ class PythonInstall(Prefab):
         architecture,
         implementation,
         metadata,
+        paths=None,
         managed_by=None,
     ):
         if arch_ver := metadata.get(f"{implementation}_version"):
             metadata[f"{implementation}_version"] = tuple(arch_ver)
 
+        paths = {} if paths is None else paths
+
         # noinspection PyArgumentList
         return cls(
             version=tuple(version),  # type: ignore
@@ -399,6 +408,7 @@ class PythonInstall(Prefab):
             implementation=implementation,
             managed_by=managed_by,
             metadata=metadata,
+            paths=paths,
         )
 
     def get_pip_version(self) -> str | None:
@@ -430,7 +440,7 @@ def _python_exe_regex(basename: str = "python"):
 
 def get_folder_pythons(
     base_folder: str | os.PathLike,
-    basenames: tuple[str] = ("python", "pypy"),
+    basenames: tuple[str, ...] = ("python", "pypy", "micropython"),
     finder: DetailFinder | None = None,
     managed_by: str | None = None,
 ):
@@ -438,6 +448,8 @@ def get_folder_pythons(
 
     finder = DetailFinder() if finder is None else finder
 
+    base_folder = str(base_folder)
+
     with finder, os.scandir(base_folder) as fld:
         for file_path in fld:
             try:
@@ -452,11 +464,13 @@ def get_folder_pythons(
                 p = file_path.path
                 if file_path.is_symlink():
                     # Might be a venv - look for pyvenv.cfg in parent
-                    fld = os.path.dirname(p)
-                    if os.path.exists(os.path.join(fld, "../pyvenv.cfg")):
+                    dirname = os.path.dirname(p)
+
+                    if os.path.exists(os.path.join(dirname, "../pyvenv.cfg")):
                         continue
                 else:
                     p = file_path.path
+
                 install = finder.get_install_details(p, managed_by=managed_by)
                 if install:
                     yield install

{ducktools_pythonfinder-0.8.6 → ducktools_pythonfinder-0.9.0/src/ducktools_pythonfinder.egg-info}/PKG-INFO

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