Merge pull request #222 from nschloe/test-fixes

nschloe · web-flow · commit 90480fbf8c34 · 2018-01-31T19:14:48.000+01:00
Test fixes
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -48,6 +48,9 @@ jobs:
       - run: texhash
       # install
       - run: pip3 install -r test_requirements.txt
+      # Install very specific versions of the dependencies; the build is too
+      # fragile otherwise.
+      - run: pip3 install matplotlib==2.1.0
       - run: pip3 install .
       # lint
       - run: pylint setup.py
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2010-2017 Nico Schlömer
+Copyright (c) 2010-2018 Nico Schlömer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # matplotlib2tikz
 
 [![CircleCI](https://img.shields.io/circleci/project/github/nschloe/matplotlib2tikz/master.svg)](https://circleci.com/gh/nschloe/matplotlib2tikz/tree/master)
-[![codecov](https://codecov.io/gh/nschloe/matplotlib2tikz/branch/master/graph/badge.svg)](https://codecov.io/gh/nschloe/matplotlib2tikz)
+[![codecov](https://img.shields.io/codecov/c/github/nschloe/matplotlib2tikz.svg)](https://codecov.io/gh/nschloe/matplotlib2tikz)
 [![Documentation Status](https://readthedocs.org/projects/matplotlib2tikz/badge/?version=latest)](https://readthedocs.org/projects/matplotlib2tikz/?badge=latest)
 [![PyPi Version](https://img.shields.io/pypi/v/matplotlib2tikz.svg)](https://pypi.python.org/pypi/matplotlib2tikz)
-[![awesome](https://img.shields.io/badge/awesome-yes-brightgreen.svg)](https://img.shields.io/badge/awesome-yes-brightgreen.svg)
-[![GitHub stars](https://img.shields.io/github/stars/nschloe/matplotlib2tikz.svg?style=social&label=Stars&maxAge=2592000)](https://github.com/nschloe/matplotlib2tikz)
+[![awesome](https://img.shields.io/badge/awesome-yes-brightgreen.svg)](https://github.com/nschloe/matplotlib2tikz)
+[![GitHub stars](https://img.shields.io/github/stars/nschloe/matplotlib2tikz.svg?style=social&label=Stars)](https://github.com/nschloe/matplotlib2tikz)
 
 This is matplotlib2tikz, a Python tool for converting matplotlib figures into
 [PGFPlots](https://www.ctan.org/pkg/pgfplots)
diff --git a/doc/conf.py b/doc/conf.py
@@ -51,7 +51,7 @@
 
 # General information about the project.
 project = u'matplotlib2tikz'
-copyright = u'2010-2017, Nico Schlömer'
+copyright = u'2010-2018, Nico Schlömer'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/matplotlib2tikz/__about__.py b/matplotlib2tikz/__about__.py
@@ -2,7 +2,8 @@
 #
 __author__ = u'Nico Schlömer'
 __email__ = 'nico.schloemer@gmail.com'
-__copyright__ = 'Copyright (c) 2010-2017, %s <%s>' % (__author__, __email__)
+__copyright__ = \
+    u'Copyright (c) 2010-2018, {} <{}>'.format(__author__, __email__)
 __credits__ = []
 __license__ = 'License :: OSI Approved :: MIT License'
 __version__ = '0.6.14'
diff --git a/test/helpers.py b/test/helpers.py
@@ -2,19 +2,21 @@
 #
 from __future__ import print_function
 
+import math
 import os
+import re
 import shutil
 import subprocess
 import tempfile
 
-import matplotlib2tikz
-
 import imagehash
 import matplotlib
 import matplotlib.image as mpimg
 import matplotlib.pyplot as plt
 from PIL import Image
 
+import matplotlib2tikz
+
 
 class Phash(object):
     def __init__(self, fig):
@@ -75,11 +77,31 @@ def __init__(self, fig):
 
         pdf_file = tmp_base + '.pdf'
 
+        # PIL can only read images with up to 89478485 pixels (to prevent
+        # decompression bomb DOS attacks). Make sure the resulting image will
+        # be smaller.
+        pdfinfo_out = subprocess.check_output(
+            ['pdfinfo', pdf_file],
+            stderr=subprocess.STDOUT
+            ).decode('utf-8')
+        # Extract page size
+        # Page size:      195.106 x 156.239 pts
+        m = re.search(
+            'Page size: *([0-9]+\\.[0-9]+) x ([0-9]+\\.[0-9]+) pts',
+            pdfinfo_out
+            )
+        # get dims in inches
+        dims = [float(m.group(1)) / 72, float(m.group(2)) / 72]
+        assert dims is not None
+        max_num_pixels = 89e6
+        max_dpi = math.sqrt(max_num_pixels / dims[0] / dims[1])
+        dpi = min(2400, max_dpi)
+
         # Convert PDF to PNG.
         # Use a high resolution here to cover small changes.
         ptp_out = subprocess.check_output(
             [
-                'pdftoppm', '-r', '2400', '-png',
+                'pdftoppm', '-r', str(dpi), '-png',
                 pdf_file, tmp_base
             ],
             stderr=subprocess.STDOUT
diff --git a/test/test_annotate.py b/test/test_annotate.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-from helpers import Phash
-
 import matplotlib.pyplot as plt
 import numpy as np
 
+from helpers import Phash
+
 
 def plot():
     fig = plt.figure(1, figsize=(8, 5))
diff --git a/test/test_fancybox.py b/test/test_fancybox.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
 # Taken from http://matplotlib.org/examples/pylab_examples/fancybox_demo.html
-import helpers
-
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
 from matplotlib.patches import FancyBboxPatch
 
+import helpers
+
 
 # Bbox object around which the fancy box will be drawn.
 bb = mtransforms.Bbox([[0.3, 0.4], [0.7, 0.6]])
diff --git a/test/test_image_plot.py b/test/test_image_plot.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-import helpers
-
 import matplotlib.pyplot as plt
 import pytest
 
+import helpers
+
 # the picture 'lena.png' with origin='lower' is flipped upside-down.
 # So it has to be upside-down in the pdf-file as well.
 
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 == '7f447a5266d4812f', phash.get_details()
+    assert phash.phash == '7f467a5262d4812f', phash.get_details()
     return
diff --git a/test/test_loglogplot.py b/test/test_loglogplot.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-import helpers
-
 from matplotlib import pyplot as plt
 import numpy as np
 
+import helpers
+
 
 def plot():
     fig = plt.figure()
diff --git a/test/test_noise.py b/test/test_noise.py
@@ -2,12 +2,12 @@
 #
 from __future__ import print_function
 
-import helpers
-
 import numpy as np
 import matplotlib.pyplot as plt
 import pytest
 
+import helpers
+
 
 def plot1():
     # Make plot with vertical (default) colorbar
diff --git a/test/test_rotated_labels.py b/test/test_rotated_labels.py
@@ -3,11 +3,11 @@
 import os
 import tempfile
 
-import matplotlib2tikz
-
 import pytest
 from matplotlib import pyplot as plt
 
+import matplotlib2tikz
+
 
 def __plot():
     fig, ax = plt.subplots()
diff --git a/test/test_sharex_and_y.py b/test/test_sharex_and_y.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-import helpers
-
 import matplotlib.pyplot as plt
 import numpy as np
 
+import helpers
+
 
 def plot():
     fig, axes = plt.subplots(2, 2, sharex=True, sharey=True, figsize=(8, 5))
@@ -20,7 +20,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'ffedac02bb942c02', phash.get_details()
+    assert phash.phash == 'ffed6c02bb944c02', phash.get_details()
     return
 
 
diff --git a/test/test_text_overlay.py b/test/test_text_overlay.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-import helpers
-
 import matplotlib.pyplot as plt
 import numpy
 
+import helpers
+
 
 def plot():
     fig = plt.figure()
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 == 'c7a780ab45af00ef', phash.get_details()
+    assert phash.phash == 'c7ab00af45af00ef', phash.get_details()
     return
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1 +1 @@
-ImageHash
+ImageHash==3.7
