summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavanum Srinivas <davanum@gmail.com>2015-11-14 23:06:55 -0500
committerDavanum Srinivas (dims) <davanum@gmail.com>2015-11-16 00:16:47 +0000
commitbdbe0111cdf058ef495b724a84c46adb9d4b2ab5 (patch)
tree5fd1903f33e14a0cc7a441feb10c3ac18b3fc89f
parenta1725700ab62502bf156fb13155e67f6e7ef1a25 (diff)
downloadoslo-rootwrap-bdbe0111cdf058ef495b724a84c46adb9d4b2ab5.tar.gz
Remove python 2.6 and cleanup tox.ini
* Remove support for python 2.6 * Remove skipsdist : Needs to be set only if sdist is expensive * Remove usedevelop : only needed when skipsdist is set to True * Remove install_command : We can just use the default, we don't need to override * Remove setenv : We can just use the default as we don't need any extra environment variables * Remove requirements.txt from deps, as this is already added automatically Change-Id: I5defad3ba70eac774a01b2137abbffcd812cd0d5
-rw-r--r--tox.ini9
1 files changed, 2 insertions, 7 deletions
diff --git a/tox.ini b/tox.ini
index f5b7eb1..c45c305 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,9 @@
[tox]
minversion = 1.6
-envlist = py34,py26,py27,pep8
-skipsdist = True
+envlist = py34,py27,pep8
[testenv]
-usedevelop = True
-install_command = pip install -U {opts} {packages}
-setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
# Functional tests with Eventlet involve monkeypatching, so force them to be
# run in a separate process
whitelist_externals = env