Merge branch 'master' into chris/FAL-3527-tags-on-unit-page

openedx · Nov 13, 2023 · 694d164 · 694d164
2 parents a005b34 + 7050eca
commit 694d164
Show file tree

Hide file tree

Showing 16 changed files with 404 additions and 326 deletions.
diff --git a/openedx/tests/completion_integration/test_models.py b/openedx/tests/completion_integration/test_models.py
@@ -62,7 +62,7 @@ def setUp(self):
         self.set_up_completion()
 
     def test_changed_value(self):
-        with self.assertNumQueries(SELECT + UPDATE + 2 * SAVEPOINT + 2 * OTHER):
+        with self.assertNumQueries(2 * SELECT + UPDATE + 2 * SAVEPOINT + 2 * OTHER):
             # OTHER = user exists, completion exists
             completion, isnew = models.BlockCompletion.objects.submit_completion(
                 user=self.user,
@@ -75,7 +75,7 @@ def test_changed_value(self):
         assert models.BlockCompletion.objects.count() == 1
 
     def test_unchanged_value(self):
-        with self.assertNumQueries(SELECT + 2 * SAVEPOINT):
+        with self.assertNumQueries(2 * SELECT + 2 * SAVEPOINT):
             completion, isnew = models.BlockCompletion.objects.submit_completion(
                 user=self.user,
                 block_key=self.block_key,

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -24,7 +24,3 @@ Django<4.0
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
-
-# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
-# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
-tox<4.0.0
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -26,7 +26,7 @@ django-storages==1.14
 # 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==4.6.12
+edx-enterprise==4.7.0
 
 # edx-drf-extensions 8.13.0 was causing errors, as mentioned in this revert PR:
 # https://github.com/openedx/edx-platform/pull/33682.

diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt
@@ -22,9 +22,9 @@ cryptography==38.0.4
     #   -r requirements/edx-sandbox/py38.in
 cycler==0.12.1
     # via matplotlib
-fonttools==4.43.1
+fonttools==4.44.0
     # via matplotlib
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via matplotlib
 joblib==1.3.2
     # via nltk