summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDavanum Srinivas <davanum@gmail.com>2015-11-14 23:06:56 -0500
committerDavanum Srinivas (dims) <davanum@gmail.com>2015-11-16 00:35:08 +0000
commitf6bae5c24dcf8d7d9c04906d67f852e4dac2bd41 (patch)
tree4c4df1fde94b2690cac34c224cd8c8d83e8f7c04 /tox.ini
parentfb8bc8b8623968f90ed676af687d1b9d00f84229 (diff)
downloadoslo-vmware-f6bae5c24dcf8d7d9c04906d67f852e4dac2bd41.tar.gz
Remove python 2.6 and cleanup tox.ini
* Remove support for python 2.6 * 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: Iff527b5e96cd2f2f1b3fc56f65bb984c37d8b276
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 3 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index 9b94a3f..80e2656 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,15 @@
[tox]
-envlist = py26,py27,py34,pypy,pep8
+envlist = py27,py34,pypy,pep8
[testenv]
-setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:pep8]
commands = flake8
[testenv:pylint]
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
pylint>=1.3.0
commands = pylint oslo