From 4496ea91bd9e8969b0e0b9d45d96448f24a170af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Elsd=C3=B6rfer?= <michael@elsdoerfer.com>
Date: Tue, 30 Aug 2016 13:09:29 +0200
Subject: [PATCH] Make pytest the test runner.

---
 setup.py | 2 +-
 tox.ini  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 219ee2c..ebc785d 100755
--- a/setup.py
+++ b/setup.py
@@ -117,7 +117,7 @@ setup(
     setup_requires=[
         'setuptools_scm',
     ],
-    tests_require=['tox', 'nose', 'scripttest', 'mock', 'hypothesis'],
+    tests_require=['tox', 'pytest', 'pytest-cov', 'nose', 'scripttest', 'mock', 'hypothesis'],
     cmdclass={'test': Tox},
     entry_points={
         'console_scripts': [
diff --git a/tox.ini b/tox.ini
index 0968270..5412ac3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,10 @@ deps = nose
        coverage
        scripttest
        mock
+       pytest
+       pytest-cov
        hypothesis
-commands = nosetests --with-coverage --cover-erase --cover-branches
+commands = py.test
 
 [testenv:docs]
 basepython = python