ducktools-pythonfinder 0.7.5__tar.gz → 0.7.7__tar.gz

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023-2024 David C Ellis
+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

{ducktools_pythonfinder-0.7.5/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ducktools-pythonfinder
-Version: 0.7.5
+Version: 0.7.7
 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.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/__init__.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/__main__.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

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

@@ -0,0 +1,2 @@
+__version__ = "0.7.7"
+__version_tuple__ = (0, 7, 7)

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/darwin/__init__.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/details_script.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/linux/__init__.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/linux/pyenv_search.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

ducktools_pythonfinder-0.7.7/src/ducktools/pythonfinder/package_list_script.py

@@ -0,0 +1,55 @@
+# Dependency listing code modified from python-readiness
+# https://github.com/hauntsaninja/python_readiness/
+# MIT License
+#
+# Copyright (c) 2024 hauntsaninja
+
+# Part of ducktools-pythonfinder
+# MIT License
+# 
+# Copyright (c) 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
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+import importlib.metadata
+import sys
+import sysconfig
+
+from pathlib import Path
+
+
+def get_dependencies():
+    purelib = Path(sysconfig.get_paths()["purelib"])
+    safe_path = sys.path if getattr(sys.flags, "safe_path", False) else sys.path[1:]
+    context = importlib.metadata.DistributionFinder.Context(path=safe_path)
+    for dist in importlib.metadata.distributions(context=context):
+        if (
+            isinstance(dist, importlib.metadata.PathDistribution)
+            and (dist_path := getattr(dist, '_path', None))
+            and isinstance(dist_path, Path)
+            and not dist_path.is_relative_to(purelib)
+        ):
+            continue
+        metadata = dist.metadata
+        name, version = metadata["Name"], metadata["Version"]
+        print(f"{name}=={version}")
+
+
+if __name__ == "__main__":
+    get_dependencies()

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/pythonorg_search.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 # 
-# Copyright (c) 2013-2014 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/shared.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/venv.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 # 
-# Copyright (c) 2013-2014 David C Ellis
+# 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
@@ -49,7 +49,9 @@ _laz = LazyImporter(
         ModuleImport("subprocess"),
         FromImport("pathlib", "Path"),
         FromImport("subprocess", "run"),
-    ]
+        FromImport(".", "package_list_script"),
+    ],
+    globs=globals()
 )
 
 VENV_CONFIG_NAME = "pyvenv.cfg"
@@ -85,18 +87,24 @@ class PythonVEnv(Prefab):
     def parent_executable(self) -> str:
         if self._parent_executable is None:
             # Guess the parent executable file
+            parent_exe = None
             if sys.platform == "win32":
                 parent_exe = os.path.join(self.parent_path, "python.exe")
             else:
-                parent_exe = os.path.join(self.parent_path, "python")
-
-            if not os.path.exists(parent_exe):
+                # try with additional numbers in order eg: python313, python3, python
+                for i in reversed(range(2)):
+                    version_part = "".join(str(v) for v in self.version[:i])
+                    parent_exe = os.path.join(self.parent_path, f"python{version_part}")
+                    if os.path.exists(parent_exe):
+                        break
+
+            if not (parent_exe and os.path.exists(parent_exe)):
                 try:
                     pyout = _laz.run(
                         [
                             self.executable,
                             "-c",
-                            "from sysconfig import get_config_var; print(get_config_var('EXENAME'))",
+                            "import sys; sys.stdout.write(getattr(sys, '_base_executable', ''))",
                         ],
                         capture_output=True,
                         text=True,
@@ -105,7 +113,7 @@ class PythonVEnv(Prefab):
                 except (_laz.subprocess.CalledProcessError, FileNotFoundError):
                     pass
                 else:
-                    if out_exe := pyout.stdout.strip():
+                    if out_exe := pyout.stdout:
                         parent_exe = os.path.join(self.parent_path, os.path.basename(out_exe))
 
             self._parent_executable = parent_exe
@@ -140,30 +148,21 @@ class PythonVEnv(Prefab):
                 f"Parent Python at \"{self.parent_executable}\" does not exist."
             )
 
-        # Should probably use sys.executable and have pip as a dependency
-        # We would need to look at possibly changing how ducktools-env works for that however.
+        package_list_script = _laz.package_list_script.__file__
 
         data = _laz.run(
-            [
-                self.parent_executable,
-                "-m", "pip",
-                "--python", self.executable,
-                "list",
-                "--format", "json"
-            ],
+            [self.executable, package_list_script],
             capture_output=True,
             text=True,
             check=True,
         )
 
-        raw_packages = _laz.json.loads(data.stdout)
+        raw_packages = data.stdout.split("\n")
 
         packages = [
-            PythonPackage(
-                name=p["name"],
-                version=p["version"],
-            )
+            PythonPackage(*p.split("=="))
             for p in raw_packages
+            if p
         ]
 
         return packages
@@ -176,27 +175,21 @@ class PythonVEnv(Prefab):
         :param cfg_path: Path to a virtualenv config file
         :return: PythonVEnv with details relative to that config file
         """
-        parent_path, version_str, parent_exe = None, None, None
         venv_base = os.path.dirname(cfg_path)
 
         with open(cfg_path, 'r') as f:
+            conf = {}
             for line in f:
-                key, value = (item.strip() for item in line.split("="))
+                key, _, value = [item.strip() for item in line.partition("=")]
+                conf[key] = value
 
-                if key == "home":
-                    parent_path = value
-                elif key in {"version", "version_info"}:
-                    # venv and uv use different key names :)
-                    version_str = value
-                elif key == "executable":
-                    parent_exe = value
-
-                if parent_path and version_str and parent_exe:
-                    break
+        parent_path = conf.get("home")
+        version_str = conf.get("version", conf.get("version_info"))
+        parent_exe = conf.get("executable", conf.get("base-executable"))
 
-            if parent_path is None or version_str is None:
-                # Not a valid venv
-                raise InvalidVEnvError(f"Path or version not defined in {cfg_path}")
+        if parent_path is None or version_str is None:
+            # Not a valid venv
+            raise InvalidVEnvError(f"Path or version not defined in {cfg_path}")
 
         if sys.platform == "win32":
             venv_exe = os.path.join(venv_base, "Scripts", "python.exe")
@@ -281,8 +274,8 @@ def get_python_venvs(
             except OSError as e:
                 # MacOS can error on searching up folders with an invalid argument
                 # On Python 3.11 or earlier.
-                if e.errno == 22:
-                    continue
+                if e.errno != 22:
+                    raise
 
 
 def list_python_venvs(

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/win32/__init__.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/win32/pyenv_search.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools/pythonfinder/win32/registry_search.py

@@ -1,7 +1,7 @@
 # ducktools-pythonfinder
 # MIT License
 #
-# Copyright (c) 2023-2024 David C Ellis
+# 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

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ducktools-pythonfinder
-Version: 0.7.5
+Version: 0.7.7
 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.7.5 → ducktools_pythonfinder-0.7.7}/src/ducktools_pythonfinder.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/ducktools/pythonfinder/__init__.py
 src/ducktools/pythonfinder/__main__.py
 src/ducktools/pythonfinder/_version.py
 src/ducktools/pythonfinder/details_script.py
+src/ducktools/pythonfinder/package_list_script.py
 src/ducktools/pythonfinder/pythonorg_search.py
 src/ducktools/pythonfinder/shared.py
 src/ducktools/pythonfinder/venv.py

{ducktools_pythonfinder-0.7.5 → ducktools_pythonfinder-0.7.7}/tests/test_venv_finder.py

@@ -127,8 +127,9 @@ def test_found_parent(with_venvs, this_python, this_venv):
     parent = venv_ex.get_parent_install()
     assert os.path.dirname(parent.executable) == os.path.dirname(this_python.executable)
 
-    # venv version str works same as parent
-    assert venv_ex.version_str == parent.version_str
+    # venvs created by the venv module don't record prerelease details in the version
+    # That's not my fault that's venv!
+    assert venv_ex.version[:3] == parent.version[:3]
 
 
 def test_found_parent_cache(with_venvs, this_python):

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

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