From 00d9ac38ab17c63e5e737408f08e850130d4a882 Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 13 May 2014 10:35:48 -0400
Subject: [PATCH] Twisted 14.0.0 is now (partially) installable on python 3, so
 test with it.

Consolidate the dependency section of the .travis.yml now that more of our
dependencies are cross-version.
---
 .travis.yml              | 7 +++----
 tornado/test/runtests.py | 3 +++
 tox.ini                  | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f837827..15a42a1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,11 @@ env:
 install:
     # always install unittest2 on py26 even if $DEPS is unset
     - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then pip install --use-mirrors futures mock pycares 'pycurl<7.19.3' twisted Monotime==1.0; fi
+    - if [[ $DEPS == true]]; then pip install --use-mirrors pycares pycurl twisted; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then pip install --use-mirrors futures mock Monotime==1.0; fi
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DEPS == true ]]; then pip install --use-mirrors sphinx==1.2; fi
     - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' && $DEPS == true ]]; then pip install --use-mirrors futures mock; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.2' && $DEPS == true ]]; then pip install --use-mirrors pycares mock; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.3' && $DEPS == true ]]; then pip install --use-mirrors pycares; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.4' && $DEPS == true ]]; then pip install --use-mirrors pycares; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.2' && $DEPS == true ]]; then pip install --use-mirrors mock; fi
     # On travis the extension should always be built
     - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then export TORNADO_EXTENSION=1; fi
     - python setup.py install
diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
index 7ebd6bd9..a1fb3295 100644
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
@@ -82,6 +82,9 @@ def main():
     warnings.filterwarnings("ignore", category=DeprecationWarning)
     warnings.filterwarnings("error", category=DeprecationWarning,
                             module=r"tornado\..*")
+    warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
+    warnings.filterwarnings("error", category=PendingDeprecationWarning,
+                            module=r"tornado\..*")
     # The unittest module is aggressive about deprecating redundant methods,
     # leaving some without non-deprecated spellings that work on both
     # 2.7 and 3.2
diff --git a/tox.ini b/tox.ini
index 3d67726c..3f385727 100644
--- a/tox.ini
+++ b/tox.ini
@@ -123,6 +123,7 @@ setenv = TORNADO_EXTENSION=1
 # pycares installation currently fails on py34
 # (https://github.com/pypa/pip/pull/816)
 deps =
+     Twisted>=14.0.0
      pycurl>=7.19.3
 
 [testenv:pypy-full]