ducktools-pythonfinder 0.10.4__tar.gz → 0.10.6__tar.gz

{ducktools_pythonfinder-0.10.4/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.10.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducktools-pythonfinder
-Version: 0.10.4
+Version: 0.10.6
 Summary: Cross platform tool to find available python installations
 Author: David C Ellis
 License-Expression: MIT

{ducktools_pythonfinder-0.10.4 → ducktools_pythonfinder-0.10.6}/pyproject.toml

@@ -46,6 +46,8 @@ dev = [
     "mypy>=1.16",
 ]
 
+zipapp = ["pip>=26.0"]
+
 [tool.setuptools.packages.find]
 where = ["src"]
 

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

@@ -0,0 +1,2 @@
+__version__ = "0.10.6"
+__version_tuple__ = (0, 10, 6)

{ducktools_pythonfinder-0.10.4 → ducktools_pythonfinder-0.10.6}/src/ducktools/pythonfinder/linux/__init__.py

@@ -80,12 +80,15 @@ def get_path_pythons(
         if not os.path.exists(fld):
             continue
 
-        for install in get_folder_pythons(fld, finder=finder):
-            for path, manager in known_paths.items():
-                if os.path.commonpath((path, install.executable)) == path:
-                    install.managed_by = manager
-                    break
+        # Do the search like this to get subfolders
+        for path, manager in known_paths.items():
+            if os.path.commonpath((path, fld)) == path:
+                managed_by = manager
+                break
+        else:
+            managed_by = None
 
+        for install in get_folder_pythons(fld, finder=finder, managed_by=managed_by):
             name = os.path.basename(install.executable)
             if name in exe_names:
                 install.shadowed = True

{ducktools_pythonfinder-0.10.4 → ducktools_pythonfinder-0.10.6}/src/ducktools/pythonfinder/shared.py

@@ -51,13 +51,6 @@ _laz = LazyImporter(
 
 FULL_PY_VER_RE = r"(?P<major>\d+)\.(?P<minor>\d+)\.?(?P<micro>\d*)-?(?P<releaselevel>a|b|c|rc)?(?P<serial>\d*)?"
 
-UV_PYTHON_RE = (
-    r"(?P<implementation>[a-zA-Z]+)"
-    r"-(?P<version>\d+\.\d+\.\d*[a-zA-Z]*\d*)\+?(?P<extra>.*?)?"
-    r"-(?P<platform>\w*)"
-    r"-(?P<arch>\w*)"
-    r"-.*"
-)
 
 # Cache for runtime details
 # Code to work out where to store data
@@ -298,16 +291,21 @@ class DetailFinder(Prefab):
         exe_path = os.path.abspath(exe_path)
         mtime = os.stat(exe_path).st_mtime
 
+        # If the mtime of the file has been set to 0
+        # it is not possible to reliably cache install details
+        cacheable_install = (mtime != 0)
+
         install = None
         if cached_details := self.raw_cache.get(exe_path):
-            if cached_details["mtime"] == mtime:
+            if cacheable_install and cached_details["mtime"] == mtime:
                 install = PythonInstall.from_json(**cached_details["install"])
             else:
                 self.raw_cache.pop(exe_path)
+                self._dirty_cache = True
 
         if install is None:
             install = self.query_install(exe_path, managed_by, metadata)
-            if install:
+            if install and cacheable_install:
                 self.raw_cache[exe_path] = {
                     "mtime": mtime,
                     "install": as_dict(install)
@@ -574,6 +572,7 @@ def get_uv_pythons(finder=None) -> Iterator[PythonInstall]:
                 for f in fld:
                     if (
                         f.is_dir()
+                        and not f.is_symlink()
                         and (install := _implementation_from_uv_dir(f, finder=finder))
                     ):
                         yield install

{ducktools_pythonfinder-0.10.4 → ducktools_pythonfinder-0.10.6/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducktools-pythonfinder
-Version: 0.10.4
+Version: 0.10.6
 Summary: Cross platform tool to find available python installations
 Author: David C Ellis
 License-Expression: MIT

{ducktools_pythonfinder-0.10.4 → ducktools_pythonfinder-0.10.6}/tests/test_uv_finder.py

@@ -33,7 +33,6 @@ import unittest.mock as mock
 import pytest
 
 from ducktools.pythonfinder.shared import (
-    UV_PYTHON_RE,
     get_uv_python_path,
     get_uv_pythons,
 )
@@ -153,13 +152,3 @@ class TestUVReal:
         assert pythons[0].implementation == "pypy"
         assert pythons[0].implementation_version >= (7, 3, 17)
         assert pythons[0].managed_by == "Astral"
-
-
-def test_regex_matches():
-    example_312 = "cpython-3.12.7-windows-x86_64-none"
-    match = re.match(UV_PYTHON_RE, example_312)
-    assert match.groups() == ("cpython", "3.12.7", "", "windows", "x86_64")
-
-    example_313t = "cpython-3.13.0+freethreaded-windows-x86_64-none"
-    match = re.match(UV_PYTHON_RE, example_313t)
-    assert match.groups() == ("cpython", "3.13.0", "freethreaded", "windows", "x86_64")