From: Stephen Finucane <stephen@that.guru>
Date: Tue, 4 Jun 2019 16:07:05 +0000 (+0100)
Subject: Add support for Django 2.2
X-Git-Tag: v2.2.0-rc1~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb380d2b881d49ed8d14c4a35bb99a145e94f20e;p=thirdparty%2Fpatchwork.git

Add support for Django 2.2

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/releasenotes/notes/django-2-2-support-479b35dd3ecd5a2a.yaml b/releasenotes/notes/django-2-2-support-479b35dd3ecd5a2a.yaml
new file mode 100644
index 00000000..773001f5
--- /dev/null
+++ b/releasenotes/notes/django-2-2-support-479b35dd3ecd5a2a.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    `Django 2.1 <https://docs.djangoproject.com/en/dev/releases/2.2/>`_ is now
+    supported. This requires Python 3.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 563e24e2..1055cf60 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
-Django==2.1.7; python_version >= '3.4'
+Django==2.2.2; python_version >= '3.4'
 Django==1.11.20; python_version < '3.0'  # pyup: ignore
 djangorestframework==3.9.2
 django-filter==2.1.0; python_version >= '3.4'
diff --git a/requirements-prod.txt b/requirements-prod.txt
index aec042e6..9680b6f8 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,4 +1,4 @@
-Django==2.1.7; python_version >= '3.4'
+Django==2.2.2; python_version >= '3.4'
 Django==1.11.20; python_version < '3.0'  # pyup: ignore
 djangorestframework==3.9.2
 django-filter==2.1.0; python_version >= '3.4'
diff --git a/tox.ini b/tox.ini
index 78b57f78..d4c34e1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = pep8,docs,py{27,34}-django111,py{35,36}-django{111,20,21}
+envlist = pep8,docs,py{27,34}-django111,py{35,36}-django{111,20,21,22}
 skipsdist = True
 
 [testenv]
@@ -14,6 +14,9 @@ deps =
     django21: django>=2.1,<2.2
     django{20,21}: djangorestframework>=3.7,<3.10
     django{20,21}: django-filter>=2.0,<3.0
+    django22: django>=2.2,<2.3
+    django22: djangorestframework>=3.9.2
+    django22: django-filter>=2.1,<3.0
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1