diff options
| author | John Anderson <sontek@gmail.com> | 2015-03-06 10:55:52 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-03-06 10:55:52 -0800 |
| commit | 50a8a077f403b89ff43ad745f101213c2cfeea8f (patch) | |
| tree | be4b6b5de1830e6c5ad8ec6b6d1f1ee89956e67c /tox.ini | |
| parent | 25c64c68d45d11f63684ac6d7ac7fb7e86f6acd3 (diff) | |
| parent | 6c1a1c60123d150a41fef3062df9a64b995305c5 (diff) | |
| download | pyramid-50a8a077f403b89ff43ad745f101213c2cfeea8f.tar.gz pyramid-50a8a077f403b89ff43ad745f101213c2cfeea8f.tar.bz2 pyramid-50a8a077f403b89ff43ad745f101213c2cfeea8f.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8
Conflicts:
pyramid/config/views.py
pyramid/scaffolds/tests.py
tox.ini
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 71 |
1 files changed, 58 insertions, 13 deletions
@@ -1,22 +1,29 @@ [tox] -envlist = - py26,py27,py32,py33,py34,pypy,pypy3,cover +envlist = + py26,py27,py32,py33,py34,pypy,pypy3,pep8, + {py2,py3}-docs, + {py2,py3}-cover,coverage [testenv] -commands = - python setup.py -q dev - python setup.py -q test -q - -[testenv:cover] +# Most of these are defaults but if you specify any you can't fall back +# to defaults for others. basepython = - python2.6 -commands = - python setup.py -q dev - nosetests --with-xunit --with-xcoverage -deps = - nosexcover + py26: python2.6 + py27: python2.7 + py32: python3.2 + py33: python3.3 + py34: python3.4 + pypy: pypy + pypy3: pypy3 + py2: python2.7 + py3: python3.4 + +commands = + pip install pyramid[testing] + nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} [testenv:pep8] +basepython = python3.4 commands = flake8 pyramid/ deps = @@ -25,4 +32,42 @@ deps = # we separate coverage into its own testenv because a) "last run wins" wrt # cobertura jenkins reporting and b) pypy and jython can't handle any # combination of versions of coverage and nosexcover that i can find. +[testenv:py2-cover] +commands = + pip install pyramid[testing] + coverage run --source=pyramid {envbindir}/nosetests + coverage xml -o coverage-py2.xml +setenv = + COVERAGE_FILE=.coverage.py2 + +[testenv:py3-cover] +commands = + pip install pyramid[testing] + coverage run --source=pyramid {envbindir}/nosetests + coverage xml -o coverage-py3.xml +setenv = + COVERAGE_FILE=.coverage.py3 +[testenv:py2-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html + +[testenv:py3-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html + +[testenv:coverage] +basepython = python3.4 +commands = + coverage erase + coverage combine + coverage xml + coverage report --show-missing --fail-under=100 +deps = + coverage +setenv = + COVERAGE_FILE=.coverage |