Make 'python setup.py test' work

Packagers sometimes like to use 'python setup.py test'. This
change adjusts setup.py and setup.cfg to allow this to work
with pytest instead of nose. To make things work, the
settings for coverage need to be moved into tox.ini.

A SkipTest in test_config_middleware is changed to its pytest
equivalent.

5 files changed, 7 insertions, 5 deletions

diff --git a/pytest.ini b/pytest.ini
index 69d62a0..5ee6477 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,2 @@
 [pytest]
-addopts = --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing
 testpaths = tests
diff --git a/setup.cfg b/setup.cfg
index f15c017..3c00092 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,5 @@
 [wheel]
 universal = true
+
+[aliases]
+test = pytest
diff --git a/setup.py b/setup.py
index 79f9d70..2ac2606 100644
--- a/setup.py
+++ b/setup.py
@@ -42,8 +42,8 @@ setup(
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
     zip_safe=False,
-    test_suite='nose.collector',
-    tests_require=['nose>=0.11'],
+    setup_requires=['pytest-runner'],
+    tests_require=['pytest'],
     extras_require={
         'Config': [],
         'Paste': ['Paste'],
diff --git a/tests/test_config_middleware.py b/tests/test_config_middleware.py
index 56c3d04..52ba7d1 100644
--- a/tests/test_config_middleware.py
+++ b/tests/test_config_middleware.py
@@ -20,7 +20,7 @@ def test_error():
     try:
         from paste.fixture import TestApp
     except ImportError:
-        raise SkipTest
+        raise pytest.skip('unable to import TestApp')
 
     wrapped = ConfigMiddleware(app_with_exception, {'test': 1})
     test_app = TestApp(wrapped)
diff --git a/tox.ini b/tox.ini
index 42469da..4f0d91c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,4 +9,4 @@ deps =
     pytest
     pytest-cov
 commands =
-    py.test {posargs}
+    py.test --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing {posargs}