ducktools-pythonfinder 0.6.0__tar.gz → 0.6.2__tar.gz

{ducktools_pythonfinder-0.6.0/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-pythonfinder
-Version: 0.6.0
+Version: 0.6.2
 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.6.0 → ducktools_pythonfinder-0.6.2}/src/ducktools/pythonfinder/__main__.py

@@ -184,7 +184,10 @@ def display_local_installs(
         if install.shadowed:
             version_str = f"[{version_str}]"
 
-        if install.implementation != "cpython":
+        if (
+            install.implementation != "cpython"
+            and install.implementation_version != install.version
+        ):
             alternate_implementations = True
             version_str = f"({install.implementation_version_str}) {version_str}"
 

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

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

{ducktools_pythonfinder-0.6.0 → ducktools_pythonfinder-0.6.2}/src/ducktools/pythonfinder/shared.py

@@ -88,7 +88,7 @@ def version_tuple_to_str(version_tuple):
     else:
         releaselevel = ""
 
-    if serial == 0:
+    if serial == 0 or not releaselevel:
         serial = ""
     else:
         serial = f"{serial}"
@@ -151,13 +151,14 @@ class PythonInstall(Prefab):
     @property
     def implementation_version(self) -> tuple[int, int, int, str, int] | None:
         if self._implementation_version is None:
-            if self.implementation == "cpython":
-                self._implementation_version = self.version
-            elif implementation_ver := self.metadata.get(f"{self.implementation}_version"):
+            if implementation_ver := self.metadata.get(f"{self.implementation}_version"):
                 if len(implementation_ver) == 3:
                     self._implementation_version = tuple([*implementation_ver, "final", 0])  # type: ignore
                 else:
                     self._implementation_version = implementation_ver
+            else:
+                self._implementation_version = self.version
+
         return self._implementation_version
 
     @property
@@ -273,11 +274,18 @@ def get_folder_pythons(
     with os.scandir(base_folder) as fld:
         for file_path in fld:
             if (
-                not file_path.is_symlink()
-                and file_path.is_file()
+                file_path.is_file()
                 and any(reg.fullmatch(file_path.name) for reg in regexes)
             ):
-                install = get_install_details(file_path.path)
+                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")):
+                        continue
+                else:
+                    p = file_path.path
+                install = get_install_details(p)
                 if install:
                     yield install
 
@@ -337,10 +345,11 @@ def get_uv_pythons(query_executables=True) -> 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, query_executables))
-                ):
-                    yield install
+        if os.path.exists(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, query_executables))
+                    ):
+                        yield install

{ducktools_pythonfinder-0.6.0 → ducktools_pythonfinder-0.6.2/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-pythonfinder
-Version: 0.6.0
+Version: 0.6.2
 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.6.0/src/ducktools/pythonfinder/_version.py

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