diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-30 11:46:23 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-30 11:46:23 -0400 |
| commit | 7bd3511d03f5c00c9d512ee5d2a71f485b238f5f (patch) | |
| tree | a4d897727cd73c1276b69e96313dd7bca2c96bc4 | |
| parent | e6c43e12de4307fa736f231b198944525e0dc923 (diff) | |
| download | python-coveragepy-git-7bd3511d03f5c00c9d512ee5d2a71f485b238f5f.tar.gz | |
Use tox on travis. There's probably a better way to do this.
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | tox.ini | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 7af26488..3b8c708d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,16 +13,14 @@ python: - pypy install: - - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2==1.1.0; fi - - pip install PyContracts==1.7.6 - - python setup.py clean develop + - pip install tox==2.1.1 before_script: - coverage debug sys - - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then export COVERAGE_NO_EXTENSION=1; fi script: - - python igor.py zip_mods install_egg - - python igor.py test_with_tracer c - - python igor.py remove_extension - - python igor.py test_with_tracer py + - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then tox -e py26; fi + - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e py27; fi + - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then tox -e py33; fi + - if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then tox -e py34; fi + - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then tox -e pypy25; fi @@ -32,7 +32,7 @@ deps = py26,py27,py33,py34,py35: greenlet==0.4.7 setenv = - pypy24,pypy26,pypy3_24: COVERAGE_NO_EXTENSION=no C extensions under PyPy + pypy24,pypy25,pypy26,pypy3_24: COVERAGE_NO_EXTENSION=no C extensions under PyPy usedevelop = True passenv = * @@ -40,6 +40,9 @@ passenv = * [testenv:pypy24] basepython = pypy2.4 +[testenv:pypy25] +basepython = pypy2.5 + [testenv:pypy26] basepython = pypy2.6 |