From 3b41d3a5470f43149c590425442f165870bb58c1 Mon Sep 17 00:00:00 2001
From: Eduard Braun <Eduard.Braun2@gmx.de>
Date: Sun, 19 Feb 2017 18:04:36 +0100
Subject: [PATCH] Add Python 3.6 to tests and simplify .travis.yml by using
 'tox-travis'

---
 .travis.yml | 26 ++++++++++----------------
 tox.ini     |  1 +
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48a15d5..a853a19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,25 @@
 language: python
 
+python:
+  - pypy
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
 install:
-  - pip install tox codecov
-
-env:
-  - TOX_ENV=pypy
-  - TOX_ENV=py27
-  - TOX_ENV=py33
-  - TOX_ENV=py34
-# - TOX_ENV=py35
-# - TOX_ENV=flake8
+  - pip install tox-travis codecov
 
 script:
-  - tox -e $TOX_ENV
+  - tox
 
 matrix:
   fast_finish: true
 
   include:
-    # https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
     - python: 3.5
       env:
-      - TOX_ENV=py35
-
-    - python: 3.5
-      env:
-      - TOX_ENV=flake8
+      - TOXENV=flake8
 
 after_success:
   - coverage combine && codecov
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 30dacf8..df04c05 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist =
     py33
     py34
     py35
+    py36
     flake8