summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-10-14 22:50:09 -0500
committerMichael Merickel <michael@merickel.org>2015-10-14 22:50:09 -0500
commit3ea5f7dceb79662cdcf94877fe73ac57f53c9c17 (patch)
treed3cbfdebf22a2c42a78db1fc1220e5f5728b5245 /tox.ini
parente9637c7f521c1f499e12115fa035a55d15ce65e8 (diff)
parent6013930f5e119e3383588aeb2802811111caac40 (diff)
downloadpyramid-3ea5f7dceb79662cdcf94877fe73ac57f53c9c17.tar.gz
pyramid-3ea5f7dceb79662cdcf94877fe73ac57f53c9c17.tar.bz2
pyramid-3ea5f7dceb79662cdcf94877fe73ac57f53c9c17.zip
Merge pull request #1976 from bertjwregeer/fix/python3.5
Fix python 3.5 support
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini5
1 files changed, 3 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index d3e494de9..20a9ee5b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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]