lockss-turtles 0.6.0.dev3__py3-none-any.whl → 0.6.0.dev5__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-dev3'
+__version__ = '0.6.0-dev5'
 
 __copyright__ = '''
 Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University

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/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/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)
@@ -253,9 +253,9 @@ class PluginSet(BaseModel):
     def has_plugin(self, plugin_id: PluginIdentifier) -> bool:
         return self.get_builder().has_plugin(plugin_id)
 
+    def initialize(self, root: Path) -> PluginSet:
+        self.get_builder().initialize(root)
+        return self
+
     def make_plugin(self, plugin_id: PluginIdentifier) -> Plugin:
         return self.get_builder().make_plugin(plugin_id)
-
-    def _initialize(self, root: Path) -> PluginSet:
-        self.get_builder()._initialize(root)
-        return self

{lockss_turtles-0.6.0.dev3.dist-info → lockss_turtles-0.6.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-turtles
-Version: 0.6.0.dev3
+Version: 0.6.0.dev5
 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.dev5.dist-info/RECORD

@@ -0,0 +1,15 @@
+lockss/turtles/__init__.py,sha256=dBhiD405_62kpn_SOOAzVuRkhN12vIkuBf79vfVyyoc,1743
+lockss/turtles/__main__.py,sha256=825geLIwXS0LKRqxifJXlLaAZrY8nllXfHzw5ch5ysM,1624
+lockss/turtles/app.py,sha256=aMWuYsY88FV1YTjcnXDhKHoAYh47i819y9qa9nJMrFE,13312
+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/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.dev5.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_turtles-0.6.0.dev5.dist-info/METADATA,sha256=xb6BV0IKas0UER1SS8suFEFsfpVq1YN8F2ySlQxpLyo,39610
+lockss_turtles-0.6.0.dev5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_turtles-0.6.0.dev5.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
+lockss_turtles-0.6.0.dev5.dist-info/RECORD,,

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
 
 

lockss_turtles-0.6.0.dev3.dist-info/RECORD

@@ -1,15 +0,0 @@
-lockss/turtles/__init__.py,sha256=G0_ly0qQJFS58h2l9AdA9g65rn0HHfd3uxID81G1a1o,1743
-lockss/turtles/__main__.py,sha256=825geLIwXS0LKRqxifJXlLaAZrY8nllXfHzw5ch5ysM,1624
-lockss/turtles/app.py,sha256=aMWuYsY88FV1YTjcnXDhKHoAYh47i819y9qa9nJMrFE,13312
-lockss/turtles/cli.py,sha256=EG2M4Sfi60M6ODaAcYtf6y0C_uwkwinJMtBZ6XkhR74,18498
-lockss/turtles/plugin.py,sha256=re44YVlzXVU8azDshxn7oHw1GdTQLLQgYwkvZlur-60,5384
-lockss/turtles/plugin_registry.py,sha256=Vps4Nz6P9tG00amYHhSrHSOJMWvRxhfSU99VoI-fCNw,11096
-lockss/turtles/plugin_set.py,sha256=gATNQ3XGHZBsqS_ppZLq93wFR--Bbz6mzdMRjSOTiSY,11308
-lockss/turtles/util.py,sha256=wGCrw_YySvyqaCzT0PItzXpkLHOCMMC_DQHhGU7zudI,2500
-unittest/lockss/turtles/__init__.py,sha256=TEV2QoSOLkf5qqfOPROURqefI-_qRPozW96SX6QB8xw,3168
-unittest/lockss/turtles/test_plugin_set.py,sha256=i-VM8mvrPuW2KqUlh2HPVRtgh3-F7RhmRAwcvhwpoDA,3354
-lockss_turtles-0.6.0.dev3.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_turtles-0.6.0.dev3.dist-info/METADATA,sha256=ONd4_KOw-3v85fJqs-VHsH1G0LaYbO4Gm0v9_-Dfpfg,39610
-lockss_turtles-0.6.0.dev3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_turtles-0.6.0.dev3.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
-lockss_turtles-0.6.0.dev3.dist-info/RECORD,,