In branch4.0, pin unittest2 to version 0.5.x.

diff --git a/.travis.yml b/.travis.yml
index c32036d4a73abb374736d73afbf4ab8700ee73d8..f24db6f3d3166d1026258dc10c837bdee941d7b9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ env:
 
 install:
     # always install unittest2 on py26 even if $DEPS is unset
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install 'unittest2<0.6'; fi
     - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then pip install futures mock Monotime==1.0; fi
     - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' && $DEPS == true ]]; then pip install futures mock; fi
     - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' && $DEPS == true ]]; then pip install pycares pycurl; fi

diff --git a/tox.ini b/tox.ini
index 0004dd5fd65af4996abdb60d3ffca4bb2dfc6fa8..20bac2ac1517daeff47d04dff1aa4de282bfbc60 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,7 @@ install_command = pip install {opts} {packages}
 
 [testenv:py26]
 basepython = python2.6
-deps = unittest2
+deps = unittest2<0.6
 
 [testenv:py26-full]
 basepython = python2.6