From efe694381f1061f838190303ed08035ef5b45d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 3 Mar 2017 12:23:45 +0100
Subject: [PATCH] Also test on Python 3.6

---
 .travis.yml | 17 ++++++++++-------
 tox.ini     |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 355b4f3..228e344 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,18 @@
 language: python
 
-# Python 3.5 specified to make tox environment 'py35' work.
+# Python versions specified to make tox environment 'py35' and 'py36' work.
 # See: https://github.com/travis-ci/travis-ci/issues/4794
-python:
-  - 3.5
-
 # Environment changes have to be manually synced with 'tox.ini'.
 # See: https://github.com/travis-ci/travis-ci/issues/3024
-env:
-  - TOXENV=py27
-  - TOXENV=py35
+
+matrix:
+  include:
+  - python: '2.7'
+    env: TOXENV=py27
+  - python: '3.5'
+    env: TOXENV=py35
+  - python: '3.6'
+    env: TOXENV=py36
 
 install:
   - pip install -r requirements.txt
diff --git a/tox.ini b/tox.ini
index c9c38de..0b170f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # Environment changes have to be manually synced with '.travis.yml'.
-envlist = py27,py35
+envlist = py27,py35,py36
 
 [pytest]
 ;addopts = -v --cov pillarsdk --cov-report term-missing