Merge pull request #236 from lzaoral/add-django-5

Add support for Django 5.0
release-engineering · Dec 12, 2023 · 308ea96 · 308ea96
2 parents a470ecf + 800d485
commit 308ea96
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -40,6 +40,9 @@ jobs:
           py310-django4,
           py311-django4,
           py312-django4,
+          py310-django5,
+          py311-django5,
+          py312-django5,
           py39-bandit,
         ]
 

diff --git a/kobo/django/fields.py b/kobo/django/fields.py
@@ -6,13 +6,16 @@
 from django.core import exceptions
 from django.utils.text import capfirst
 from django.forms.widgets import Select
-from django.forms.fields import CallableChoiceIterator
 
 import kobo.django.forms
 from kobo.types import StateEnum
 from kobo.django.compat import gettext_lazy as _
 from kobo.django.django_version import django_version_ge
 
+if django_version_ge('5.0.0'):
+    from django.utils.choices import CallableChoiceIterator
+else:
+    from django.forms.fields import CallableChoiceIterator
 
 '''
 StateEnumField

diff --git a/kobo/hub/static/kobo/css/screen.css b/kobo/hub/static/kobo/css/screen.css
@@ -31,6 +31,22 @@ body {
     float: right;
 }
 
+#logout-form {
+    display: inline;
+}
+
+#logout-form button {
+    font-size: inherit;
+    font-weight: normal;
+    color: #ffffff;
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    text-decoration: underline;
+    font-family: inherit;
+}
+
 #menu {
     border: 1px solid #8c8f91;
     border-top: none;

diff --git a/kobo/hub/templates/layout.html b/kobo/hub/templates/layout.html
@@ -17,7 +17,13 @@
 <body>
 <div id="header">{% block header_site_name %}{% endblock %}{% if title %} - {{ title }}{% endif %}
   <div id="login">
-    {% if user.is_authenticated %}user: <strong>{{ user }}</strong> | <a href="{% url 'auth/logout' %}?next={{ request.path }}">logout</a>{% else %}{% block login %}<a href="{% url 'auth/login' %}?next={{ request.path }}">login</a>{% endblock %}{% endif %}
+    {% if user.is_authenticated %}
+    user: <strong>{{ user }}</strong> | <form id="logout-form" method="post" action="{% url 'auth/logout' %}">
+      {% csrf_token %}
+      <button type="submit">logout</button>
+      <input type="hidden" name="next" value="{{ request.path }}"/>
+    </form>
+    {% else %}{% block login %}<a href="{% url 'auth/login' %}?next={{ request.path }}">login</a>{% endblock %}{% endif %}
     {% if user.is_superuser %} | <a href="{% url 'index' %}admin/">admin</a>{% endif %}
     {% block header_login %}{% endblock %}
   </div>

diff --git a/tests/test_views.py b/tests/test_views.py
@@ -57,7 +57,7 @@ def test_krb5login_redirect_to(self):
         self.assertIn(response['Location'], ['http://testserver/auth/login/', '/auth/login/'])
 
     def test_logout(self):
-        response = self.client.get('/auth/logout/')
+        response = self.client.post('/auth/logout/')
         self.assertIn(response.status_code, [200, 302])
         self.client.post('/auth/login/', self.credentials)
         self.client.logout()

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # Don't forget to update GA config when changing this
-envlist = {py36, py38, py39, py310, py311}-{django2, django3}, {py38, py39, py310, py311, py312}-django4, py39-bandit
+envlist = {py36, py38, py39, py310, py311}-{django2, django3}, {py38, py39, py310, py311, py312}-django4, {py310, py311, py312}-django5, py39-bandit
 skip_missing_interpreters = True
 
 [testenv]
@@ -11,6 +11,7 @@ deps =
     django2: Django~=2.2.0  # Django 2 LTS (EOL 4/2022)
     django3: Django~=3.2.0  # Django 3 LTS (EOL 4/2024)
     django4: Django~=4.2.0  # Django 4 LTS (EOL 4/2026)
+    django5: Django~=5.0.0
 # for testing with python-rpm
 sitepackages = True