summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-09-05 13:06:45 +0000
committerGerrit Code Review <review@openstack.org>2013-09-05 13:06:45 +0000
commit16edd97007a71129197e4b3df303ed97ccffe436 (patch)
tree67ac654ec39da02db5cf0233ac14021b4a46bad9
parent44c97cc099a35af2d3d999f9799238fc72be071d (diff)
parentc8723ce175b48bdde016a6efb4945b6b3766080f (diff)
downloadpython-openstackclient-16edd97007a71129197e4b3df303ed97ccffe436.tar.gz
Merge "Update tox.ini for new tox 1.6 config"
-rw-r--r--tox.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index e2c61af4..f6a5c338 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
[tox]
+minversion = 1.6
envlist = py26,py27,py33,pep8
+skipdist = True
[testenv]
+usedevelop = True
+install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
LANG=en_US.UTF-8
LANGUAGE=en_US:en
@@ -17,7 +21,7 @@ commands = flake8
commands = {posargs}
[testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+commands = python setup.py test --coverage --testr-args='{posargs}'
[tox:jenkins]
downloadcache = ~/cache/pip