ducktools-pythonfinder 0.4.5__tar.gz → 0.4.7__tar.gz

{ducktools_pythonfinder-0.4.5/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.4.7}/PKG-INFO

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

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

{ducktools_pythonfinder-0.4.5 → ducktools_pythonfinder-0.4.7}/src/ducktools/pythonfinder/shared.py

@@ -112,6 +112,9 @@ class DetailsScript:
                     self._source_code = f.read()
             elif os.path.splitext(archive_path := sys.argv[0])[1].startswith(".pyz"):
                 script_path = os.path.relpath(details_script.__file__, archive_path)
+                if sys.platform == "win32":
+                    # Windows paths have backslashes, these do not work in zipfiles
+                    script_path = script_path.replace("\\", "/")
                 script = _laz.zipfile.Path(archive_path, script_path)
                 self._source_code = script.read_text()
             else:

ducktools_pythonfinder-0.4.7/src/ducktools/pythonfinder/win32/pyenv_search.py

@@ -0,0 +1,81 @@
+# ducktools-pythonfinder
+# MIT License
+#
+# Copyright (c) 2023-2024 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.
+from __future__ import annotations
+
+import os
+import os.path
+from _collections_abc import Iterator
+
+from ..shared import PythonInstall, get_install_details
+
+
+PYENV_VERSIONS_FOLDER = os.path.join(os.environ.get("PYENV_ROOT", ""), "versions")
+
+
+def get_pyenv_pythons(
+    versions_folder: str | os.PathLike = PYENV_VERSIONS_FOLDER,
+) -> Iterator[PythonInstall]:
+    if not os.path.exists(versions_folder):
+        return
+
+    for p in os.scandir(versions_folder):
+        path_base = os.path.basename(p.path)
+
+        if path_base.startswith("pypy"):
+            executable = os.path.join(p.path, "pypy.exe")
+            if os.path.exists(executable):
+                yield get_install_details(executable)
+        elif path_base.startswith("graalpy"):
+            # Graalpy exe in bin subfolder
+            executable = os.path.join(p.path, "bin", "graalpy.exe")
+            if os.path.exists(executable):
+                yield get_install_details(executable)
+        else:
+            # Regular CPython
+            executable = os.path.join(p.path, "python.exe")
+
+            if os.path.exists(executable):
+                split_version = p.name.split("-")
+
+                # If there are 1 or 2 arguments this is a recognised version
+                # Otherwise it is unrecognised
+                if len(split_version) == 2:
+                    version, arch = split_version
+
+                    # win32 in pyenv name means 32 bit python install
+                    # 'arm' is the only alternative which will be 64bit
+                    arch = "32bit" if arch == "win32" else "64bit"
+                    try:
+                        yield PythonInstall.from_str(
+                            version, executable, architecture=arch
+                        )
+                    except ValueError:
+                        pass
+                elif len(split_version) == 1:
+                    version = split_version[0]
+                    try:
+                        yield PythonInstall.from_str(
+                            version, executable, architecture="64bit"
+                        )
+                    except ValueError:
+                        pass

{ducktools_pythonfinder-0.4.5 → ducktools_pythonfinder-0.4.7/src/ducktools_pythonfinder.egg-info}/PKG-INFO

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

@@ -1,2 +0,0 @@
-__version__ = "0.4.5"
-__version_tuple__ = (0, 4, 5)

ducktools_pythonfinder-0.4.5/src/ducktools/pythonfinder/win32/pyenv_search.py

@@ -1,69 +0,0 @@
-# ducktools-pythonfinder
-# MIT License
-#
-# Copyright (c) 2023-2024 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.
-from __future__ import annotations
-
-import os
-import os.path
-from _collections_abc import Iterator
-
-from ..shared import PythonInstall
-
-
-PYENV_VERSIONS_FOLDER = os.path.join(os.environ.get("PYENV_ROOT", ""), "versions")
-
-
-def get_pyenv_pythons(
-    versions_folder: str | os.PathLike = PYENV_VERSIONS_FOLDER,
-) -> Iterator[PythonInstall]:
-    if not os.path.exists(versions_folder):
-        return
-
-    for p in os.scandir(versions_folder):
-        executable = os.path.join(p.path, "python.exe")
-
-        if os.path.exists(executable):
-            split_version = p.name.split("-")
-
-            # If there are 1 or 2 arguments this is a recognised version
-            # Otherwise it is unrecognised
-            if len(split_version) == 2:
-                version, arch = split_version
-
-                # win32 in pyenv name means 32 bit python install
-                # 'arm' is the only alternative which will be 64bit
-                arch = "32bit" if arch == "win32" else "64bit"
-                try:
-                    yield PythonInstall.from_str(
-                        version, executable, architecture=arch
-                    )
-                except ValueError:
-                    pass
-            elif len(split_version) == 1:
-                version = split_version[0]
-                try:
-                    yield PythonInstall.from_str(
-                        version, executable, architecture="64bit"
-                    )
-                except ValueError:
-                    pass
-