Run tests on Travis via tox.

Netflix-Skunkworks · Sep 7, 2017 · 11ea1cb · 11ea1cb
1 parent d626e89
commit 11ea1cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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