Upgrade Sphinx version for Read the Docs (pypa#6477)

dan-hipschman · May 8, 2019 · 17be5bf · 17be5bf
1 parent 919ee31
commit 17be5bf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/news/6471.doc b/news/6471.doc
@@ -0,0 +1 @@
+Upgrade Sphinx version used to build documentation.
diff --git a/tools/docs-requirements.txt b/tools/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx == 1.7.*
+sphinx == 2.0.1
 git+https://github.com/python/python-docs-theme.git#egg=python-docs-theme
 git+https://github.com/pypa/pypa-docs-theme.git#egg=pypa-docs-theme
 

diff --git a/tox.ini b/tox.ini
@@ -30,7 +30,7 @@ commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report
 [testenv:docs]
 # Don't skip install here since pip_sphinxext uses pip's internals.
 deps = -r{toxinidir}/tools/docs-requirements.txt
-basepython = python2.7
+basepython = python3.6
 commands =
     sphinx-build -W -d {envtmpdir}/doctrees/html -b html docs/html docs/build/html
     # Having the conf.py in the docs/html is weird but needed because we
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Upgrade Sphinx version used to build documentation.