Merge pull request #161 from nschloe/version-bump

Version bump

Author: nschloe

matplotlib2tikz/__about__.py

@@ -5,6 +5,6 @@
 __copyright__ = 'Copyright (c) 2010-2017, %s <%s>' % (__author__, __email__)
 __credits__ = []
 __license__ = 'License :: OSI Approved :: MIT License'
-__version__ = '0.6.5'
+__version__ = '0.6.6'
 __maintainer__ = u'Nico Schlömer'
 __status__ = 'Development Status :: 5 - Production/Stable'

test/test_hashes.py renamed to test/helpers.py

@@ -1,25 +1,18 @@
 # -*- coding: utf-8 -*-
 #
 import matplotlib2tikz
-import testfunctions
 
 import os
 import tempfile
-from importlib import import_module
-import pytest
 import subprocess
 from PIL import Image
 import imagehash
 from matplotlib import pyplot as plt
 
 
-@pytest.mark.parametrize('name', testfunctions.__all__)
-def test_hash(name):
-    test = import_module('testfunctions.' + name)
-    # import the test
-    fig = test.plot()
+def compute_phash(fig):
     # convert to tikz file
-    _, tmp_base = tempfile.mkstemp(prefix=name)
+    _, tmp_base = tempfile.mkstemp()
     tikz_file = tmp_base + '_tikz.tex'
     matplotlib2tikz.save(
         tikz_file,
@@ -68,7 +61,7 @@ def test_hash(name):
     except subprocess.CalledProcessError as e:
         print('Command output:')
         print('=' * 70)
-        print(repr(e.output))
+        print(e.output)
         print('=' * 70)
         if 'DISPLAY' not in os.environ:
             cmd = ['curl', '-sT', tikz_file, 'chunk.io']
@@ -89,14 +82,23 @@ def test_hash(name):
     png_file = tmp_base + '-1.png'
 
     # compute the phash of the PNG
-    phash = imagehash.phash(Image.open(png_file)).__str__()
+    return (
+        imagehash.phash(Image.open(png_file)).__str__(), png_file, pdf_file,
+        tex_out, ptp_out, mpl_reference, tikz_file
+        )
+
+
+def assert_phash(fig, reference_phash):
+    phash, png_file, pdf_file, tex_out, ptp_out, mpl_reference, tikz_file =\
+        compute_phash(fig)
 
-    if test.phash != phash:
+    if reference_phash != phash:
         # Compute the Hamming distance between the two 64-bit numbers
-        hamming_dist = bin(int(phash, 16) ^ int(test.phash, 16)).count('1')
+        hamming_dist = \
+            bin(int(phash, 16) ^ int(reference_phash, 16)).count('1')
         print('Output file: %s' % png_file)
         print('computed pHash:  %s' % phash)
-        print('reference pHash: %s' % test.phash)
+        print('reference pHash: %s' % reference_phash)
         print(
             'Hamming distance: %s (out of %s)' %
             (hamming_dist, 4 * len(phash))
@@ -136,6 +138,6 @@ def test_hash(name):
                 )
             print('Uploaded output PNG file to %s' % out.decode('utf-8'))
 
-    assert test.phash == phash
+    assert reference_phash == phash
 
     return

test/testfunctions/lena.png renamed to test/lena.png

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 #
-desc = 'Annotations'
-# phash = 'ab8a78a1549654fe'
-phash = 'ab8a79a1549654be'
+from helpers import assert_phash
 
+import matplotlib.pyplot as plt
+import numpy as np
 
-def plot():
-    from matplotlib import pyplot as pp
-    import numpy as np
 
-    fig = pp.figure(1, figsize=(8, 5))
+def plot():
+    fig = plt.figure(1, figsize=(8, 5))
     ax = fig.add_subplot(
             111,
             autoscale_on=False,
@@ -36,3 +34,7 @@ def plot():
             arrowprops=dict(arrowstyle='->')
             )
     return fig
+
+
+def test():
+    assert_phash(plot(), 'ab8a79a1549654be')

test/testfunctions/rotated_labels.py renamed to test/rotated_labels.py

@@ -1,13 +1,11 @@
 # -*- coding: utf-8 -*-
-""" Bar Chart test
+'''Bar Chart test
 
 This tests plots a simple bar chart.  Bar charts are plotted as
 rectangle patches witch are difficult to tell from other rectangle
 patches that should not be plotted in PGFPlots (e.g. axis, legend)
-
-"""
-desc = 'Bar Chart'
-phash = '5f09a9e6b172874a'
+'''
+from helpers import assert_phash
 
 
 def plot():
@@ -30,3 +28,6 @@ def plot():
 
     return fig
 
+
+def test():
+    assert_phash(plot(), '5f09a9e6b172874a')

test/testfunctions/annotate.py renamed to test/test_annotate.py

@@ -5,8 +5,7 @@
 at the correct z-order to be sucessful.
 
 """
-desc = 'Bar Chart With Errorbars'
-phash = '5f09a9e6b1728746'
+from helpers import assert_phash
 
 
 def plot():
@@ -34,3 +33,6 @@ def plot():
 
     return fig
 
+
+def test():
+    assert_phash(plot(), '5f09a9e6b1728746')

test/testfunctions/barchart.py renamed to test/test_barchart.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 #
-desc = 'Simple $\sin$ plot with some labels'
-# phash = '5f34e1ce21c3e5c1'
-phash = '1f36e5c621c1e7c1'
+from helpers import assert_phash
+
+from matplotlib import pyplot as plt
+from matplotlib import style
+import numpy as np
 
 
 def plot():
-    from matplotlib import pyplot as plt
-    from matplotlib import style
-    import numpy as np
     fig = plt.figure()
     with plt.style.context(('ggplot')):
         t = np.arange(0.0, 2.0, 0.1)
@@ -23,3 +22,7 @@ def plot():
         plt.title('Simple plot $\\frac{\\alpha}{2}$')
         plt.grid(True)
     return fig
+
+
+def test():
+    assert_phash(plot(), '1f36e5c621c1e7c1')

test/testfunctions/barchart_errorbars.py renamed to test/test_barchart_errorbars.py

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+''' Box Plot test
+
+This test plots a box plot with three data series. The causes an empty Line2D
+to be plotted.  Without care, this can turn into an empty table in PGFPlot
+which crashes latex (due to it treating an empty table as a table with
+external data in the file '' or '.tex')
+See: https://github.com/nschloe/matplotlib2tikz/pull/134
+'''
+import helpers
+
+
+def plot():
+    import matplotlib.pyplot as plt
+
+    # plot data
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+
+    data = [
+        [
+            0.8792419963142024, 0.8842648555256405, 0.8830545971510088,
+            0.8831310510125482, 0.8839926059865629, 0.8795815040451961,
+            0.8780455489941472, 0.8785436398314896, 0.8830947020953477,
+            0.8853267660041949, 0.8888678711018956, 0.8852975957910832,
+            0.8806832729996307, 0.8757157004574541, 0.8767001155960863,
+            0.8840806038864472, 0.8817619814119265, 0.8888364252374024,
+            0.8812448127688732, 0.8831027782255365
+        ], [
+            0.8977874209274417, 0.8941751386130553, 0.8896779411432865,
+            0.8971274869048325, 0.8974081692527065, 0.8942767272739647,
+            0.8875248054826029, 0.8777267389916926, 0.8950411839136605,
+            0.8927553406630346, 0.8950822278376636, 0.8987940094730611,
+            0.8921713177345106, 0.8875512496817447, 0.8897284821652239,
+            0.8910385725900226, 0.8879321741542129, 0.889056167587369,
+            0.884905350828982, 0.89214934207348
+        ], [
+            0.8841888415170959, 0.8922931655807687, 0.8896153674950393,
+            0.8875992162118492, 0.890776178375901, 0.8889109386518265,
+            0.8879119743598638, 0.8912870099488378, 0.8981046527087161,
+            0.8920725720963792, 0.8841683225315845, 0.8857539590587772,
+            0.8945156112818913, 0.8894879283167035, 0.8912651966639861,
+            0.8929190818922158, 0.8943297597492411, 0.8888594626359189,
+            0.8912494597675972, 0.8917524004164856
+        ]]
+
+    ax.boxplot(data)
+
+    return fig
+
+
+def test():
+    helpers.assert_phash(plot(), '6be3e6b95e8000de')