fix: test cases

openedx · Oct 2, 2024 · f7b1a6e · f7b1a6e
1 parent cbad568
commit f7b1a6e
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -66,10 +66,10 @@ upgrade: piptools ## update the requirements/*.txt files with the latest package
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip install -qr requirements/pip.txt
 	pip install -qr requirements/pip-tools.txt
-	pip-compile --upgrade -o requirements/base.txt requirements/base.in
-	pip-compile --upgrade -o requirements/test.txt requirements/test.in
-	pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
-	pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
+	pip-compile --upgrade --allow-unsafe -o requirements/base.txt requirements/base.in
+	pip-compile --upgrade --allow-unsafe -o requirements/test.txt requirements/test.in
+	pip-compile --upgrade --allow-unsafe -o requirements/ci.txt requirements/ci.in
+	pip-compile --upgrade --allow-unsafe -o requirements/quality.txt requirements/quality.in
 	# Let tox control the Django version for tests
 	grep -e "^django==" requirements/base.txt > requirements/django.txt
 	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp

diff --git a/requirements/base.in b/requirements/base.in
@@ -20,3 +20,4 @@ edx-django-release-util
 edx-django-utils
 edx-drf-extensions
 pytz
+setuptools
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -5,7 +5,9 @@
 #    make upgrade
 #
 asgiref==3.8.1
-    # via django
+    # via
+    #   django
+    #   django-cors-headers
 attrs==24.2.0
     # via
     #   jsonschema
@@ -90,7 +92,7 @@ elasticsearch-dsl==7.4.1
     #   django-elasticsearch-dsl-drf
 gunicorn==23.0.0
     # via -r requirements/base.in
-idna==3.8
+idna==3.10
     # via requests
 inflection==0.5.1
     # via drf-spectacular
@@ -141,7 +143,7 @@ referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.25.0
+requests==2.32.3
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -174,3 +176,7 @@ urllib3==1.26.20
     # via
     #   elasticsearch
     #   requests
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==75.1.0
+    # via -r requirements/base.in
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -9,10 +9,15 @@ asgiref==3.8.1
     #   -r requirements/base.txt
     #   django
     #   django-cors-headers
-astroid==3.2.4
+astroid==3.3.4
     # via
     #   pylint
     #   pylint-celery
+attrs==24.2.0
+    # via
+    #   -r requirements/base.txt
+    #   jsonschema
+    #   referencing
 certifi==2024.8.30
     # via
     #   -r requirements/base.txt
@@ -44,7 +49,7 @@ cryptography==43.0.1
     # via
     #   -r requirements/base.txt
     #   pyjwt
-dill==0.3.8
+dill==0.3.9
     # via pylint
 django==4.2.16
     # via
@@ -56,7 +61,7 @@ django==4.2.16
     #   django-waffle
     #   djangorestframework
     #   drf-jwt
-    #   drf-yasg
+    #   drf-spectacular
     #   edx-django-release-util
     #   edx-django-utils
     #   edx-drf-extensions
@@ -86,7 +91,7 @@ djangorestframework==3.15.2
     #   -r requirements/base.txt
     #   django-elasticsearch-dsl-drf
     #   drf-jwt
-    #   drf-yasg
+    #   drf-spectacular
     #   edx-drf-extensions
 dnspython==2.6.1
     # via
@@ -96,11 +101,11 @@ drf-jwt==1.19.2
     # via
     #   -r requirements/base.txt
     #   edx-drf-extensions
-drf-yasg==1.21.7
+drf-spectacular==0.27.2
     # via -r requirements/base.txt
 edx-django-release-util==1.4.0
     # via -r requirements/base.txt
-edx-django-utils==5.15.0
+edx-django-utils==5.16.0
     # via
     #   -r requirements/base.txt
     #   edx-drf-extensions
@@ -125,33 +130,40 @@ elasticsearch-dsl==7.4.1
     #   django-elasticsearch-dsl-drf
 gunicorn==23.0.0
     # via -r requirements/base.txt
-idna==3.8
+idna==3.10
     # via
     #   -r requirements/base.txt
     #   requests
 inflection==0.5.1
     # via
     #   -r requirements/base.txt
-    #   drf-yasg
+    #   drf-spectacular
 isort==5.13.2
     # via pylint
 jinja2==3.1.4
     # via code-annotations
+jsonschema==4.23.0
+    # via
+    #   -r requirements/base.txt
+    #   drf-spectacular
+jsonschema-specifications==2023.12.1
+    # via
+    #   -r requirements/base.txt
+    #   jsonschema
 markupsafe==2.1.5
     # via jinja2
 mccabe==0.7.0
     # via pylint
 mysqlclient==2.2.4
     # via -r requirements/base.txt
-newrelic==9.13.0
+newrelic==10.0.0
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
 packaging==24.1
     # via
     #   -r requirements/base.txt
     #   django-nine
-    #   drf-yasg
     #   gunicorn
 path==17.0.0
     # via
@@ -163,7 +175,7 @@ pbr==6.1.0
     # via
     #   -r requirements/base.txt
     #   stevedore
-platformdirs==4.3.2
+platformdirs==4.3.6
     # via pylint
 psutil==6.0.0
     # via
@@ -180,7 +192,7 @@ pyjwt[crypto]==2.9.0
     #   -r requirements/base.txt
     #   drf-jwt
     #   edx-drf-extensions
-pylint==3.2.7
+pylint==3.3.1
     # via
     #   -r requirements/quality.in
     #   edx-lint
@@ -195,7 +207,7 @@ pylint-plugin-utils==0.8.2
     # via
     #   pylint-celery
     #   pylint-django
-pymongo==4.8.0
+pymongo==4.10.1
     # via
     #   -r requirements/base.txt
     #   edx-opaque-keys
@@ -210,19 +222,27 @@ python-dateutil==2.9.0.post0
 python-slugify==8.0.4
     # via code-annotations
 pytz==2024.2
-    # via
-    #   -r requirements/base.txt
-    #   drf-yasg
+    # via -r requirements/base.txt
 pyyaml==6.0.2
     # via
     #   -r requirements/base.txt
     #   code-annotations
-    #   drf-yasg
+    #   drf-spectacular
     #   edx-django-release-util
+referencing==0.35.1
+    # via
+    #   -r requirements/base.txt
+    #   jsonschema
+    #   jsonschema-specifications
 requests==2.32.3
     # via
     #   -r requirements/base.txt
     #   edx-drf-extensions
+rpds-py==0.20.0
+    # via
+    #   -r requirements/base.txt
+    #   jsonschema
+    #   referencing
 semantic-version==2.10.0
     # via
     #   -r requirements/base.txt
@@ -257,9 +277,13 @@ typing-extensions==4.12.2
 uritemplate==4.1.1
     # via
     #   -r requirements/base.txt
-    #   drf-yasg
+    #   drf-spectacular
 urllib3==1.26.20
     # via
     #   -r requirements/base.txt
     #   elasticsearch
     #   requests
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==75.1.0
+    # via -r requirements/base.txt
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -9,7 +9,7 @@ asgiref==3.8.1
     #   -r requirements/base.txt
     #   django
     #   django-cors-headers
-astroid==3.2.4
+astroid==3.3.4
     # via
     #   -r requirements/test.in
     #   pylint
@@ -18,6 +18,8 @@ attrs==24.2.0
     #   -r requirements/base.txt
     #   jsonschema
     #   referencing
+cachetools==5.5.0
+    # via tox
 certifi==2024.8.30
     # via
     #   -r requirements/base.txt
@@ -57,7 +59,7 @@ ddt==1.7.2
     # via -r requirements/test.in
 diff-cover==9.2.0
     # via -r requirements/test.in
-dill==0.3.8
+dill==0.3.9
     # via pylint
 distlib==0.3.8
     # via virtualenv
@@ -145,7 +147,7 @@ filelock==3.16.1
     #   virtualenv
 gunicorn==23.0.0
     # via -r requirements/base.txt
-idna==3.8
+idna==3.10
     # via
     #   -r requirements/base.txt
     #   requests
@@ -169,8 +171,6 @@ jsonschema-specifications==2023.12.1
     # via
     #   -r requirements/base.txt
     #   jsonschema
-lazy-object-proxy==1.10.0
-    # via astroid
 markupsafe==2.1.5
     # via jinja2
 mccabe==0.7.0
@@ -204,7 +204,10 @@ pbr==6.1.0
 pep8==1.7.1
     # via -r requirements/test.in
 platformdirs==4.3.6
-    # via virtualenv
+    # via
+    #   pylint
+    #   tox
+    #   virtualenv
 pluggy==1.5.0
     # via
     #   diff-cover
@@ -225,10 +228,8 @@ pyjwt[crypto]==2.9.0
     #   -r requirements/base.txt
     #   drf-jwt
     #   edx-drf-extensions
-pylint==1.5.0
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.in
+pylint==3.3.1
+    # via -r requirements/test.in
 pymongo==4.10.1
     # via
     #   -r requirements/base.txt
@@ -237,6 +238,8 @@ pynacl==1.5.0
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
+pyproject-api==1.8.0
+    # via tox
 pytest==8.3.3
     # via
     #   -r requirements/test.in
@@ -266,7 +269,7 @@ referencing==0.35.1
     #   -r requirements/base.txt
     #   jsonschema
     #   jsonschema-specifications
-requests==2.25.0
+requests==2.32.3
     # via
     #   -r requirements/base.txt
     #   edx-drf-extensions
@@ -301,7 +304,7 @@ text-unidecode==1.3
     # via python-slugify
 tomlkit==0.13.2
     # via pylint
-tox==4.18.1
+tox==4.21.0
     # via -r requirements/test.in
 typing-extensions==4.12.2
     # via
@@ -319,3 +322,7 @@ urllib3==1.26.20
     #   requests
 virtualenv==20.26.6
     # via tox
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==75.1.0
+    # via -r requirements/base.txt