diff options
| author | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
| commit | 17279b4da22af5caf23d402b29cef0f729408474 (patch) | |
| tree | 786a5290b1440dea4cc33043cb0715113e0c0451 /tox.ini | |
| parent | 50a8a077f403b89ff43ad745f101213c2cfeea8f (diff) | |
| parent | 46805450633291682f97e87055313fc3be477326 (diff) | |
| download | pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.gz pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.bz2 pyramid-17279b4da22af5caf23d402b29cef0f729408474.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8
Conflicts:
pyramid/view.py
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 26 |
1 files changed, 25 insertions, 1 deletions
@@ -2,7 +2,7 @@ envlist = py26,py27,py32,py33,py34,pypy,pypy3,pep8, {py2,py3}-docs, - {py2,py3}-cover,coverage + {py2,py3}-cover,coverage, [testenv] # Most of these are defaults but if you specify any you can't fall back @@ -71,3 +71,27 @@ deps = coverage setenv = COVERAGE_FILE=.coverage + +[testenv:py2-scaffolds] +basepython = python2.7 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:py3-scaffolds] +basepython = python3.4 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:pypy-scaffolds] +basepython = pypy +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:pypy3-scaffolds] +basepython = pypy3 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv |