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

Remove xblockutils package

openedx/core/djangoapps/xblock/runtime/shims.py

@@ -141,7 +141,7 @@ class RuntimeShim:
         warnings.warn(
             "Use of runtime.render_template is deprecated. "
             "For template files included with your XBlock (which is preferable), use "
-            "xblockutils.resources.ResourceLoader.render_mako_template to render them, or use a JavaScript-based "
+            "xblock.utils.resources.ResourceLoader.render_mako_template to render them, or use a JavaScript-based "
             "template instead. For template files that are part of the LMS/Studio, use the 'mako' XBlock service.",
             DeprecationWarning, stacklevel=2,
         )

requirements/edx/base.txt

@@ -793,7 +793,7 @@ openedx-mongodbproxy==0.2.0
     # via -r requirements/edx/kernel.in
 optimizely-sdk==4.1.1
     # via -r requirements/edx/bundled.in
-ora2==5.5.4
+ora2==5.5.5
     # via -r requirements/edx/bundled.in
 oscrypto==1.3.0
     # via snowflake-connector-python
@@ -1229,7 +1229,6 @@ xblock-poll==1.13.0
     # via -r requirements/edx/bundled.in
 xblock-utils==4.0.0
     # via
-    #   -r requirements/edx/kernel.in
     #   done-xblock
     #   edx-sga
     #   lti-consumer-xblock

requirements/edx/development.txt

@@ -893,7 +893,7 @@ execnet==2.0.2
     #   pytest-xdist
 factory-boy==3.3.0
     # via -r requirements/edx/testing.txt
-faker==19.8.0
+faker==19.9.0
     # via
     #   -r requirements/edx/testing.txt
     #   factory-boy
@@ -1229,7 +1229,7 @@ multidict==6.0.4
     #   -r requirements/edx/testing.txt
     #   aiohttp
     #   yarl
-mypy==1.5.1
+mypy==1.6.0
     # via
     #   -r requirements/edx/development.in
     #   django-stubs
@@ -1331,7 +1331,7 @@ optimizely-sdk==4.1.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-ora2==5.5.4
+ora2==5.5.5
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt

requirements/edx/doc.txt

@@ -933,7 +933,7 @@ openedx-mongodbproxy==0.2.0
     # via -r requirements/edx/base.txt
 optimizely-sdk==4.1.1
     # via -r requirements/edx/base.txt
-ora2==5.5.4
+ora2==5.5.5
     # via -r requirements/edx/base.txt
 oscrypto==1.3.0
     # via

requirements/edx/kernel.in

@@ -158,5 +158,4 @@ user-util                           # Functionality for retiring users (GDPR com
 webob
 web-fragments                       # Provides the ability to render fragments of web pages
 XBlock[django]                      # Courseware component architecture
-xblock-utils                        # Provides utilities used by the Discussion XBlock
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations

requirements/edx/testing.txt

@@ -689,7 +689,7 @@ execnet==2.0.2
     # via pytest-xdist
 factory-boy==3.3.0
     # via -r requirements/edx/testing.in
-faker==19.8.0
+faker==19.9.0
     # via factory-boy
 fastapi==0.103.2
     # via pact-python
@@ -1000,7 +1000,7 @@ openedx-mongodbproxy==0.2.0
     # via -r requirements/edx/base.txt
 optimizely-sdk==4.1.1
     # via -r requirements/edx/base.txt
-ora2==5.5.4
+ora2==5.5.5
     # via -r requirements/edx/base.txt
 oscrypto==1.3.0
     # via

xmodule/discussion_block.py

@@ -12,8 +12,8 @@ from web_fragments.fragment import Fragment
 from xblock.completable import XBlockCompletionMode
 from xblock.core import XBlock
 from xblock.fields import UNIQUE_ID, Scope, String
-from xblockutils.resources import ResourceLoader
-from xblockutils.studio_editable import StudioEditableXBlockMixin
+from xblock.utils.resources import ResourceLoader
+from xblock.utils.studio_editable import StudioEditableXBlockMixin
 
 from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, Provider