From 2b871fc335f96aad19235b3a01e29b6516f2faac Mon Sep 17 00:00:00 2001
From: Florian Aucomte <f.aucomte@hotmail.co.uk>
Date: Fri, 8 Nov 2024 16:24:35 +0000
Subject: [PATCH] Django 4 (#335)

* Django 4

* Upgrade Django redis
---
 django_site/pipeline_settings.py |  2 +-
 django_site/settings.py          |  2 +-
 django_site/urls.py              | 11 +++++------
 generate_requirements.py         |  4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/django_site/pipeline_settings.py b/django_site/pipeline_settings.py
index ec50ab4..058ce78 100644
--- a/django_site/pipeline_settings.py
+++ b/django_site/pipeline_settings.py
@@ -24,7 +24,7 @@
     "game",
     "pipeline",
     "portal",
-    "captcha",
+    "django_recaptcha",
     "common",
     "django.contrib.admin",
     "django.contrib.admindocs",
diff --git a/django_site/settings.py b/django_site/settings.py
index e47f29c..678a6ae 100644
--- a/django_site/settings.py
+++ b/django_site/settings.py
@@ -60,7 +60,7 @@
     "game",
     "pipeline",
     "portal",
-    "captcha",
+    "django_recaptcha",
     "common",
     "django.contrib.admin",
     "django.contrib.admindocs",
diff --git a/django_site/urls.py b/django_site/urls.py
index 83367da..d6b60c0 100644
--- a/django_site/urls.py
+++ b/django_site/urls.py
@@ -1,6 +1,5 @@
-from django.conf.urls import include, url
 from django.contrib import admin
-from django.urls import path
+from django.urls import include, path, re_path
 from game import python_den_urls
 from game import urls as game_urls
 from portal import urls as portal_urls
@@ -12,9 +11,9 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r"^", include(portal_urls)),
+    re_path(r"^", include(portal_urls)),
     path("administration/", admin.site.urls),
-    url(r"^rapidrouter/", include(game_urls)),
-    url(r"^pythonden/", include(python_den_urls)),
-    url(r"^versions/$", versions, name="versions"),
+    re_path(r"^rapidrouter/", include(game_urls)),
+    re_path(r"^pythonden/", include(python_den_urls)),
+    re_path(r"^versions/$", versions, name="versions"),
 ]
diff --git a/generate_requirements.py b/generate_requirements.py
index a7c1e0b..9629495 100644
--- a/generate_requirements.py
+++ b/generate_requirements.py
@@ -29,8 +29,8 @@
         common_requirement,
         "requests-toolbelt==0.9.*",
         "mysqlclient==2.1.*",
-        "redis==3.3.*",
-        "django-redis==4.11.*",
+        "redis==5.2.0",
+        "django-redis==5.4.0",
         "google-cloud-logging==1.*",
         "google-auth==1.*",
         "psycopg2==2.9.10"