Merge with skeleton

1 files changed, 2 insertions, 7 deletions

diff --git a/setup.py b/setup.py
index f1d1d7b..b0547f6 100644
--- a/setup.py
+++ b/setup.py
@@ -10,8 +10,6 @@ import setuptools
 with io.open('README.rst', encoding='utf-8') as readme:
 	long_description = readme.read()
 
-needs_pytest = set(['pytest', 'test']).intersection(sys.argv)
-pytest_runner = ['pytest_runner'] if needs_pytest else []
 needs_wheel = set(['release', 'bdist_wheel', 'dists']).intersection(sys.argv)
 wheel = ['wheel'] if needs_wheel else []
 
@@ -33,11 +31,8 @@ setup_params = dict(
 	extras_require={
 	},
 	setup_requires=[
-		'setuptools_scm>=1.9',
-	] + pytest_runner + wheel,
-	tests_require=[
-		'pytest>=2.8',
-	],
+		'setuptools_scm>=1.9,!=1.13.1,!=1.14.0',
+	] + wheel,
 	classifiers=[
 		"Development Status :: 5 - Production/Stable",
 		"Intended Audience :: Developers",