5 files changed, 63 insertions(+), 22 deletions(-)

M .travis.yml
M README.rst
M docs/release_notes.rst
M setup.py
M tox.ini

@@ 1,25 1,61 @@
-# Because Python 3.6 is available on GCE
-dist: trusty
-
-language: python
 cache: pip
 
-python:
-  - "3.4"
-  - "3.5"
-  - "3.6"
-
-env:
-  - LINT="yes"
-  - DJANGO="1.11"
-  - DJANGO="2.0"
+language: python
 
 matrix:
-  exclude:
-  - python: "3.5"
-    env: LINT="yes"
-  - python: "3.6"
+  include:
+  - python: 3.4
+    dist: trusty
+    sudo: false
     env: LINT="yes"
+  - python: 3.4
+    dist: trusty
+    sudo: false
+    env: DJANGO="1.11"
+  - python: 3.4
+    dist: trusty
+    sudo: false
+    env: DJANGO="2.0"
+
+  - python: 3.5
+    dist: trusty
+    sudo: false
+    env: DJANGO="1.11"
+  - python: 3.5
+    dist: trusty
+    sudo: false
+    env: DJANGO="2.0"
+  - python: 3.5
+    dist: trusty
+    sudo: false
+    env: DJANGO="2.1"
+
+  - python: 3.6
+    dist: trusty
+    sudo: false
+    env: DJANGO="1.11"
+  - python: 3.6
+    dist: trusty
+    sudo: false
+    env: DJANGO="2.0"
+  - python: 3.6
+    dist: trusty
+    sudo: false
+    env: DJANGO="2.1"
+
+  - python: 3.7
+    dist: xenial
+    sudo: true
+    env: DJANGO="2.0"
+  - python: 3.7
+    dist: xenial
+    sudo: true
+    env: DJANGO="2.1"
+
+  - python: pypy
+    dist: trusty
+    sudo: false
+    env: DJANGO="1.11"
 
 addons:
   apt:


@@ 28,7 64,7 @@ addons:
       - libjpeg8-dev
 
 install:
-  - pip install tox\>=2.1 tox-travis codecov
+  - pip install tox tox-travis codecov
 
 script:
   - tox

@@ 26,7 26,7 @@ The below table explains which Django versions are supported.
 +------------------+----------------+--------------+
 | Release          | Django         | Upgrade from |
 +==================+================+==============+
-| 0.4b2            | 1.11, 2.0      | 0.3          |
+| 0.4b2            | 1.11, 2.0, 2.1 | 0.3          |
 +------------------+----------------+--------------+
 | 0.3.x            | 1.8, 1.9,      | 0.2          |
 |                  | 1.10, 1.11     |              |

@@ 18,7 18,8 @@ django-wiki 0.4b2
 Added
 ~~~~~
 
- * Django 2 support :url-issue:`755` (Raffaele Salmaso & Mads Jensen)
+ * Django 2.0 and 2.1 support :url-issue:`755` (Raffaele Salmaso & Mads Jensen)
+ * Python 3.7 support
  * Added ``wiki.sites.WikiSite`` for easy customization :url-issue:`827`
  * Automatic link highlighting of URLs handles lots of new patterns :url-issue:`816` (Branko Majic)
  * Red links: Internal links turn red and link to Create Page (Mathias Rav)  :url-issue:`889`

@@ 24,7 24,7 @@ def get_path(fname):
 
 
 install_requirements = [
-    "Django>=1.11,<2.1",
+    "Django>=1.11,<2.2",
     "bleach>=2.1,<2.2",
     "Pillow",
     "django-nyt>=1.1.1,<1.2",

@@ 1,6 1,6 @@
 [tox]
 # Ensure you add to .travis.yml if you add here, using `tox -l`
-envlist = {py34,py35,py36}-django{111,20},lint
+envlist = {py34,py35,py36,py37}-django{111,20,21},lint
 
 
 [travis]


@@ 8,11 8,13 @@ python =
   3.4: py34
   3.5: py35
   3.6: py36
+  3.7: py37
 
 [travis:env]
 DJANGO =
   1.11: django111
   2.0: django20
+  2.1: django21
 LINT =
   yes: lint
 


@@ 35,11 37,13 @@ deps =
   .[test]
   django111: Django>=1.11,<2.0
   django20: Django>=2.0,<2.1
+  django21: Django>=2.1,<2.2
 
 basepython =
   py34: python3.4
   py35: python3.5
   py36: python3.6
+  py37: python3.7
 
 
 [testenv:lint]