Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Django 5.0 #374

Merged
merged 1 commit into from
May 24, 2024
Merged

Update to Django 5.0 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ocw/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
ricardobranco777 marked this conversation as resolved.
Show resolved Hide resolved

logger = logging.getLogger(__name__)
__SCHEDULER = None
Expand All @@ -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


Expand Down
4 changes: 2 additions & 2 deletions ocw/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load static %}
{% load bootstrap4 %}
{% load django_bootstrap5 %}
<html>
<head>
<title>OpenQA-CloudWatch</title>
Expand All @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion ocw/templates/ocw/instance_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load render_table from django_tables2 %}
{% load static %}
{% load bootstrap4 %}
{% load django_bootstrap5 %}
m-dati marked this conversation as resolved.
Show resolved Hide resolved

{% block content %}
<link rel="stylesheet" href="{% static 'css/instance_table.css' %}">
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion webui/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
'django.contrib.staticfiles',
'django_tables2',
'django_filters',
'bootstrap4',
'django_bootstrap5',
]

MIDDLEWARE = [
Expand Down
Loading