lockss-turtles 0.4.0.dev4__py3-none-any.whl → 0.5.0__py3-none-any.whl

CHANGELOG.rst

@@ -2,11 +2,21 @@
 Release Notes
 =============
 
+-----
+0.5.0
+-----
+
+Released: 2024-09-04
+
+*  **Features**
+
+   *  ``AntPluginSet``: also include plugin auxiliary packages (``plugin_aux_packages``).
+
 -----
 0.4.0
 -----
 
-Released: ?
+Released: 2023-05-17
 
 *  **Features**
 

lockss/turtles/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,10 +28,10 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '0.4.0-dev4'
+__version__ = '0.5.0'
 
 __copyright__ = '''
-Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 '''.strip()
 
 __license__ = __copyright__ + '\n\n' + '''

lockss/turtles/__main__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

lockss/turtles/app.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

lockss/turtles/cli.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

lockss/turtles/plugin.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -87,6 +87,15 @@ class Plugin(object):
         if tag != 'map':
             raise RuntimeError(f'{plugin_path!s}: invalid root element: {tag}')
 
+    def get_aux_packages(self):
+        key = 'plugin_aux_packages'
+        lst = [x[1] for x in self._parsed.findall('entry') if x[0].tag == 'string' and x[0].text == key]
+        if lst is None or len(lst) < 1:
+            return []
+        if len(lst) > 1:
+            raise ValueError(f'plugin declares {len(lst)} entries for {key}')
+        return [x.text for x in lst[0].findall('string')]
+
     def get_identifier(self):
         return self._only_one('plugin_identifier')
 

lockss/turtles/plugin_registry.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

lockss/turtles/plugin_set.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -160,15 +160,21 @@ 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)
+        orig_plugin = None
+        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)
+            orig_plugin = orig_plugin or cur_plugin
             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')
@@ -192,7 +198,7 @@ class AntPluginSet(PluginSet):
             raise self._sanitize(cpe)
         if not jar_path.is_file():
             raise FileNotFoundError(str(jar_path))
-        return (jar_path, plugin)
+        return (jar_path, orig_plugin)
 
     def _plugin_path(self, plugin_id):
         return Path(self.get_main_path()).joinpath(Plugin.id_to_file(plugin_id))

lockss/turtles/resources/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

lockss/turtles/util.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+# Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

{lockss_turtles-0.4.0.dev4.dist-info → lockss_turtles-0.5.0.dist-info}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
+Copyright (c) 2000-2024, Board of Trustees of Leland Stanford Jr. University
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: lockss-turtles
-Version: 0.4.0.dev4
+Version: 0.5.0
 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-dev4
-.. |RELEASE_DATE| replace:: ?
+.. |RELEASE| replace:: 0.5.0
+.. |RELEASE_DATE| replace:: 2024-09-04
 
 .. |HELP| replace:: ``--help/-h``
 .. |IDENTIFIER| replace:: ``--identifier/-i``
@@ -49,6 +49,10 @@ Turtles
 .. |PRODUCTION| replace:: ``--production/-p``
 .. |TESTING| replace:: ``--testing/-t``
 
+.. image:: https://assets.lockss.org/images/logos/turtles/turtles_128x128.png
+   :alt: Turtles logo
+   :align: right
+
 Turtles is a tool to manage LOCKSS plugin sets and LOCKSS plugin registries.
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)
@@ -830,7 +834,7 @@ The command needs:
 
 *  A `Plugin Registry Catalog`_, either from the |PLUGIN_REGISTRY_CATALOG| option or from ``plugin-signing-credentials.yaml`` in the `Configuration Files`_.
 
-*  One or more plugin registry layer IDs, from the `Plugin Registry Layer Options`_ (|IDENTIFIER| options, |IDENTIFIERS| options, and alternatively, |TESTING| options, |PRODUCTION| option).
+*  One or more plugin registry layer IDs, from the `Plugin Registry Layer Options`_ (|LAYER| options, |LAYERS| options, and alternatively, |TESTING| options, |PRODUCTION| option).
 
 *  One or more JAR paths. The list of JAR paths to process is derived from:
 
@@ -880,7 +884,7 @@ The ``license`` command displays the license terms for Turtles and exits.
 ``release-plugin`` (``rp``)
 ---------------------------
 
-The ``release-plugin`` command is used for `Building Plugins`_ and `Deploying Plugins`, being essentially `build-plugin`_ followed by `deploy-plugin`_. It has its own |HELP| option::
+The ``release-plugin`` command is used for `Building Plugins`_ and `Deploying Plugins`_, being essentially `build-plugin`_ followed by `deploy-plugin`_. It has its own |HELP| option::
 
     usage: turtles release-plugin [-h] [--output-format FMT] [--password PASS]
                                   [--plugin-registry-catalog FILE]
@@ -1020,9 +1024,9 @@ Plugin Registry Layer Options
 
 Commands that are `Deploying Plugins`_ expect one or more plugin registry layer IDs. The list of plugin registry layer IDs to target is derived from:
 
-*  The plugin registry layer IDs listed as |JAR| options.
+*  The plugin registry layer IDs listed as |LAYER| options.
 
-*  The plugin registry layer IDs found in the files listed as |JARS| options.
+*  The plugin registry layer IDs found in the files listed as |LAYERS| options.
 
 As a convenience, the following synonyms also exist:
 

lockss_turtles-0.5.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+CHANGELOG.rst,sha256=7nWZAeg0Ooyve3gLiI1lQ42GcnYuTSZcc3G-11nQxPU,3316
+lockss/turtles/__init__.py,sha256=imcQSoXnByEwC0TXwaFQ59Vns2ykHea9ZVERCPquI_g,3196
+lockss/turtles/__main__.py,sha256=JgPPcV-BFhP8oR9FM3VyfHhlhNvBPM3Udzy7AJ_3-bQ,1633
+lockss/turtles/app.py,sha256=RUdFtivrEUl7atjOTE8NHJKk4VwFZ7-ZWmrFshdtWCI,9074
+lockss/turtles/cli.py,sha256=XAt7fqmOLlkX6aFulHiDjPrRKRnkL0quThc9KEPDhPc,22476
+lockss/turtles/plugin.py,sha256=W929mPGcFIb2X2VoV3C5bRZOf2JMIs25of0MO80rCSk,4709
+lockss/turtles/plugin_registry.py,sha256=naTX2O1lV_107gdG7fFQd7G_UWz0aKNB56nX80paFHY,9441
+lockss/turtles/plugin_set.py,sha256=ZwMAJFx8xFdeki6XIp31u8fEa1vzBa9e6fRQSSENYX8,10776
+lockss/turtles/resources/__init__.py,sha256=uEuqtibBLM9fuwA_xFvzUmLRJsSoVrW-2YM8iyBiLuE,1579
+lockss/turtles/resources/plugin-registry-catalog-schema.json,sha256=etH0ytEXTw1QFFRaxJySCNX9fWP63BXo8n91Snv5Yjc,685
+lockss/turtles/resources/plugin-registry-schema.json,sha256=dvNSxkU0McAe-fYIYBMJ9ezBvRSAW3kvhCcfESq5BrY,2766
+lockss/turtles/resources/plugin-set-catalog-schema.json,sha256=UbB0BCd9jdROGyXf2pZg4GV4lxToM9uBgN5WVyndK4w,650
+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=F7t7MH4XRbgybe1x2N0beVNl3M_oGP0hOHFy65I06KQ,2430
+lockss_turtles-0.5.0.dist-info/LICENSE,sha256=JX4FmVNVAGpW35lQahPhK_o2W1mwRa1TmA3yrSOyNWg,1506
+lockss_turtles-0.5.0.dist-info/METADATA,sha256=51rjDbXSGqwftgb4p-2k2LmOp5I0rN9jDWX9iWuzQTk,39523
+lockss_turtles-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lockss_turtles-0.5.0.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
+lockss_turtles-0.5.0.dist-info/RECORD,,

{lockss_turtles-0.4.0.dev4.dist-info → lockss_turtles-0.5.0.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

lockss_turtles-0.4.0.dev4.dist-info/RECORD

@@ -1,20 +0,0 @@
-CHANGELOG.rst,sha256=Lv-bS9-c4dtclJrtlNr8HymmhR283_WgqERmG-Qqg8A,3158
-lockss/turtles/__init__.py,sha256=HAsIzJRsUX8X882RVGjPsPcQhq9bDokO6GJU2-Dw5e4,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_registry.py,sha256=cgsGSlhNnAuJUOnPeHxRMkJdI_Wmha79Z2cG_Lpq_lw,9441
-lockss/turtles/plugin_set.py,sha256=jB8fGMwsYdXcZab_GRcvTahVCnjW94AkyWeHlgg7qLc,10486
-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
-lockss/turtles/resources/plugin-set-catalog-schema.json,sha256=UbB0BCd9jdROGyXf2pZg4GV4lxToM9uBgN5WVyndK4w,650
-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.dev4.dist-info/LICENSE,sha256=ArAnVWK-WhSxCVQWDF_PWBETwjSZ35HfugnUJPqPXyg,1506
-lockss_turtles-0.4.0.dev4.dist-info/METADATA,sha256=n4mSaXLXMA64gx4Ig88A7DJokrqJWwd1oJjHP9U1pXs,39406
-lockss_turtles-0.4.0.dev4.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-lockss_turtles-0.4.0.dev4.dist-info/entry_points.txt,sha256=25BAVFSBRKWAWiXIGZgcr1ypt2mV7nj31Jl8WcNZZOk,51
-lockss_turtles-0.4.0.dev4.dist-info/RECORD,,