summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-02-06 01:12:24 -0600
committerMichael Merickel <michael@merickel.org>2015-02-06 01:12:24 -0600
commitb63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (patch)
tree695d4b5e5ae974d0770acfbe9b8231ea1c71288a /tox.ini
parentd35a916095943b020f30acb90e878abe9bfd4fb1 (diff)
parent4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5 (diff)
downloadpyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.gz
pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.bz2
pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.zip
Merge branch 'master' into feature.re-entrant-config
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 4 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 714c5b6d3..29bd48639 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,15 @@ envlist =
[testenv]
commands =
- python setup.py dev
- python setup.py test -q
+ python setup.py -q dev
+ python setup.py -q test -q
[testenv:cover]
basepython =
python2.6
commands =
- python setup.py dev
- python setup.py nosetests --with-xunit --with-xcoverage
+ python setup.py -q dev
+ nosetests --with-xunit --with-xcoverage
deps =
nosexcover