Merge pull request #415 from msabramo/travis_use_tox

Travis use tox

.travis.yml

@@ -1,13 +1,15 @@
-# Configuration for Travis CI
-# !!! When making changes, make sure to also edit tox.ini !!!
-
 language: python
-python:
-  - "2.6"
-  - "2.7"
-# command to install dependencies
+env:
+    - TOXENV=py26
+    - TOXENV=py27
+    - TOXENV=cover
+    # - TOXENV=pypy
+    # - TOXENV=py32
+    # - TOXENV=py33
+    # - TOXENV=py34
 install:
-  - pip install -r test_requirements.txt --use-mirrors
-# command to run tests
+    - travis_retry pip install tox==1.6.1
 script:
-  - python setup.py test -q
+    - travis_retry tox
+notifications:
+    email: false

setup.cfg

@@ -3,11 +3,7 @@ zip_ok = false
 
 [nosetests]
 exclude=medusa
-where=supervisor
 nocapture=1
-cover-package=supervisor
-with-coverage=1
-cover-erase=1
 
 [bdist_rpm]
 requires = 

tox.ini

@@ -5,7 +5,7 @@
 
 [tox]
 envlist =
-    py26,py27
+    py26,py27,cover
 
 [testenv]
 commands =
@@ -19,7 +19,7 @@ usedevelop = true
 basepython =
     python2.6
 commands =
-    python setup.py nosetests --with-xunit --with-xcoverage
+    python setup.py nosetests --with-xunit --with-xcoverage --cover-package=supervisor --cover-erase
 deps =
     mock >= 0.5.0
     meld3 >= 0.6.5