Run the sphinx tests under py3.4 instead of py2.7.

diff --git a/.travis.yml b/.travis.yml
index 8e6f75c474429c62026af37af034b78d495f2c92..194c7bedb0ece2ff23e3f35e907e386f58c65be7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,12 @@ install:
     # always install unittest2 on py26 even if $DEPS is unset
     - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; 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 pycares 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
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.4' && $DEPS == true ]]; then pip install sphinx==1.2.2; fi
     # On travis the extension should always be built
     - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then export TORNADO_EXTENSION=1; fi
     - python setup.py install
@@ -55,7 +55,7 @@ script:
     - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then python $TARGET --ioloop_time_monotonic; fi
     - if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then python $TARGET --ioloop_time_monotonic; fi
     - export TORNADO_EXTENSION=0
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DEPS == true ]]; then cd ../docs && mkdir sphinx-out && sphinx-build -E -n -W -b html . sphinx-out; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.4' && $DEPS == true ]]; then cd ../docs && mkdir sphinx-out && sphinx-build -E -n -W -b html . sphinx-out; fi
 
 after_success:
     coveralls

diff --git a/tox.ini b/tox.ini
index 6a07c501ca579354aa1ada3ffeaa30aded6c9fb2..4bf2d16c4d677c218342c52281ee5c7632c930dc 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,7 @@ envlist =
         py27-unittest2, py33-unittest2,
 
         # Ensure the sphinx build has no errors or warnings
-        py2-docs
+        py-docs
 
 [testenv]
 commands = python -m tornado.test.runtests {posargs:}
@@ -267,9 +267,9 @@ commands = python -m tornado.test.runtests --locale=zh_TW {posargs:}
 basepython = python3.3
 setenv = LANG=en_US.utf-8
 
-[testenv:py2-docs]
-basepython = python2.7
+[testenv:py-docs]
+basepython = python3
 changedir = docs
-deps = sphinx==1.2
+deps = sphinx==1.2.2
 commands =
     sphinx-build -q -E -n -W -b html . {envtmpdir}/html