ducktools-pythonfinder 0.6.6__tar.gz → 0.6.8__tar.gz

{ducktools_pythonfinder-0.6.6/src/ducktools_pythonfinder.egg-info → ducktools_pythonfinder-0.6.8}/PKG-INFO

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

@@ -74,8 +74,42 @@ def stop_autoclose():
         _laz.subprocess.run("pause", shell=True)
 
 
-def parse_args(args):
-    parser = _laz.argparse.ArgumentParser(
+def _get_parser_class():
+    # This class is deferred to avoid the argparse import
+    # if there are no arguments to parse
+
+    class FixedArgumentParser(_laz.argparse.ArgumentParser):
+        """
+        The builtin argument parser uses shutil to figure out the terminal width
+        to display help info. This one replaces the function that calls help info
+        and plugs in a value for width.
+
+        This prevents the unnecessary import.
+        """
+
+        def _get_formatter(self):
+            # Calculate width
+            try:
+                columns = int(os.environ['COLUMNS'])
+            except (KeyError, ValueError):
+                try:
+                    size = os.get_terminal_size()
+                except (AttributeError, ValueError, OSError):
+                    # get_terminal_size unsupported
+                    columns = 80
+                else:
+                    columns = size.columns
+
+            # noinspection PyArgumentList
+            return self.formatter_class(prog=self.prog, width=columns - 2)
+
+    return FixedArgumentParser
+
+
+def get_parser():
+    FixedArgumentParser = _get_parser_class()  # noqa
+
+    parser = FixedArgumentParser(
         prog="ducktools-pythonfinder",
         description="Discover base Python installs",
     )
@@ -122,9 +156,7 @@ def parse_args(args):
         help="Include prerelease versions"
     )
 
-    vals = parser.parse_args(args)
-
-    return vals
+    return parser
 
 
 def display_local_installs(
@@ -270,7 +302,8 @@ def main():
         )
 
     if sys.argv[1:]:
-        vals = parse_args(sys.argv[1:])
+        parser = get_parser()
+        vals = parser.parse_args(sys.argv[1:])
 
         if vals.command == "online":
             system = vals.system if vals.system else _laz.platform.system()

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

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

{ducktools_pythonfinder-0.6.6 → ducktools_pythonfinder-0.6.8}/src/ducktools/pythonfinder/linux/pyenv_search.py

@@ -78,6 +78,7 @@ def get_pyenv_pythons(
                     version=version_tuple,
                     executable=executable,
                     metadata=metadata,
+                    managed_by="pyenv",
                 )
-            elif query_executables and (install := get_install_details(executable)):
+            elif query_executables and (install := get_install_details(executable, managed_by="pyenv")):
                 yield install

{ducktools_pythonfinder-0.6.6 → ducktools_pythonfinder-0.6.8}/src/ducktools/pythonfinder/shared.py

@@ -137,6 +137,7 @@ class PythonInstall(Prefab):
     executable: str
     architecture: str = "64bit"
     implementation: str = "cpython"
+    managed_by: str | None = None
     metadata: dict = attribute(default_factory=dict)
     shadowed: bool = False
     _implementation_version: tuple[int, int, int, str, int] | None = attribute(default=None, private=True)
@@ -180,6 +181,7 @@ class PythonInstall(Prefab):
         executable: str,
         architecture: str = "64bit",
         implementation: str = "cpython",
+        managed_by: str | None = None,
         metadata: dict | None = None,
     ):
         version_tuple = version_str_to_tuple(version)
@@ -190,16 +192,23 @@ class PythonInstall(Prefab):
             executable=executable,
             architecture=architecture,
             implementation=implementation,
+            managed_by=managed_by,
             metadata=metadata,
         )
 
     @classmethod
-    def from_json(cls, version, executable, architecture, implementation, metadata):
+    def from_json(cls, version, executable, architecture, implementation, metadata, managed_by=None):
         if arch_ver := metadata.get(f"{implementation}_version"):
             metadata[f"{implementation}_version"] = tuple(arch_ver)
 
+        # noinspection PyArgumentList
         return cls(
-            tuple(version), executable, architecture, implementation, metadata  # noqa
+            version=tuple(version),
+            executable=executable,
+            architecture=architecture,
+            implementation=implementation,
+            managed_by=managed_by,
+            metadata=metadata,
         )
 
     def get_pip_version(self) -> str | None:
@@ -229,7 +238,7 @@ def _python_exe_regex(basename: str = "python"):
         return _laz.re.compile(rf"{basename}\d?\.?\d*")
 
 
-def get_install_details(executable: str) -> PythonInstall | None:
+def get_install_details(executable: str, managed_by=None) -> PythonInstall | None:
     try:
         source = details.get_source_code()
     except FileNotFoundError:
@@ -270,7 +279,7 @@ def get_install_details(executable: str) -> PythonInstall | None:
     except _laz.json.JSONDecodeError as e:
         return None
 
-    return PythonInstall.from_json(**output)
+    return PythonInstall.from_json(**output, managed_by=managed_by)
 
 
 def get_folder_pythons(
@@ -344,7 +353,8 @@ def _implementation_from_uv_dir(
                         executable=python_path,
                         architecture="32bit" if arch in {"i686", "armv7"} else "64bit",
                         implementation=implementation,
-                        metadata=metadata
+                        metadata=metadata,
+                        managed_by="Astral UV",
                     )
             except ValueError:
                 pass
@@ -354,6 +364,7 @@ def _implementation_from_uv_dir(
             # Slow backup - ask python itself
             if query_executables:
                 install = get_install_details(python_path)
+                install.managed_by = "Astral UV"
 
     return install
 

{ducktools_pythonfinder-0.6.6 → ducktools_pythonfinder-0.6.8}/src/ducktools/pythonfinder/win32/pyenv_search.py

@@ -48,13 +48,13 @@ def get_pyenv_pythons(
             if path_base.startswith("pypy"):
                 executable = os.path.join(p.path, "pypy.exe")
                 if os.path.exists(executable):
-                    yield get_install_details(executable)
+                    yield get_install_details(executable, managed_by="pyenv")
                     continue
             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)
+                    yield get_install_details(executable, managed_by="pyenv")
                     continue
 
         # Regular CPython
@@ -76,6 +76,7 @@ def get_pyenv_pythons(
                         version=version,
                         executable=executable,
                         architecture=arch,
+                        managed_by="pyenv",
                     )
                 except ValueError:
                     pass
@@ -86,6 +87,7 @@ def get_pyenv_pythons(
                         version=version,
                         executable=executable,
                         architecture="64bit",
+                        managed_by="pyenv",
                     )
                 except ValueError:
                     pass

{ducktools_pythonfinder-0.6.6 → ducktools_pythonfinder-0.6.8}/src/ducktools/pythonfinder/win32/registry_search.py

@@ -126,6 +126,7 @@ def get_registered_pythons() -> Iterator[PythonInstall]:
                                     executable=python_path,
                                     architecture=architecture,
                                     metadata=metadata,
+                                    managed_by=metadata["Company"],
                                 )
                             except ValueError:
                                 pass

{ducktools_pythonfinder-0.6.6 → ducktools_pythonfinder-0.6.8/src/ducktools_pythonfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ducktools-pythonfinder
-Version: 0.6.6
+Version: 0.6.8
 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.6 → ducktools_pythonfinder-0.6.8}/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(version=out_ver, executable=out_executable)]
+    assert python_versions == [PythonInstall.from_str(version=out_ver, executable=out_executable, managed_by="pyenv")]
 
 
 @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(version="3.12.1", executable=py_exe)]
+    assert versions == [PythonInstall.from_str(version="3.12.1", executable=py_exe, managed_by="pyenv")]
 
 
 @pytest.mark.skipif(sys.platform != "win32", reason="Test for Windows only")
@@ -106,7 +106,9 @@ def test_32bit_version(fs):
 
     versions = list(get_pyenv_pythons(tmpdir))
 
-    assert versions == [PythonInstall.from_str(version="3.12.1", executable=py_exe, architecture="32bit")]
+    assert versions == [
+        PythonInstall.from_str(version="3.12.1", executable=py_exe, architecture="32bit", managed_by="pyenv")
+    ]
 
 
 @pytest.mark.skipif(sys.platform != "win32", reason="Test for Windows only")
@@ -155,7 +157,7 @@ def test_fs_versions_nix(fs):
 
     versions = list(get_pyenv_pythons(tmpdir))
 
-    assert versions == [PythonInstall.from_str(version="3.12.1", executable=py_exe)]
+    assert versions == [PythonInstall.from_str(version="3.12.1", executable=py_exe, managed_by="pyenv")]
 
 
 @pytest.mark.skipif(sys.platform == "win32", reason="Test for non-Windows only")
@@ -235,6 +237,7 @@ def test_pypy_version(fs):
             architecture="64bit",
             implementation="pypy",
             metadata={"pypy_version": (7, 3, 15, "final", 0)},
+            managed_by="pyenv",
         )
 
         assert versions == [out_version]

{ducktools_pythonfinder-0.6.6 → ducktools_pythonfinder-0.6.8}/tests/test_uv_finder.py

@@ -132,6 +132,7 @@ class TestUVReal:
         assert len(pythons) == 1
         assert pythons[0].version_str == "3.12.6"
         assert pythons[0].implementation == "cpython"
+        assert pythons[0].managed_by == "Astral UV"
 
     @pytest.mark.uv_python
     def test_finds_installed_pypy(self, uv_pythondir):
@@ -145,6 +146,7 @@ class TestUVReal:
         assert pythons[0].version >= (3, 10, 14)
         assert pythons[0].implementation == "pypy"
         assert pythons[0].implementation_version >= (7, 3, 17)
+        assert pythons[0].managed_by == "Astral UV"
 
 
 def test_regex_matches():

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

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