From 6b46f1e4a321d693534ce48cedac2c9d10fb5b7f Mon Sep 17 00:00:00 2001 From: Rachele Morino Date: Thu, 21 Mar 2024 17:24:12 -0400 Subject: [PATCH] Upgrade to Django 4.0.1 --- python/cac_tripplanner/cac_tripplanner/settings.py | 2 -- python/cac_tripplanner/cac_tripplanner/urls.py | 3 +-- python/cac_tripplanner/requirements.txt | 4 ++-- python/cac_tripplanner/shortlinks/test/urls.py | 3 +-- python/cac_tripplanner/shortlinks/urls.py | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/python/cac_tripplanner/cac_tripplanner/settings.py b/python/cac_tripplanner/cac_tripplanner/settings.py index 96b528c1..658521e5 100644 --- a/python/cac_tripplanner/cac_tripplanner/settings.py +++ b/python/cac_tripplanner/cac_tripplanner/settings.py @@ -165,8 +165,6 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True # Directory for default featured destinations added in destinations 0012 diff --git a/python/cac_tripplanner/cac_tripplanner/urls.py b/python/cac_tripplanner/cac_tripplanner/urls.py index 9a67d317..e6e2b2b9 100644 --- a/python/cac_tripplanner/cac_tripplanner/urls.py +++ b/python/cac_tripplanner/cac_tripplanner/urls.py @@ -1,5 +1,4 @@ -from django.conf.urls import re_path -from django.urls import include +from django.urls import include, re_path from django.views.generic import RedirectView from django.contrib.gis import admin diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt index 3c4ead76..b3bb2eb5 100644 --- a/python/cac_tripplanner/requirements.txt +++ b/python/cac_tripplanner/requirements.txt @@ -1,9 +1,9 @@ base58==2.0.1 boto3==1.15.9 boto==2.49.0 -Django==3.2.25 +Django==4.0.1 django-ckeditor==6.0.0 -django-image-cropping==1.5.0 +django-image-cropping==1.7.0 django-extensions==3.1.5 django-storages==1.10.1 easy-thumbnails==2.8.1 diff --git a/python/cac_tripplanner/shortlinks/test/urls.py b/python/cac_tripplanner/shortlinks/test/urls.py index 3b14ef2d..5621e21a 100644 --- a/python/cac_tripplanner/shortlinks/test/urls.py +++ b/python/cac_tripplanner/shortlinks/test/urls.py @@ -1,5 +1,4 @@ -from django.conf.urls import re_path -from django.urls import include, path +from django.urls import include, path, re_path from shortlinks.test.views import stub_view app_name = 'shortlinks' diff --git a/python/cac_tripplanner/shortlinks/urls.py b/python/cac_tripplanner/shortlinks/urls.py index ce4d9d0b..8eb00dca 100644 --- a/python/cac_tripplanner/shortlinks/urls.py +++ b/python/cac_tripplanner/shortlinks/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import re_path +from django.urls import re_path from django.views.decorators.csrf import csrf_exempt from .views import ShortenedLinkRedirectView, ShortenedLinkCreateView