diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 43 | ||||
| -rwxr-xr-x | travis_selector.sh | 18 |
4 files changed, 12 insertions, 54 deletions
@@ -6,6 +6,7 @@ dist MANIFEST env servers/*/kafka-bin -.coverage +.coverage* .noseids docs/_build +.cache* diff --git a/.travis.yml b/.travis.yml index 1f0baa6..64d019c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ deploy: # branch: master script: - - if [ -n "$UNIT_AND_LINT_ONLY" ]; then tox -e lint,`./travis_selector.sh $TRAVIS_PYTHON_VERSION`; else tox -e `./travis_selector.sh $TRAVIS_PYTHON_VERSION`; fi + - tox -e ${TRAVIS_PYTHON_VERSION/./} after_success: - coveralls @@ -1,48 +1,23 @@ [tox] -envlist = lint, py26, py27, pypy, py33, py34, py35, docs +envlist = py{26,27,py,33,34,35}, docs [testenv] deps = - nose - nose-timer - coverage + pytest + pytest-cov + pytest-catchlog + pytest-pylint + pytest-sugar mock python-snappy + py{26,27}: six + py26: unittest2 commands = - nosetests {posargs:-v -x --with-id --id-file={envdir}/.noseids --with-timer --timer-top-n 10 --with-coverage --cover-erase --cover-package kafka} + py.test {posargs:--pylint --pylint-rcfile=pylint.rc --pylint-error-types=EF --durations=10 --cov=kafka --doctest-modules kafka test} setenv = - NOSE_LOGFORMAT = %(asctime)s - %(thread)d - %(name)s - %(levelname)s - %(message)s PROJECT_ROOT = {toxinidir} passenv = KAFKA_VERSION -[testenv:py26] -deps = - six - unittest2 - nose - nose-timer - coverage - mock - python-snappy - -[testenv:py27] -deps = - six - unittest2 - nose - nose-timer - coverage - mock - python-snappy - -[testenv:lint] -basepython = python2.7 -deps = - unittest2 - mock - pylint -commands = pylint --rcfile=pylint.rc {posargs: -E kafka test} - [testenv:docs] deps = sphinxcontrib-napoleon diff --git a/travis_selector.sh b/travis_selector.sh deleted file mode 100755 index 5700cbc..0000000 --- a/travis_selector.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# This works with the .travis.yml file to select a python version for testing - -if [ $1 == "pypy" ]; then - echo "pypy" -elif [ $1 == "3.5" ]; then - echo "py35" -elif [ $1 == "3.4" ]; then - echo "py34" -elif [ $1 == "3.3" ]; then - echo "py33" -elif [ $1 == "2.7" ]; then - echo "py27" -elif [ $1 == "2.6" ]; then - echo "py26" -else - echo $1 -fi; |