ConceptXBlock | Drop py3.8 support | replace pkg_resource with importlib.resources

.github/workflows/pypi-publish.yml

@@ -15,7 +15,7 @@ jobs:
       - name: setup python
         uses: actions/setup-python@v3
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: Install pip
         run: pip install -r requirements/pip.txt

concept/concept.py

@@ -5,7 +5,7 @@
 
 import json
 
-import pkg_resources
+import importlib.resources
 from xblock.core import XBlock
 from xblock.fields import Integer, Scope, String
 from xblock.fragment import Fragment
@@ -43,8 +43,8 @@ def relay_handler(self, request, suffix):
 
     def resource_string(self, path):
         """Handy helper for getting resources from our kit."""
-        data = pkg_resources.resource_string(__name__, path)
-        return data.decode("utf8")
+        data = importlib.resources.files(__package__).joinpath(path)
+        return data.read_text(encoding="utf-8")
 
     def student_view(self, context=None):
         """
@@ -79,8 +79,8 @@ def student_view(self, context=None):
 
     def studio_view(self, context=None):
         frag = Fragment(self.resource_string("static/html/studio_hack.html"))
-        frag.add_javascript(pkg_resources.resource_string(__name__, "static/js/oa_server.js"))
-        frag.add_javascript(pkg_resources.resource_string(__name__, "static/js/oa_edit.js"))
+        frag.add_javascript(importlib.resources.files(__package__).joinpath("static/js/oa_server.js"))
+        frag.add_javascript(importlib.resources.files(__package__).joinpath("static/js/oa_edit.js"))
         return frag
 
     # TO-DO: change this to create the scenarios you'd like to see in the

requirements/base.txt

@@ -32,7 +32,7 @@ web-fragments==2.1.0
     # via xblock
 webob==1.8.7
     # via xblock
-xblock==2.0.0
+xblock==5.0.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file: