From: Stephen Finucane <stephen@that.guru>
Date: Thu, 13 Sep 2018 21:47:49 +0000 (-0600)
Subject: Add support for Django 2.1
X-Git-Tag: v2.2.0-rc1~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe8f9a31ce710307c4640b0802895b19a457f862;p=thirdparty%2Fpatchwork.git

Add support for Django 2.1

For once, this just works. Yay!

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

diff --git a/releasenotes/notes/django-2-1-support-b30ef19137bf4d28.yaml b/releasenotes/notes/django-2-1-support-b30ef19137bf4d28.yaml
new file mode 100644
index 00000000..e3013a38
--- /dev/null
+++ b/releasenotes/notes/django-2-1-support-b30ef19137bf4d28.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    `Django 2.1 <https://docs.djangoproject.com/en/dev/releases/2.1/>`_ is now
+    supported. This requires Python 3.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 2574fd37..b0cdd0de 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
-Django==2.0.8; python_version >= '3.4'
-Django==1.11.15; python_version < '3.0'
+Django==2.1.2; python_version >= '3.4'
+Django==1.11.15; python_version < '3.0'  # pyup: ignore
 djangorestframework==3.8.2
 django-filter==2.0.0; python_version >= '3.4'
 django-filter==1.1.0; python_version < '3.0'  # pyup: ignore
diff --git a/requirements-prod.txt b/requirements-prod.txt
index 9b7cc6a2..5bf8a273 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,5 +1,5 @@
-Django==2.0.8; python_version >= '3.4'
-Django==1.11.15; python_version < '3.0'
+Django==2.1.2; python_version >= '3.4'
+Django==1.11.15; python_version < '3.0'  # pyup: ignore
 djangorestframework==3.8.2
 django-filter==2.0.0; python_version >= '3.4'
 django-filter==1.1.0; python_version < '3.0'  # pyup: ignore
diff --git a/tox.ini b/tox.ini
index da2a5060..357c7d03 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}
+envlist = pep8,docs,py{27,34}-django111,py{35,36}-django{111,20,21}
 skipsdist = True
 
 [testenv]
@@ -11,8 +11,9 @@ deps =
     django111: django-filter>=1.0,<3.0; python_version >= '3.4'
     django111: django-filter>=1.0,<2.0; python_version < '3.0'
     django20: django>=2.0,<2.1
-    django20: djangorestframework>=3.7,<3.9
-    django20: django-filter>=2.0,<3.0
+    django21: django>=2.1,<2.2
+    django{20,21}: djangorestframework>=3.7,<3.9
+    django{20,21}: django-filter>=2.0,<3.0
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1