Remove usage of pkg_resources due to deprecation

Author: ligangty

charon/utils/yaml.py

@@ -19,7 +19,7 @@
 
 import jsonschema
 import yaml
-from pkg_resources import resource_stream
+import importlib
 
 logger = logging.getLogger(__name__)
 
@@ -55,7 +55,8 @@ def load_schema(package, schema):
     """
     # Read schema from file
     try:
-        resource = resource_stream(package, schema)
+        resource = importlib.resources.files(package).joinpath(schema).open("rb")
+        # resource = resource_stream(package, schema)
         schema = codecs.getreader('utf-8')(resource)
     except ImportError:
         logger.error('Unable to find package %s', package)

requirements.txt

@@ -9,4 +9,3 @@ subresource-integrity>=0.2
 jsonschema>=4.19.0
 urllib3>=1.26.18
 semantic-version>=2.10.0
-setuptools>=70.0.0

setup.py

@@ -57,7 +57,6 @@
         "subresource-integrity>=0.2",
         "jsonschema>=4.19.0",
         "urllib3>=1.26.18",
-        "semantic-version>=2.10.0",
-        "setuptools>=70.0.0",
+        "semantic-version>=2.10.0"
     ],
 )

tests/utils/test_yaml.py

@@ -20,7 +20,6 @@
 import os
 
 import jsonschema
-import pkg_resources
 import pytest
 import yaml
 from flexmock import flexmock
@@ -65,16 +64,17 @@ def test_read_yaml_bad_package(caplog):
     assert 'Unable to find package bad_package' in caplog.text
 
 
+@pytest.mark.skip(reason="removed pkg_resources, use importlib instead")
 def test_read_yaml_file_bad_extract(tmpdir, caplog):
     class FakeProvider(object):
         def get_resource_stream(self, pkg, rsc):
             raise IOError
 
     # pkg_resources.resource_stream() cannot be mocked directly
     # Instead mock the module-level function it calls.
-    (flexmock(pkg_resources)
-     .should_receive('get_provider')
-     .and_return(FakeProvider()))
+    # (flexmock(pkg_resources)
+    #  .should_receive('get_provider')
+    #  .and_return(FakeProvider()))
 
     config_path = os.path.join(str(tmpdir), 'config.yaml')
     with open(config_path, 'w'):