Merge pull request #1386 from appsembler/main

Update from `main` (production)

Dockerfile.tutor

@@ -17,23 +17,25 @@ RUN pip install -r ./requirements/edx/base.txt  \
 
 # Sync with `edx-configs` `appsembler/tahoe/us/juniper/prod/files/server-vars.yml`
 RUN echo "Installing pip packages:" \
-    && pip install openedx-scorm-xblock==10.4.0 \
-    && pip install xblock-launchcontainer==2.3.1 \
+    && pip install xblock-launchcontainer==4.0.0 \
     && pip install xblock-prismjs==0.1.4 \
     && pip install xblock-problem-builder==4.1.9 \
     && echo \
+    && pip install https://github.com/appsembler/openedx-scorm-xblock/archive/refs/tags/v15.1.0-appsembler-tahoe-compat.tar.gz \
     && pip install https://github.com/appsembler/pdfXBlock/archive/v0.3.1.tar.gz \
     && pip install https://github.com/edx/xblock-free-text-response/archive/4149cc450.tar.gz \
     && pip install https://github.com/pmitros/FeedbackXBlock/archive/v1.1.tar.gz \
     && pip install https://github.com/ubc/ubcpi/archive/1.0.0.tar.gz \
     && echo \
-    && pip install course-access-groups==0.6.0 \
-    && pip install figures==0.4.1 \
+    && pip install course-access-groups==0.6.1 \
+    && pip install figures==0.4.4 \
     && pip install tahoe-figures-plugins==0.1.1  \
     && pip install tahoe-lti==0.3.0 \
-    && pip install tahoe-scorm==0.1.2 \
+    && pip install tahoe-scorm==0.1.4 \
+    && pip install xblock-grade-fetcher==0.5.0 \
+    && pip install django-manage-admins==0.1.0 \
     && echo \
-    && pip install https://github.com/appsembler/openedx-completion-aggregator/archive/3.0.3-2021-may-18-bug-fixes.tar.gz \
+    && pip install https://github.com/appsembler/openedx-completion-aggregator/archive/3.0.3-2023-mar-27-revert-use-of-task-track.tar.gz \
     && echo "Finished installing pip packages."
 
 EXPOSE 8000

conf/locale/ar/LC_MESSAGES/django.po

@@ -16825,7 +16825,7 @@ msgstr "استعراض عملية التقييم في Studio"
 
 #: lms/templates/courseware/progress.html
 msgid "Course Progress for '{username}' ({email})"
-msgstr "تقدم الدورة ل '{اسم المستخدم}' ({عنوان البريد الالكتروني})"
+msgstr "تقدم الدورة ل '{username}' ({email})"
 
 #: lms/templates/courseware/progress.html
 msgid "View Certificate"

requirements/edx/base.txt

@@ -181,7 +181,7 @@ pillow==7.1.2             # via -r requirements/edx/base.in, edx-enterprise, edx
 pkgconfig==1.5.1          # via xmlsec
 polib==1.1.0              # via edx-i18n-tools
 psutil==1.2.1             # via -r requirements/edx/paver.txt, edx-django-utils
--e git+https://github.com/technige/py2neo[email protected]#egg=py2neo==3.1.2 # via -r requirements/edx/github.in             # via -r requirements/edx/base.in
+py2neo-history==3.1.2
 pycontracts==1.8.12       # via -r requirements/edx/base.in, edx-user-state-client
 pycountry==19.8.18        # via -r requirements/edx/base.in
 pycparser==2.20           # via -r requirements/edx/../edx-sandbox/shared.txt, cffi

requirements/edx/development.txt

@@ -218,7 +218,7 @@ pkgconfig==1.5.1          # via -r requirements/edx/testing.txt, xmlsec
 pluggy==0.13.1            # via -r requirements/edx/testing.txt, diff-cover, pytest, tox
 polib==1.1.0              # via -r requirements/edx/testing.txt, edx-i18n-tools
 psutil==1.2.1             # via -r requirements/edx/testing.txt, edx-django-utils
--e git+https://github.com/technige/py2neo[email protected]#egg=py2neo==3.1.2 # via -r requirements/edx/github.in             # via -r requirements/edx/testing.txt
+py2neo-history==3.1.2
 py==1.8.1                 # via -r requirements/edx/testing.txt, pytest, tox
 pycodestyle==2.6.0        # via -r requirements/edx/testing.txt, flake8
 pycontracts==1.8.12       # via -r requirements/edx/testing.txt, edx-user-state-client

requirements/edx/github.in

@@ -59,7 +59,6 @@ git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
--e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2
 
 # The latest 2.0.0 release doesn't yet support Django 2.2, this commit from master does
 -e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit

requirements/edx/testing.txt

@@ -209,7 +209,9 @@ pkgconfig==1.5.1          # via -r requirements/edx/base.txt, xmlsec
 pluggy==0.13.1            # via -r requirements/edx/coverage.txt, diff-cover, pytest, tox
 polib==1.1.0              # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools
 psutil==1.2.1             # via -r requirements/edx/base.txt, edx-django-utils
--e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2 # via -r requirements/edx/github.in             # via -r requirements/edx/base.txt
+# modified from https://github.com/openedx/edx-platform/pull/33453
+# for earlier pip version in use on Juniper release
+py2neo-history==3.1.2
 py==1.8.1                 # via pytest, tox
 pycodestyle==2.6.0        # via -r requirements/edx/testing.in, flake8
 pycontracts==1.8.12       # via -r requirements/edx/base.txt, edx-user-state-client