From ff17e51699f1eeed520545f004c29a9572570b01 Mon Sep 17 00:00:00 2001 From: farhan Date: Wed, 11 Oct 2023 11:31:23 +0500 Subject: [PATCH 1/2] refactor: remove xblockutils package --- openedx/core/djangoapps/xblock/runtime/shims.py | 2 +- requirements/edx/kernel.in | 1 - xmodule/discussion_block.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py index abef606bcf..18aa41eb91 100644 --- a/openedx/core/djangoapps/xblock/runtime/shims.py +++ b/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, ) diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in index 18f4f87faa..1c727d2f9c 100644 --- a/requirements/edx/kernel.in +++ b/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 diff --git a/xmodule/discussion_block.py b/xmodule/discussion_block.py index b5c5c01907..943c6359dd 100644 --- a/xmodule/discussion_block.py +++ b/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 From 23a44b9ddbf6df2ef2df7324ae6b01ea19173045 Mon Sep 17 00:00:00 2001 From: farhan Date: Wed, 11 Oct 2023 14:45:02 +0500 Subject: [PATCH 2/2] chore: Upgrade python requirements --- requirements/edx/base.txt | 5 ++--- requirements/edx/development.txt | 8 ++++---- requirements/edx/doc.txt | 4 ++-- requirements/edx/testing.txt | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 60dd1232f6..255330b8af 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -470,7 +470,7 @@ edx-django-utils==5.7.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.11.0 # via # -r requirements/edx/kernel.in # edx-completion @@ -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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 595ebb3e87..9da0db36f8 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -741,7 +741,7 @@ edx-django-utils==5.7.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.11.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.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 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 3b6aa57299..af0a22e6ab 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -546,7 +546,7 @@ edx-django-utils==5.7.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.11.0 # via # -r requirements/edx/base.txt # edx-completion @@ -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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 125de02350..dd8a5207c0 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -573,7 +573,7 @@ edx-django-utils==5.7.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.11.0 # via # -r requirements/edx/base.txt # edx-completion @@ -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