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.

diff --git a/.travis.yml b/.travis.yml
index 3f83782709f25a8f3f54323e9f69313c7cb52643..15a42a1b91d51689eed234c930c6e4a9d9b2df5f 100644 (file)
--- 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 7ebd6bd90dc91bf1637f51bdbb7761fa7021359e..a1fb329523a68031dcb2eb369ec57d2c4f2aee52 100644 (file)
--- 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 3d67726c2b37a46d8e9204fd12ea69828a7b5276..3f3857276679e7edacf4b00d781a9c57a4247032 100644 (file)
--- 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]