diff options
| author | cewing <cris@crisewing.com> | 2016-10-22 12:35:21 -0400 |
|---|---|---|
| committer | cewing <cris@crisewing.com> | 2016-10-22 12:35:21 -0400 |
| commit | 03f6d630364a9adf438e0bd7d7b9f3bc3175f093 (patch) | |
| tree | de2aed9476c9d569375287a4ea89e9faf0f7b73a /tox.ini | |
| parent | 1610c8fd3605f2ed481c37da27a1ce059419888a (diff) | |
| parent | e73ae375581539ed42aa97d7cd6e96e6fbd64c79 (diff) | |
| download | pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.tar.gz pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.tar.bz2 pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.zip | |
Merge branch 'master' into issue.2614
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -1,17 +1,18 @@ [tox] envlist = - py27,py33,py34,py35,pypy, + py27,py34,py35,py36,pypy, docs,pep8, {py2,py3}-cover,coverage, +skip-missing-interpreters = True [testenv] # Most of these are defaults but if you specify any you can't fall back # to defaults for others. basepython = py27: python2.7 - py33: python3.3 py34: python3.4 py35: python3.5 + py36: python3.6 pypy: pypy py2: python2.7 py3: python3.5 @@ -26,12 +27,6 @@ commands = python pyramid/scaffolds/tests.py deps = virtualenv -[testenv:py33-scaffolds] -basepython = python3.3 -commands = - python pyramid/scaffolds/tests.py -deps = virtualenv - [testenv:py34-scaffolds] basepython = python3.4 commands = |