lockss-turtles 0.4.0.post1__py3-none-any.whl → 0.5.0.dev1__py3-none-any.whl

CHANGELOG.rst

@@ -2,15 +2,13 @@
 Release Notes
 =============
 
------------
-0.4.0-post1
------------
-
-Released: 2023-05-22
+-----
+0.5.0
+-----
 
-*  **Bugfixes**
+Released: ?
 
-   *  Documentation fixes.
+*  **Features**
 
 -----
 0.4.0

lockss/turtles/__init__.py

@@ -28,7 +28,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '0.4.0-post1'
+__version__ = '0.5.0-dev1'
 
 __copyright__ = '''
 Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University

lockss/turtles/plugin.py

@@ -87,6 +87,13 @@ class Plugin(object):
         if tag != 'map':
             raise RuntimeError(f'{plugin_path!s}: invalid root element: {tag}')
 
+    def get_aux_packages(self):
+        def _get_aux_packages_result(r):
+            if r.tag != 'list':
+                raise ValueError(f'plugin_aux_packages expects <list>, was <{r.tag}>')
+            return [x.text for x in r.findall('string')]
+        return self._only_one('plugin_aux_packages', result=_get_aux_packages_result) or []
+
     def get_identifier(self):
         return self._only_one('plugin_identifier')
 

lockss/turtles/plugin_set.py

@@ -160,15 +160,19 @@ class AntPluginSet(PluginSet):
 
     # Returns (jar_path, plugin)
     def _little_build(self, plugin_id, keystore_path, keystore_alias, keystore_password=None):
-        plugin = self.make_plugin(plugin_id)
+        cur_id = plugin_id
         # Get all directories for jarplugin -d
         dirs = list()
-        cur_id = plugin_id
         while cur_id is not None:
+            cur_plugin = self.make_plugin(cur_id)
             cur_dir = Plugin.id_to_dir(cur_id)
             if cur_dir not in dirs:
                 dirs.append(cur_dir)
-            cur_id = self.make_plugin(cur_id).get_parent_identifier()
+            for aux_package in cur_plugin.get_aux_packages():
+                aux_dir = Plugin.id_to_dir(f'{aux_package}.FAKEPlugin')
+                if aux_dir not in dirs:
+                    dirs.append(aux_dir)
+            cur_id = cur_plugin.get_parent_identifier()
         # Invoke jarplugin
         jar_fstr = Plugin.id_to_file(plugin_id)
         jar_path = self.get_root_path().joinpath('plugins/jars', f'{plugin_id}.jar')

{lockss_turtles-0.4.0.post1.dist-info → lockss_turtles-0.5.0.dev1.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: lockss-turtles
-Version: 0.4.0.post1
+Version: 0.5.0.dev1
 Summary: Tool to manage LOCKSS plugin sets and LOCKSS plugin registries
 Home-page: https://www.lockss.org/
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin
 Author-email: thib@cs.stanford.edu
-Requires-Python: >=3.7,<4.0
+Requires-Python: >=3.8,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -14,16 +14,16 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Utilities
 Requires-Dist: java-manifest (>=1.1.0,<2.0.0)
-Requires-Dist: jsonschema (>=4.17.3,<5.0.0)
-Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: rich-argparse (>=1.1.0,<2.0.0)
+Requires-Dist: jsonschema (>=4.23.0,<5.0.0)
+Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
+Requires-Dist: rich-argparse (>=1.5.2,<2.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
 Requires-Dist: xdg (>=6.0.0,<7.0.0)
 Project-URL: Repository, https://github.com/lockss/lockss-turtles
@@ -33,8 +33,8 @@ Description-Content-Type: text/x-rst
 Turtles
 =======
 
-.. |RELEASE| replace:: 0.4.0-post1
-.. |RELEASE_DATE| replace:: 2023-05-22
+.. |RELEASE| replace:: 0.5.0-dev1
+.. |RELEASE_DATE| replace:: ?
 
 .. |HELP| replace:: ``--help/-h``
 .. |IDENTIFIER| replace:: ``--identifier/-i``
@@ -436,8 +436,6 @@ The contents are described below:
 
    Turtles does not currently do anything with this information, but it can be used to record plugins that have been abandoned or retracted over the lifetime of the plugin registry.
 
-   Turtles does not currently do anything with this information, but it can be used to record plugins that have been abandoned or retracted over the lifetime of the plugin registry.
-
 Plugin Registry Layouts
 =======================
 

{lockss_turtles-0.4.0.post1.dist-info → lockss_turtles-0.5.0.dev1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-CHANGELOG.rst,sha256=SMXP8uJIoU55uTJ5jLbbvLFMsLVH4v5VhO0awABv-ss,3271
-lockss/turtles/__init__.py,sha256=hzSIZcC-9ODC24KNw3JiG7_-hykHmxjQ6JT4Q22RR18,3202
+CHANGELOG.rst,sha256=RQtaT4SvQQhwh-CyUyliviGFoqVd1aXRMErRO3v8bu4,3216
+lockss/turtles/__init__.py,sha256=Bre9OZG1fd-6yVbj54c93-xZlLfBIEcx61ivllm8LKk,3201
 lockss/turtles/__main__.py,sha256=57NMiI-NAibLExMX0Y6QApQhaDUblHTQqCDSiWBVt6k,1633
 lockss/turtles/app.py,sha256=X6AoOPPJEKrhcT9kwNXp7J7XO3KLoXdLdozgKf49Ajw,9074
 lockss/turtles/cli.py,sha256=yZqmRrGSY_4aMAv6nvx-ax6Lab_ckoNg1BVsOuoGm1U,22476
-lockss/turtles/plugin.py,sha256=ewDT3d_QPKnQqO_zuiD2XQaDcJSzoVDPylmFPe_OELU,4312
+lockss/turtles/plugin.py,sha256=tfo_dO7y81RSIvfBmUhJ9A_ZoLFAXZsxI2GbBDTUMI8,4654
 lockss/turtles/plugin_registry.py,sha256=cgsGSlhNnAuJUOnPeHxRMkJdI_Wmha79Z2cG_Lpq_lw,9441
-lockss/turtles/plugin_set.py,sha256=jB8fGMwsYdXcZab_GRcvTahVCnjW94AkyWeHlgg7qLc,10486
+lockss/turtles/plugin_set.py,sha256=r1i2q9yGtAupYoj7ZLUU_FCfAqRk1LnNz479BNv9HxU,10692
 lockss/turtles/resources/__init__.py,sha256=qHJYdSSUBYvd4Ib_RPqN0P5G2nHFYrf9UqLsHaN0J8U,1579
 lockss/turtles/resources/plugin-registry-catalog-schema.json,sha256=etH0ytEXTw1QFFRaxJySCNX9fWP63BXo8n91Snv5Yjc,685
 lockss/turtles/resources/plugin-registry-schema.json,sha256=dvNSxkU0McAe-fYIYBMJ9ezBvRSAW3kvhCcfESq5BrY,2766
@@ -13,8 +13,8 @@ lockss/turtles/resources/plugin-set-catalog-schema.json,sha256=UbB0BCd9jdROGyXf2
 lockss/turtles/resources/plugin-set-schema.json,sha256=EeptOiipJdWwfLIxUHXap59Hbq32UXzT2MpI2eADM1U,2338
 lockss/turtles/resources/plugin-signing-credentials-schema.json,sha256=VLld14jOMG8V_ru0jtQD5GunNDNLp2MoRGMSZg9xVn8,753
 lockss/turtles/util.py,sha256=g3pGADgnmaQce3pNrpA1VjuSlNUJUAITyPyM6pNdVOA,2430
-lockss_turtles-0.4.0.post1.dist-info/LICENSE,sha256=ArAnVWK-WhSxCVQWDF_PWBETwjSZ35HfugnUJPqPXyg,1506
-lockss_turtles-0.4.0.post1.dist-info/METADATA,sha256=PvCpUHl5GROHKChrcL21krzJUHywr7LCS-DgRe5pWXs,39713
-lockss_turtles-0.4.0.post1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-lockss_turtles-0.4.0.post1.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
-lockss_turtles-0.4.0.post1.dist-info/RECORD,,
+lockss_turtles-0.5.0.dev1.dist-info/LICENSE,sha256=ArAnVWK-WhSxCVQWDF_PWBETwjSZ35HfugnUJPqPXyg,1506
+lockss_turtles-0.5.0.dev1.dist-info/METADATA,sha256=_WtbeCIZPP5xx6PEsFPpXcUOkqc0EQSwsms2Sb-86RM,39524
+lockss_turtles-0.5.0.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lockss_turtles-0.5.0.dev1.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
+lockss_turtles-0.5.0.dev1.dist-info/RECORD,,

{lockss_turtles-0.4.0.post1.dist-info → lockss_turtles-0.5.0.dev1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.5.2
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any