From 0656373986f1f45f8ff66328e09daf222abf1e02 Mon Sep 17 00:00:00 2001
From: anthony-shaw <anthonyshaw@apache.org>
Date: Thu, 28 Apr 2016 16:45:52 -0400
Subject: [PATCH] Switch to tox

---
 .travis.yml | 8 +++-----
 tox.ini     | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3df7ad9..3520e22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,6 @@ python:
   - "nightly" # currently points to 3.6-dev
 install: 
   - pip install -r requirements.txt
-  - pip install nose coverage codecov
-# command to run tests
-script:  
-  - python setup.py nosetests --with-coverage
-after-success: codecov
\ No newline at end of file
+  - pip install tox
+script:
+    - tox
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 0c86a4d..bd6d659 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist = py{2.6,2.7,pypy,pypy3,3.3,3.4,3.5},lint,pylint
 
 [testenv]
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps =
     coveralls
 commands =