From: Ben Darnell Date: Wed, 14 May 2014 00:35:59 +0000 (-0400) Subject: Also exclude pycares from pypy on travis. X-Git-Tag: v4.0.0b1~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bdf7013f244f3bc372d9908068fb9458d246b65;p=thirdparty%2Ftornado.git Also exclude pycares from pypy on travis. --- diff --git a/.travis.yml b/.travis.yml index 9c8baa940..7e8ff6922 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,11 +15,10 @@ env: install: # always install unittest2 on py26 even if $DEPS is unset - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi - - if [[ $DEPS == true ]]; then pip install pycares; fi - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then pip install futures mock Monotime==1.0; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DEPS == true ]]; then pip install sphinx==1.2; fi - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' && $DEPS == true ]]; then pip install futures mock; fi - - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' && $DEPS == true ]]; then pip install pycurl; fi + - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' && $DEPS == true ]]; then pip install pycares pycurl; fi - if [[ $TRAVIS_PYTHON_VERSION == '3.2' && $DEPS == true ]]; then pip install mock; fi # Twisted runs on 2.x and 3.3+ - if [[ $TRAVIS_PYTHON_VERSION != '3.2' && $DEPS == true ]]; then pip install Twisted; fi