From 09f258bdba2710a016cf134336adbac77f22d35b Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Thu, 11 Jun 2015 17:17:58 -0500 Subject: [PATCH] Make tox only install unittest2 in python2.6 fixes some issues around test skipping caused by unittest2 in Python 2.7+ --- tox.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f608061d..23b2aee1 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ envlist = py26,py27,pypy,py33,py34 [base] deps = nose mock - unittest2 PyYAML six @@ -17,6 +16,11 @@ commands = {envpython} setup.py build_ext --inplace nosetests --verbosity=2 tests/unit/ nosetests --verbosity=2 tests/integration/cqlengine +[testenv:py26] +deps = {[testenv]deps} + unittest2 +# test skipping is different in unittest2 for python 2.7+; let's just use it where needed + [testenv:pypy] deps = {[base]deps} commands = {envpython} setup.py build_ext --inplace