summaryrefslogtreecommitdiff
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:20:56 +0000
commita47698447af17c31339abf01f5734ebe56edd8db (patch)
treea8660c6a89c529bb2544a7b13d750cec19d97362
parent3807cdab02981905111197ddde833e77e7915e81 (diff)
downloadpycadf-a47698447af17c31339abf01f5734ebe56edd8db.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: I49d14fc878521e2b6fd4bd13dfd12f99a245b1fd
-rw-r--r--tox.ini10
1 files changed, 2 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 452e361..78c0402 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,9 @@
[tox]
minversion = 1.6
-skipsdist = True
-envlist = py26,py27,py33,py34,pep8
+envlist = py27,py33,py34,pep8
[testenv]
-setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
-install_command = pip install -U {opts} {packages}
-usedevelop = True
+deps = -r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:pep8]
@@ -18,7 +13,6 @@ commands = flake8
commands = python setup.py build_sphinx
[testenv:cover]
-setenv = VIRTUAL_ENV={envdir}
commands = python setup.py testr --coverage
[testenv:venv]