lockss-turtles 0.4.0.dev4__tar.gz → 0.5.0.dev1__tar.gz

{lockss_turtles-0.4.0.dev4 → lockss_turtles-0.5.0.dev1}/CHANGELOG.rst

@@ -3,11 +3,19 @@ Release Notes
 =============
 
 -----
-0.4.0
+0.5.0
 -----
 
 Released: ?
 
+*  **Features**
+
+-----
+0.4.0
+-----
+
+Released: 2023-05-17
+
 *  **Features**
 
    *  ``directory`` plugin registry layout now has the same file naming convention option as ``rcs``.

{lockss_turtles-0.4.0.dev4 → lockss_turtles-0.5.0.dev1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: lockss-turtles
-Version: 0.4.0.dev4
+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,7 +33,7 @@ Description-Content-Type: text/x-rst
 Turtles
 =======
 
-.. |RELEASE| replace:: 0.4.0-dev4
+.. |RELEASE| replace:: 0.5.0-dev1
 .. |RELEASE_DATE| replace:: ?
 
 .. |HELP| replace:: ``--help/-h``
@@ -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.4.0.dev4 → lockss_turtles-0.5.0.dev1}/README.rst

@@ -2,7 +2,7 @@
 Turtles
 =======
 
-.. |RELEASE| replace:: 0.4.0-dev4
+.. |RELEASE| replace:: 0.5.0-dev1
 .. |RELEASE_DATE| replace:: ?
 
 .. |HELP| replace:: ``--help/-h``
@@ -18,6 +18,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|)
@@ -799,7 +803,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:
 
@@ -849,7 +853,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]
@@ -989,9 +993,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.4.0.dev4 → lockss_turtles-0.5.0.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lockss-turtles"
-version = "0.4.0-dev4"
+version = "0.5.0-dev1"
 description = "Tool to manage LOCKSS plugin sets and LOCKSS plugin registries"
 license = "BSD-3-Clause"
 authors = [
@@ -25,11 +25,11 @@ include = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 java-manifest = "^1.1.0"
-jsonschema = "^4.17.3"
-pyyaml = "^6.0"
-rich-argparse = "^1.1.0"
+jsonschema = "^4.23.0"
+pyyaml = "^6.0.2"
+rich-argparse = "^1.5.2"
 tabulate = "^0.9.0"
 xdg = "^6.0.0"
 

{lockss_turtles-0.4.0.dev4 → lockss_turtles-0.5.0.dev1}/src/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-dev4'
+__version__ = '0.5.0-dev1'
 
 __copyright__ = '''
 Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University

{lockss_turtles-0.4.0.dev4 → lockss_turtles-0.5.0.dev1}/src/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-0.4.0.dev4 → lockss_turtles-0.5.0.dev1}/src/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')