lockss-turtles 0.6.0.dev7__py3-none-any.whl → 0.6.0.dev9__py3-none-any.whl

lockss/turtles/__init__.py

@@ -5,7 +5,7 @@ Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin
 registries.
 """
 
-__version__ = '0.6.0-dev7'
+__version__ = '0.6.0-dev9'
 
 __copyright__ = '''
 Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University

lockss/turtles/app.py

@@ -107,7 +107,7 @@ class TurtlesApp(object):
         with plugin_registry_path.open('r') as fpr:
             for yaml_obj in yaml.safe_load_all(fpr):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginRegistryKind.__args__:
-                    plugin_registry = PluginRegistry(**yaml_obj).initialize(plugin_registry_path)
+                    plugin_registry = PluginRegistry(**yaml_obj).initialize(plugin_registry_path.parent)
                     self._plugin_registries.append(plugin_registry)
         return self
 
@@ -118,7 +118,7 @@ class TurtlesApp(object):
         with plugin_registry_catalog_path.open('r') as fprc:
             for yaml_obj in yaml.safe_load_all(fprc):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginRegistryCatalogKind.__args__:
-                    plugin_registry_catalog = PluginRegistryCatalog(**yaml_obj).initialize(plugin_registry_catalog_path)
+                    plugin_registry_catalog = PluginRegistryCatalog(**yaml_obj).initialize(plugin_registry_catalog_path.parent)
                     self._plugin_registry_catalogs.append(plugin_registry_catalog)
                     for plugin_registry_file in plugin_registry_catalog.get_plugin_registry_files():
                         self.load_plugin_registries(plugin_registry_catalog_path.joinpath(plugin_registry_file))
@@ -131,7 +131,7 @@ class TurtlesApp(object):
         with plugin_set_catalog_path.open('r') as fpsc:
             for yaml_obj in yaml.safe_load_all(fpsc):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginSetCatalogKind.__args__:
-                    plugin_set_catalog = PluginSetCatalog(**yaml_obj).initialize(plugin_set_catalog_path)
+                    plugin_set_catalog = PluginSetCatalog(**yaml_obj).initialize(plugin_set_catalog_path.parent)
                     self._plugin_set_catalogs.append(plugin_set_catalog)
                     for plugin_set_file in plugin_set_catalog.get_plugin_set_files():
                         self.load_plugin_sets(plugin_set_catalog_path.joinpath(plugin_set_file))
@@ -144,7 +144,7 @@ class TurtlesApp(object):
         with plugin_set_path.open('r') as fps:
             for yaml_obj in yaml.safe_load_all(fps):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginSetKind.__args__:
-                    plugin_set = PluginSet(**yaml_obj).initialize(plugin_set_path)
+                    plugin_set = PluginSet(**yaml_obj).initialize(plugin_set_path.parent)
                     self._plugin_sets.append(plugin_set)
         return self
 
@@ -153,7 +153,7 @@ class TurtlesApp(object):
         if self._plugin_signing_credentials:
             raise ValueError(f'Plugin signing credentials already loaded from: {self._plugin_signing_credentials.get_root()!s}')
         with plugin_signing_credentials_path.open('r') as fpsc:
-            self._plugin_signing_credentials = PluginSigningCredentials(**yaml.safe_load(fpsc)).initialize(plugin_signing_credentials_path)
+            self._plugin_signing_credentials = PluginSigningCredentials(**yaml.safe_load(fpsc)).initialize(plugin_signing_credentials_path.parent)
         return self
 
     def release_plugin(self, plugin_ids: list[PluginIdentifier], layer_ids: list[PluginRegistryLayerIdentifier], interactive: bool=False) -> dict[str, list[tuple[str, str, Path, Plugin]]]:

lockss/turtles/plugin_set.py

@@ -91,7 +91,7 @@ class BasePluginSetBuilder(BaseModelWithRoot, ABC):
         return getattr(self, 'test')
 
     def _plugin_path(self, plugin_id: PluginIdentifier) -> Path:
-        return self.get_main_path().joinpath(Plugin.id_to_file(plugin_id))
+        return self.get_main().joinpath(Plugin.id_to_file(plugin_id))
 
 
 class AntPluginSetBuilder(BasePluginSetBuilder):
@@ -165,8 +165,8 @@ class AntPluginSetBuilder(BasePluginSetBuilder):
             raise FileNotFoundError(str(jar_path))
         return jar_path, orig_plugin
 
-    def _plugin_path(self, plugin_id: PluginIdentifier) -> Path:
-        return self.get_main_path().joinpath(Plugin.id_to_file(plugin_id))
+    # def _plugin_path(self, plugin_id: PluginIdentifier) -> Path:
+    #     return self.get_main().joinpath(Plugin.id_to_file(plugin_id))
 
     def _sanitize(self, called_process_error: subprocess.CalledProcessError) -> subprocess.CalledProcessError:
         cmd = called_process_error.cmd[:]

{lockss_turtles-0.6.0.dev7.dist-info → lockss_turtles-0.6.0.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-turtles
-Version: 0.6.0.dev7
+Version: 0.6.0.dev9
 Summary: Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin

{lockss_turtles-0.6.0.dev7.dist-info → lockss_turtles-0.6.0.dev9.dist-info}/RECORD

@@ -1,15 +1,15 @@
-lockss/turtles/__init__.py,sha256=bDxv5pDaIL6N-MH9RlQpPAXYcFRqHI9jENbY3ah3xfo,1743
+lockss/turtles/__init__.py,sha256=jJO55YlRq3-Nd2OVnpIYDfLgxuh7Y1eNS5oaavofQbQ,1743
 lockss/turtles/__main__.py,sha256=825geLIwXS0LKRqxifJXlLaAZrY8nllXfHzw5ch5ysM,1624
-lockss/turtles/app.py,sha256=T9g6UxdtdmimgkbPSWaDrbNScTljCqyNLDOf7i4AiGI,13375
+lockss/turtles/app.py,sha256=7jC9fhVxfG9RDM8_yLxWzZ2cx_9HOzFZX3aJ9Np2hbg,13410
 lockss/turtles/cli.py,sha256=pLZAG1hmYarCp0R4vHSJcTs3G1umk2esvaLhM5JX7rg,18435
 lockss/turtles/plugin.py,sha256=re44YVlzXVU8azDshxn7oHw1GdTQLLQgYwkvZlur-60,5384
 lockss/turtles/plugin_registry.py,sha256=pIQOzrastTxeJsny3CV2GhhYO0iQflPdJAxSIdxAiYY,11095
-lockss/turtles/plugin_set.py,sha256=PqfFwENtwyYeuGgiKkQuZcYr3r4jmwsVldoon_S2WA0,11297
+lockss/turtles/plugin_set.py,sha256=hKUXOSRyhHxxcMWE3I69Wykod32Ig871oeJsMTvbXfU,11291
 lockss/turtles/util.py,sha256=wGCrw_YySvyqaCzT0PItzXpkLHOCMMC_DQHhGU7zudI,2500
 unittest/lockss/turtles/__init__.py,sha256=hrgWx4GaP-hhPBuRlbLndJnOQmZicKCLaP-dQTCu1sQ,3162
 unittest/lockss/turtles/test_plugin_set.py,sha256=i-VM8mvrPuW2KqUlh2HPVRtgh3-F7RhmRAwcvhwpoDA,3354
-lockss_turtles-0.6.0.dev7.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_turtles-0.6.0.dev7.dist-info/METADATA,sha256=GMjO-lUyKSAMp27rWBQEEXDRrDNKRbiEmKBtNXyYlhE,39610
-lockss_turtles-0.6.0.dev7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_turtles-0.6.0.dev7.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
-lockss_turtles-0.6.0.dev7.dist-info/RECORD,,
+lockss_turtles-0.6.0.dev9.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_turtles-0.6.0.dev9.dist-info/METADATA,sha256=ivXHe6Cy2GpyuXAhs26XV4zZTQwUWhPNxMUEaJgDNW0,39610
+lockss_turtles-0.6.0.dev9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_turtles-0.6.0.dev9.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
+lockss_turtles-0.6.0.dev9.dist-info/RECORD,,