Merge pull request #112 from farhan/farhan/remove-xblockutils

Remove xblock utils package

Author: Feanil Patel

audio/audio.py

@@ -5,7 +5,10 @@
 from xblock.core import XBlock
 from xblock.fields import Integer, Scope, String
 from xblock.fragment import Fragment
-from xblockutils.resources import ResourceLoader
+try:
+    from xblock.utils.resources import ResourceLoader
+except ModuleNotFoundError:  # For backward compatibility with releases older than Quince.
+    from xblockutils.resources import ResourceLoader
 
 resource_loader = ResourceLoader(__name__)
 

requirements/base.in

@@ -2,4 +2,3 @@
 -c constraints.txt
 
 XBlock
-xblock-utils

requirements/base.txt

@@ -6,81 +6,33 @@
 #
 appdirs==1.4.4
     # via fs
-asgiref==3.7.2
-    # via django
-boto3==1.28.62
-    # via fs-s3fs
-botocore==1.31.62
-    # via
-    #   boto3
-    #   s3transfer
-django==3.2.22
-    # 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==4.9.3
     # via xblock
 mako==1.2.4
-    # via
-    #   xblock
-    #   xblock-utils
+    # via xblock
 markupsafe==2.1.3
     # via
     #   mako
     #   xblock
-openedx-django-pyfs==3.4.0
-    # via xblock
 python-dateutil==2.8.2
-    # via
-    #   botocore
-    #   xblock
+    # via xblock
 pytz==2023.3.post1
-    # via
-    #   django
-    #   xblock
+    # via xblock
 pyyaml==6.0.1
     # via xblock
-s3transfer==0.7.0
-    # via boto3
 simplejson==3.19.2
-    # via
-    #   xblock
-    #   xblock-utils
+    # via xblock
 six==1.16.0
     # via
     #   fs
-    #   fs-s3fs
     #   python-dateutil
-sqlparse==0.4.4
-    # via django
-typing-extensions==4.8.0
-    # via asgiref
-urllib3==1.26.17
-    # via botocore
 web-fragments==2.1.0
-    # via
-    #   xblock
-    #   xblock-utils
+    # via xblock
 webob==1.8.7
     # via xblock
-xblock[django]==1.8.1
-    # via
-    #   -r requirements/base.in
-    #   xblock-utils
-xblock-utils==4.0.0
+xblock==1.8.1
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip.txt

@@ -8,7 +8,7 @@ wheel==0.41.2
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.2.1
+pip==23.3.1
     # via -r requirements/pip.in
 setuptools==68.2.2
     # via -r requirements/pip.in

setup.py

@@ -92,7 +92,7 @@ def is_requirement(line):
 
 setup(
     name='audio-xblock',
-    version='0.2.0',
+    version='0.3.0',
     description='Audio XBlock, to play audio files in the course',
     long_description=README,
     long_description_content_type='text/markdown',