diff options
| author | Chris McDonough <chrism@plope.com> | 2015-11-04 12:42:50 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-11-04 12:42:50 -0800 |
| commit | 5cd91621668807f9b66811fe57a04fba96e7458a (patch) | |
| tree | f135aa39e3c3a5910c4eaf06764941470038b36a /tox.ini | |
| parent | 20d9350e61bc86e019c42b866c0b85cd274438bb (diff) | |
| parent | 5a7e26812a0afd18f6335641e799f6892c970fb5 (diff) | |
| download | pyramid-5cd91621668807f9b66811fe57a04fba96e7458a.tar.gz pyramid-5cd91621668807f9b66811fe57a04fba96e7458a.tar.bz2 pyramid-5cd91621668807f9b66811fe57a04fba96e7458a.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,pypy3,pep8, + py26,py27,py32,py33,py34,py35,pypy,pypy3,pep8, {py2,py3}-docs, {py2,py3}-cover,coverage, @@ -13,10 +13,11 @@ basepython = py32: python3.2 py33: python3.3 py34: python3.4 + py35: python3.5 pypy: pypy pypy3: pypy3 py2: python2.7 - py3: python3.4 + py3: python3.5 commands = pip install pyramid[testing] |