Merge pull request #63 from Alir3z4/django-2.0

Test on django 2.0

Author: nikolas

.travis.yml

@@ -1,12 +1,23 @@
 language: python
 sudo: false
 python:
-    - 2.7
-    - 3.5
-    - 3.6
-    - pypy
+  - '2.7'
+  - '3.5'
+  - '3.6'
+  - 'pypy'
+env:
+  - DJANGO="Django>=1.8.0,<1.9.0"
+  - DJANGO="Django>=1.11,<1.12.0"
+  - DJANGO="Django>=2.0,<2.1"
+matrix:
+  exclude:
+  - python: '2.7'
+    env: DJANGO="Django>=2.0,<2.1"
+  - python: 'pypy'
+    env: DJANGO="Django>=2.0,<2.1"
 install:
-    - pip install -r requirements/dev.txt
+  - pip install $DJANGO
+  - pip install -r requirements/dev.txt
 script:
-    - flake8 *.py django_markwhat/*.py
-    - python run_tests.py
+  - flake8 *.py django_markwhat/*.py
+  - python run_tests.py

ChangeLog.rst

@@ -1,3 +1,9 @@
+1.6
+================
+----
+
+* Now tested on Django 2.0
+
 1.5.1 2016-12-07
 ================
 ----

requirements.txt

@@ -1 +0,0 @@
-Django==1.11.4

requirements/dev.txt

@@ -1,5 +1,3 @@
--r ../requirements.txt
-
 Markdown==2.6.9
 CommonMark==0.7.4
 textile==3.0.0