Merge pull request #208 from NREL/django-upgrade

Django upgrade to 4.2.15
NREL · Aug 28, 2024 · 692bf7f · 692bf7f
2 parents 785cdae + d5918bf
commit 692bf7f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/calliope_app/account/urls.py b/calliope_app/account/urls.py
@@ -1,7 +1,6 @@
 from django.contrib.auth import views as auth_views
 from django.conf import settings
-from django.conf.urls import url
-from django.urls import path
+from django.urls import path, re_path
 
 from account import views
 
@@ -26,8 +25,8 @@
         views.set_timezone,
         name='set_timezone'
     ),
-    
-    url(
+
+    re_path(
         r'^password_reset/$',
         auth_views.PasswordResetView.as_view(
             template_name='registration/pw_reset_form.html',
@@ -37,14 +36,14 @@
         ),
         name='password_reset'
     ),
-    url(
+    re_path(
         r'^password_reset/done/$',
         auth_views.PasswordResetDoneView.as_view(
             template_name='registration/pw_reset_done.html'
         ),
         name='password_reset_done'
     ),
-    url(
+    re_path(
         r'^reset/\
         (?P<uidb64>[0-9A-Za-z_\-]+)/\
         (?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,40})/$',
@@ -53,7 +52,7 @@
         ),
         name='password_reset_confirm'
     ),
-    url(
+    re_path(
         r'^reset/done/$',
         auth_views.PasswordResetCompleteView.as_view(
             template_name='registration/pw_reset_complete.html'

diff --git a/calliope_app/calliope_app/settings/local.py b/calliope_app/calliope_app/settings/local.py
@@ -39,7 +39,7 @@
 # --------------------------------------------------------------------------------
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'ENGINE': 'django.db.backends.postgresql',
         'HOST': env.str('POSTGRES_HOST'),
         'PORT': env.str('POSTGRES_PORT'),
         'USER': env.str('POSTGRES_USER'),

diff --git a/calliope_app/calliope_app/settings/prod.py b/calliope_app/calliope_app/settings/prod.py
@@ -17,7 +17,7 @@
 # --------------------------------------------------------------------------------
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'ENGINE': 'django.db.backends.postgresql',
         'HOST': env.str('POSTGRES_HOST'),
         'PORT': env.str('POSTGRES_PORT'),
         'USER': env.str('POSTGRES_USER'),

diff --git a/calliope_app/calliope_app/settings/test.py b/calliope_app/calliope_app/settings/test.py
@@ -23,7 +23,7 @@
 # --------------------------------------------------------------------------------
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'ENGINE': 'django.db.backends.postgresql',
         'HOST': env.str('POSTGRES_HOST'),
         'PORT': env.str('POSTGRES_PORT'),
         'USER': env.str('POSTGRES_USER'),

diff --git a/calliope_app/requirements.txt b/calliope_app/requirements.txt
@@ -2,7 +2,7 @@ django_ratelimit==4.1.0
 git+https://github.com/NREL/GEOPHIRES-X.git#egg=geophires-x
 boto3==1.24.37
 celery[redis]==5.3.0
-django==3.2.25
+django==4.2.15
 django-crispy-forms==1.14.0
 django-environ>=0.4.5
 django-modeltranslation==0.18.12

diff --git a/calliope_app/template/urls.py b/calliope_app/template/urls.py
@@ -1,6 +1,3 @@
-from django.contrib.auth import views as auth_views
-from django.conf import settings
-from django.conf.urls import url
 from django.urls import path
 
 from template import views