Update tox.ini to actually run tests and make Travis use it.

Remove py.test runner from setup.py.

3 files changed, 8 insertions, 26 deletions

diff --git a/.travis.yml b/.travis.yml
index 9a7d9ea9..b9fdd09f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ language: python
 sudo: false
 
 env:
-  - TOX_ENV=py27
-  - TOX_ENV=py34
+  - TOXENV=py27
+  - TOXENV=py34
 
 addons:
   apt:
@@ -14,5 +14,8 @@ addons:
 services:
   - mongodb
 
+install:
+  - pip install -U tox
+
 script:
-  - ./setup.py test
+  - tox
diff --git a/setup.py b/setup.py
index 682daa2a..d2a57c25 100755
--- a/setup.py
+++ b/setup.py
@@ -6,21 +6,6 @@ import sys
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
-
-class PyTest(TestCommand):
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        #import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.test_args)
-        sys.exit(errno)
-
-
 install_requires = [
     # core dependencies
     'decorator',
@@ -85,6 +70,4 @@ setup(
     },
     install_requires=install_requires,
     zip_safe=False,
-    test_suite='tests',
-    cmdclass={'test': PyTest},
 )
diff --git a/tox.ini b/tox.ini
index 880383b3..7195b10c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,5 @@
 envlist = py27,py34
 
 [testenv]
-basepython =
-    py27: python2.7
-    py34: python3.4
-
-deps =
-    pytest
+deps = pytest
+commands = py.test tests/