From 76be56977c8c81e00966b1c49f82ecbb0361b904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polyconseil.fr>
Date: Mon, 18 Jun 2018 13:44:28 +0200
Subject: Upgrade supported Python and Django versions.

Django: Support the latest released version, and the latest LTS before
that version.

Python: Add support for python3.6 and pypy3.
---
 .travis.yml          | 21 ++++++++++-----------
 requirements_dev.txt |  2 +-
 setup.py             |  1 +
 tox.ini              | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02d3739..04e672f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,24 +10,23 @@ install:
 matrix:
   include:
     - python: "2.7"
-      env: TOXENV=py27-django17
-      env: TOXENV=py27-django18
-      env: TOXENV=py27-django19
-      env: TOXENV=py27-django110
+      env: TOXENV=py27-django111
     - python: "3.4"
-      env: TOXENV=py34-django110
+      env: TOXENV=py34-django20
     - python: "3.5"
-      env: TOXENV=py35-django17
-      env: TOXENV=py35-django18
-      env: TOXENV=py35-django19
-      env: TOXENV=py35-django110
+      env: TOXENV=py35-django20
+    - python: "3.6"
+      env: TOXENV=py36-django111
+      env: TOXENV=py36-django20
 
     # Pypy
     - python: "pypy"
-      env: TOXENV=py27-django110
+      env: TOXENV=pypy27-django111
+    - python: "pypy3"
+      env: TOXENV=pypy3-django20
 
     # Linting
-    - python: "3.5"
+    - python: "3.6"
       env: TOXENV=lint
 
 notifications:
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 944bc1e..3dc8e5f 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -2,7 +2,7 @@
 -e .
 -r requirements_test.txt
 
-Django>=1.8
+Django>=1.11
 
 coverage
 wheel
diff --git a/setup.py b/setup.py
index 9c23b3b..812bf76 100755
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     test_suite='tests',
diff --git a/tox.ini b/tox.ini
index cd28e4f..ead2bf6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,8 @@
 [tox]
 envlist =
-    py{27,34,35}-django{17,18,19,110}
+    py{27,34,35,36}-django{111,20}
+    pypy27-django111
+    pypy3-django{111,20}
     lint
 
 toxworkdir = {env:TOX_WORKDIR:.tox}
@@ -8,10 +10,8 @@ toxworkdir = {env:TOX_WORKDIR:.tox}
 [testenv]
 deps =
     -rrequirements_test.txt
-    django17: Django>=1.7,<1.8
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
-    django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<1.12
+    django20: Django>=2.0,<2.1
 
 whitelist_externals = make
 commands = make test
-- 
cgit v1.2.1