Skip to content
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
alenkadev marked this conversation as resolved.
Outdated

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)
Expand Down
4 changes: 1 addition & 3 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -713,8 +713,6 @@ lazy==1.6
# lti-consumer-xblock
# ora2
# xblock
loremipsum==1.0.5
# via ora2
lti-consumer-xblock==9.14.2
Comment thread
alenkadev marked this conversation as resolved.
# via -r requirements/edx/kernel.in
lxml[html-clean]==5.3.2
Expand Down Expand Up @@ -845,7 +843,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==6.17.2

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. Copilot is right that bundle.in is included in base.in, but I assume that the override here is good enough, especially because this is how the requirements are written in openedx/edx-platform.

If this doesn't fix it and we still run into issues, we could consider addressing this issue and contributing the change upstream.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this. bundled.in is included via base.in, so I agree there is a theoretical possibility of future resolves selecting a different version. However, this override pattern matches the current approach used in upstream edx-platform, and the explicit pin in base.txt ensures the compiled requirements use ora2==6.17.2. Given that, I'd prefer to keep this aligned with upstream for now and revisit updating the source constraint if we continue to see dependency resolution issues.

# via -r requirements/edx/bundled.in
packaging==25.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/bundled.in
Original file line number Diff line number Diff line change
Expand Up @@ -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>=6.17.2 # Open Response Assessment XBlock (upgraded to remove loremipsum dependency)
Comment thread
alenkadev marked this conversation as resolved.
Outdated
xblock-poll # Xblock for polling users
xblock-drag-and-drop-v2 # Drag and Drop XBlock
xblock-google-drive # XBlock for google docs and calendar
Expand Down
7 changes: 1 addition & 6 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1187,11 +1187,6 @@ 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.2
# via
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -1400,7 +1395,7 @@ optimizely-sdk==5.2.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
ora2==6.16.4
ora2==6.17.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down
6 changes: 1 addition & 5 deletions requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -865,10 +865,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
Expand Down Expand Up @@ -1019,7 +1015,7 @@ openedx-learning==0.27.1
# -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
Expand Down
6 changes: 1 addition & 5 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -906,10 +906,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
Expand Down Expand Up @@ -1064,7 +1060,7 @@ openedx-learning==0.27.1
# -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
Expand Down
Loading