lockss-turtles version 0.3.1

thibgc · thibgc · commit 05534536f438 · 2023-03-07T15:20:20.000-08:00
Squashed commit of the following: commit f65e51c Author: Thib Guicherd-Callin <thib@cs.stanford.edu> Date: Tue Mar 7 15:05:39 2023 -0800 0.3.1 release. commit b20c35a Author: Thib Guicherd-Callin <thib@cs.stanford.edu> Date: Tue Mar 7 14:53:50 2023 -0800 Fixed use of the ``importlib.resources`` library.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,16 @@
 Release Notes
 =============
 
+-----
+0.3.1
+-----
+
+Released: 2023-03-07
+
+.. rubric:: Bug Fixes
+
+*  Fixed use of the ``importlib.resources`` library.
+
 -----
 0.3.0
 -----
diff --git a/README.rst b/README.rst
@@ -17,7 +17,7 @@ Turtles
 
 Turtles is a tool to manage LOCKSS plugin sets and LOCKSS plugin registries.
 
-**Latest release:** 0.3.0 (2023-03-07)
+**Latest release:** 0.3.1 (2023-03-07)
 
 -------------
 Prerequisites
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lockss-turtles"
-version = "0.3.0"
+version = "0.3.1"
 description = "Tool to manage LOCKSS plugin sets and LOCKSS plugin registries"
 license = "BSD-3-Clause"
 authors = [
diff --git a/src/lockss/turtles/__init__.py b/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.3.0'
+__version__ = '0.3.1'
 
 __copyright__ = '''\
 Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University
diff --git a/src/lockss/turtles/app.py b/src/lockss/turtles/app.py
@@ -120,8 +120,8 @@ def load_plugin_sets(self, plugin_set_catalog_path=None):
     def load_plugin_signing_credentials(self, plugin_signing_credentials_path=None):
         if self._plugin_signing_credentials is None:
             plugin_signing_credentials_path = _path(plugin_signing_credentials_path) if plugin_signing_credentials_path else self._select_file(TurtlesApp.PLUGIN_SIGNING_CREDENTIALS)
-            plugin_signing_credentials_schema_path = importlib.resources.path(lockss.turtles.resources, TurtlesApp.PLUGIN_SIGNING_CREDENTIALS_SCHEMA)
-            self._plugin_signing_credentials = _load_and_validate(plugin_signing_credentials_schema_path, plugin_signing_credentials_path)
+            with importlib.resources.path(lockss.turtles.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, layer_ids, interactive=False):
diff --git a/src/lockss/turtles/plugin_registry.py b/src/lockss/turtles/plugin_registry.py
@@ -44,9 +44,9 @@ class PluginRegistryCatalog(object):
     @staticmethod
     def from_path(plugin_registry_catalog_path):
         plugin_registry_catalog_path = _path(plugin_registry_catalog_path)
-        plugin_registry_catalog_schema_path = importlib.resources.path(lockss.turtles.resources, PluginRegistryCatalog.PLUGIN_REGISTRY_CATALOG_SCHEMA)
-        parsed = _load_and_validate(plugin_registry_catalog_schema_path, plugin_registry_catalog_path)
-        return PluginRegistryCatalog(parsed)
+        with importlib.resources.path(lockss.turtles.resources, PluginRegistryCatalog.PLUGIN_REGISTRY_CATALOG_SCHEMA) as plugin_registry_catalog_schema_path:
+            parsed = _load_and_validate(plugin_registry_catalog_schema_path, plugin_registry_catalog_path)
+            return PluginRegistryCatalog(parsed)
 
     def __init__(self, parsed):
         super().__init__()
@@ -63,9 +63,9 @@ class PluginRegistry(object):
     @staticmethod
     def from_path(plugin_registry_file_path):
         plugin_registry_file_path = _path(plugin_registry_file_path)
-        plugin_registry_schema_path = importlib.resources.path(lockss.turtles.resources, PluginRegistry.PLUGIN_REGISTRY_SCHEMA)
-        lst = _load_and_validate(plugin_registry_schema_path, plugin_registry_file_path, multiple=True)
-        return [PluginRegistry._from_obj(parsed, plugin_registry_file_path) for parsed in lst]
+        with importlib.resources.path(lockss.turtles.resources, PluginRegistry.PLUGIN_REGISTRY_SCHEMA) as plugin_registry_schema_path:
+           lst = _load_and_validate(plugin_registry_schema_path, plugin_registry_file_path, multiple=True)
+           return [PluginRegistry._from_obj(parsed, plugin_registry_file_path) for parsed in lst]
 
     @staticmethod
     def _from_obj(parsed, plugin_registry_file_path):
diff --git a/src/lockss/turtles/plugin_set.py b/src/lockss/turtles/plugin_set.py
@@ -47,9 +47,9 @@ class PluginSetCatalog(object):
     @staticmethod
     def from_path(plugin_set_catalog_path):
         plugin_set_catalog_path = _path(plugin_set_catalog_path)
-        plugin_set_catalog_schema_path = importlib.resources.path(lockss.turtles.resources, PluginSetCatalog.PLUGIN_SET_CATALOG_SCHEMA)
-        parsed = _load_and_validate(plugin_set_catalog_schema_path, plugin_set_catalog_path)
-        return PluginSetCatalog(parsed)
+        with importlib.resources.path(lockss.turtles.resources, PluginSetCatalog.PLUGIN_SET_CATALOG_SCHEMA) as plugin_set_catalog_schema_path:
+            parsed = _load_and_validate(plugin_set_catalog_schema_path, plugin_set_catalog_path)
+            return PluginSetCatalog(parsed)
 
     def __init__(self, parsed):
         super().__init__()
@@ -66,9 +66,9 @@ class PluginSet(object):
     @staticmethod
     def from_path(plugin_set_file_path):
         plugin_set_file_path = _path(plugin_set_file_path)
-        plugin_set_schema_path = importlib.resources.path(lockss.turtles.resources, PluginSet.PLUGIN_SET_SCHEMA)
-        lst = _load_and_validate(plugin_set_schema_path, plugin_set_file_path, multiple=True)
-        return [PluginSet._from_obj(parsed, plugin_set_file_path) for parsed in lst]
+        with importlib.resources.path(lockss.turtles.resources, PluginSet.PLUGIN_SET_SCHEMA) as plugin_set_schema_path:
+            lst = _load_and_validate(plugin_set_schema_path, plugin_set_file_path, multiple=True)
+            return [PluginSet._from_obj(parsed, plugin_set_file_path) for parsed in lst]
 
     @staticmethod
     def _from_obj(parsed, plugin_set_file_path):
