chore: Shift from pkg_resources to importlib.resources

sql_grader/mixins/scenario.py

@@ -2,7 +2,8 @@
 Mixin workbench behavior into XBlocks
 """
 from glob import glob
-import pkg_resources
+import importlib.resources
+import importlib
 
 
 def _read_file(file_path):
@@ -62,7 +63,8 @@ def workbench_scenarios(cls):
         """
         module = cls.__module__
         module = module.split('.', maxsplit=1)[0]
-        directory = pkg_resources.resource_filename(module, 'scenarios')
-        files = _find_files(directory)
+        module_ref = importlib.import_module(module)
+        files = importlib.resources.files(module_ref).joinpath('scenarios')
+        files = _find_files(files)
         scenarios = _read_files(files)
         return scenarios

sql_grader/problem.py

@@ -4,9 +4,16 @@
 import os
 import sqlite3
 
-import pkg_resources
+try:
+    from xblock.utils.resources import ResourceLoader
+except ModuleNotFoundError:
+    # For backward compatibility with releases older than Quince.
+    from xblockutils.resources import ResourceLoader
+import importlib.resources
 
 
+loader = ResourceLoader(__name__)
+
 class SqlProblem:
     """
     Handle modeling and processing of SQL problems aside from XBlock logic
@@ -178,10 +185,7 @@ def all_datasets():
     """
     Lookup the names of all avaiable datasets (.sql files)
     """
-    dataset_directory = pkg_resources.resource_filename(
-        'sql_grader',
-        'datasets'
-    )
+    dataset_directory = importlib.resources.files('sql_grader') / 'datasets'
     for _, _, files in os.walk(dataset_directory):
         for fname in files:
             if fname.endswith('.sql'):
@@ -193,8 +197,7 @@ def resource_string(path):
     """
     Handy helper for getting resources from our kit
     """
-    data = pkg_resources.resource_string(__name__, path)
-    return data.decode('utf8')
+    return loader.load_unicode(path)
 
 
 def create_database(database_name):