From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 13 May 2014 23:57:43 +0000 (-0400)
Subject: .travis.yml: don't install Twisted on 3.2 or pycurl on pypy.
X-Git-Tag: v4.0.0b1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b441c52edec9e94ef4144790f5b65d0700c5024;p=thirdparty%2Ftornado.git

.travis.yml: don't install Twisted on 3.2 or pycurl on pypy.
---

diff --git a/.travis.yml b/.travis.yml
index 45cfe625b..9c8baa940 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,14 @@ 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 pycurl twisted; 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 == '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
     # On travis the extension should always be built
     - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then export TORNADO_EXTENSION=1; fi
     - python setup.py install