lockss-turtles 0.6.0.dev1__tar.gz → 0.6.0.dev2__tar.gz

{lockss_turtles-0.6.0.dev1 → lockss_turtles-0.6.0.dev2}/CHANGELOG.rst

@@ -16,6 +16,8 @@ Released: ?
 
 *  **Changes**
 
+   *  The configuration directory for Turtles in ``$XDG_CONFIG_HOME`` (by default ``$HOME/.config``), ``/usr/local/share``, and ``/etc`` is now called ``lockss-turtles`` instead of ``lockss.turtles``.
+
    *  Some long options have been renamed (the short options remain unchanged):
 
       ============ ================= =============

{lockss_turtles-0.6.0.dev1 → lockss_turtles-0.6.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-turtles
-Version: 0.6.0.dev1
+Version: 0.6.0.dev2
 Summary: Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin
@@ -24,7 +24,10 @@ Requires-Dist: lockss-pybasic (>=0.1.0,<0.2.0)
 Requires-Dist: pydantic (>=2.11.7,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.0,<6.1.0)
 Requires-Dist: xdg (>=6.0.0,<6.1.0)
+Project-URL: Documentation, https://docs.lockss.org/en/latest/software/turtles
 Project-URL: Repository, https://github.com/lockss/lockss-turtles
+Project-URL: changelog, https://github.com/lockss/lockss-turtles/blob/main/CHANGELOG.rst
+Project-URL: issues, https://github.com/lockss/lockss-turtles/issues
 Description-Content-Type: text/x-rst
 
 =======

{lockss_turtles-0.6.0.dev1 → lockss_turtles-0.6.0.dev2}/pyproject.toml

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-turtles"
-version = "0.6.0-dev1" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.6.0-dev2" # 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"
@@ -60,7 +60,11 @@ classifiers = [
     "Topic :: Utilities",
 ]
 
+# See https://docs.pypi.org/project_metadata/
 [project.urls]
+changelog = "https://github.com/lockss/lockss-turtles/blob/main/CHANGELOG.rst"
+documentation = "https://docs.lockss.org/en/latest/software/turtles"
+issues = "https://github.com/lockss/lockss-turtles/issues"
 repository = "https://github.com/lockss/lockss-turtles"
 
 [tool.poetry]

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

{lockss_turtles-0.6.0.dev1 → lockss_turtles-0.6.0.dev2}/src/lockss/turtles/app.py

@@ -45,11 +45,13 @@ from .util import YamlT, load_and_validate
 
 class TurtlesApp(object):
 
-    XDG_CONFIG_DIR: Path = xdg.xdg_config_home().joinpath(__package__)
+    CONFIG_DIR_NAME = 'lockss-turtles'
 
-    USR_CONFIG_DIR: Path = Path('/usr/local/share', __package__)
+    XDG_CONFIG_DIR: Path = xdg.xdg_config_home().joinpath(CONFIG_DIR_NAME)
 
-    ETC_CONFIG_DIR: Path = Path('/etc', __package__)
+    USR_CONFIG_DIR: Path = Path('/usr/local/share', CONFIG_DIR_NAME)
+
+    ETC_CONFIG_DIR: Path = Path('/etc', CONFIG_DIR_NAME)
 
     CONFIG_DIRS: List[Path] = [XDG_CONFIG_DIR, USR_CONFIG_DIR, ETC_CONFIG_DIR]
 
@@ -71,7 +73,6 @@ class TurtlesApp(object):
     def build_plugin(self, plugin_ids: List[str]) -> Dict[str, Tuple[str, Path, Plugin]]:
         return {plugin_id: self._build_one_plugin(plugin_id) for plugin_id in plugin_ids}
 
-    # Returns (src_path, plugin_id) -> list of (registry_id, layer_id, dst_path, plugin)
     def deploy_plugin(self, src_paths: List[Path], layer_ids: List[str], interactive: bool=False) -> Dict[Tuple[Path, str], List[Tuple[str, str, Optional[Path], Optional[Plugin]]]]:
         plugin_ids = [Plugin.id_from_jar(src_path) for src_path in src_paths]
         return {(src_path, plugin_id): self._deploy_one_plugin(src_path,
@@ -99,7 +100,6 @@ class TurtlesApp(object):
             with IR.path(__resources__, TurtlesApp.PLUGIN_SIGNING_CREDENTIALS_SCHEMA) as plugin_signing_credentials_schema_path:
                 self._plugin_signing_credentials = load_and_validate(plugin_signing_credentials_schema_path, plugin_signing_credentials_path)
 
-    # Returns plugin_id -> list of (registry_id, layer_id, dst_path, plugin)
     def release_plugin(self, plugin_ids: List[str], layer_ids: List[str], interactive: bool=False) -> Dict[str, List[Tuple[str, str, Path, Plugin]]]:
         # ... plugin_id -> (set_id, jar_path, plugin)
         ret1 = self.build_plugin(plugin_ids)
@@ -122,7 +122,6 @@ class TurtlesApp(object):
     def set_password(self, pw: Union[Callable[[], str], str]) -> None:
         self._password = pw if callable(pw) else lambda: pw
 
-    # Returns (set_id, jar_path, plugin)
     def _build_one_plugin(self, plugin_id: str) -> Tuple[str, Optional[Path], Optional[Plugin]]:
         for plugin_set in self._plugin_sets:
             if plugin_set.has_plugin(plugin_id):
@@ -133,7 +132,6 @@ class TurtlesApp(object):
                 return plugin_set.get_id(), bp[0] if bp else None, bp[1] if bp else None
         raise Exception(f'{plugin_id}: not found in any plugin set')
 
-    # Returns list of (registry_id, layer_id, dst_path, plugin)
     def _deploy_one_plugin(self, src_jar: Path, plugin_id: str, layer_ids: List[str], interactive: bool=False) -> List[Tuple[str, str, Optional[Path], Optional[Plugin]]]:
         ret = list()
         for plugin_registry in self._plugin_registries: