Merge branch 'v1.4.x'

Pulling work from release branch back to master

Author: tacaswell

TODO

@@ -145,13 +145,6 @@ def html():
     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'
-    if os.path.exists(figures_dest_path):
-        shutil.rmtree(figures_dest_path)
-    copytree(
-        'pyplots', figures_dest_path,
-        ignore=ignore_patterns("*.pyc"))
-
     # Clean out PDF files from the _images directory
     for filename in glob.glob('build/html/_images/*.pdf'):
         os.remove(filename)

TODO_TESTS

@@ -523,7 +523,7 @@ def render_figures(code, code_path, output_dir, output_base, context,
                    function_name, config, context_reset=False):
     """
     Run a pyplot script and save the low and high res PNGs and a PDF
-    in outdir.
+    in *output_dir*.
 
     Save the images under *output_dir* with file names derived from
     *output_base*
@@ -546,7 +546,6 @@ def render_figures(code, code_path, output_dir, output_base, context,
 
     code_pieces = split_code_at_show(code)
 
-    # Look for single-figure output files first
     # Look for single-figure output files first
     all_exists = True
     img = ImageFile(output_base, output_dir)

doc/make.py

@@ -4,6 +4,7 @@
 import six
 
 import functools
+import gc
 import os
 import sys
 import shutil
@@ -65,20 +66,25 @@ def failer(*args, **kwargs):
     return known_fail_decorator
 
 
+def _do_cleanup(original_units_registry):
+    plt.close('all')
+    gc.collect()
+
+    matplotlib.tests.setup()
+
+    matplotlib.units.registry.clear()
+    matplotlib.units.registry.update(original_units_registry)
+    warnings.resetwarnings()  # reset any warning filters set in tests
+
+
 class CleanupTest(object):
     @classmethod
     def setup_class(cls):
         cls.original_units_registry = matplotlib.units.registry.copy()
 
     @classmethod
     def teardown_class(cls):
-        plt.close('all')
-
-        matplotlib.tests.setup()
-
-        matplotlib.units.registry.clear()
-        matplotlib.units.registry.update(cls.original_units_registry)
-        warnings.resetwarnings()  # reset any warning filters set in tests
+        _do_cleanup(cls.original_units_registry)
 
     def test(self):
         self._func()
@@ -93,13 +99,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        plt.close('all')
-
-        matplotlib.tests.setup()
-
-        matplotlib.units.registry.clear()
-        matplotlib.units.registry.update(cls.original_units_registry)
-        warnings.resetwarnings()  # reset any warning filters set in tests
+        _do_cleanup(cls.original_units_registry)
 
 
 def cleanup(func):
@@ -109,13 +109,8 @@ def wrapped_function(*args, **kwargs):
         try:
             func(*args, **kwargs)
         finally:
-            plt.close('all')
-
-            matplotlib.tests.setup()
+            _do_cleanup(original_units_registry)
 
-            matplotlib.units.registry.clear()
-            matplotlib.units.registry.update(original_units_registry)
-            warnings.resetwarnings() #reset any warning filters set in tests
     return wrapped_function
 
 
@@ -157,8 +152,6 @@ def test(self):
         baseline_dir, result_dir = _image_directories(self._func)
 
         for fignum, baseline in zip(plt.get_fignums(), self._baseline_images):
-            figure = plt.figure(fignum)
-
             for extension in self._extensions:
                 will_fail = not extension in comparable_formats()
                 if will_fail:
@@ -182,6 +175,8 @@ def test(self):
                     will_fail, fail_msg,
                     known_exception_class=ImageComparisonFailure)
                 def do_test():
+                    figure = plt.figure(fignum)
+
                     if self._remove_text:
                         self.remove_text(figure)
 

lib/matplotlib/sphinxext/plot_directive.py

@@ -39,7 +39,7 @@ def _test_savefig_to_stringio(format='ps'):
     values = [re.sub(b'%%.*?\n', b'', x) for x in values]
 
     assert values[0] == values[1]
-    assert values[1] == values[2]
+    assert values[1] == values[2].replace(b'\r\n', b'\n')
 
 
 @cleanup

lib/matplotlib/testing/decorators.py

@@ -483,3 +483,6 @@ backend      : %(backend)s
                                    # Path to mencoder binary. Without full path
                                    # $PATH is searched
 #animation.mencoder_args: ''       # Additional arguments to pass to mencoder
+#animation.convert_path: 'convert' # Path to ImageMagick's convert binary.
+                                   # On Windows use the full path since convert 
+                                   # is also the name of a system tool.

lib/matplotlib/tests/test_backend_ps.py

@@ -1711,9 +1711,6 @@ def check_requirements(self):
         if 'TRAVIS' in os.environ:
             raise CheckFailed("Can't build with Travis")
 
-        if PY3:
-            raise CheckFailed("gtk3agg backend does not work on Python 3")
-
         # This check needs to be performed out-of-process, because
         # importing gi and then importing regular old pygtk afterward
         # segfaults the interpreter.

matplotlibrc.template

@@ -1557,6 +1557,7 @@ RendererAgg::_draw_path_collection_generic
 
     if ((Nfacecolors == 0 && Nedgecolors == 0) || Npaths == 0)
     {
+        Py_XDECREF(transforms_arr);
         return Py::Object();
     }
 
@@ -1708,6 +1709,8 @@ RendererAgg::_draw_path_collection_generic
         }
     }
 
+    Py_XDECREF(transforms_arr);
+
     return Py::Object();
 }
 
@@ -2383,11 +2386,7 @@ RendererAgg::tostring_rgba_minimized(const Py::Tuple& args)
 
     int newwidth = 0;
     int newheight = 0;
-    #if PY3K
-    Py::Bytes data;
-    #else
-    Py::String data;
-    #endif
+    PyObject *data;
 
     if (xmin < xmax && ymin < ymax)
     {
@@ -2406,18 +2405,12 @@ RendererAgg::tostring_rgba_minimized(const Py::Tuple& args)
         // the _AsString() API.
         unsigned int* dst;
 
-        #if PY3K
-        data = Py::Bytes(static_cast<const char*>(NULL), (int) newsize);
-        dst = reinterpret_cast<unsigned int*>(PyBytes_AsString(data.ptr()));
-        #else
-        data = Py::String(static_cast<const char*>(NULL), (int) newsize);
-        dst = reinterpret_cast<unsigned int*>(PyString_AsString(data.ptr()));
-        #endif
-
-        if (dst == NULL)
+        data = PyBytes_FromStringAndSize(NULL, newsize);
+        if (data == NULL)
         {
             throw Py::MemoryError("RendererAgg::tostring_minimized could not allocate memory");
         }
+        dst = (unsigned int *)PyBytes_AsString(data);
 
         unsigned int*  src = (unsigned int*)pixBuffer;
         for (int y = ymin; y < ymax; ++y)
@@ -2436,7 +2429,8 @@ RendererAgg::tostring_rgba_minimized(const Py::Tuple& args)
     bounds[3] = Py::Int(newheight);
 
     Py::Tuple result(2);
-    result[0] = data;
+    result[0] = Py::Object(data, false);
+    Py_DECREF(data);
     result[1] = bounds;
 
     return result;

setupext.py

@@ -1264,7 +1264,7 @@ _image_module::frombuffer(const Py::Tuple& args)
 
     args.verify_length(4);
 
-    PyObject *bufin = new_reference_to(args[0]);
+    PyObject *bufin = args[0].ptr();
     size_t x = (long)Py::Int(args[1]);
     size_t y = (long)Py::Int(args[2]);