ducktools-pythonfinder 0.7.3__tar.gz → 0.7.4__tar.gz

{ducktools_pythonfinder-0.7.3/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ducktools-pythonfinder
-Version: 0.7.3
+Version: 0.7.4
 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.4/src/ducktools/pythonfinder/_version.py

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

{ducktools_pythonfinder-0.7.3 → ducktools_pythonfinder-0.7.4}/src/ducktools/pythonfinder/venv.py

@@ -31,7 +31,7 @@ import os
 import sys
 
 
-from ducktools.classbuilder.prefab import Prefab
+from ducktools.classbuilder.prefab import Prefab, attribute
 from ducktools.lazyimporter import LazyImporter, FromImport, ModuleImport
 
 from .shared import (
@@ -46,6 +46,7 @@ _laz = LazyImporter(
     [
         ModuleImport("re"),
         ModuleImport("json"),
+        ModuleImport("subprocess"),
         FromImport("pathlib", "Path"),
         FromImport("subprocess", "run"),
     ]
@@ -74,6 +75,7 @@ class PythonVEnv(Prefab):
     executable: str
     version: tuple[int, int, int, str, int]
     parent_path: str
+    _parent_executable: str | None = attribute(default=None, repr=False)
 
     @property
     def version_str(self) -> str:
@@ -81,10 +83,34 @@ class PythonVEnv(Prefab):
 
     @property
     def parent_executable(self) -> str:
-        if sys.platform == "win32":
-            return os.path.join(self.parent_path, "python.exe")
-        else:
-            return os.path.join(self.parent_path, "python")
+        if self._parent_executable is None:
+            # Guess the parent executable file
+            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:
+                    pyout = _laz.run(
+                        [
+                            self.executable,
+                            "-c",
+                            "from sysconfig import get_config_var; print(get_config_var('EXENAME'))",
+                        ],
+                        capture_output=True,
+                        text=True,
+                        check=True,
+                    )
+                except _laz.subprocess.CalledProcessError:
+                    pass
+                else:
+                    if out_exe := pyout.stdout.strip():
+                        parent_exe = os.path.join(self.parent_path, os.path.basename(out_exe))
+
+            self._parent_executable = parent_exe
+
+        return self._parent_executable
 
     @property
     def parent_exists(self) -> bool:
@@ -150,7 +176,7 @@ 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 = None, None
+        parent_path, version_str, parent_exe = None, None, None
         venv_base = os.path.dirname(cfg_path)
 
         with open(cfg_path, 'r') as f:
@@ -162,12 +188,15 @@ class PythonVEnv(Prefab):
                 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:
+                if parent_path and version_str and parent_exe:
                     break
-            else:
-                # Not a valid venv, ignore
-                raise InvalidVEnvError(f"Path and 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")
@@ -198,6 +227,7 @@ class PythonVEnv(Prefab):
             executable=venv_exe,
             version=version_tuple,
             parent_path=parent_path,
+            _parent_executable=parent_exe,
         )
 
 

{ducktools_pythonfinder-0.7.3 → ducktools_pythonfinder-0.7.4/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ducktools-pythonfinder
-Version: 0.7.3
+Version: 0.7.4
 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.3 → ducktools_pythonfinder-0.7.4}/tests/conftest.py

@@ -20,7 +20,9 @@
 # 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 os.path
 import sys
+import sysconfig
 
 from pathlib import Path
 
@@ -42,10 +44,19 @@ def uses_details_script(fs):
 
 @pytest.fixture(scope="session")
 def this_python():
+    config_exe = sysconfig.get_config_var("EXENAME")
+
+    if config_exe:
+        exename = os.path.basename(sysconfig.get_config_var("EXENAME"))
+    elif sys.platform == "win32":
+        exename = "python.exe"
+    else:
+        exename = "python"
+
     if sys.platform == "win32":
-        py_exe = Path(sys.base_prefix) / "python.exe"
+        py_exe = Path(sys.base_prefix) / exename
     else:
-        py_exe = Path(sys.base_prefix) / "bin" / "python"
+        py_exe = Path(sys.base_prefix) / "bin" / exename
 
     return get_install_details(str(py_exe))
 

{ducktools_pythonfinder-0.7.3 → ducktools_pythonfinder-0.7.4}/tests/test_venv_finder.py

@@ -125,7 +125,7 @@ def test_found_parent(with_venvs, this_python, this_venv):
 
     # We found the base env that created this python, all details match
     parent = venv_ex.get_parent_install()
-    assert parent == this_python
+    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

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

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