Skip to content

Commit 50d65d7

Browse files
committed
fix: extract html xblock
1 parent 5409baa commit 50d65d7

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
name: ${{ matrix.shard_name }}(py=${{ matrix.python-version }},dj=${{ matrix.django-version }},mongo=${{ matrix.mongo-version }})
1818
runs-on: ${{ matrix.os-version }}
1919
strategy:
20+
fail-fast: false
2021
matrix:
2122
python-version:
2223
- "3.11"

cms/envs/common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@
868868

869869
# Import after sys.path fixup
870870
from xmodule.modulestore.inheritance import InheritanceMixin
871-
from xmodule.x_module import XModuleMixin
871+
from xmodule.x_module import XModuleMixin, ResourceTemplates
872872

873873
# These are the Mixins that will be added to every Blocklike upon instantiation.
874874
# DO NOT EXPAND THIS LIST!! We want it eventually to be EMPTY. Why? Because dynamically adding functions/behaviors to
@@ -881,6 +881,7 @@
881881
# (b) refactor their functionality out of the Blocklike objects and into the edx-platform block runtimes.
882882
LmsBlockMixin,
883883
InheritanceMixin,
884+
ResourceTemplates,
884885
XModuleMixin,
885886
EditInfoMixin,
886887
AuthoringMixin,

openedx/envs/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ def _make_locale_paths(settings):
720720
# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
721721
# .. toggle_creation_date: 2024-11-10
722722
# .. toggle_target_removal_date: 2025-06-01
723-
USE_EXTRACTED_HTML_BLOCK = False
723+
USE_EXTRACTED_HTML_BLOCK = True
724724

725725
# .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
726726
# .. toggle_default: False

requirements/edx/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ xblock-utils==4.0.0
12781278
# via
12791279
# edx-sga
12801280
# xblock-poll
1281-
xblocks-contrib==0.4.0
1281+
git+https://github.com/openedx/xblocks-contrib.git@htmlblock
12821282
# via -r requirements/edx/bundled.in
12831283
xmlsec==1.3.14
12841284
# via

requirements/edx/development.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2291,7 +2291,7 @@ xblock-utils==4.0.0
22912291
# -r requirements/edx/testing.txt
22922292
# edx-sga
22932293
# xblock-poll
2294-
xblocks-contrib==0.4.0
2294+
git+https://github.com/openedx/xblocks-contrib.git@htmlblock
22952295
# via
22962296
# -r requirements/edx/doc.txt
22972297
# -r requirements/edx/testing.txt

requirements/edx/doc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ xblock-utils==4.0.0
15961596
# -r requirements/edx/base.txt
15971597
# edx-sga
15981598
# xblock-poll
1599-
xblocks-contrib==0.4.0
1599+
git+https://github.com/openedx/xblocks-contrib.git@htmlblock
16001600
# via -r requirements/edx/base.txt
16011601
xmlsec==1.3.14
16021602
# via

requirements/edx/testing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,7 @@ xblock-utils==4.0.0
16991699
# -r requirements/edx/base.txt
17001700
# edx-sga
17011701
# xblock-poll
1702-
xblocks-contrib==0.4.0
1702+
git+https://github.com/openedx/xblocks-contrib.git@htmlblock
17031703
# via -r requirements/edx/base.txt
17041704
xmlsec==1.3.14
17051705
# via

0 commit comments

Comments
 (0)