From 462cfcd50729ac1b9c8f9604d0bc0072ae1e1ded Mon Sep 17 00:00:00 2001
From: "M. Tayyab Tahir Qureshi" <tayyab.tahir@arbisoft.com>
Date: Fri, 21 Nov 2025 16:56:53 +0500
Subject: [PATCH 1/3] chore: change pip installation to git branch installation

---
 openedx/envs/common.py           | 2 +-
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/doc.txt         | 2 +-
 requirements/edx/testing.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openedx/envs/common.py b/openedx/envs/common.py
index 86f6d9e1dc13..515b868c5724 100644
--- a/openedx/envs/common.py
+++ b/openedx/envs/common.py
@@ -1706,7 +1706,7 @@ def _make_locale_paths(settings):
 # .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
 # .. toggle_target_removal_date: 2025-06-01
-USE_EXTRACTED_HTML_BLOCK = False
+USE_EXTRACTED_HTML_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
 # .. toggle_default: False
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 6f626fa9ac2d..49b425f88e14 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1275,7 +1275,7 @@ xblock-utils==4.0.0
     # via
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.7.1
+git+https://github.com/openedx/xblocks-contrib.git@ttqureshi/xmlmixin
     # via -r requirements/edx/bundled.in
 xmlsec==1.3.14
     # via
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 8e5a53f9699a..42406025398a 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -2290,7 +2290,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/testing.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.7.1
+git+https://github.com/openedx/xblocks-contrib.git@ttqureshi/xmlmixin
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index e8fef5599b4a..53fc3e0d0382 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -1611,7 +1611,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.7.1
+git+https://github.com/openedx/xblocks-contrib.git@ttqureshi/xmlmixin
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index edb337ce4b8e..d1b91dc96f51 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1697,7 +1697,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.7.1
+git+https://github.com/openedx/xblocks-contrib.git@ttqureshi/xmlmixin
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via

From ff1d7e9db8d7e4c4788de6caea10e277cf33d891 Mon Sep 17 00:00:00 2001
From: "M. Tayyab Tahir Qureshi" <tayyab.tahir@arbisoft.com>
Date: Thu, 27 Nov 2025 18:50:49 +0500
Subject: [PATCH 2/3] chore: chore

---
 .github/workflows/unit-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 7fba6b6b4cf1..78af44c738e2 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -20,6 +20,7 @@ jobs:
     name: ${{ matrix.shard_name }}(py=${{ matrix.python-version }},dj=${{ matrix.django-version }},mongo=${{ matrix.mongo-version }})
     runs-on: ${{ matrix.os-version }}
     strategy:
+      fail-fast: false
       matrix:
         python-version:
           - "3.11"

From 33e314c280d0a2ac6d0edb96b5b88b8085d983b1 Mon Sep 17 00:00:00 2001
From: "M. Tayyab Tahir Qureshi" <tayyab.tahir@arbisoft.com>
Date: Wed, 3 Dec 2025 12:18:15 +0500
Subject: [PATCH 3/3] chore: chore

---
 .github/workflows/unit-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 78af44c738e2..7fba6b6b4cf1 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -20,7 +20,6 @@ jobs:
     name: ${{ matrix.shard_name }}(py=${{ matrix.python-version }},dj=${{ matrix.django-version }},mongo=${{ matrix.mongo-version }})
     runs-on: ${{ matrix.os-version }}
     strategy:
-      fail-fast: false
       matrix:
         python-version:
           - "3.11"