From 3079eaba5f3ea75dca8dfd3dc8c709e49bef5f4d Mon Sep 17 00:00:00 2001 From: Ricardo Branco Date: Fri, 24 May 2024 09:37:03 +0200 Subject: [PATCH] Update to Django 5.0 --- ocw/apps.py | 4 ++-- ocw/templates/base.html | 4 ++-- ocw/templates/ocw/instance_list.html | 2 +- requirements.txt | 8 ++++---- webui/settings.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ocw/apps.py b/ocw/apps.py index b826a032..65a5ef4a 100644 --- a/ocw/apps.py +++ b/ocw/apps.py @@ -3,7 +3,7 @@ from django.apps import AppConfig from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.executors.pool import ThreadPoolExecutor -from pytz import utc +from datetime import timezone logger = logging.getLogger(__name__) __SCHEDULER = None @@ -20,7 +20,7 @@ def getScheduler(): # pylint: disable=invalid-name 'coalesce': False, 'max_instances': 1 } - __SCHEDULER = BackgroundScheduler(executors=executors, job_defaults=job_defaults, timezone=utc) + __SCHEDULER = BackgroundScheduler(executors=executors, job_defaults=job_defaults, timezone=timezone.utc) return __SCHEDULER diff --git a/ocw/templates/base.html b/ocw/templates/base.html index 775b486c..f67dda35 100644 --- a/ocw/templates/base.html +++ b/ocw/templates/base.html @@ -1,5 +1,5 @@ {% load static %} -{% load bootstrap4 %} +{% load django_bootstrap5 %} OpenQA-CloudWatch @@ -8,7 +8,7 @@ - {% bootstrap_javascript jquery=1 %} + {% bootstrap_javascript %}
diff --git a/ocw/templates/ocw/instance_list.html b/ocw/templates/ocw/instance_list.html index bfb3c645..21eb2ca5 100644 --- a/ocw/templates/ocw/instance_list.html +++ b/ocw/templates/ocw/instance_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load render_table from django_tables2 %} {% load static %} -{% load bootstrap4 %} +{% load django_bootstrap5 %} {% block content %} diff --git a/requirements.txt b/requirements.txt index 2ed34ce0..db282154 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,10 +8,10 @@ cachetools msrestazure==0.6.4 uwsgi==2.0.24 requests==2.32.1 -Django~=4.2.2 -django-tables2==2.6.0 -django-filter==23.2 -django-bootstrap4==23.1 +Django~=5.0.6 +django-tables2==2.7.0 +django-filter==23.5 +django-bootstrap5==24.2 texttable oauth2client google-api-python-client==2.96.0 diff --git a/webui/settings.py b/webui/settings.py index 6bd94ca5..d07e3257 100644 --- a/webui/settings.py +++ b/webui/settings.py @@ -47,7 +47,7 @@ 'django.contrib.staticfiles', 'django_tables2', 'django_filters', - 'bootstrap4', + 'django_bootstrap5', ] MIDDLEWARE = [