diff --git a/account/urls/admin.py b/account/urls/admin.py index 5826ae2..ca4c89c 100644 --- a/account/urls/admin.py +++ b/account/urls/admin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.admin import UserAdminAPI, GenerateUserAPI diff --git a/account/urls/oj.py b/account/urls/oj.py index a2cebe0..6545a3a 100644 --- a/account/urls/oj.py +++ b/account/urls/oj.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.oj import (ApplyResetPasswordAPI, ResetPasswordAPI, UserChangePasswordAPI, UserRegisterAPI, UserChangeEmailAPI, diff --git a/announcement/urls/admin.py b/announcement/urls/admin.py index 09673e6..7c0908a 100644 --- a/announcement/urls/admin.py +++ b/announcement/urls/admin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.admin import AnnouncementAdminAPI diff --git a/announcement/urls/oj.py b/announcement/urls/oj.py index 67178b0..2cdc923 100644 --- a/announcement/urls/oj.py +++ b/announcement/urls/oj.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.oj import AnnouncementAPI diff --git a/conf/urls/admin.py b/conf/urls/admin.py index 8e6d293..3a73d72 100644 --- a/conf/urls/admin.py +++ b/conf/urls/admin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views import SMTPAPI, JudgeServerAPI, WebsiteConfigAPI, TestCasePruneAPI, SMTPTestAPI from ..views import ReleaseNotesAPI, DashboardInfoAPI diff --git a/conf/urls/oj.py b/conf/urls/oj.py index 3e6d757..dad174c 100644 --- a/conf/urls/oj.py +++ b/conf/urls/oj.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views import JudgeServerHeartbeatAPI, LanguagesAPI, WebsiteConfigAPI diff --git a/contest/urls/admin.py b/contest/urls/admin.py index 0b017cc..44cb91e 100644 --- a/contest/urls/admin.py +++ b/contest/urls/admin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.admin import ContestAnnouncementAPI, ContestAPI, ACMContestHelper, DownloadContestSubmissions diff --git a/contest/urls/oj.py b/contest/urls/oj.py index 9e94fa5..257175f 100644 --- a/contest/urls/oj.py +++ b/contest/urls/oj.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.oj import ContestAnnouncementListAPI from ..views.oj import ContestPasswordVerifyAPI, ContestAccessAPI diff --git a/deploy/requirements.txt b/deploy/requirements.txt index 710dd65..df890cd 100644 --- a/deploy/requirements.txt +++ b/deploy/requirements.txt @@ -3,7 +3,7 @@ django-cas-ng==5.0.1 django-dbconn-retry==0.1.7 django-dramatiq==0.11.6 django-redis==5.4.0 -Django==3.2.25 +Django==5.0.6 djangorestframework==3.15.1 dramatiq==1.17.0 entrypoints==0.4 @@ -15,8 +15,10 @@ gunicorn==22.0.0 jsonfield==3.1.0 otpauth==1.0.1 pillow==10.2.0 -psycopg2==2.9.9 +psycopg==3.1.19 +psycopg-binary==3.1.19 python-dateutil==2.8.2 +pytz==2024.1 qrcode==7.4.2 raven==6.10.0 XlsxWriter==3.2.0 diff --git a/oj/dev_settings.py b/oj/dev_settings.py index 8bc626d..d83921c 100644 --- a/oj/dev_settings.py +++ b/oj/dev_settings.py @@ -6,9 +6,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) DATABASES = { "default": { - "ENGINE": "django.db.backends.postgresql_psycopg2", + "ENGINE": "django.db.backends.postgresql", "HOST": get_env("POSTGRES_HOST", "127.0.0.1"), - "PORT": get_env("POSTGRES_PORT", "5435"), + "PORT": get_env("POSTGRES_PORT", "5432"), "NAME": get_env("POSTGRES_DB", "onlinejudge"), "USER": get_env("POSTGRES_USER", "onlinejudge"), "PASSWORD": get_env("POSTGRES_PASSWORD", "onlinejudge"), diff --git a/oj/production_settings.py b/oj/production_settings.py index f98838b..467b35b 100644 --- a/oj/production_settings.py +++ b/oj/production_settings.py @@ -2,7 +2,7 @@ from utils.shortcuts import get_env DATABASES = { "default": { - "ENGINE": "django.db.backends.postgresql_psycopg2", + "ENGINE": "django.db.backends.postgresql", "HOST": get_env("POSTGRES_HOST", "oj-postgres"), "PORT": get_env("POSTGRES_PORT", "5432"), "NAME": get_env("POSTGRES_DB"), diff --git a/oj/urls.py b/oj/urls.py index c626656..d0e3523 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, re_path as url urlpatterns = [ url(r"^api/", include("account.urls.oj")), diff --git a/problem/urls/admin.py b/problem/urls/admin.py index e3a921f..7d568c3 100644 --- a/problem/urls/admin.py +++ b/problem/urls/admin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.admin import (ContestProblemAPI, ProblemAPI, TestCaseAPI, MakeContestProblemPublicAPIView, CompileSPJAPI, AddContestProblemAPI, ExportProblemAPI, ImportProblemAPI, diff --git a/problem/urls/oj.py b/problem/urls/oj.py index f7cd3ae..f2ddf77 100644 --- a/problem/urls/oj.py +++ b/problem/urls/oj.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.oj import ProblemTagAPI, ProblemAPI, ContestProblemAPI, PickOneAPI diff --git a/submission/urls/admin.py b/submission/urls/admin.py index 7cd441d..f359668 100644 --- a/submission/urls/admin.py +++ b/submission/urls/admin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.admin import SubmissionRejudgeAPI, SubmissionStatisticsAPI diff --git a/submission/urls/oj.py b/submission/urls/oj.py index 49116b9..49c5e1e 100644 --- a/submission/urls/oj.py +++ b/submission/urls/oj.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from ..views.oj import SubmissionAPI, SubmissionListAPI, ContestSubmissionListAPI, SubmissionExistsAPI diff --git a/utils/urls.py b/utils/urls.py index 7e0128e..d9a25e0 100644 --- a/utils/urls.py +++ b/utils/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from .views import SimditorImageUploadAPIView, SimditorFileUploadAPIView