diff options
| author | Seth M Morton <seth.m.morton@gmail.com> | 2016-03-07 15:58:31 -0800 |
|---|---|---|
| committer | Seth M Morton <seth.m.morton@gmail.com> | 2016-03-07 16:25:05 -0800 |
| commit | ef11bc6f721ed9f5756688a4691bf2e1f3edacad (patch) | |
| tree | 4d11bdf0df1c2d1acb780d1fd8c0d20f0d05fe0b | |
| parent | 983241f77d84bf6c23eb456c0ca88411513b3917 (diff) | |
| download | natsort-ef11bc6f721ed9f5756688a4691bf2e1f3edacad.tar.gz | |
Updated configuration files.
Added all dependencies to the tox.ini, and removed python3.2.
Removed 3.2 from the travis config, and added nightly builds and pypy.
The hypothesis version mentioned in the setup.py was so old that it
confused pip; this hypothesis version specification was removed.
In both setup.py and travis config, the doctests have been consolidated.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | setup.py | 15 | ||||
| -rw-r--r-- | tox.ini | 54 |
5 files changed, 64 insertions, 13 deletions
@@ -13,6 +13,7 @@ var sdist develop-eggs .installed.cfg +.python-version # We are using MANIFEST.in instead MANIFEST @@ -15,6 +15,7 @@ var sdist develop-eggs .installed.cfg +.python-version # We are using MANIFEST.in instead MANIFEST diff --git a/.travis.yml b/.travis.yml index 7b35f1d..b3be083 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,11 @@ language: python python: - 2.6 - 2.7 -# - 3.2 - 3.3 - 3.4 - 3.5 +- nightly +- pypy env: - WITH_OPTIONS=true - WITH_OPTIONS=false @@ -24,8 +25,7 @@ install: - pip install pytest-cov pytest-flakes pytest-pep8 hypothesis - pip install coveralls script: -- python -m pytest --cov natsort --flakes --pep8 +- python -m pytest --cov natsort --flakes --pep8 test_natsort README.rst docs/source/intro.rst docs/source/examples.rst - python -m pytest --doctest-modules natsort -- python -m pytest README.rst docs/source/intro.rst docs/source/examples.rst after_success: coveralls @@ -21,19 +21,18 @@ class PyTest(TestCommand): def run_tests(self): # import here, cause outside the eggs aren't loaded import pytest - err1 = pytest.main(['--cov', 'natsort', + return pytest.main(['--cov', 'natsort', '--cov-report', 'term-missing', '--flakes', '--pep8', - '-s', + # '-s', # '--failed', # '-v', - ]) - err2 = pytest.main(['--doctest-modules', 'natsort']) - err3 = pytest.main(['README.rst', + 'test_natsort', + 'README.rst', 'docs/source/intro.rst', - 'docs/source/examples.rst']) - return err1 | err2 | err3 + 'docs/source/examples.rst', + ]) # Read the natsort.py file for the module version number @@ -62,7 +61,7 @@ REQUIRES = 'argparse' if sys.version[:3] in ('2.6', '3.0', '3.1') else '' # Testing needs pytest, and mock if less than python 3.3 TESTS_REQUIRE = ['pytest', 'pytest-pep8', 'pytest-flakes', - 'pytest-cov', 'pytest-cache', 'hypothesis>=1.6.2'] + 'pytest-cov', 'pytest-cache', 'hypothesis'] if (sys.version.startswith('2') or (sys.version.startswith('3') and int(sys.version.split('.')[1]) < 3)): @@ -5,8 +5,58 @@ [tox] envlist = - py26, py27, py32, py33, py34, py35, pypy + py26, py27, py33, py34, py35, pypy [testenv] commands = {envpython} setup.py test -deps = pytest +deps = + pytest + pytest-pep8 + pytest-flakes + pytest-cov + pytest-cache + hypothesis + +[testenv:py26] +deps = + pytest + pytest-pep8 + pytest-flakes + pytest-cov + pytest-cache + hypothesis + mock + pathlib + argparse + +[testenv:py27] +deps = + pytest + pytest-pep8 + pytest-flakes + pytest-cov + pytest-cache + hypothesis + mock + pathlib + +[testenv:py33] +deps = + pytest + pytest-pep8 + pytest-flakes + pytest-cov + pytest-cache + hypothesis + pathlib + +[testenv:pypy] +deps = + pytest + pytest-pep8 + pytest-flakes + pytest-cov + pytest-cache + hypothesis + mock + pathlib |