From 11ea1cb307172af76d36033b28821c32c7585d5e Mon Sep 17 00:00:00 2001
From: "Andrew M. White" <andreww@netflix.com>
Date: Thu, 7 Sep 2017 11:31:23 -0700
Subject: [PATCH] Run tests on Travis via tox.

---
 .travis.yml | 5 +++--
 tox.ini     | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6d7f77..12d2540 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ cache:
 before_install:
   - nvm install 6.9.5
 install:
-  - ./.travis/install.sh
+  - pip install tox-travis
+  - if [[ "$TEST_SUITE" == "js" ]]; then make install-node-requirements; fi
 script:
-  - make test-$TEST_SUITE
+  - if [[ "$TEST_SUITE" == "js" ]]; then make test-js; else tox; fi
diff --git a/tox.ini b/tox.ini
index f233517..2101633 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,13 @@ envlist =
   py36,
   lint
 
+[travis]
+python =
+  2.7: py27, lint
+  3.4: py34
+  3.5: py35
+  3.6: py36
+
 [testenv]
 install_command = pip install --process-dependency-links {opts} {packages}
 commands = py.test