Merge pull request #393 from jmadler/testrevamp

Switch to pytest as a test runner

Author: jmadler

.travis.yml

@@ -30,7 +30,5 @@ before_script:
       flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics; 
     fi
 
-# command to run tests, e.g. python setup.py test
-
 script:
   - tox

TESTING.txt

@@ -1,9 +1,7 @@
 Currently the tests are passing on OS X and Linux on Python 2.7 and 3.4.
 
-The test suite can be run either with:
+The test suite can be run with:
 
-    $ python setup.py test
+    $ tox
 
-which uses the unittest module's test discovery mechanism, or with:
-
-    $ py.test
+which tests the module under a number of different python versions, where available.

discover_tests.py

@@ -78,7 +78,6 @@
                      'LICENSE.txt',
                      'futurize.py',
                      'pasteurize.py',
-                     'discover_tests.py',
                      'check_rst.sh',
                      'TESTING.txt',
                     ],
@@ -177,6 +176,5 @@
       include_package_data=True,
       python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
       classifiers=CLASSIFIERS,
-      test_suite = "discover_tests",
       **setup_kwds
      )

setup.py

@@ -2,4 +2,5 @@
 envlist = py27,py34,py35,py36,py37
 
 [testenv]
-commands = python setup.py test
+deps = pytest
+commands = pytest {posargs}