From: Andrew Donnellan <ajd@linux.ibm.com>
Date: Wed, 8 Apr 2020 21:47:54 +0000 (+0100)
Subject: Add Django 3.0 support
X-Git-Tag: v3.0.0~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3d4f9f36b2b16aa54837b67733f2de5cf93457b;p=thirdparty%2Fpatchwork.git

Add Django 3.0 support

Add the latest version of Django.

Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Stephen Finucane <stephen@that.guru>
Closes: #311
---

diff --git a/patchwork/api/patch.py b/patchwork/api/patch.py
index 15fce8ef..d881504f 100644
--- a/patchwork/api/patch.py
+++ b/patchwork/api/patch.py
@@ -9,7 +9,7 @@ import email.parser
 
 from django.core.exceptions import ValidationError
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import status
 from rest_framework.exceptions import APIException
 from rest_framework.exceptions import PermissionDenied
diff --git a/releasenotes/notes/django-3-0-support-b961e7345456b88f.yaml b/releasenotes/notes/django-3-0-support-b961e7345456b88f.yaml
new file mode 100644
index 00000000..63ba2255
--- /dev/null
+++ b/releasenotes/notes/django-3-0-support-b961e7345456b88f.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    `Django 3.0 <https://docs.djangoproject.com/en/dev/releases/3.0/>`_ is
+    now supported.
diff --git a/tox.ini b/tox.ini
index 39254c84..8ba75470 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.2
-envlist = pep8,docs,py{36,37,38}-django{22}
+envlist = pep8,docs,py{36,37,38}-django{22,30}
 skipsdist = true
 ignore_basepython_conflict = true
 
@@ -11,6 +11,9 @@ deps =
     django22: django>=2.2,<2.3
     django22: djangorestframework>=3.10,<3.12
     django22: django-filter>=2.1,<3.0
+    django30: django>=3.0,<3.1
+    django30: djangorestframework>=3.10,<3.12
+    django30: django-filter>=2.2,<3.0
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1