lockss-turtles 0.6.0.dev8__tar.gz → 0.6.0.dev10__tar.gz

{lockss_turtles-0.6.0.dev8 → lockss_turtles-0.6.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-turtles
-Version: 0.6.0.dev8
+Version: 0.6.0.dev10
 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.dev8 → lockss_turtles-0.6.0.dev10}/pyproject.toml

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-turtles"
-version = "0.6.0-dev8" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.6.0-dev10" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
 description = "Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries"
 license = { text = "BSD-3-Clause" }
 readme = "README.rst"

{lockss_turtles-0.6.0.dev8 → lockss_turtles-0.6.0.dev10}/src/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-dev8'
+__version__ = '0.6.0-dev10'
 
 __copyright__ = '''
 Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University

{lockss_turtles-0.6.0.dev8 → lockss_turtles-0.6.0.dev10}/src/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-0.6.0.dev8 → lockss_turtles-0.6.0.dev10}/src/lockss/turtles/plugin_registry.py

@@ -199,7 +199,7 @@ class PluginRegistry(BaseModelWithRoot):
     id: PluginRegistryIdentifier = Field(title='Plugin Registry Identifier', description='An identifier for the plugin set')
     name: str = Field(title='Plugin Registry Name', description='A name for the plugin set')
     layout: PluginRegistryLayout = Field(title='Plugin Registry Layout', description='A layout for the plugin registry')
-    layers: list[PluginRegistryLayer] = Field(min_length=1, title='Plugin Registry Layers', description="A non-empty list of plugin registry layers", alias='plugin-registry-layers')
+    layers: list[PluginRegistryLayer] = Field(min_length=1, title='Plugin Registry Layers', description="A non-empty list of plugin registry layers")
     plugin_identifiers: list[PluginIdentifier] = Field(min_length=1, title='Plugin Identifiers', description="A non-empty list of plugin identifiers", alias='plugin-identifiers')
     suppressed_plugin_identifiers: list[PluginIdentifier] = Field([], title='Suppressed Plugin Identifiers', description="A list of suppressed plugin identifiers", alias='suppressed-plugin-identifiers')