summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-12-16 19:48:53 -0500
committerChris McDonough <chrism@plope.com>2014-12-16 19:48:53 -0500
commit27db38880d46b6f4345cf86766924de976e24177 (patch)
tree8c5dcf10f1177e6b0fc212cd8fa0eea20ecf9f5d /tox.ini
parentb1fac53cd0c3b930aec90e27f4d19c5f785f52e2 (diff)
parentcc15bbf7de74f4cdfc676e34fa429d2658d1ddf6 (diff)
downloadpyramid-27db38880d46b6f4345cf86766924de976e24177.tar.gz
pyramid-27db38880d46b6f4345cf86766924de976e24177.tar.bz2
pyramid-27db38880d46b6f4345cf86766924de976e24177.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 2bf213ca4..714c5b6d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py32,py33,py34,pypy,cover
+ py26,py27,py32,py33,py34,pypy,pypy3,cover
[testenv]
commands =