From 12c27eccadaaf72640736926c68c1539f1b037f7 Mon Sep 17 00:00:00 2001 From: Seth M Morton Date: Mon, 2 May 2016 23:56:08 -0700 Subject: 3rd attempt to fix Python 2.6 testing bug. --- setup.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index cdb52a0..6e9bc70 100644 --- a/setup.py +++ b/setup.py @@ -20,22 +20,22 @@ class PyTest(TestCommand): def run_tests(self): # import here, cause outside the eggs aren't loaded + import pytest if sys.version[:3] == '2.6': - flakes_pep8 = [] + return pytest.main() else: - flakes_pep8 = ['--flakes', '--pep8'] - import pytest - return pytest.main(flakes_pep8 + - ['--cov', 'natsort', - '--cov-report', 'term-missing', - # '-s', - # '--failed', - # '-v', - # 'test_natsort', - # 'README.rst', - # 'docs/source/intro.rst', - # 'docs/source/examples.rst', - ]) + return pytest.main(['--cov', 'natsort', + '--cov-report', 'term-missing', + '--flakes', + '--pep8', + # '-s', + # '--failed', + # '-v', + # 'test_natsort', + # 'README.rst', + # 'docs/source/intro.rst', + # 'docs/source/examples.rst', + ]) # Read the natsort.py file for the module version number -- cgit v1.2.1