From e0ca1838ae079ffc64a970760dc79d6c848ab93a Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Sun, 25 Jan 2015 11:19:14 -0500 Subject: [PATCH] In branch4.0, pin unittest2 to version 0.5.x. --- .travis.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c32036d4a..f24db6f3d 100644 --- 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 0004dd5fd..20bac2ac1 100644 --- 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 -- 2.47.3