tgzr.package_management 0.0.4__tar.gz → 0.100__tar.gz

{tgzr_package_management-0.0.4 → tgzr_package_management-0.100}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tgzr.package_management
-Version: 0.0.4
+Version: 0.100
 Summary: tgzr package_management engine
 Project-URL: Documentation, https://github.com/open-tgzr/tgzr.package_management#readme
 Project-URL: Issues, https://github.com/open-tgzr/tgzr.package_management/issues
@@ -17,7 +17,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.9
 Requires-Dist: hatch
+Requires-Dist: importlib-metadata
 Requires-Dist: uv
 Description-Content-Type: text/markdown
 

{tgzr_package_management-0.0.4 → tgzr_package_management-0.100}/pyproject.toml

@@ -7,6 +7,7 @@ name = "tgzr.package_management"
 dynamic = ["version"]
 description = 'tgzr package_management engine'
 readme = "README.md"
+requires-python = ">=3.9"
 license = "GPL-3.0-or-later"
 keywords = []
 authors = [
@@ -27,6 +28,7 @@ classifiers = [
 dependencies = [
   "uv",
   "hatch",
+  "importlib-metadata", # needed to support modern Distribution api with py3.9
 ]
 
 

{tgzr_package_management-0.0.4 → tgzr_package_management-0.100}/tgzr/package_management/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.4'
-__version_tuple__ = version_tuple = (0, 0, 4)
+__version__ = version = '0.100'
+__version_tuple__ = version_tuple = (0, 100)
 
 __commit_id__ = commit_id = None

{tgzr_package_management-0.0.4 → tgzr_package_management-0.100}/tgzr/package_management/package_manager.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import platform
 from pathlib import Path

{tgzr_package_management-0.0.4 → tgzr_package_management-0.100}/tgzr/package_management/plugin_manager.py

@@ -11,10 +11,12 @@ from typing import (
 )
 
 import sys
-import importlib.metadata
+import importlib_metadata
 import inspect
 import logging
 
+import rich
+
 T = TypeVar("T", bound="Plugin")
 
 logger = logging.getLogger(__name__)
@@ -41,7 +43,7 @@ class Plugin:
     def plugin_id(cls) -> str:
         return f"{cls.plugin_type_name()}@{cls.plugin_name()}"
 
-    def __init__(self, ep: importlib.metadata.EntryPoint):
+    def __init__(self, ep: importlib_metadata.EntryPoint):
         super().__init__()
         self._entry_point = ep
 
@@ -65,12 +67,12 @@ class PluginManager(Generic[PluginType]):
         return get_args(cls.__orig_bases__[0])[0]  # type: ignore __orig_bases__ trust me bro.
 
     def __init__(self):
-        self._broken: list[tuple[importlib.metadata.EntryPoint, Exception]] = []
+        self._broken: list[tuple[importlib_metadata.EntryPoint, Exception]] = []
         self._loaded: list[PluginType] = []
         self._needs_loading: bool = True
 
     def _instantiate_plugin_type(
-        self, PluginType: Type[PluginType], entry_point: importlib.metadata.EntryPoint
+        self, PluginType: Type[PluginType], entry_point: importlib_metadata.EntryPoint
     ) -> PluginType:
         """
         Subclasses will want to override this if the managed plugin type needs
@@ -86,7 +88,7 @@ class PluginManager(Generic[PluginType]):
             | Callable[[], PluginType | list[PluginType]]
             | Iterable[PluginType]
         ),
-        entry_point: importlib.metadata.EntryPoint,
+        entry_point: importlib_metadata.EntryPoint,
     ) -> list[PluginType]:
         # print("Resolving shell app plugins:", loaded)
         ManagedPluginType = self.__class__.managed_plugin_type()
@@ -104,7 +106,7 @@ class PluginManager(Generic[PluginType]):
             try:
                 plugin_or_list_of_plugins = loaded()  # type: ignore
             except Exception as err:
-                ValueError(
+                raise ValueError(
                     f"Error while executing callable entry point value (ep={entry_point}): {err}"
                 )
             return self._resolve_plugins(
@@ -122,10 +124,7 @@ class PluginManager(Generic[PluginType]):
         )
 
     def _load_plugins(self):
-        if sys.version_info[:2] == (3, 9):
-            all_entry_points = importlib.metadata.entry_points().get(self.EP_GROUP, [])
-        else:
-            all_entry_points = importlib.metadata.entry_points(group=self.EP_GROUP)
+        all_entry_points = importlib_metadata.entry_points(group=self.EP_GROUP)
 
         self._broken.clear()
         self._loaded.clear()
@@ -135,11 +134,13 @@ class PluginManager(Generic[PluginType]):
             try:
                 loaded = ep.load()
             except Exception as err:
+                raise  # TMP DEE
                 self._broken.append((ep, err))
             else:
                 try:
                     plugins = self._resolve_plugins(loaded, ep)
                 except Exception as err:
+                    raise  # TMP DEE
                     self._broken.append((ep, err))
                 else:
                     for plugin in plugins:
@@ -149,7 +150,7 @@ class PluginManager(Generic[PluginType]):
 
     def get_broken_plugins(
         self, force_reload: bool = False
-    ) -> list[tuple[importlib.metadata.EntryPoint, Exception]]:
+    ) -> list[tuple[importlib_metadata.EntryPoint, Exception]]:
         if force_reload or self._needs_loading:
             self._load_plugins()
         return self._broken

{tgzr_package_management-0.0.4 → tgzr_package_management-0.100}/tgzr/package_management/venv.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from pathlib import Path
-import importlib.metadata
+import importlib_metadata
 import platform
 import json
 import os
@@ -156,11 +158,11 @@ class Venv:
     def get_cmd_names(self) -> list[str]:
         raise NotImplementedError()
 
-    def get_package(self, package_name: str) -> importlib.metadata.Distribution | None:
+    def get_package(self, package_name: str) -> importlib_metadata.Distribution | None:
         if self.site_packages_path is None:
             return None
         distributions = list(
-            importlib.metadata.distributions(
+            importlib_metadata.distributions(
                 name=package_name, path=[str(self.site_packages_path)]
             )
         )
@@ -173,10 +175,10 @@ class Venv:
 
     def get_packages(
         self, name_filters: list[str] | None = None
-    ) -> list[importlib.metadata.Distribution]:
+    ) -> list[importlib_metadata.Distribution]:
         if self.site_packages_path is None:
             return []
-        distributions = importlib.metadata.distributions(
+        distributions = importlib_metadata.distributions(
             path=[str(self.site_packages_path)]
         )
         ret = []
@@ -215,10 +217,10 @@ class Venv:
 
     def get_plugins(
         self, group_filter: str | None
-    ) -> list[tuple[importlib.metadata.EntryPoint, importlib.metadata.Distribution]]:
+    ) -> list[tuple[importlib_metadata.EntryPoint, importlib_metadata.Distribution]]:
         if self.site_packages_path is None:
             return []
-        distributions = importlib.metadata.distributions(
+        distributions = importlib_metadata.distributions(
             path=[str(self.site_packages_path)]
         )
         plugins = []
@@ -230,7 +232,7 @@ class Venv:
 
     def get_plugins_slow(
         self, group_filter: str | None
-    ) -> list[importlib.metadata.EntryPoint]:
+    ) -> list[importlib_metadata.EntryPoint]:
         cmd_args = ["studio", "plugins-here", "--format", "json"]
         if group_filter:
             cmd_args.extend(["--group-filter", group_filter])
@@ -243,7 +245,7 @@ class Venv:
         ret = []
         for entry in data:
             # print(entry)
-            ep = importlib.metadata.EntryPoint(
+            ep = importlib_metadata.EntryPoint(
                 entry["name"], entry["value"], entry["group"]
             )
             ret.append(ep)