From c107dd3af1be97338d5bdd927680fb46d27ae390 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Wed, 4 Nov 2015 16:16:10 -0800 Subject: [PATCH] setup: fix 'setup.py test' with new setuptools changes, fix surt==0.2 --- setup.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 959d5852..bb60756b 100755 --- a/setup.py +++ b/setup.py @@ -20,9 +20,13 @@ long_description = open('README.rst').read() class PyTest(TestCommand): + user_options = [] + def initialize_options(self): + self._argv = [] + pass + def finalize_options(self): - TestCommand.finalize_options(self) - self.test_suite = True + pass def run_tests(self): import pytest @@ -31,7 +35,9 @@ class PyTest(TestCommand): os.environ.pop('PYWB_CONFIG_FILE', None) cmdline = ' --cov-config .coveragerc --cov pywb' cmdline += ' -v --doctest-module ./pywb/ tests/' + errcode = pytest.main(cmdline) + sys.exit(errcode) setup( @@ -74,7 +80,7 @@ setup( 'requests', 'redis', 'jinja2', - 'surt', + 'surt==0.2', 'pyyaml', 'watchdog', 'webencodings',