Update to Django 5.0

SUSE · May 24, 2024 · 6c236a8 · 6c236a8
1 parent acc4ea1
commit 6c236a8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 {% load static %}
-{% load bootstrap4 %}
+{% load django_bootstrap5 %}
 <html>
     <head>
         <title>OpenQA-CloudWatch</title>
@@ -8,7 +8,7 @@
         <script async defer src="https://buttons.github.io/buttons.js"></script>
     </head>
     <body>
-        {% bootstrap_javascript jquery=1 %}
+        {% bootstrap_javascript %}
         <div class="page-header">
           <div class="row container-fluid">
             <div class="col-sm-6">

diff --git 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 %}
     <link rel="stylesheet" href="{% static 'css/instance_table.css' %}">

diff --git 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
@@ -47,7 +47,7 @@
     'django.contrib.staticfiles',
     'django_tables2',
     'django_filters',
-    'bootstrap4',
+    'django_bootstrap5',
 ]
 
 MIDDLEWARE = [