Merge branch 'master' into html-extracted

Author: irtazaakram

common/djangoapps/student/tests/test_api.py

@@ -88,7 +88,7 @@ def test_get_course_enrollments(self):
 
         result = get_course_enrollments(self.user)
 
-        self.assertQuerySetEqual(expected, result)
+        self.assertEqual(list(expected), list(result))
 
     def test_get_filtered_course_enrollments(self):
         """Verify a filtered subset of enrollments can be retrieved"""
@@ -99,4 +99,4 @@ def test_get_filtered_course_enrollments(self):
 
         result = get_course_enrollments(self.user, True, course_ids=[course_2.id])
 
-        self.assertQuerySetEqual(expected, result)
+        self.assertEqual(list(expected), list(result))

lms/djangoapps/verify_student/management/commands/tests/test_manual_verify_student.py

@@ -77,7 +77,7 @@ def test_manual_verifications_created_date(self):
             created_at__gte=earliest_allowed_verification_date()
         )
 
-        self.assertQuerysetEqual(verification1, [repr(r) for r in verification2], transform=repr)
+        self.assertEqual(list(map(repr, verification1)), list(map(repr, verification2)))
 
     def test_user_doesnot_exist_log(self):
         """

openedx/core/djangoapps/enrollments/tests/test_services.py

@@ -97,7 +97,8 @@ def test_get_enrollments_can_take_proctored_exams_by_course(self):
             {'username': 'user4', 'mode': 'professional'},
             {'username': 'user5', 'mode': 'verified'}
         ]
-        self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
+        actual_values = [self.enrollment_to_dict(e) for e in enrollments]
+        self.assertEqual(actual_values, expected_values)
 
     def test_get_enrollments_can_take_proctored_exams_by_course_ignore_inactive(self):
         """
@@ -141,7 +142,8 @@ def test_get_enrollments_can_take_proctored_exams_allow_honor(self):
             {'username': 'user5', 'mode': 'verified'}
 
         ]
-        self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
+        actual_values = [self.enrollment_to_dict(e) for e in enrollments]
+        self.assertEqual(actual_values, expected_values)
 
     def test_get_enrollments_can_take_proctored_exams_not_enable_proctored_exams(self):
         self.course.enable_proctored_exams = False
@@ -180,7 +182,8 @@ def test_text_search_partial_return_some(self):
         expected_values = [
             {'username': 'user3', 'mode': 'masters'}
         ]
-        self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
+        actual_values = [self.enrollment_to_dict(e) for e in enrollments]
+        self.assertEqual(actual_values, expected_values)
 
     @ddt.data('user1', 'USER1', '[email protected]', '[email protected]')
     def test_text_search_exact_return_one(self, text_search):
@@ -192,7 +195,8 @@ def test_text_search_exact_return_one(self, text_search):
         expected_values = [
             {'username': 'user1', 'mode': 'executive-education'}
         ]
-        self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
+        actual_values = [self.enrollment_to_dict(e) for e in enrollments]
+        self.assertEqual(actual_values, expected_values)
 
     def test_text_search_return_none(self):
         enrollments = self.service.get_enrollments_can_take_proctored_exams(

openedx/core/djangoapps/util/management/commands/dump_settings.py

@@ -7,7 +7,7 @@
 
 from django.conf import settings
 from django.core.management.base import BaseCommand
-
+from django.utils.functional import Promise
 
 SETTING_NAME_REGEX = re.compile(r'^[A-Z][A-Z0-9_]*$')
 
@@ -78,10 +78,11 @@ def _to_json_friendly_repr(value: object) -> object:
             if not isinstance(subkey, (str, int)):
                 raise ValueError(f"Unexpected dict key {subkey} of type {type(subkey)}")
         return {subkey: _to_json_friendly_repr(subval) for subkey, subval in value.items()}
-    if proxy_args := getattr(value, "_proxy____args", None):
-        if len(proxy_args) == 1 and isinstance(proxy_args[0], str):
-            # Print gettext_lazy as simply the wrapped string
-            return proxy_args[0]
+
+    # Directly convert Promise objects (gettext_lazy) to their string representation
+    if isinstance(value, Promise):
+        return str(value)
+
     try:
         module = value.__module__
         qualname = value.__qualname__

requirements/constraints.txt

@@ -51,7 +51,7 @@ django-stubs<6
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==6.2.15
+edx-enterprise==6.2.16
 
 # Date: 2023-07-26
 # Our legacy Sass code is incompatible with anything except this ancient libsass version.
@@ -83,6 +83,11 @@ openai<=0.28.1
 # Issue for unpinning: https://github.com/openedx/edx-platform/issues/35267
 path<16.12.0
 
+# Date: 2025-05-11
+# Broke lxml[html_clean] extra dependency declaration
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/37168
+pip-tools<7.5.0
+
 # Date: 2022-08-03
 # pycodestyle==2.9.0 generates false positive error E275.
 # Constraint can be removed once the issue https://github.com/PyCQA/pycodestyle/issues/1090 is fixed.

requirements/edx-sandbox/base.txt

@@ -14,15 +14,15 @@ codejail-includes==2.0.0
     # via -r requirements/edx-sandbox/base.in
 contourpy==1.3.3
     # via matplotlib
-cryptography==45.0.5
+cryptography==45.0.6
     # via -r requirements/edx-sandbox/base.in
 cycler==0.12.1
     # via matplotlib
 fonttools==4.59.0
     # via matplotlib
 joblib==1.5.1
     # via nltk
-kiwisolver==1.4.8
+kiwisolver==1.4.9
     # via matplotlib
 lxml[html-clean,html_clean]==5.3.2
     # via
@@ -36,7 +36,7 @@ markupsafe==3.0.2
     # via
     #   chem
     #   openedx-calc
-matplotlib==3.10.3
+matplotlib==3.10.5
     # via -r requirements/edx-sandbox/base.in
 mpmath==1.3.0
     # via sympy
@@ -72,7 +72,7 @@ python-dateutil==2.9.0.post0
     # via matplotlib
 random2==1.0.2
     # via -r requirements/edx-sandbox/base.in
-regex==2025.7.31
+regex==2025.7.34
     # via nltk
 scipy==1.16.1
     # via

requirements/edx/base.txt

@@ -24,7 +24,7 @@ aniso8601==10.0.1
     # via edx-tincan-py35
 annotated-types==0.7.0
     # via pydantic
-anyio==4.9.0
+anyio==4.10.0
     # via httpx
 appdirs==1.4.4
     # via fs
@@ -70,14 +70,14 @@ bleach[css]==6.2.0
     #   xblock-poll
 boto==2.49.0
     # via -r requirements/edx/kernel.in
-boto3==1.39.16
+boto3==1.40.6
     # via
     #   -r requirements/edx/kernel.in
     #   django-ses
     #   fs-s3fs
     #   ora2
     #   snowflake-connector-python
-botocore==1.39.16
+botocore==1.40.6
     # via
     #   -r requirements/edx/kernel.in
     #   boto3
@@ -104,7 +104,7 @@ celery==5.5.3
     #   enterprise-integrated-channels
     #   event-tracking
     #   openedx-learning
-certifi==2025.7.14
+certifi==2025.8.3
     # via
     #   elasticsearch
     #   httpcore
@@ -118,7 +118,7 @@ cffi==1.17.1
     #   snowflake-connector-python
 chardet==5.2.0
     # via pysrt
-charset-normalizer==3.4.2
+charset-normalizer==3.4.3
     # via
     #   requests
     #   snowflake-connector-python
@@ -148,7 +148,7 @@ codejail-includes==2.0.0
     # via -r requirements/edx/kernel.in
 crowdsourcehinter-xblock==0.8
     # via -r requirements/edx/bundled.in
-cryptography==45.0.5
+cryptography==45.0.6
     # via
     #   -r requirements/edx/kernel.in
     #   django-fernet-fields-v2
@@ -191,6 +191,7 @@ django==4.2.23
     #   django-push-notifications
     #   django-sekizai
     #   django-ses
+    #   django-simple-history
     #   django-statici18n
     #   django-storages
     #   django-user-tasks
@@ -341,7 +342,7 @@ django-sekizai==4.1.0
     #   openedx-django-wiki
 django-ses==4.4.0
     # via -r requirements/edx/bundled.in
-django-simple-history==3.1.1
+django-simple-history==3.8.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
@@ -361,7 +362,7 @@ django-storages==1.14.6
     # via
     #   -r requirements/edx/kernel.in
     #   edxval
-django-user-tasks==3.4.2
+django-user-tasks==3.4.3
     # via -r requirements/edx/kernel.in
 django-waffle==5.0.0
     # via
@@ -476,7 +477,7 @@ edx-drf-extensions==10.6.0
     #   edxval
     #   enterprise-integrated-channels
     #   openedx-learning
-edx-enterprise==6.2.15
+edx-enterprise==6.2.16
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
@@ -511,7 +512,7 @@ edx-opaque-keys[django]==3.0.0
     #   openedx-filters
     #   ora2
     #   xblocks-contrib
-edx-organizations==7.1.0
+edx-organizations==7.2.1
     # via -r requirements/edx/kernel.in
 edx-proctoring==5.2.0
     # via
@@ -578,11 +579,11 @@ event-tracking==3.3.0
     #   edx-completion
     #   edx-proctoring
     #   edx-search
-fastavro==1.11.1
+fastavro==1.12.0
     # via openedx-events
 filelock==3.18.0
     # via snowflake-connector-python
-firebase-admin==7.0.0
+firebase-admin==7.1.0
     # via edx-ace
 frozenlist==1.7.0
     # via
@@ -676,6 +677,8 @@ inflection==0.5.1
     # via
     #   drf-spectacular
     #   drf-yasg
+invoke==2.2.0
+    # via paramiko
 ipaddress==1.0.23
     # via -r requirements/edx/kernel.in
 isodate==0.7.2
@@ -722,7 +725,7 @@ lazy==1.6
     #   xblock
 loremipsum==1.0.5
     # via ora2
-lti-consumer-xblock==9.14.0
+lti-consumer-xblock==9.14.2
     # via -r requirements/edx/kernel.in
 lxml[html-clean,html_clean]==5.3.2
     # via
@@ -778,7 +781,7 @@ mpmath==1.3.0
     # via sympy
 msgpack==1.1.1
     # via cachecontrol
-multidict==6.6.3
+multidict==6.6.4
     # via
     #   aiohttp
     #   yarl
@@ -861,7 +864,7 @@ packaging==25.0
     #   gunicorn
     #   kombu
     #   snowflake-connector-python
-paramiko==3.5.1
+paramiko==4.0.0
     # via edx-enterprise
 path==16.11.0
     # via
@@ -933,9 +936,7 @@ pydantic==2.11.7
 pydantic-core==2.33.2
     # via pydantic
 pyjwkest==1.4.2
-    # via
-    #   -r requirements/edx/kernel.in
-    #   lti-consumer-xblock
+    # via -r requirements/edx/kernel.in
 pyjwt[crypto]==2.10.1
     # via
     #   -r requirements/edx/kernel.in
@@ -1039,15 +1040,15 @@ random2==1.0.2
     # via -r requirements/edx/kernel.in
 recommender-xblock==3.1.0
     # via -r requirements/edx/bundled.in
-redis==6.2.0
+redis==6.4.0
     # via
     #   -r requirements/edx/kernel.in
     #   walrus
 referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-regex==2025.7.31
+regex==2025.7.34
     # via nltk
 requests==2.32.4
     # via
@@ -1080,7 +1081,7 @@ requests-oauthlib==2.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   social-auth-core
-rpds-py==0.26.0
+rpds-py==0.27.0
     # via
     #   jsonschema
     #   referencing

requirements/edx/coverage.txt

@@ -6,7 +6,7 @@
 #
 chardet==5.2.0
     # via diff-cover
-coverage==7.10.1
+coverage==7.10.3
     # via -r requirements/edx/coverage.in
 diff-cover==9.6.0
     # via -r requirements/edx/coverage.in