Upgrade Django to 5.2.1 and fix migration compatibility

courses/migrations/0022_programrequirements.py

@@ -107,8 +107,17 @@ class Migration(migrations.Migration):
                 name="courses_programrequirement_root_uniq",
             ),
         ),
-        migrations.AlterIndexTogether(
-            name="programrequirement",
-            index_together={("program", "course"), ("course", "program")},
+        # Changed to use named indexes for Django 5 compatibility
+        migrations.AddIndex(
+            model_name="programrequirement",
+            index=models.Index(
+                fields=["program", "course"], name="courses_pro_program_temp_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="programrequirement",
+            index=models.Index(
+                fields=["course", "program"], name="courses_pro_course__temp_idx"
+            ),
         ),
     ]

courses/migrations/0055_rename_programrequirement_index.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.2 on 2024-09-10 17:28
+# Modified for Django 5.2 compatibility
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -9,14 +10,26 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RenameIndex(
+        # Remove temporary indexes from migration 0022
+        migrations.RemoveIndex(
             model_name="programrequirement",
-            new_name="courses_pro_course__fdcdb6_idx",
-            old_fields=("course", "program"),
+            name="courses_pro_program_temp_idx",
         ),
-        migrations.RenameIndex(
+        migrations.RemoveIndex(
             model_name="programrequirement",
-            new_name="courses_pro_program_c8ff7c_idx",
-            old_fields=("program", "course"),
+            name="courses_pro_course__temp_idx",
+        ),
+        # Add properly named indexes
+        migrations.AddIndex(
+            model_name="programrequirement",
+            index=models.Index(
+                fields=["course", "program"], name="courses_pro_course__fdcdb6_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="programrequirement",
+            index=models.Index(
+                fields=["program", "course"], name="courses_pro_program_c8ff7c_idx"
+            ),
         ),
     ]

courses/migrations/0064_rename_programrequirement_program_required_program_courses_pro_program_18e9ef_idx_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.2.22 on 2025-07-02 18:33
+# Modified for Django 5.2 compatibility
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -9,18 +10,24 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RenameIndex(
-            model_name="programrequirement",
-            new_name="courses_pro_program_18e9ef_idx",
-            old_fields=("program", "required_program"),
-        ),
-        migrations.RenameIndex(
-            model_name="programrequirement",
-            new_name="courses_pro_require_99b956_idx",
-            old_fields=("required_program", "program"),
-        ),
+        # Remove the old index_together setting
         migrations.AlterIndexTogether(
             name="programrequirement",
             index_together=set(),
         ),
+        # Add named indexes explicitly
+        migrations.AddIndex(
+            model_name="programrequirement",
+            index=models.Index(
+                fields=["program", "required_program"],
+                name="courses_pro_program_18e9ef_idx",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="programrequirement",
+            index=models.Index(
+                fields=["required_program", "program"],
+                name="courses_pro_require_99b956_idx",
+            ),
+        ),
     ]

courses/models.py

@@ -1996,11 +1996,24 @@ class Meta:
             ),
         )
         indexes = [
-            models.Index(fields=("program", "course")),
-            models.Index(fields=("course", "program")),
-            models.Index(fields=("program", "required_program")),
-            models.Index(fields=("required_program", "program")),
-            models.Index(fields=("program", "node_type", "depth")),
+            models.Index(
+                fields=["program", "course"], name="courses_pro_program_c8ff7c_idx"
+            ),
+            models.Index(
+                fields=["course", "program"], name="courses_pro_course__fdcdb6_idx"
+            ),
+            models.Index(
+                fields=["program", "required_program"],
+                name="courses_pro_program_18e9ef_idx",
+            ),
+            models.Index(
+                fields=["required_program", "program"],
+                name="courses_pro_require_99b956_idx",
+            ),
+            models.Index(
+                fields=["program", "node_type", "depth"],
+                name="courses_pro_program_4f3727_idx",
+            ),
         ]
 
 

ecommerce/migrations/0022_backfill_reference_number.py

@@ -2,8 +2,8 @@
 
 from django.conf import settings
 from django.db import migrations
-from django.db.models import F, Value
-from django.db.models.functions import Concat
+from django.db.models import CharField, F, Value
+from django.db.models.functions import Cast, Concat
 
 from ecommerce.constants import REFERENCE_NUMBER_PREFIX
 
@@ -15,7 +15,8 @@ def backfill_order_reference_number(apps, schema_editor):
             Value(REFERENCE_NUMBER_PREFIX),
             Value(settings.ENVIRONMENT),
             Value("-"),
-            F("id"),
+            Cast(F("id"), CharField()),
+            output_field=CharField(),
         )
     )
 

main/settings.py

@@ -1151,6 +1151,7 @@
 OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = "oauth2_provider.RefreshToken"  # noqa: S105
 
 OAUTH2_PROVIDER = {
+    "PKCE_REQUIRED": False,
     "OIDC_ENABLED": True,
     "OIDC_RSA_PRIVATE_KEY": get_string(
         name="OIDC_RSA_PRIVATE_KEY",

pyproject.toml

@@ -21,15 +21,15 @@ celery-redbeat = "^2.0.0"
 click = ">=8.1,!=8.2.0"
 deepdiff = "^8.0.0"
 dj-database-url = "^0.5.0"
-django = "4.2.25"
+django = "5.2.1"
 django-anymail = {extras = ["mailgun"], version = "^11.1"}
 django-cors-headers = "^4.0.0"
 django-countries = "^7.2.1"
 django-filter = "^24.3"
 django-health-check = { git = "https://github.com/revsys/django-health-check", rev="53f9bdc3a7acc8a577319987fef0bd3040eef4b4" }  # pragma: allowlist secret
 django-hijack = "^3.6.0"
 django-ipware = "^7.0.0"
-django-oauth-toolkit = "^1.7.0"
+django-oauth-toolkit = "^3.1.0"
 django-redis = "^5.0.0"
 django-reversion = "^5.1.0"
 django-robots = "6.1"
@@ -38,7 +38,7 @@ django-treebeard = "^4.5.1"
 django-user-agents = "^0.4.0"
 django-viewflow = "^2.2.7"
 django-webpack-loader = "^3.0.0"
-djangorestframework = "^3.12.4"
+djangorestframework = "^3.16.1"
 djoser = "^2.1.0"
 drf-extensions = "^0.8.0"
 drf-spectacular = "^0.28.0"

pytest.ini

@@ -11,6 +11,8 @@ env =
   CELERY_TASK_ALWAYS_EAGER=True
   DEBUG=False
   DJANGO_SETTINGS_MODULE=main.settings
+  SECRET_KEY=test-secret-key-for-testing
+  [email protected]
   GOOGLE_DOMAIN_VERIFICATION_TAG_VALUE=
   KEYCLOAK_BASE_URL=http://keycloak/
   KEYCLOAK_REALM_NAME=ol-test

users/views_test.py

@@ -24,10 +24,12 @@ def test_cannot_create_user(client):
     assert resp.status_code == status.HTTP_404_NOT_FOUND
 
 
-def test_cannot_update_user(user_client, user):
-    """Verify the api to update a user is doesn't accept the verb"""
-    resp = user_client.patch(
-        reverse("users_api-detail", kwargs={"pk": user.id}), data={"name": "Name"}
+def test_cannot_update_user(staff_client, user):
+    """Verify the api to update a user doesn't accept the verb"""
+    resp = staff_client.patch(
+        reverse("users_api-detail", kwargs={"pk": user.id}),
+        data={"name": "Name"},
+        content_type="application/json",
     )
 
     assert resp.status_code == status.HTTP_405_METHOD_NOT_ALLOWED