lockss-turtles 0.6.0.dev3__tar.gz → 0.6.0.dev4__tar.gz

{lockss_turtles-0.6.0.dev3 → lockss_turtles-0.6.0.dev4}/PKG-INFO

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

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-turtles"
-version = "0.6.0-dev3" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.6.0-dev4" # 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.dev3 → lockss_turtles-0.6.0.dev4}/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-dev3'
+__version__ = '0.6.0-dev4'
 
 __copyright__ = '''
 Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University

{lockss_turtles-0.6.0.dev3 → lockss_turtles-0.6.0.dev4}/src/lockss/turtles/cli.py

@@ -43,7 +43,6 @@ from pydantic.v1.class_validators import validator
 import tabulate
 from typing import Optional
 
-from lockss.turtles.plugin_registry import PluginRegistryLayer
 from . import __copyright__, __license__, __version__
 from .app import TurtlesApp
 from .plugin_registry import PluginRegistryLayerIdentifier

{lockss_turtles-0.6.0.dev3 → lockss_turtles-0.6.0.dev4}/src/lockss/turtles/plugin_registry.py

@@ -54,7 +54,7 @@ class PluginRegistryCatalog(BaseModelWithRoot):
     plugin_registry_files: list[str] = Field(min_length=1, description="A non-empty list of plugin registry files", title='Plugin Registry Files', alias='plugin-registry-files')
 
     def get_plugin_registry_files(self) -> list[Path]:
-        return [self._get_root().joinpath(pstr) for pstr in self.plugin_registry_files]
+        return [self.get_root().joinpath(pstr) for pstr in self.plugin_registry_files]
 
 
 PluginRegistryLayoutType = Literal['directory', 'rcs']

{lockss_turtles-0.6.0.dev3 → lockss_turtles-0.6.0.dev4}/src/lockss/turtles/plugin_set.py

@@ -54,7 +54,7 @@ class PluginSetCatalog(BaseModelWithRoot):
     plugin_set_files: list[str] = Field(min_length=1, description="A non-empty list of plugin set files", title='Plugin Set Files', alias='plugin-set-files')
 
     def get_plugin_set_files(self) -> list[Path]:
-        return [self._get_root().joinpath(p) for p in self.plugin_set_files]
+        return [self.get_root().joinpath(p) for p in self.plugin_set_files]
 
 
 PluginSetBuilderType = Literal['ant', 'maven']
@@ -70,10 +70,10 @@ class BasePluginSetBuilder(BaseModelWithRoot, ABC):
         pass
 
     def get_main(self) -> Path:
-        return self._get_root().joinpath(self._get_main())
+        return self.get_root().joinpath(self._get_main())
 
     def get_test(self) -> Path:
-        return self._get_root().joinpath(self._get_test())
+        return self.get_root().joinpath(self._get_test())
 
     def get_type(self) -> PluginSetBuilderType:
         return getattr(self, 'type')
@@ -121,7 +121,7 @@ class AntPluginSetBuilder(BasePluginSetBuilder):
         if not self._built:
             # Do build
             subprocess.run('ant load-plugins',
-                           shell=True, cwd=self._get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
+                           shell=True, cwd=self.get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
             self._built = True
 
     def _little_build(self, plugin_id: PluginIdentifier, keystore_path: Path, keystore_alias: str, keystore_password: str=None) -> tuple[Path, Plugin]:
@@ -142,14 +142,14 @@ class AntPluginSetBuilder(BasePluginSetBuilder):
             cur_id = cur_plugin.get_parent_identifier()
         # Invoke jarplugin
         jar_fstr = Plugin.id_to_file(plugin_id)
-        jar_path = self._get_root().joinpath('plugins/jars', f'{plugin_id}.jar')
+        jar_path = self.get_root().joinpath('plugins/jars', f'{plugin_id}.jar')
         jar_path.parent.mkdir(parents=True, exist_ok=True)
         cmd = ['test/scripts/jarplugin',
                '-j', str(jar_path),
                '-p', str(jar_fstr)]
         for d in dirs:
             cmd.extend(['-d', d])
-        subprocess.run(cmd, cwd=self._get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
+        subprocess.run(cmd, cwd=self.get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
         # Invoke signplugin
         cmd = ['test/scripts/signplugin',
                '--jar', str(jar_path),
@@ -158,7 +158,7 @@ class AntPluginSetBuilder(BasePluginSetBuilder):
         if keystore_password is not None:
             cmd.extend(['--password', keystore_password])
         try:
-            subprocess.run(cmd, cwd=self._get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
+            subprocess.run(cmd, cwd=self.get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
         except subprocess.CalledProcessError as cpe:
             raise self._sanitize(cpe)
         if not jar_path.is_file():
@@ -203,13 +203,13 @@ class MavenPluginSetBuilder(BasePluginSetBuilder):
                    f'-Dkeystore.alias={keystore_alias}',
                    f'-Dkeystore.password={keystore_password}']
             try:
-                subprocess.run(cmd, cwd=self._get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
+                subprocess.run(cmd, cwd=self.get_root(), check=True, stdout=sys.stdout, stderr=sys.stderr)
             except subprocess.CalledProcessError as cpe:
                 raise self._sanitize(cpe)
             self._built = True
 
     def _little_build(self, plugin_id: PluginIdentifier) -> tuple[Path, Plugin]:
-        jar_path = self._get_root().joinpath('target', 'pluginjars', f'{plugin_id}.jar')
+        jar_path = self.get_root().joinpath('target', 'pluginjars', f'{plugin_id}.jar')
         if not jar_path.is_file():
             raise Exception(f'{plugin_id}: built JAR not found: {jar_path!s}')
         return jar_path, Plugin.from_jar(jar_path)

{lockss_turtles-0.6.0.dev3 → lockss_turtles-0.6.0.dev4}/tests/unittest/lockss/turtles/__init__.py

@@ -31,7 +31,7 @@
 from collections.abc import Callable
 from pydantic import ValidationError
 from pydantic_core import ErrorDetails
-from typing import Any, Dict, Optional, Tuple, Union
+from typing import Any, Optional, Tuple, Union
 from unittest import TestCase