Merge remote-tracking branch 'refs/remotes/matplotlib/master'

wangx173 · wangx173 · commit a08fb443c3d8 · 2016-02-05T22:29:14.000-05:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -88,8 +88,8 @@ test_script:
   # Now build the thing..
   - '%CMD_IN_ENV% python setup.py develop'
   # tests
-  # for now, just let them pass to get the after_test parts...
-  - python tests.py || cmd /c "exit /b 0"
+  - python tests.py
+  - python visual_tests.py
 
 after_test:
   # After the tests were a success, build packages (wheels and conda)
@@ -126,6 +126,7 @@ artifacts:
     type: zip
 
 on_failure:
+  - python visual_tests.py
   - echo zipping images after a failure...
-  - 7z a result_images.zip result_images\ >NUL:
+  - 7z a result_images.zip result_images\ |grep -v "Compressing"
   - appveyor PushArtifact result_images.zip
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -151,9 +151,7 @@ <h4>Need help?</h4>
 
 <p>To keep up to date with what's going on in matplotlib, see
 the <a href="{{ pathto('users/whats_new.html', 1) }}">what's new
-page</a>, the more detailed <a href="{{ pathto('_static/CHANGELOG', 1)
-}}">changelog</a> or browse
-the <a href="https://github.com/matplotlib/matplotlib">source
+page</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source
 code</a>.  Anything that could require changes to your existing code
 is logged in the <a href="{{ pathto('api/api_changes.html', 1) }}">api
 changes</a> file.</p>
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -351,7 +351,8 @@ def checkdep_dvipng():
 
 def checkdep_ghostscript():
     if sys.platform == 'win32':
-        gs_execs = ['gswin32c', 'gswin64c', 'gs']
+        # mgs is the name in miktex
+        gs_execs = ['gswin32c', 'gswin64c', 'mgs', 'gs']
     else:
         gs_execs = ['gs']
     for gs_exec in gs_execs:
@@ -553,7 +554,13 @@ def _create_tmp_config_dir():
         # Some restricted platforms (such as Google App Engine) do not provide
         # gettempdir.
         return None
-    tempdir = os.path.join(tempdir, 'matplotlib-%s' % getpass.getuser())
+
+    try:
+        username = getpass.getuser()
+    except KeyError:
+        username = str(os.getuid())
+    tempdir = os.path.join(tempdir, 'matplotlib-%s' % username)
+
     os.environ['MPLCONFIGDIR'] = tempdir
 
     mkdirs(tempdir)
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -214,7 +214,8 @@ def set_axes(self, axes):
 
         ACCEPTS: an :class:`~matplotlib.axes.Axes` instance
         """
-        warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
+        warnings.warn(_get_axes_msg.format('set_axes'), mplDeprecation,
+                      stacklevel=1)
         self.axes = axes
 
     def get_axes(self):
@@ -225,7 +226,8 @@ def get_axes(self):
         This has been deprecated in mpl 1.5, please use the
         axes property.  Will be removed in 1.7 or 2.0.
         """
-        warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
+        warnings.warn(_get_axes_msg.format('get_axes'), mplDeprecation,
+                      stacklevel=1)
         return self.axes
 
     @property
@@ -1581,5 +1583,5 @@ def kwdoc(a):
 
 docstring.interpd.update(Artist=kwdoc(Artist))
 
-_get_axes_msg = """This has been deprecated in mpl 1.5, please use the
+_get_axes_msg = """{} has been deprecated in mpl 1.5, please use the
 axes property.  A removal date has not been set."""
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3147,16 +3147,16 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
            If True produces boxes with the Patch artist
 
         showmeans : bool, default = False
-           If True, will toggle one the rendering of the means
+           If True, will toggle on the rendering of the means
 
         showcaps : bool, default = True
-           If True, will toggle one the rendering of the caps
+           If True, will toggle on the rendering of the caps
 
         showbox : bool, default = True
-           If True, will toggle one the rendering of box
+           If True, will toggle on the rendering of the box
 
         showfliers : bool, default = True
-           If True, will toggle one the rendering of the fliers
+           If True, will toggle on the rendering of the fliers
 
         boxprops : dict or None (default)
            If provided, will set the plotting style of the boxes
@@ -3412,16 +3412,16 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
           If `True`, will produce a notched box plot
 
         showmeans : bool, default = False
-          If `True`, will toggle one the rendering of the means
+          If `True`, will toggle on the rendering of the means
 
         showcaps  : bool, default = True
-          If `True`, will toggle one the rendering of the caps
+          If `True`, will toggle on the rendering of the caps
 
         showbox  : bool, default = True
-          If `True`, will toggle one the rendering of box
+          If `True`, will toggle on the rendering of the box
 
         showfliers : bool, default = True
-          If `True`, will toggle one the rendering of the fliers
+          If `True`, will toggle on the rendering of the fliers
 
         boxprops : dict or None (default)
           If provided, will set the plotting style of the boxes
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1452,6 +1452,10 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
     # multiple
     if sys.platform == 'win32': precmd = '%s &&'% os.path.splitdrive(tmpdir)[0]
     else: precmd = ''
+    #Replace \\ for / so latex does not think there is a function call
+    latexfile = latexfile.replace("\\", "/")
+    # Replace ~ so Latex does not think it is line break
+    latexfile = latexfile.replace("~", "\\string~")
     command = '%s cd "%s" && latex -interaction=nonstopmode "%s" > "%s"'\
                 %(precmd, tmpdir, latexfile, outfile)
     verbose.report(command, 'debug')
@@ -1530,8 +1534,13 @@ def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
 
     with io.open(outfile, 'rb') as fh:
         if exit_status:
-            raise RuntimeError('ghostscript was not able to process \
-    your image.\nHere is the full report generated by ghostscript:\n\n' + fh.read())
+            output = fh.read()
+            m = "\n".join(["ghostscript was not able to process your image.",
+                           "Here is the full report generated by ghostscript:",
+                           "",
+                           "%s"])
+            # use % to prevent problems with bytes
+            raise RuntimeError(m % output)
         else:
             verbose.report(fh.read(), 'debug')
     os.remove(outfile)
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -609,6 +609,9 @@ def destroy(*args):
             self.window.update()
         else:
             self.canvas.draw_idle()
+        # Raise the new window.
+        self.canvas.manager.window.attributes('-topmost', 1)
+        self.canvas.manager.window.attributes('-topmost', 0)
         self._shown = True
 
     def destroy(self, *args):
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -961,8 +961,8 @@ def find_tex_file(filename, format=None):
     `--format` option.
 
     Apparently most existing TeX distributions on Unix-like systems
-    use kpathsea. I hear MikTeX (a popular distribution on Windows)
-    doesn't use kpathsea, so what do we do? (TODO)
+    use kpathsea. It's also available as part of MikTeX, a popular
+    distribution on Windows.
 
     .. seealso::
 
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -166,8 +166,8 @@ def convert(filename, cache):
     """
     base, extension = filename.rsplit('.', 1)
     if extension not in converter:
-        raise ImageComparisonFailure(
-            "Don't know how to convert %s files to png" % extension)
+        from nose import SkipTest
+        raise SkipTest("Don't know how to convert %s files to png" % extension)
     newname = base + '_' + extension + '.png'
     if not os.path.exists(filename):
         raise IOError("'%s' does not exist" % filename)
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -290,7 +290,7 @@ def image_comparison(baseline_images=None, extensions=None, tol=0,
 
         Otherwise, a list of extensions to test. For example ['png','pdf'].
 
-      *tol*: (default 13)
+      *tol*: (default 0)
         The RMS threshold above which the test is considered failed.
 
       *freetype_version*: str or tuple
@@ -426,3 +426,24 @@ def backend_switcher(*args, **kwargs):
 
         return nose.tools.make_decorator(func)(backend_switcher)
     return switch_backend_decorator
+
+
+def skip_if_command_unavailable(cmd):
+    """
+    skips a test if a command is unavailable.
+
+    Parameters
+    ----------
+    cmd : list of str
+        must be a complete command which should not
+        return a non zero exit code, something like
+        ["latex", "-version"]
+    """
+    from matplotlib.compat.subprocess import check_output
+    try:
+        check_output(cmd)
+    except:
+        from nose import SkipTest
+        raise SkipTest('missing command: %s' % cmd[0])
+
+    return lambda f: f
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_31.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_31.pdf
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -26,6 +26,9 @@
 import warnings
 from matplotlib.cbook import IgnoredKeywordWarning
 
+import sys
+on_win = (sys.platform == 'win32')
+
 # Note: Some test cases are run twice: once normally and once with labeled data
 #       These two must be defined in the same test function or need to have
 #       different baseline images to prevent race conditions when nose runs
@@ -2749,7 +2752,8 @@ def test_subplot_key_hash():
 
 @image_comparison(baseline_images=['specgram_freqs',
                                    'specgram_freqs_linear'],
-                  remove_text=True, extensions=['png'], tol=0.03)
+                  remove_text=True, extensions=['png'],
+                  tol=0.05 if on_win else 0.03)
 def test_specgram_freqs():
     '''test axes.specgram in default (psd) mode with sinusoidal stimuli'''
     n = 10000
@@ -2849,7 +2853,8 @@ def test_specgram_noise():
 
 @image_comparison(baseline_images=['specgram_magnitude_freqs',
                                    'specgram_magnitude_freqs_linear'],
-                  remove_text=True, extensions=['png'], tol=0.03)
+                  remove_text=True, extensions=['png'],
+                  tol=0.05 if on_win else 0.03)
 def test_specgram_magnitude_freqs():
     '''test axes.specgram in magnitude mode with sinusoidal stimuli'''
     n = 10000
@@ -2950,7 +2955,8 @@ def test_specgram_magnitude_noise():
 
 
 @image_comparison(baseline_images=['specgram_angle_freqs'],
-                  remove_text=True, extensions=['png'])
+                  remove_text=True, extensions=['png'],
+                  tol=0.003 if on_win else 0)
 def test_specgram_angle_freqs():
     '''test axes.specgram in angle mode with sinusoidal stimuli'''
     n = 10000
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -71,6 +71,7 @@ def test_savefig_to_stringio_with_distiller():
 
 @cleanup
 @needs_tex
+@needs_ghostscript
 def test_savefig_to_stringio_with_usetex():
     matplotlib.rcParams['text.latex.unicode'] = True
     matplotlib.rcParams['text.usetex'] = True
@@ -90,6 +91,7 @@ def test_savefig_to_stringio_eps_afm():
 
 @cleanup
 @needs_tex
+@needs_ghostscript
 def test_savefig_to_stringio_with_usetex_eps():
     matplotlib.rcParams['text.latex.unicode'] = True
     matplotlib.rcParams['text.usetex'] = True
@@ -132,6 +134,46 @@ def test_patheffects():
             fig.savefig(ps, format='ps')
 
 
+@cleanup
+@needs_tex
+@needs_ghostscript
+def test_tilde_in_tempfilename():
+    # Tilde ~ in the tempdir path (e.g. TMPDIR, TMP oder TEMP on windows
+    # when the username is very long and windows uses a short name) breaks
+    # latex before https://github.com/matplotlib/matplotlib/pull/5928
+    import tempfile
+    import shutil
+    import os
+    import os.path
+
+    tempdir = None
+    old_tempdir = tempfile.tempdir
+    try:
+        # change the path for new tempdirs, which is used
+        # internally by the ps backend to write a file
+        tempdir = tempfile.mkdtemp()
+        base_tempdir = os.path.join(tempdir, "short~1")
+        os.makedirs(base_tempdir)
+        tempfile.tempdir = base_tempdir
+
+        # usetex results in the latex call, which does not like the ~
+        plt.rc('text', usetex=True)
+        plt.plot([1, 2, 3, 4])
+        plt.xlabel(r'\textbf{time} (s)')
+        #matplotlib.verbose.set_level("debug")
+        output_eps = os.path.join(base_tempdir, 'tex_demo.eps')
+        # use the PS backend to write the file...
+        plt.savefig(output_eps, format="ps")
+    finally:
+        tempfile.tempdir = old_tempdir
+        if tempdir:
+            try:
+                shutil.rmtree(tempdir)
+            except Exception as e:
+                # do not break if this is not removeable...
+                print(e)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_dviread.py b/lib/matplotlib/tests/test_dviread.py
@@ -2,6 +2,8 @@
                         unicode_literals)
 
 from matplotlib.externals import six
+from matplotlib.testing.decorators import skip_if_command_unavailable
+
 
 from nose.tools import assert_equal, with_setup
 import matplotlib.dviread as dr
@@ -60,6 +62,7 @@ def test_PsfontsMap():
     assert_equal(entry.filename, '/absolute/font9.pfb')
 
 
+@skip_if_command_unavailable(["kpsewhich", "-version"])
 def test_dviread():
     dir = os.path.join(os.path.dirname(__file__), 'baseline_images', 'dviread')
     with open(os.path.join(dir, 'test.json')) as f:
diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
@@ -20,6 +20,9 @@
 from matplotlib import path as mpath
 from matplotlib import transforms as mtrans
 
+import sys
+on_win = (sys.platform == 'win32')
+
 
 def test_Polygon_close():
     #: Github issue #1018 identified a bug in the Polygon handling
@@ -250,7 +253,7 @@ def test_wedge_movement():
 
 
 @image_comparison(baseline_images=['wedge_range'],
-                  remove_text=True)
+                  remove_text=True, tol=0.06 if on_win else 0)
 def test_wedge_range():
     ax = plt.axes()
 
diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
@@ -17,6 +17,9 @@
     import mock
 from nose.tools import assert_equal
 
+import sys
+on_win = (sys.platform == 'win32')
+
 
 @image_comparison(baseline_images=['patheffect1'], remove_text=True)
 def test_patheffect1():
@@ -110,7 +113,7 @@ def test_SimplePatchShadow_offset():
     assert_equal(pe._offset, (4, 5))
 
 
-@image_comparison(baseline_images=['collection'])
+@image_comparison(baseline_images=['collection'], tol=0.013 if on_win else 0)
 def test_collection():
     x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
     data = np.sin(x) + np.cos(y)
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -14,6 +14,8 @@
 import matplotlib.cm as cm
 from matplotlib.path import Path
 
+import sys
+on_win = (sys.platform == 'win32')
 
 def test_delaunay():
     # No duplicate points, regular grid.
@@ -770,7 +772,8 @@ def z(x, y):
 
 
 @image_comparison(baseline_images=['tri_smooth_gradient'],
-                  extensions=['png'], remove_text=True)
+                  extensions=['png'], remove_text=True,
+                  tol=0.015 if on_win else 0)
 def test_tri_smooth_gradient():
     # Image comparison based on example trigradient_demo.
 
diff --git a/src/_png.cpp b/src/_png.cpp
diff --git a/test.txt b/test.txt
diff --git a/visual_tests.py b/visual_tests.py
