Merge pull request #4778 from pradyunsg/docs/fix-rtd-build

Fix the documentation build

MANIFEST.in

@@ -12,7 +12,7 @@ exclude .travis.yml
 exclude .landscape.yml
 exclude src/pip/_vendor/Makefile
 exclude tox.ini
-exclude dev-requirements.txt
+exclude *-requirements.txt
 exclude appveyor.yml
 
 recursive-include src/pip/_vendor *.pem

docs-requirements.txt

@@ -0,0 +1,7 @@
+sphinx == 1.6.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
+
+# XXX: This is a workaround for conf.py not seeing the development pip version
+#      when the documentation is built on ReadTheDocs.
+.

docs/conf.py

@@ -68,6 +68,11 @@ try:
 except ImportError:
     version = release = 'dev'
 
+# We have this here because readthedocs plays tricks sometimes and there seems
+# to be a hiesenbug, related to the version of pip discovered. This is here to
+# help debug that if someone decides to do that in the future.
+print(version)
+
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None

tox.ini

@@ -15,11 +15,7 @@ install_command = python -m pip install {opts} {packages}
 usedevelop = True
 
 [testenv:docs]
-deps =
-    sphinx == 1.6.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
-
+deps = -r{toxinidir}/docs-requirements.txt
 basepython = python2.7
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html