Add support for Django 2.0

Nothing too complicated here except for the addition of a new compat
wrapper, which will be removed again shortly. According to the Django
release notes, Django should function with Python 3.4. However, it was
not possible to get this functioning due to the below error:

  Traceback (most recent call last):
    File ".../patchwork/manage.py", line 11, in <module>
    ...
    File ".../django/db/models/fields/related.py", line 313, in contribute_to_class
      'app_label': cls._meta.app_label.lower(),
  TypeError: unsupported operand type(s) for %: 'bytes' and 'dict'

This does not appear to be an issue with Patchwork but the exact root
cause has not been identified. As a result, only Python 3.5 and 3.6 are
marked as supported for this Django version.

As this is the first Python 3-only dependency we have, we need to start
making use of the 'python_version' environment marker.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Signed-off-by: Daniel Axtens <dja@axtens.net>

diff --git a/releasenotes/notes/django-2-0-support-807980866ca16b77.yaml b/releasenotes/notes/django-2-0-support-807980866ca16b77.yaml
new file mode 100644 (file)
index 0000000..5c20673
--- /dev/null
+++ b/releasenotes/notes/django-2-0-support-807980866ca16b77.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    `Django 2.0 <https://docs.djangoproject.com/en/2.0/releases/2.0/>`_ is now
+    supported.

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 8bad8f07389b3638b9c99085374cb1d7d905e1ba..f4ad751aed7860f6de7892fe987f3545433fe490 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,5 @@
-Django>=1.11,<2.0
+Django>=1.11,<2.1; python_version >= '3.4'
+Django>=1.11,<2.0; python_version < '3.0'
 djangorestframework>=3.4,<3.9
 django-filter>=1.0,<1.2
 -r requirements-test.txt

diff --git a/requirements-prod.txt b/requirements-prod.txt
index c30688cce1f967ed256aa5afc4f38dc91efca58d..e7a753544567142793f86328cb5c0347c5963824 100644 (file)
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,4 +1,5 @@
-Django>=1.11,<2.0
+Django>=1.11,<2.1; python_version >= '3.4'
+Django>=1.11,<2.0; python_version < '3.0'
 djangorestframework>=3.4,<3.9
 django-filter>=1.0,<1.2
 psycopg2>=2.7,<2.8

diff --git a/tox.ini b/tox.ini
index 5f3d7e7255bbfb4a02c3c294f9dd3bf99b16a8b0..4eef4c447bef422297d8dce1348824478b5f4749 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = pep8,docs,py{27,34,35,36}-django111
+envlist = pep8,docs,py{27,34}-django111,py{35,36}-django{111,20}
 skipsdist = True
 
 [testenv]
@@ -9,6 +9,9 @@ deps =
     django111: django>=1.11,<2.0
     django111: djangorestframework>=3.6,<3.9
     django111: django-filter>=1.0,<1.2
+    django20: django>=2.0,<2.1
+    django20: djangorestframework>=3.7,<3.9
+    django20: django-filter>=1.1,<1.2
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
     PYTHONDONTWRITEBYTECODE = 1