Merge pull request #206 from moggers87/travis-tox

Re-enable Python 3.6 in tests

.travis.yml

@@ -1,7 +1,11 @@
 language: python
 sudo: false
 python:
+  - 2.7
+  - 3.3
+  - 3.4
   - 3.5
+  - 3.6
 cache:
   directories:
     - $HOME/.cache/pip
@@ -9,7 +13,7 @@ services:
   - postgresql
   - mysql
 install:
-  - pip install tox
+  - pip install tox-travis
 before_script:
   - mysql -e 'create database test_project';
   - psql -c 'create database test_project;' -U postgres;

tox.ini

@@ -1,8 +1,10 @@
 [tox]
 envlist =
-    coverage-erase
+    begin
+    py33-django18-{sqlite,postgres,mysql}
     {py27,py34,py35}-django{18,19,110,111}-{sqlite,postgres,mysql}
-    coverage-report
+    py36-django111-{sqlite,postgres,mysql}
+    end
     flake8
 
 [testenv]
@@ -16,11 +18,19 @@ deps =
     postgres: psycopg2
     mysql: mysqlclient
 commands =
-    coverage-erase: coverage erase
+    begin: coverage erase
     sqlite: coverage run -a tests/runtests.py
     postgres: coverage run -a tests/runtests.py -d psql
     mysql: coverage run -a tests/runtests.py -d mysql
-    coverage-report: coverage report
+    end: coverage report
+
+[travis]
+python =
+    2.7: begin, py27, end
+    3.3: begin, py33, end
+    3.4: begin, py34, end
+    3.5: begin, py35, end, flake8
+    3.6: begin, py36, end
 
 [flake8]
 max-line-length=120