Merge pull request #182 from juanifioren/revert-180-feature-django-and-python-upgrade

reverted wrong commit

.travis.yml

@@ -3,19 +3,15 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
-  - "3.6"
 env:
   - DJANGO=1.7
   - DJANGO=1.8
   - DJANGO=1.9
   - DJANGO=1.10
-  - DJANGO=1.11
 matrix:
   exclude:
     - python: "3.5"
       env: DJANGO=1.7
-    - python: "3.6"
-      env: DJANGO=1.7
 install:
   - pip install tox coveralls
 script:

tox.ini

@@ -2,10 +2,9 @@
 
 envlist=
     clean,
-    py27-django{17,18,19,110,111},
-    py34-django{17,18,19,110,111},
-    py35-django{18,19,110,111},
-    py36-django{18,19,110,111},
+    py27-django{17,18,19,110},
+    py34-django{17,18,19,110},
+    py35-django{18,19,110},
 
 [testenv]
 
@@ -14,7 +13,6 @@ deps =
     django18: django>=1.8,<1.9
     django19: django>=1.9,<1.10
     django110: django>=1.10,<1.11
-    django111: django>=1.11,<1.12
     coverage
     mock