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,14 +5,22 @@
 
 import json
 
-import pkg_resources
+import importlib.resources
 from xblock.core import XBlock
-from xblock.fields import Integer, Scope, String
+from xblock.fields import Scope, String
 from xblock.fragment import Fragment
 
+try:
+    from xblock.utils.resources import ResourceLoader
+except ModuleNotFoundError:
+    from xblockutils.resources import ResourceLoader
+
 import requests
 
 
+loader = ResourceLoader(__name__)
+
+
 class ConceptXBlock(XBlock):
     """
     This XBlock allows concept tagging in a course. 
@@ -43,8 +51,7 @@ 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")
+        return loader.load_unicode(path)
 
     def student_view(self, context=None):
         """
@@ -79,8 +86,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

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -8,9 +8,9 @@ appdirs==1.4.4
     # via fs
 fs==2.4.16
     # via xblock
-lxml==5.1.0
+lxml==5.3.0
     # via xblock
-mako==1.3.2
+mako==1.3.5
     # via xblock
 markupsafe==2.1.5
     # via
@@ -20,19 +20,19 @@ python-dateutil==2.9.0.post0
     # via xblock
 pytz==2024.1
     # via xblock
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via xblock
-simplejson==3.19.2
+simplejson==3.19.3
     # via xblock
 six==1.16.0
     # via
     #   fs
     #   python-dateutil
-web-fragments==2.1.0
+web-fragments==2.2.0
     # via xblock
-webob==1.8.7
+webob==1.8.8
     # via xblock
-xblock==2.0.0
+xblock==5.1.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip.txt

@@ -1,14 +1,14 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
 #
-wheel==0.42.0
+wheel==0.44.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==24.0
+pip==24.2
     # via -r requirements/pip.in
-setuptools==69.1.1
+setuptools==74.1.2
     # via -r requirements/pip.in

requirements/pip_tools.txt

@@ -1,32 +1,23 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
 #
-build==1.1.1
+build==1.2.2
     # via pip-tools
 click==8.1.7
     # via pip-tools
-importlib-metadata==7.0.1
+packaging==24.1
     # via build
-packaging==23.2
-    # via build
-pip-tools==7.4.0
+pip-tools==7.4.1
     # via -r requirements/pip_tools.in
-pyproject-hooks==1.0.0
-    # via
-    #   build
-    #   pip-tools
-tomli==2.0.1
+pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-    #   pyproject-hooks
-wheel==0.42.0
+wheel==0.44.0
     # via pip-tools
-zipp==3.17.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip