ducktools-pythonfinder 0.6.3__tar.gz → 0.6.5__tar.gz

{ducktools_pythonfinder-0.6.3/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.6.5}/PKG-INFO

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

@@ -157,12 +157,10 @@ def display_local_installs(
         elif max_ver and install.version > max_ver:
             continue
         elif compatible:
-            mismatch = False
-            for i, val in enumerate(compatible):
-                if val != install.version[i]:
-                    mismatch = True
-                    break
-            if mismatch:
+            if install.version < compatible:
+                continue
+            version_parts = len(compatible) - 1
+            if install.version[:version_parts] > compatible[:-1]:
                 continue
 
         version_str = install.version_str
@@ -181,6 +179,9 @@ def display_local_installs(
         ):
             version_str = f"**{version_str}"
 
+        if install.metadata.get("freethreaded"):
+            version_str = f"{version_str}t"
+
         if install.shadowed:
             version_str = f"[{version_str}]"
 

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

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

{ducktools_pythonfinder-0.6.3 → ducktools_pythonfinder-0.6.5}/src/ducktools/pythonfinder/details_script.py

@@ -26,7 +26,7 @@ Get the details from a python install as JSON
 """
 import sys
 
-FULL_PY_VER_RE = r"(?P<major>\d+)\.(?P<minor>\d+)\.?(?P<micro>\d*)-?(?P<releaselevel>[a-zA-Z]*)(?P<serial>\d*)"
+FULL_PY_VER_RE = r"(?P<major>\d+)\.(?P<minor>\d+)\.?(?P<micro>\d*)-?(?P<releaselevel>a|b|c|rc)?(?P<serial>\d*)?"
 
 
 def version_str_to_tuple(version):
@@ -80,6 +80,11 @@ def get_details():
             metadata = {"{}_version".format(implementation): sys.implementation.version}
         else:
             metadata = {}
+            if sys.version_info >= (3, 13):
+                import sysconfig
+                freethreaded = bool(sysconfig.get_config_var("Py_GIL_DISABLED"))
+                metadata["freethreaded"] = freethreaded
+
 
     install = dict(
         version=list(sys.version_info),

{ducktools_pythonfinder-0.6.3 → ducktools_pythonfinder-0.6.5}/src/ducktools/pythonfinder/linux/pyenv_search.py

@@ -33,7 +33,7 @@ from _collections_abc import Iterator
 
 from ducktools.lazyimporter import LazyImporter, ModuleImport
 
-from ..shared import PythonInstall, get_install_details
+from ..shared import PythonInstall, get_install_details, FULL_PY_VER_RE, version_str_to_tuple
 
 _laz = LazyImporter(
     [
@@ -41,8 +41,7 @@ _laz = LazyImporter(
     ]
 )
 
-# pyenv folder names
-PYTHON_VER_RE = r"\d{1,2}\.\d{1,2}\.\d+[a-z]*\d*"
+# 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")
@@ -64,7 +63,21 @@ def get_pyenv_pythons(
         executable = os.path.join(p.path, "bin/python")
 
         if os.path.exists(executable):
-            if _laz.re.fullmatch(PYTHON_VER_RE, p.name):
-                yield PythonInstall.from_str(p.name, executable)
+            if p.name.endswith("t"):
+                freethreaded = True
+                version = p.name[:-1]
+            else:
+                freethreaded = False
+                version = p.name
+            if _laz.re.fullmatch(FULL_PY_VER_RE, version):
+                version_tuple = version_str_to_tuple(version)
+                metadata = {}
+                if version_tuple >= (3, 13):
+                    metadata["freethreaded"] = freethreaded
+                yield PythonInstall(
+                    version=version_tuple,
+                    executable=executable,
+                    metadata=metadata,
+                )
             elif query_executables and (install := get_install_details(executable)):
                 yield install

{ducktools_pythonfinder-0.6.3 → ducktools_pythonfinder-0.6.5}/src/ducktools/pythonfinder/shared.py

@@ -46,7 +46,15 @@ _laz = LazyImporter(
 )
 
 
-FULL_PY_VER_RE = r"(?P<major>\d+)\.(?P<minor>\d+)\.?(?P<micro>\d*)-?(?P<releaselevel>[a-zA-Z]*)(?P<serial>\d*)"
+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"-.*"
+)
 
 
 def version_str_to_tuple(version):
@@ -61,7 +69,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"
@@ -323,25 +331,29 @@ def _implementation_from_uv_dir(
     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
+        if match := _laz.re.fullmatch(UV_PYTHON_RE, direntry.name):
+            implementation, version, extra, platform, arch = match.groups()
+            metadata = {
+                "freethreaded": "freethreaded" in extra,
+            }
+
+            try:
+                if implementation in {"cpython"}:
+                    install = PythonInstall.from_str(
+                        version=version,
+                        executable=python_path,
+                        architecture="32bit" if arch in {"i686", "armv7"} else "64bit",
+                        implementation=implementation,
+                        metadata=metadata
+                    )
+            except ValueError:
+                pass
+
+        if install is None:
+            # Directory name format has changed or this is an alternate implementation
             # Slow backup - ask python itself
             if query_executables:
                 install = get_install_details(python_path)
-        else:
-            if implementation in {"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
-                if query_executables:
-                    install = get_install_details(python_path)
 
     return install
 

{ducktools_pythonfinder-0.6.3 → ducktools_pythonfinder-0.6.5}/src/ducktools/pythonfinder/win32/pyenv_search.py

@@ -73,7 +73,9 @@ def get_pyenv_pythons(
                 arch = "32bit" if arch == "win32" else "64bit"
                 try:
                     yield PythonInstall.from_str(
-                        version, executable, architecture=arch
+                        version=version,
+                        executable=executable,
+                        architecture=arch,
                     )
                 except ValueError:
                     pass
@@ -81,7 +83,9 @@ def get_pyenv_pythons(
                 version = split_version[0]
                 try:
                     yield PythonInstall.from_str(
-                        version, executable, architecture="64bit"
+                        version=version,
+                        executable=executable,
+                        architecture="64bit",
                     )
                 except ValueError:
                     pass

{ducktools_pythonfinder-0.6.3 → ducktools_pythonfinder-0.6.5}/src/ducktools/pythonfinder/win32/registry_search.py

@@ -31,7 +31,7 @@ Based on PEP 514 registry entries.
 import winreg  # noqa  # pycharm seems to think winreg doesn't exist in python3.12
 from _collections_abc import Iterator
 
-from ..shared import PythonInstall
+from ..shared import PythonInstall, version_str_to_tuple
 
 exclude_companies = {
     "PyLauncher",  # pylauncher is special cased to be ignored
@@ -100,18 +100,24 @@ def get_registered_pythons() -> Iterator[PythonInstall]:
                                     winreg.CloseKey(install_key)
 
                             python_version: str | None = metadata.get("Version")
-                            # Pyenv puts architecture information in the Version value for some reason
-                            if python_version:
-                                python_version = python_version.split("-")[0]
 
                             architecture = metadata.get("SysArchitecture")
 
                             metadata["InWindowsRegistry"] = True
 
                         if python_path and python_version:
+                            # Pyenv puts architecture information in the Version value for some reason
+                            python_version = python_version.split("-")[0]
+                            version_tuple = version_str_to_tuple(python_version)
+
+                            if (
+                                version_tuple >= (3, 13)
+                                and "freethreaded" in metadata.get("DisplayName", "")
+                            ):
+                                metadata["freethreaded"] = True
                             try:
-                                yield PythonInstall.from_str(
-                                    version=python_version,
+                                yield PythonInstall(
+                                    version=version_tuple,
                                     executable=python_path,
                                     architecture=architecture,
                                     metadata=metadata,

{ducktools_pythonfinder-0.6.3 → ducktools_pythonfinder-0.6.5/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-pythonfinder
-Version: 0.6.3
+Version: 0.6.5
 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.3 → ducktools_pythonfinder-0.6.5}/tests/test_pyenv.py

@@ -72,7 +72,7 @@ def test_mock_versions_folder():
 
         python_versions = list(get_pyenv_pythons())
 
-    assert python_versions == [PythonInstall.from_str(out_ver, out_executable)]
+    assert python_versions == [PythonInstall.from_str(version=out_ver, executable=out_executable)]
 
 
 @pytest.mark.skipif(sys.platform != "win32", reason="Test for Windows only")
@@ -89,7 +89,7 @@ def test_fs_versions_win(fs):
 
     versions = list(get_pyenv_pythons(tmpdir))
 
-    assert versions == [PythonInstall.from_str("3.12.1", py_exe)]
+    assert versions == [PythonInstall.from_str(version="3.12.1", executable=py_exe)]
 
 
 @pytest.mark.skipif(sys.platform != "win32", reason="Test for Windows only")
@@ -106,7 +106,7 @@ def test_32bit_version(fs):
 
     versions = list(get_pyenv_pythons(tmpdir))
 
-    assert versions == [PythonInstall.from_str("3.12.1", py_exe, architecture="32bit")]
+    assert versions == [PythonInstall.from_str(version="3.12.1", executable=py_exe, architecture="32bit")]
 
 
 @pytest.mark.skipif(sys.platform != "win32", reason="Test for Windows only")
@@ -155,7 +155,7 @@ def test_fs_versions_nix(fs):
 
     versions = list(get_pyenv_pythons(tmpdir))
 
-    assert versions == [PythonInstall.from_str("3.12.1", py_exe)]
+    assert versions == [PythonInstall.from_str(version="3.12.1", executable=py_exe)]
 
 
 @pytest.mark.skipif(sys.platform == "win32", reason="Test for non-Windows only")

{ducktools_pythonfinder-0.6.3 → ducktools_pythonfinder-0.6.5}/tests/test_uv_finder.py

@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 import os
+import re
 import subprocess
 
 from tempfile import TemporaryDirectory
@@ -32,8 +33,8 @@ import unittest.mock as mock
 import pytest
 
 from ducktools.pythonfinder.shared import (
+    UV_PYTHON_RE,
     get_uv_python_path,
-    _implementation_from_uv_dir,
     get_uv_pythons,
 )
 
@@ -144,3 +145,13 @@ class TestUVReal:
         assert pythons[0].version >= (3, 10, 14)
         assert pythons[0].implementation == "pypy"
         assert pythons[0].implementation_version >= (7, 3, 17)
+
+
+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")

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

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