Merge pull request #138 from edly-io/ttqureshi/depr_pkg_resources

schoolyourself-xblock | Replace pkg_resources to importlib_resources | Drop support for python 3.8

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        python-version: [ 3.8 ]
+        python-version: [ 3.11, 3.12 ]
         toxenv: [ testenv ]
     steps:
     - name: Checkout Repo

.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

requirements/base.in

@@ -3,3 +3,4 @@
 
 XBlock
 Mako
+xblock-utils

requirements/base.txt

@@ -1,40 +1,85 @@
 #
-# 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
 #
 appdirs==1.4.4
     # via fs
+asgiref==3.8.1
+    # via django
+boto3==1.35.24
+    # via fs-s3fs
+botocore==1.35.24
+    # via
+    #   boto3
+    #   s3transfer
+django==3.2.25
+    # via
+    #   -c requirements/common_constraints.txt
+    #   openedx-django-pyfs
 fs==2.4.16
+    # via
+    #   fs-s3fs
+    #   openedx-django-pyfs
+    #   xblock
+fs-s3fs==1.1.1
+    # via openedx-django-pyfs
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+lazy==1.6
     # via xblock
-lxml==5.1.0
+lxml==5.3.0
     # via xblock
-mako==1.3.2
+mako==1.3.5
     # via
     #   -r requirements/base.in
     #   xblock
+    #   xblock-utils
 markupsafe==2.1.5
     # via
     #   mako
     #   xblock
-python-dateutil==2.8.2
+openedx-django-pyfs==3.7.0
     # via xblock
-pytz==2024.1
-    # via xblock
-pyyaml==6.0.1
-    # via xblock
-simplejson==3.19.2
+python-dateutil==2.9.0.post0
+    # via
+    #   botocore
+    #   xblock
+pytz==2024.2
+    # via
+    #   django
+    #   xblock
+pyyaml==6.0.2
     # via xblock
+s3transfer==0.10.2
+    # via boto3
+simplejson==3.19.3
+    # via
+    #   xblock
+    #   xblock-utils
 six==1.16.0
     # via
     #   fs
+    #   fs-s3fs
     #   python-dateutil
-web-fragments==2.1.0
-    # via xblock
-webob==1.8.7
+sqlparse==0.5.1
+    # via django
+urllib3==2.2.3
+    # via botocore
+web-fragments==2.2.0
+    # via
+    #   xblock
+    #   xblock-utils
+webob==1.8.8
     # via xblock
-xblock==1.10.0
+xblock[django]==5.1.0
+    # via
+    #   -r requirements/base.in
+    #   xblock-utils
+xblock-utils==4.0.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/ci.txt

@@ -1,10 +1,10 @@
 #
-# 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
 #
-cachetools==5.3.2
+cachetools==5.5.0
     # via
     #   -r requirements/tox.txt
     #   tox
@@ -20,37 +20,32 @@ distlib==0.3.8
     # via
     #   -r requirements/tox.txt
     #   virtualenv
-filelock==3.13.1
+filelock==3.16.1
     # via
     #   -r requirements/tox.txt
     #   tox
     #   virtualenv
-packaging==23.2
+packaging==24.1
     # via
     #   -r requirements/tox.txt
     #   pyproject-api
     #   tox
-platformdirs==4.2.0
+platformdirs==4.3.6
     # via
     #   -r requirements/tox.txt
     #   tox
     #   virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
     # via
     #   -r requirements/tox.txt
     #   tox
-pyproject-api==1.6.1
+pyproject-api==1.8.0
     # via
     #   -r requirements/tox.txt
     #   tox
-tomli==2.0.1
-    # via
-    #   -r requirements/tox.txt
-    #   pyproject-api
-    #   tox
-tox==4.13.0
+tox==4.20.0
     # via -r requirements/tox.txt
-virtualenv==20.25.1
+virtualenv==20.26.5
     # via
     #   -r requirements/tox.txt
     #   tox

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==75.1.0
     # 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.0.3
+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

requirements/test.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,67 +8,122 @@ appdirs==1.4.4
     # via
     #   -r requirements/base.txt
     #   fs
-exceptiongroup==1.2.0
-    # via pytest
+asgiref==3.8.1
+    # via
+    #   -r requirements/base.txt
+    #   django
+boto3==1.35.24
+    # via
+    #   -r requirements/base.txt
+    #   fs-s3fs
+botocore==1.35.24
+    # via
+    #   -r requirements/base.txt
+    #   boto3
+    #   s3transfer
+django==3.2.25
+    # via
+    #   -c requirements/common_constraints.txt
+    #   -r requirements/base.txt
+    #   openedx-django-pyfs
 fs==2.4.16
     # via
     #   -r requirements/base.txt
+    #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
+fs-s3fs==1.1.1
+    # via
+    #   -r requirements/base.txt
+    #   openedx-django-pyfs
 iniconfig==2.0.0
     # via pytest
-lxml==5.1.0
+jmespath==1.0.1
+    # via
+    #   -r requirements/base.txt
+    #   boto3
+    #   botocore
+lazy==1.6
+    # via
+    #   -r requirements/base.txt
+    #   xblock
+lxml==5.3.0
     # via
     #   -r requirements/base.txt
     #   xblock
-mako==1.3.2
+mako==1.3.5
     # via
     #   -r requirements/base.txt
     #   xblock
+    #   xblock-utils
 markupsafe==2.1.5
     # via
     #   -r requirements/base.txt
     #   mako
     #   xblock
 mock==5.1.0
     # via -r requirements/test.in
-packaging==23.2
+openedx-django-pyfs==3.7.0
+    # via
+    #   -r requirements/base.txt
+    #   xblock
+packaging==24.1
     # via pytest
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
-pytest==8.0.2
+pytest==8.3.3
     # via -r requirements/test.in
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via
     #   -r requirements/base.txt
+    #   botocore
     #   xblock
-pytz==2024.1
+pytz==2024.2
     # via
     #   -r requirements/base.txt
+    #   django
     #   xblock
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   -r requirements/base.txt
     #   xblock
-simplejson==3.19.2
+s3transfer==0.10.2
+    # via
+    #   -r requirements/base.txt
+    #   boto3
+simplejson==3.19.3
     # via
     #   -r requirements/base.txt
     #   xblock
+    #   xblock-utils
 six==1.16.0
     # via
     #   -r requirements/base.txt
     #   fs
+    #   fs-s3fs
     #   python-dateutil
-tomli==2.0.1
-    # via pytest
-web-fragments==2.1.0
+sqlparse==0.5.1
+    # via
+    #   -r requirements/base.txt
+    #   django
+urllib3==2.2.3
+    # via
+    #   -r requirements/base.txt
+    #   botocore
+web-fragments==2.2.0
     # via
     #   -r requirements/base.txt
     #   xblock
-webob==1.8.7
+    #   xblock-utils
+webob==1.8.8
     # via
     #   -r requirements/base.txt
     #   xblock
-xblock==1.10.0
+xblock[django]==5.1.0
+    # via
+    #   -r requirements/base.txt
+    #   xblock-utils
+xblock-utils==4.0.0
     # via -r requirements/base.txt
 
 # The following packages are considered to be unsafe in a requirements file: