diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-02-21 16:10:24 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-02-21 16:10:24 -0700 |
| commit | 1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch) | |
| tree | 0db5dd6f25a9166c118c4a24d66f281f43b0aeba /tox.ini | |
| parent | 30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff) | |
| parent | aa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff) | |
| download | pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2 pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,py35,pypy,pypy3, + py26,py27,py33,py34,py35,pypy,pypy3, docs,pep8, {py2,py3}-cover,coverage, @@ -10,7 +10,6 @@ envlist = basepython = py26: python2.6 py27: python2.7 - py32: python3.2 py33: python3.3 py34: python3.4 py35: python3.5 |