Remove xblockutils package

google_drive/google_calendar.py

@@ -10,8 +10,12 @@
 from xblock.core import XBlock
 from xblock.fields import Integer, Scope, String
 from web_fragments.fragment import Fragment
-from xblockutils.publish_event import PublishEventMixin
-from xblockutils.resources import ResourceLoader
+try:
+    from xblock.utils.publish_event import PublishEventMixin  # pylint: disable=ungrouped-imports
+    from xblock.utils.resources import ResourceLoader  # pylint: disable=ungrouped-imports
+except ModuleNotFoundError:  # For backward compatibility with releases older than Quince.
+    from xblockutils.publish_event import PublishEventMixin
+    from xblockutils.resources import ResourceLoader
 
 LOG = logging.getLogger(__name__)
 RESOURCE_LOADER = ResourceLoader(__name__)

google_drive/google_docs.py

@@ -11,8 +11,12 @@
 from xblock.core import XBlock
 from xblock.fields import Scope, String
 from web_fragments.fragment import Fragment
-from xblockutils.publish_event import PublishEventMixin
-from xblockutils.resources import ResourceLoader
+try:
+    from xblock.utils.publish_event import PublishEventMixin  # pylint: disable=ungrouped-imports
+    from xblock.utils.resources import ResourceLoader  # pylint: disable=ungrouped-imports
+except ModuleNotFoundError:  # For backward compatibility with releases older than Quince.
+    from xblockutils.publish_event import PublishEventMixin
+    from xblockutils.resources import ResourceLoader
 import six
 
 LOG = logging.getLogger(__name__)

requirements/base.in

@@ -2,7 +2,5 @@
 -c constraints.txt
 
 Django                    # Web application framework
-mako                      # Used by xblock-utils.resources, but not declared as a requirement for it
 requests
 XBlock[django]            # Courseware component architecture
-xblock-utils

requirements/ci.txt

@@ -8,15 +8,15 @@ asgiref==3.7.2
     # via django
 certifi==2023.7.22
     # via requests
-charset-normalizer==3.3.0
+charset-normalizer==3.3.2
     # via requests
 coverage==6.5.0
     # via coveralls
 coveralls==3.3.1
     # via -r requirements/ci.in
 distlib==0.3.7
     # via virtualenv
-django==3.2.22
+django==3.2.23
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -25,7 +25,7 @@ docopt==0.6.2
     # via coveralls
 edx-i18n-tools==1.3.0
     # via -r requirements/ci.in
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   tox
     #   virtualenv
@@ -68,5 +68,5 @@ typing-extensions==4.8.0
     # via asgiref
 urllib3==2.0.7
     # via requests
-virtualenv==20.24.5
+virtualenv==20.24.6
     # via tox

requirements/dev.txt

@@ -18,9 +18,9 @@ backports-functools-lru-cache==1.6.6
     # via caniusepython3
 binaryornot==0.4.4
     # via cookiecutter
-boto3==1.28.67
+boto3==1.28.77
     # via fs-s3fs
-botocore==1.31.67
+botocore==1.31.77
     # via
     #   boto3
     #   s3transfer
@@ -34,7 +34,7 @@ chardet==5.2.0
     # via
     #   binaryornot
     #   diff-cover
-charset-normalizer==3.3.0
+charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via
@@ -64,7 +64,7 @@ distlib==0.3.7
     # via
     #   caniusepython3
     #   virtualenv
-django==3.2.22
+django==3.2.23
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -76,11 +76,11 @@ docopt==0.6.2
     # via coveralls
 edx-i18n-tools==1.3.0
     # via -r requirements/travis.in
-edx-lint==5.3.4
+edx-lint==5.3.6
     # via -r requirements/quality.in
 exceptiongroup==1.1.3
     # via pytest
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   tox
     #   virtualenv
@@ -126,10 +126,7 @@ lxml==4.9.3
     #   xblock
     #   xblock-sdk
 mako==1.2.4
-    # via
-    #   -r requirements/base.in
-    #   xblock
-    #   xblock-utils
+    # via xblock
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.3
@@ -189,7 +186,7 @@ pylint==2.12.2
     #   pylint-plugin-utils
 pylint-celery==0.3
     # via edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.5
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -201,14 +198,14 @@ pypng==0.20220715.0
     #   xblock-sdk
 pyproject-hooks==1.0.0
     # via build
-pytest==7.4.2
+pytest==7.4.3
     # via
     #   -r requirements/test.in
     #   pytest-cov
     #   pytest-django
 pytest-cov==4.1.0
     # via -r requirements/test.in
-pytest-django==4.5.2
+pytest-django==4.6.0
     # via -r requirements/test.in
 python-dateutil==2.8.2
     # via
@@ -246,7 +243,6 @@ simplejson==3.19.2
     # via
     #   xblock
     #   xblock-sdk
-    #   xblock-utils
 six==1.16.0
     # via
     #   edx-lint
@@ -297,32 +293,28 @@ urllib3==1.26.18
     #   botocore
     #   requests
     #   transifex-client
-virtualenv==20.24.5
+virtualenv==20.24.6
     # via tox
 web-fragments==2.1.0
     # via
     #   xblock
     #   xblock-sdk
-    #   xblock-utils
 webob==1.8.7
     # via
     #   xblock
     #   xblock-sdk
-wheel==0.41.2
+wheel==0.41.3
     # via pip-tools
 wrapt==1.13.3
     # via astroid
 xblock[django]==1.8.1
     # via
     #   -r requirements/base.in
     #   xblock-sdk
-    #   xblock-utils
 xblock-sdk==0.7.0
     # via
     #   -r requirements/dev.in
     #   -r requirements/test.in
-xblock-utils==4.0.0
-    # via -r requirements/base.in
 zipp==3.17.0
     # via importlib-metadata
 

requirements/django.txt

@@ -1 +1 @@
-django==3.2.22
+django==3.2.23

requirements/pip-tools.txt

@@ -21,7 +21,7 @@ tomli==2.0.1
     #   build
     #   pip-tools
     #   pyproject-hooks
-wheel==0.41.2
+wheel==0.41.3
     # via pip-tools
 zipp==3.17.0
     # via importlib-metadata

requirements/pip.txt

@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.41.2
+wheel==0.41.3
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.3
+pip==23.3.1
     # via -r requirements/pip.in
 setuptools==68.2.2
     # via -r requirements/pip.in

requirements/quality.txt

@@ -18,9 +18,9 @@ backports-functools-lru-cache==1.6.6
     # via caniusepython3
 binaryornot==0.4.4
     # via cookiecutter
-boto3==1.28.67
+boto3==1.28.77
     # via fs-s3fs
-botocore==1.31.67
+botocore==1.31.77
     # via
     #   boto3
     #   s3transfer
@@ -34,7 +34,7 @@ chardet==5.2.0
     # via
     #   binaryornot
     #   diff-cover
-charset-normalizer==3.3.0
+charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via
@@ -59,14 +59,14 @@ diff-cover==8.0.0
     # via -r requirements/dev.in
 distlib==0.3.7
     # via caniusepython3
-django==3.2.22
+django==3.2.23
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   openedx-django-pyfs
     #   xblock-sdk
-edx-lint==5.3.4
+edx-lint==5.3.6
     # via -r requirements/quality.in
 exceptiongroup==1.1.3
     # via pytest
@@ -111,10 +111,7 @@ lxml==4.9.3
     #   xblock
     #   xblock-sdk
 mako==1.2.4
-    # via
-    #   -r requirements/base.in
-    #   xblock
-    #   xblock-utils
+    # via xblock
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.3
@@ -164,7 +161,7 @@ pylint==2.12.2
     #   pylint-plugin-utils
 pylint-celery==0.3
     # via edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.5
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -176,14 +173,14 @@ pypng==0.20220715.0
     #   xblock-sdk
 pyproject-hooks==1.0.0
     # via build
-pytest==7.4.2
+pytest==7.4.3
     # via
     #   -r requirements/test.in
     #   pytest-cov
     #   pytest-django
 pytest-cov==4.1.0
     # via -r requirements/test.in
-pytest-django==4.5.2
+pytest-django==4.6.0
     # via -r requirements/test.in
 python-dateutil==2.8.2
     # via
@@ -219,7 +216,6 @@ simplejson==3.19.2
     # via
     #   xblock
     #   xblock-sdk
-    #   xblock-utils
 six==1.16.0
     # via
     #   edx-lint
@@ -265,26 +261,22 @@ web-fragments==2.1.0
     # via
     #   xblock
     #   xblock-sdk
-    #   xblock-utils
 webob==1.8.7
     # via
     #   xblock
     #   xblock-sdk
-wheel==0.41.2
+wheel==0.41.3
     # via pip-tools
 wrapt==1.13.3
     # via astroid
 xblock[django]==1.8.1
     # via
     #   -r requirements/base.in
     #   xblock-sdk
-    #   xblock-utils
 xblock-sdk==0.7.0
     # via
     #   -r requirements/dev.in
     #   -r requirements/test.in
-xblock-utils==4.0.0
-    # via -r requirements/base.in
 zipp==3.17.0
     # via importlib-metadata