summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-03-05 10:09:53 -0600
committerMichael Merickel <michael@merickel.org>2015-03-05 10:09:53 -0600
commit6279cc428b2464066f67e4795045680bb3d59973 (patch)
tree5f8e22498468f316d88b326baa751abf0acb1d9d /tox.ini
parent06bb4a4db67321e7629f4f2438516ba358f226e9 (diff)
parentaf810c54fa9829096085f0ca601030c4fb74b5c7 (diff)
downloadpyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.gz
pyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.bz2
pyramid-6279cc428b2464066f67e4795045680bb3d59973.zip
Merge branch 'master' into fix.shared-view-renderer
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 29bd48639..202e29e30 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,5 @@
[tox]
+skipsdist = True
envlist =
py26,py27,py32,py33,py34,pypy,pypy3,cover