Merge branch 'master' into patch-1

nschloe · web-flow · commit 8d36b90e7028 · 2017-06-12T14:07:07.000+02:00
diff --git a/test/helpers.py b/test/helpers.py
@@ -83,9 +83,10 @@ def __init__(self, fig):
         pdf_file = tmp_base + '.pdf'
 
         # Convert PDF to PNG.
+        # Use a high resolution here to cover small changes.
         ptp_out = subprocess.check_output(
             [
-                'pdftoppm', '-rx', '600', '-ry', '600', '-png',
+                'pdftoppm', '-r', '2400', '-png',
                 pdf_file, tmp_base
             ],
             stderr=subprocess.STDOUT
diff --git a/test/test_annotate.py b/test/test_annotate.py
@@ -39,7 +39,7 @@ def plot():
 def test():
     plt.close('all')
     phash = Phash(plot())
-    assert phash.phash == 'ab8a79a1549654be', phash.get_details()
+    assert phash.phash == 'ab8a71a1549e54be', phash.get_details()
 
 
 if __name__ == '__main__':
diff --git a/test/test_basic_sin.py b/test/test_basic_sin.py
@@ -25,7 +25,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '1f36e5c621c1e7c1', phash.get_details()
+    assert phash.phash == '1f36e5ce21c1e5c1', phash.get_details()
 
 
 if __name__ == '__main__':
diff --git a/test/test_boxplot.py b/test/test_boxplot.py
@@ -51,4 +51,4 @@ def plot():
 
 def test():
     phash = Phash(plot())
-    assert phash.phash == '6be3e6b95e8000de', phash.get_details()
+    assert phash.phash == '69e2f6b97e8000de', phash.get_details()
diff --git a/test/test_dual_axis.py b/test/test_dual_axis.py
@@ -19,4 +19,4 @@ def plot():
 
 def test():
     phash = Phash(plot())
-    assert phash.phash == '5382544c16bdde75', phash.get_details()
+    assert phash.phash == '5b82544c169dde75', phash.get_details()
diff --git a/test/test_errorband.py b/test/test_errorband.py
@@ -23,4 +23,4 @@ def plot():
 
 def test():
     phash = Phash(plot())
-    assert phash.phash == 'af2cd5922172772c', phash.get_details()
+    assert phash.phash == 'af2cd59221727725', phash.get_details()
diff --git a/test/test_errorbar.py b/test/test_errorbar.py
@@ -21,4 +21,4 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'a3435e25bea866b8', phash.get_details()
+    assert phash.phash == 'ab435e25bea866b0', phash.get_details()
diff --git a/test/test_fancybox.py b/test/test_fancybox.py
@@ -193,7 +193,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '9d2327dc23cdd81a', phash.get_details()
+    assert phash.phash == 'dd2325dc23cdd81a', phash.get_details()
 
 
 if __name__ == '__main__':
diff --git a/test/test_fillstyle.py b/test/test_fillstyle.py
@@ -18,4 +18,4 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'a103fa09ee613e9e', phash.get_details()
+    assert phash.phash == 'a103fa59ee613e86', phash.get_details()
diff --git a/test/test_legend_best_location.py b/test/test_legend_best_location.py
@@ -62,5 +62,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '879d991d0e877c1c', phash.get_details()
+    assert phash.phash == '839f990d0e877c1d', phash.get_details()
     return
diff --git a/test/test_legend_labels.py b/test/test_legend_labels.py
@@ -24,7 +24,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'fb7c5e0aaed60094', phash.get_details()
+    assert phash.phash == 'eb785e0aaed6c190', phash.get_details()
     return
 
 
diff --git a/test/test_legends2.py b/test/test_legends2.py
@@ -32,5 +32,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '6b447a5a62d4952f', phash.get_details()
+    assert phash.phash == '7b447a5a62d4852f', phash.get_details()
     return
diff --git a/test/test_loglogplot.py b/test/test_loglogplot.py
@@ -15,5 +15,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'abc35ec96e21be80', phash.get_details()
+    assert phash.phash == 'e9c37e896e21be80', phash.get_details()
     return
diff --git a/test/test_logplot.py b/test/test_logplot.py
@@ -18,5 +18,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'e9e25eea7eea1400', phash.get_details()
+    assert phash.phash == 'a9eb5eaa7eea1400', phash.get_details()
     return
diff --git a/test/test_noise.py b/test/test_noise.py
@@ -47,7 +47,7 @@ def plot2():
 
 @pytest.mark.parametrize(
     'plot, reference_phash', [
-        (plot1, 'f55a0bb503fd0354'),
+        (plot1, 'fd5a0ba503fd0354'),
         (plot2, '5f5ca33da3816983'),
     ]
     )
diff --git a/test/test_scatter_colormap.py b/test/test_scatter_colormap.py
@@ -19,5 +19,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'cb616c42e5ec738c', phash.get_details()
+    assert phash.phash == 'cf616c42e4ec738c', phash.get_details()
     return
diff --git a/test/test_sharex_and_y.py b/test/test_sharex_and_y.py
@@ -20,5 +20,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '9bcdbc02ff919812', phash.get_details()
+    assert phash.phash == 'bbcdbc12ef119812', phash.get_details()
     return
diff --git a/test/test_subplots_with_colorbars.py b/test/test_subplots_with_colorbars.py
@@ -26,5 +26,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '6bc42fd06a95c03f', phash.get_details()
+    assert phash.phash == '6bc42bd46a95c03f', phash.get_details()
     return
diff --git a/test/test_tick_positions.py b/test/test_tick_positions.py
@@ -96,5 +96,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'cfa200af41ef40ef', phash.get_details()
+    assert phash.phash == 'c7a780ab45af00ef', phash.get_details()
     return
