build: pin DRF < 3.15

openedx · Mar 26, 2024 · 47f009c · 47f009c
1 parent df73ded
commit 47f009c
Show file tree

Hide file tree

Showing 14 changed files with 298 additions and 220 deletions.
diff --git a/Makefile b/Makefile
@@ -114,8 +114,8 @@ $(COMMON_CONSTRAINTS_TXT):
 
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	sed -i 's/Django<4.0//g' requirements/common_constraints.txt
-	sed -i 's/django-simple-history==//g' requirements/common_constraints.txt
+	sed 's/Django<4.0//g' requirements/common_constraints.txt > tmp_con; cat tmp_con > requirements/common_constraints.txt; rm tmp_con
+	sed 's/django-simple-history==//g' requirements/common_constraints.txt > tmp_con; cat tmp_con > requirements/common_constraints.txt; rm tmp_con
 	pip install -qr requirements/pip-tools.txt
 	# Make sure to compile files after any other files they include!
 	$(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-asgiref==3.7.2
+asgiref==3.8.1
     # via
     #   django
     #   django-cors-headers
@@ -27,15 +27,15 @@ charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via edx-django-utils
-cryptography==42.0.4
+cryptography==42.0.5
     # via
     #   pyjwt
     #   social-auth-core
 defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
-django==4.2.10
+django==4.2.11
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -72,7 +72,7 @@ django-extensions==3.2.3
     # via
     #   -r requirements/base.in
     #   openedx-ledger
-django-filter==23.5
+django-filter==24.1
     # via
     #   -r requirements/base.in
     #   openedx-ledger
@@ -100,6 +100,7 @@ djangoql==0.18.1
     #   openedx-ledger
 djangorestframework==3.14.0
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   drf-jwt
     #   drf-spectacular
@@ -117,7 +118,7 @@ edx-django-release-util==1.3.0
     # via
     #   -r requirements/base.in
     #   openedx-ledger
-edx-django-utils==5.10.1
+edx-django-utils==5.11.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -145,7 +146,7 @@ getsmarter-api-clients==0.6.1
     # via -r requirements/base.in
 idna==3.6
     # via requests
-importlib-resources==6.1.1
+importlib-resources==6.4.0
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -165,7 +166,7 @@ mysqlclient==2.2.4
     # via
     #   -r requirements/base.in
     #   openedx-ledger
-newrelic==9.6.0
+newrelic==9.7.1
     # via edx-django-utils
 oauthlib==3.2.2
     # via
@@ -176,9 +177,9 @@ openedx-events==9.5.2
     # via
     #   -r requirements/base.in
     #   openedx-ledger
-openedx-ledger==1.4.0
+openedx-ledger==1.4.1
     # via -r requirements/base.in
-packaging==23.2
+packaging==24.0
     # via drf-yasg
 pbr==6.0.0
     # via stevedore
@@ -217,9 +218,9 @@ pyyaml==6.0.1
     #   drf-spectacular
     #   drf-yasg
     #   edx-django-release-util
-redis==5.0.1
+redis==5.0.3
     # via openedx-ledger
-referencing==0.33.0
+referencing==0.34.0
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -230,7 +231,7 @@ requests==2.31.0
     #   requests-oauthlib
     #   slumber
     #   social-auth-core
-requests-oauthlib==1.3.1
+requests-oauthlib==2.0.0
     # via
     #   getsmarter-api-clients
     #   social-auth-core
@@ -259,11 +260,11 @@ social-auth-core==4.5.3
     #   social-auth-app-django
 sqlparse==0.4.4
     # via django
-stevedore==5.1.0
+stevedore==5.2.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via
     #   asgiref
     #   drf-spectacular
@@ -274,5 +275,5 @@ uritemplate==4.1.1
     #   drf-yasg
 urllib3==2.2.1
     # via requests
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-resources
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,19 +4,19 @@
 #
 #    make upgrade
 #
-cachetools==5.3.2
+cachetools==5.3.3
     # via tox
 chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
 distlib==0.3.8
     # via virtualenv
-filelock==3.13.1
+filelock==3.13.3
     # via
     #   tox
     #   virtualenv
-packaging==23.2
+packaging==24.0
     # via
     #   pyproject-api
     #   tox
@@ -32,7 +32,7 @@ tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.13.0
+tox==4.14.2
     # via -r requirements/ci.in
-virtualenv==20.25.0
+virtualenv==20.25.1
     # via tox
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -3,6 +3,11 @@
 # See BOM-2721 for more details.
 # Below is the copied and edited version of common_constraints
 
+# This is a temporary solution to override the real common_constraints.txt
+# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
+# See BOM-2721 for more details.
+# Below is the copied and edited version of common_constraints
+
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -16,3 +16,8 @@ Django>=4.2,<4.3
 
 # django-simple-history>3.4.0 for this repo... we were not concerned about migration issues
 django-simple-history>=3.4.0,<3.5.0
+
+# DRF 3.15.0 is providing some backwards-compatibility issues for us
+# around default model fields vs. the serializer field defs,
+# and the discontinued use of OrderedDict in serializers.
+djangorestframework<3.15