From: Ben Darnell Date: Fri, 24 May 2013 03:02:37 +0000 (-0400) Subject: Actually install sphinx on travis; fix directory reference. X-Git-Tag: v3.1.0~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5333f7a6e1473de86c2b4c0efccfc505f570a3;p=thirdparty%2Ftornado.git Actually install sphinx on travis; fix directory reference. --- diff --git a/.travis.yml b/.travis.yml index 57b8fba4a..ced0dd63b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ 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 twisted http://pypi.python.org/packages/source/M/Monotime/Monotime-1.0.tar.gz; fi + - if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DEPS == true ]]; then pip install --use-mirrors sphinx; 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 @@ -35,4 +36,4 @@ script: - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then python -m tornado.test.runtests --resolver=tornado.platform.twisted.TwistedResolver; fi - if [[ $TRAVIS_PYTHON_VERSION != pypy && $DEPS == true ]]; then python -m tornado.test.runtests --resolver=tornado.platform.caresresolver.CaresResolver; fi - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then python -m tornado.test.runtests --ioloop_time_monotonic; fi - - if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DEPS == true ]]; then cd docs && sphinx-build -E -n -W -b html . $TMPDIR/sphinx-html; fi + - if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DEPS == true ]]; then cd ../docs && sphinx-build -E -n -W -b html . $TMPDIR/sphinx-html; fi