From 51fc613d017f4171fa0ab73277761b56845ec9a2 Mon Sep 17 00:00:00 2001 From: alenkadev Date: Wed, 27 May 2026 08:55:09 +0000 Subject: [PATCH 1/6] fix: upgrade ora2 dependency to version 7.0.0 and remove loremipsum dependency --- requirements/edx/base.txt | 4 +--- requirements/edx/bundled.in | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 012d4ae32813..cdd4314b1cda 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -714,8 +714,6 @@ lazy==1.6 # lti-consumer-xblock # ora2 # xblock -loremipsum==1.0.5 - # via ora2 lti-consumer-xblock==9.14.2 # via -r requirements/edx/kernel.in lxml[html-clean]==5.3.2 @@ -844,7 +842,7 @@ openedx-learning==0.27.1 # -r requirements/edx/kernel.in optimizely-sdk==5.2.0 # via -r requirements/edx/bundled.in -ora2==6.16.4 +ora2==7.0.0 # via -r requirements/edx/bundled.in packaging==25.0 # via diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index 426dc5de3f94..cd6f507329cc 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -35,7 +35,7 @@ done-xblock # a very simple XBlock that allows learners recommender-xblock # https://github.com/edx/RecommenderXBlock staff-graded-xblock # https://github.com/openedx/staff_graded-xblock Allows off-site bulk scoring. edx-sga # The more well known "staff graded assignment" XBlock, from MIT. -ora2>=4.5.0 # Open Response Assessment XBlock +ora2>=7.0.0 # Open Response Assessment XBlock (upgraded to remove loremipsum dependency) xblock-poll # Xblock for polling users xblock-drag-and-drop-v2 # Drag and Drop XBlock xblock-google-drive # XBlock for google docs and calendar From 074c8f0e3984159cbe248a3920c3a1b72977ed65 Mon Sep 17 00:00:00 2001 From: alenkadev Date: Wed, 27 May 2026 09:35:39 +0000 Subject: [PATCH 2/6] fix: update ora2 dependency to version 7.0.0 and remove loremipsum dependency --- requirements/edx/development.txt | 9 ++------- requirements/edx/doc.txt | 4 ++-- requirements/edx/testing.txt | 8 ++------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 403968f2a194..912c5d1cd1ea 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1207,12 +1207,7 @@ libsass==0.10.0 # via # -c requirements/constraints.txt # -r requirements/edx/assets.txt -loremipsum==1.0.5 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # ora2 -lti-consumer-xblock==9.14.3 +lti-consumer-xblock==9.14.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1425,7 +1420,7 @@ optimizely-sdk==5.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -ora2==6.17.1 +ora2==7.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 3c621d636980..ede3718ee6b0 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -884,7 +884,7 @@ loremipsum==1.0.5 # via # -r requirements/edx/base.txt # ora2 -lti-consumer-xblock==9.14.3 +lti-consumer-xblock==9.14.2 # via -r requirements/edx/base.txt lxml[html-clean]==5.3.2 # via @@ -1037,7 +1037,7 @@ openedx-learning==0.30.2 # -r requirements/edx/base.txt optimizely-sdk==5.2.0 # via -r requirements/edx/base.txt -ora2==6.17.1 +ora2==6.16.4 # via -r requirements/edx/base.txt packaging==25.0 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index dc624f4423ec..a34ac9d11343 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -922,11 +922,7 @@ lazy==1.6 # lti-consumer-xblock # ora2 # xblock -loremipsum==1.0.5 - # via - # -r requirements/edx/base.txt - # ora2 -lti-consumer-xblock==9.14.3 +lti-consumer-xblock==9.14.2 # via -r requirements/edx/base.txt lxml[html-clean]==5.3.2 # via @@ -1083,7 +1079,7 @@ openedx-learning==0.30.2 # -r requirements/edx/base.txt optimizely-sdk==5.2.0 # via -r requirements/edx/base.txt -ora2==6.17.1 +ora2==7.0.0 # via -r requirements/edx/base.txt packaging==25.0 # via From 21364b15cf5d3035056c6cfd94281756feeaf39f Mon Sep 17 00:00:00 2001 From: alenkadev Date: Wed, 27 May 2026 13:59:23 +0000 Subject: [PATCH 3/6] fix: downgrade ora2 dependency to version 6.17.2 across multiple requirements files --- requirements/edx/base.txt | 2 +- requirements/edx/bundled.in | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 6 +----- requirements/edx/testing.txt | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cf085f66c725..15d8eb8b3ceb 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -857,7 +857,7 @@ openedx-learning==0.30.2 # -r requirements/edx/kernel.in optimizely-sdk==5.2.0 # via -r requirements/edx/bundled.in -ora2==7.0.0 +ora2==6.17.2 # via -r requirements/edx/bundled.in packaging==25.0 # via diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index cd6f507329cc..86589080bdcf 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -35,7 +35,7 @@ done-xblock # a very simple XBlock that allows learners recommender-xblock # https://github.com/edx/RecommenderXBlock staff-graded-xblock # https://github.com/openedx/staff_graded-xblock Allows off-site bulk scoring. edx-sga # The more well known "staff graded assignment" XBlock, from MIT. -ora2>=7.0.0 # Open Response Assessment XBlock (upgraded to remove loremipsum dependency) +ora2>=6.17.2 # Open Response Assessment XBlock (upgraded to remove loremipsum dependency) xblock-poll # Xblock for polling users xblock-drag-and-drop-v2 # Drag and Drop XBlock xblock-google-drive # XBlock for google docs and calendar diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 912c5d1cd1ea..5d333518702f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1420,7 +1420,7 @@ optimizely-sdk==5.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -ora2==7.0.0 +ora2==6.17.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index ede3718ee6b0..410613fde65a 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -880,10 +880,6 @@ lazy==1.6 # lti-consumer-xblock # ora2 # xblock -loremipsum==1.0.5 - # via - # -r requirements/edx/base.txt - # ora2 lti-consumer-xblock==9.14.2 # via -r requirements/edx/base.txt lxml[html-clean]==5.3.2 @@ -1037,7 +1033,7 @@ openedx-learning==0.30.2 # -r requirements/edx/base.txt optimizely-sdk==5.2.0 # via -r requirements/edx/base.txt -ora2==6.16.4 +ora2==6.17.2 # via -r requirements/edx/base.txt packaging==25.0 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index a34ac9d11343..2b76f554b572 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1079,7 +1079,7 @@ openedx-learning==0.30.2 # -r requirements/edx/base.txt optimizely-sdk==5.2.0 # via -r requirements/edx/base.txt -ora2==7.0.0 +ora2==6.17.2 # via -r requirements/edx/base.txt packaging==25.0 # via From c7d6ed291b84cc3e574b324ec86706334efcf9df Mon Sep 17 00:00:00 2001 From: alenkadev Date: Thu, 28 May 2026 02:20:07 +0000 Subject: [PATCH 4/6] fix: improve translation extraction process in Makefile --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 66c3608af038..f04b4791c5b6 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,11 @@ swagger: ## generate the swagger.yaml file extract_translations: ## extract localizable strings from sources i18n_tool extract --no-segment -v cd conf/locale/en/LC_MESSAGES && msgcat djangojs.po underscore.po -o djangojs.po - cd conf/locale/en/LC_MESSAGES && msgcat django.po wiki.po edx_proctoring_proctortrack.po mako.po -o django.po - cd conf/locale/en/LC_MESSAGES && rm wiki.po edx_proctoring_proctortrack.po mako.po underscore.po + cd conf/locale/en/LC_MESSAGES && \ + FILES_TO_MERGE="django.po wiki.po mako.po"; \ + [ -f edx_proctoring_proctortrack.po ] && FILES_TO_MERGE="$$FILES_TO_MERGE edx_proctoring_proctortrack.po"; \ + msgcat $$FILES_TO_MERGE -o django.po + cd conf/locale/en/LC_MESSAGES && rm -f wiki.po edx_proctoring_proctortrack.po mako.po underscore.po pull_plugin_translations: ## Pull translations for edx_django_utils.plugins for both lms and cms python manage.py lms pull_plugin_translations --verbose $(ATLAS_OPTIONS) From 04f72b3387c8fd6606992c3d8ebcd5f380a479cb Mon Sep 17 00:00:00 2001 From: alenkadev Date: Fri, 29 May 2026 13:18:57 +0000 Subject: [PATCH 5/6] fix: streamline translation extraction process and downgrade ora2 dependency --- Makefile | 8 ++------ requirements/edx/bundled.in | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f04b4791c5b6..4d9cf8782887 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,8 @@ swagger: ## generate the swagger.yaml file extract_translations: ## extract localizable strings from sources i18n_tool extract --no-segment -v - cd conf/locale/en/LC_MESSAGES && msgcat djangojs.po underscore.po -o djangojs.po - cd conf/locale/en/LC_MESSAGES && \ - FILES_TO_MERGE="django.po wiki.po mako.po"; \ - [ -f edx_proctoring_proctortrack.po ] && FILES_TO_MERGE="$$FILES_TO_MERGE edx_proctoring_proctortrack.po"; \ - msgcat $$FILES_TO_MERGE -o django.po - cd conf/locale/en/LC_MESSAGES && rm -f wiki.po edx_proctoring_proctortrack.po mako.po underscore.po + cd conf/locale/en/LC_MESSAGES && msgcat django.po wiki.po edx_proctoring_proctortrack.po mako.po -o django.po + cd conf/locale/en/LC_MESSAGES && rm wiki.po edx_proctoring_proctortrack.po mako.po underscore.po pull_plugin_translations: ## Pull translations for edx_django_utils.plugins for both lms and cms python manage.py lms pull_plugin_translations --verbose $(ATLAS_OPTIONS) diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index 86589080bdcf..426dc5de3f94 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -35,7 +35,7 @@ done-xblock # a very simple XBlock that allows learners recommender-xblock # https://github.com/edx/RecommenderXBlock staff-graded-xblock # https://github.com/openedx/staff_graded-xblock Allows off-site bulk scoring. edx-sga # The more well known "staff graded assignment" XBlock, from MIT. -ora2>=6.17.2 # Open Response Assessment XBlock (upgraded to remove loremipsum dependency) +ora2>=4.5.0 # Open Response Assessment XBlock xblock-poll # Xblock for polling users xblock-drag-and-drop-v2 # Drag and Drop XBlock xblock-google-drive # XBlock for google docs and calendar From 3427f6405e3164244e188d5a35f9d7aa8e7c71f6 Mon Sep 17 00:00:00 2001 From: alenkadev Date: Fri, 29 May 2026 13:21:06 +0000 Subject: [PATCH 6/6] fix: enhance translation extraction process in Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4d9cf8782887..66c3608af038 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ swagger: ## generate the swagger.yaml file extract_translations: ## extract localizable strings from sources i18n_tool extract --no-segment -v + cd conf/locale/en/LC_MESSAGES && msgcat djangojs.po underscore.po -o djangojs.po cd conf/locale/en/LC_MESSAGES && msgcat django.po wiki.po edx_proctoring_proctortrack.po mako.po -o django.po cd conf/locale/en/LC_MESSAGES && rm wiki.po edx_proctoring_proctortrack.po mako.po underscore.po