]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
docs: Pin sphinx 1.7 2490/head
authorBen Darnell <ben@bendarnell.com>
Sat, 15 Sep 2018 20:31:45 +0000 (16:31 -0400)
committerBen Darnell <ben@bendarnell.com>
Sat, 15 Sep 2018 20:31:45 +0000 (16:31 -0400)
The build currently fails on 1.8 due to https://bugs.python.org/issue34700

.travis.yml
docs/requirements.txt
tox.ini

index 40298e2f8affc15a7059be9716816aaa6c08f26c..e200778a357169c48bed63908995a36e7efb4b53 100644 (file)
@@ -47,7 +47,7 @@ install:
     # Ideally we'd run the docs/lint stuff on the latest Python
     # version supported. But Python 3.7 requires slower-to-start VMs,
     # so we run it on 3.6 to minimize total CI run time.
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install sphinx sphinx_rtd_theme; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install -r docs/requirements.txt; fi
     - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install flake8 mypy; fi
     # On travis the extension should always be built
     - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then export TORNADO_EXTENSION=1; fi
index 082785c9799b1c20a0174eafcab7d34c71cf16a0..d5626da3cf33357e75e8b44d7b500e6802d290f4 100644 (file)
@@ -1 +1,4 @@
+# https://bugs.python.org/issue34700
+sphinx<1.8.0
+sphinx_rtd_theme
 Twisted
diff --git a/tox.ini b/tox.ini
index ee44788e97032af7a3df74dcb4dfee6759daa10d..b3defc0656ba47f0520444de53b00dae7c8cc4a3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -61,8 +61,7 @@ deps =
      {py35,py36,py37}-full: twisted
      py3: twisted
      {py3,py35,py36,py37}-full: pycares
-     sphinx: sphinx
-     sphinx: sphinx_rtd_theme
+     sphinx: -r{toxinidir}/docs/requirements.txt
      lint: flake8
 
 setenv =