Refactor changelog entries and update import statements to use importlib.resources

Author: grongierisc

CHANGELOG.md

@@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - `%traceback` setting default value is now `True` to show traceback in message log
-- serializer is now more permissive for iris objects, allowing iris object type of `%Persistent` and `%Stream` to support http inbound/outbound adapters
+- serializer is now more permissive for iris objects, allowing iris object type of `%Stream` to support http inbound/outbound adapters
+- remove usage of `pkg_resources` in favor of `importlib.resources`
 
 ### Fixed
 

pyproject.toml

@@ -30,7 +30,6 @@ dependencies = [
     "pydantic>=2.0.0",
     "xmltodict>=0.12.0",
     "iris-embedded-python-wrapper>=0.0.6",
-    "setuptools>=40.8.0",
     "jsonpath-ng>=1.7.0",
     "debugpy>=1.8.0",
 ]

src/iop/_utils.py

@@ -4,9 +4,9 @@
 from . import _iris
 import inspect
 import xmltodict
-import pkg_resources
 import importlib
 import importlib.util
+import importlib.resources
 import json
 from iop._message import _Message, _PydanticMessage
 from pydantic import TypeAdapter
@@ -26,13 +26,22 @@ def raise_on_error(sc):
     def setup(path:str = None):
 
         if path is None:
-            # get the path of the data folder with pkg_resources
-            path = pkg_resources.resource_filename('iop', 'cls')
+            # get the path of the data folder with importlib.resources
+            try:
+                path = importlib.resources.files('iop').joinpath('cls')
+                path = str(path)
+            except ModuleNotFoundError:
+                path = None
 
-        _Utils.raise_on_error(_iris.get_iris().cls('%SYSTEM.OBJ').LoadDir(path,'cubk',"*.cls",1))
+        if path:
+            _Utils.raise_on_error(_iris.get_iris().cls('%SYSTEM.OBJ').LoadDir(path,'cubk',"*.cls",1))
 
         # for retrocompatibility load grongier.pex
-        path = pkg_resources.resource_filename('grongier', 'cls')
+        try:
+            path = importlib.resources.files('grongier').joinpath('cls')
+            path = str(path)
+        except ModuleNotFoundError:
+            path = None
 
         if path:
             _Utils.raise_on_error(_iris.get_iris().cls('%SYSTEM.OBJ').LoadDir(path,'cubk',"*.cls",1))