Merge pull request #507 from mdboom/doc_build_fail

mdboom · mdboom · commit b6148b76bfac · 2011-10-06T07:27:31.000-07:00
Doc build fail
diff --git a/doc/make.py b/doc/make.py
@@ -138,7 +138,7 @@ def html():
         options = "-D plot_formats=\"[('png', 80)]\""
     else:
         options = ''
-    if os.system('sphinx-build %s -P -b html -d build/doctrees . build/html' % options):
+    if os.system('sphinx-build %s -b html -d build/doctrees . build/html' % options):
         raise SystemExit("Building HTML failed.")
 
     figures_dest_path = 'build/html/pyplots'
diff --git a/doc/sphinxext/gen_gallery.py b/doc/sphinxext/gen_gallery.py
@@ -105,20 +105,10 @@ def gen_gallery(app, doctree):
         fh.write(content)
         fh.close()
 
-    try:
-        import multiprocessing
-        app.builder.info("generating thumbnails... ", nonl=True)
-        pool = multiprocessing.Pool()
-        pool.map(make_thumbnail, thumbnails.iteritems())
-        pool.close()
-        pool.join()
-        app.builder.info("done")
-
-    except ImportError:
-        for key in app.builder.status_iterator(
-            thumbnails.iterkeys(), "generating thumbnails... ",
-            length=len(thumbnails)):
-            image.thumbnail(key, thumbnails[key], 0.3)
+    for key in app.builder.status_iterator(
+        thumbnails.iterkeys(), "generating thumbnails... ",
+        length=len(thumbnails)):
+        image.thumbnail(key, thumbnails[key], 0.3)
 
 def setup(app):
     app.connect('env-updated', gen_gallery)
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -387,26 +387,26 @@ def recache(self, always=False):
         if always or self._invalidx:
             xconv = self.convert_xunits(self._xorig)
             if ma.isMaskedArray(self._xorig):
-                x = ma.asarray(xconv, float)
+                x = ma.asarray(xconv, np.float_)
             else:
-                x = np.asarray(xconv, float)
+                x = np.asarray(xconv, np.float_)
             x = x.ravel()
         else:
             x = self._x
         if always or self._invalidy:
             yconv = self.convert_yunits(self._yorig)
             if ma.isMaskedArray(self._yorig):
-                y = ma.asarray(yconv, float)
+                y = ma.asarray(yconv, np.float_)
             else:
-                y = np.asarray(yconv, float)
+                y = np.asarray(yconv, np.float_)
             y = y.ravel()
         else:
             y = self._y
 
         if len(x)==1 and len(y)>1:
-            x = x * np.ones(y.shape, float)
+            x = x * np.ones(y.shape, np.float_)
         if len(y)==1 and len(x)>1:
-            y = y * np.ones(x.shape, float)
+            y = y * np.ones(x.shape, np.float_)
 
         if len(x) != len(y):
             raise RuntimeError('xdata and ydata must be the same length')
@@ -746,7 +746,7 @@ def set_marker(self, marker):
         %(MarkerAccepts)s
         """
         self._marker.set_marker(marker)
-        
+
     def set_markeredgecolor(self, ec):
         """
         Set the marker edge color
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -498,7 +498,10 @@ def render_figures(code, code_path, output_dir, output_base, context,
     # -- Parse format list
     default_dpi = {'png': 80, 'hires.png': 200, 'pdf': 200}
     formats = []
-    for fmt in config.plot_formats:
+    plot_formats = config.plot_formats
+    if isinstance(plot_formats, (str, unicode)):
+        plot_formats = eval(plot_formats)
+    for fmt in plot_formats:
         if isinstance(fmt, str):
             formats.append((fmt, default_dpi.get(fmt, 80)))
         elif type(fmt) in (tuple, list) and len(fmt)==2:
@@ -584,6 +587,9 @@ def render_figures(code, code_path, output_dir, output_base, context,
 
         results.append((code_piece, images))
 
+    if not context:
+        clear_state(config.plot_rcparams)
+
     return results
 
 def run(arguments, content, options, state_machine, state, lineno):
