From d2ca5e0b8aa77a916e5b2e118bf8eba98311e702 Mon Sep 17 00:00:00 2001
From: Brett Randall <javabrett@gmail.com>
Date: Mon, 27 Nov 2017 12:06:06 +1100
Subject: [PATCH] Updated tox and Travis to use py36.

- Added a matrix config to Travis to align tox an travis environments.
- Locked dist to trusty
---
 .travis.yml | 10 +++++++---
 tox.ini     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f09fb6..0e8e715 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
+dist: trusty
 language: python
 
 sudo: false
-env:
-    - TOXENV=py27
-    - TOXENV=py34
+matrix:
+    include:
+        - python: 2.7
+          env: TOXENV=py27
+        - python: 3.6
+          env: TOXENV=py36
 
 install:
     - travis_retry pip install tox
diff --git a/tox.ini b/tox.ini
index 87ad98a..d46082e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34
+envlist = py27,py36
 
 [testenv]
 commands=python test_httpbin.py