Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ben Darnell 2014-05-13 10:35:48 -04:00
parent 9d0a2b1a38
commit 00d9ac38ab
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -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

3
tornado/test/runtests.py
View File

@ -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

1
tox.ini
View File

@ -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]