Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django 4 #335

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Django 4 #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d2df8
Django 4
faucomte97 Nov 5, 2024
fe5fd56
Upgrade Django redis
faucomte97 Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion django_site/pipeline_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"game",
"pipeline",
"portal",
"captcha",
"django_recaptcha",
"common",
"django.contrib.admin",
"django.contrib.admindocs",
Expand Down
2 changes: 1 addition & 1 deletion django_site/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"game",
"pipeline",
"portal",
"captcha",
"django_recaptcha",
"common",
"django.contrib.admin",
"django.contrib.admindocs",
Expand Down
11 changes: 5 additions & 6 deletions django_site/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"),
]
4 changes: 2 additions & 2 deletions generate_requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading