diff options
author | Seth M Morton <seth.m.morton@gmail.com> | 2016-05-02 23:56:08 -0700 |
---|---|---|
committer | Seth M Morton <seth.m.morton@gmail.com> | 2016-05-02 23:56:08 -0700 |
commit | 12c27eccadaaf72640736926c68c1539f1b037f7 (patch) | |
tree | 478c85001271bc215f11676a611511c4adfd68f4 | |
parent | a391cb26600eb7100ef682baa2ba6fbcb5e0ca10 (diff) | |
download | natsort-12c27eccadaaf72640736926c68c1539f1b037f7.tar.gz |
3rd attempt to fix Python 2.6 testing bug.
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | setup.py | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 3fde446..adfd66a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: script: - python -m pytest README.rst docs/source/intro.rst docs/source/examples.rst - python -m pytest --doctest-modules natsort -- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then python -m pytest --cov natsort test_natsort README.rst docs/source/intro.rst docs/source/examples.rst; fi -- if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then python -m pytest --cov natsort --flakes --pep8 test_natsort README.rst docs/source/intro.rst docs/source/examples.rst; fi +- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then python -m pytest; fi +- if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then python -m pytest --cov natsort --flakes --pep8; fi after_success: coveralls @@ -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 |