Merge pull request #9365 from dstansby/doc-build-reqs

tacaswell · web-flow · commit bcf269e6df02 · 2017-10-13T14:58:12.000-04:00
DOC: If PIL.image is missing, tell user to install pillow
diff --git a/doc/conf.py b/doc/conf.py
@@ -41,26 +41,27 @@
 
 
 def _check_deps():
-    names = ["colorspacious",
-             "IPython.sphinxext.ipython_console_highlighting",
-             "matplotlib",
-             "numpydoc",
-             "PIL.Image",
-             "scipy",
-             "sphinx_gallery"]
+    names = {"colorspacious": 'colorspacious',
+             "IPython.sphinxext.ipython_console_highlighting": 'ipython',
+             "matplotlib": 'matplotlib',
+             "numpydoc": 'numpydoc',
+             "PIL.Image": 'pillow',
+             "scipy": 'scipy',
+             "sphinx_gallery": 'sphinx_gallery'}
     if sys.version_info < (3, 3):
-        names.append("mock")
+        names["mock"] = 'mock'
     missing = []
     for name in names:
         try:
             __import__(name)
         except ImportError:
-            missing.append(name)
+            missing.append(names[name])
     if missing:
         raise ImportError(
             "The following dependencies are missing to build the "
             "documentation: {}".format(", ".join(missing)))
 
+
 _check_deps()
 
 import matplotlib
