Merge "Remove python 2.6 and cleanup tox.ini"

2015-11-17 02:46:24 +00:00 · 2015-11-17 02:46:24 +00:00 · 6ac4f122e5
commit 6ac4f122e5
parent 92d2d56271 9e96331a9d
1 changed files with 1 additions and 7 deletions
--- a/tox.ini
+++ b/tox.ini
@ -1,21 +1,15 @@
 [tox]
 minversion = 1.6
-skipsdist = True
 envlist = cover,
    docs,
    pep8,
-    py26,
    py27,
    py34,
    pylint,
    update-states

 [testenv]
-usedevelop = True
-install_command = pip install {opts} {packages}
-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:docs]