Merge branch 'master' into minorgrid

Author: nschloe

.circleci/config.yml

@@ -0,0 +1,69 @@
+version: 2
+
+jobs:
+
+  # # python2:
+  # build:
+  #   working_directory: ~/matplotlib2tikz
+  #   docker:
+  #     - image: ubuntu:17.10
+  #   steps:
+  #     - run: apt-get update
+  #     # don't install sympy with apt: it pulls in texlive which takes for ever
+  #     # to download and install
+  #     - run: apt-get install -y git python-pip pandoc
+  #     - run: pip2 install -U pytest pytest-cov pylint
+  #     - checkout
+  #     - run: pip2 install -r test_requirements.txt
+  #     - run: pip2 install .
+  #     # lint
+  #     - run: pylint matplotlib2tikz/
+  #     - run: pylint test/*.py
+  #     # make sure that rst converts correctly
+  #     - run: cat README.md | sed 's_<img src="\([^"]*\)" width="\([^"]*\)">_![](\1){width="\2"}_g' > /tmp/README.md
+  #     - run: pandoc /tmp/README.md -o README.rst
+  #     - run: pip2 install docutils pygments
+  #     - run: python setup.py check -r -s
+  #     # The tests
+  #     - run: cd test/ && MPLBACKEND=Agg pytest --cov matplotlib2tikz
+
+  # python3:
+  build:
+    working_directory: ~/matplotlib2tikz
+    docker:
+      - image: ubuntu:17.10
+    environment:
+      - TEXMFLOCAL: "/tmp/texmf/"
+    steps:
+      - run: apt-get update
+      - run: apt-get install -y texlive-latex-base texlive-latex-extra python3-pip python3-tk wget poppler-utils
+      - run: pip3 install -U pytest pytest-cov code_extract pylint
+      - checkout
+      - run: cd ~/matplotlib2tikz
+      - run: code-extract README.md test/zzz_readme_test.py --filter python,test
+      # install latest pgfplots
+      - run: mkdir -p $TEXMFLOCAL
+      - run: wget http://mirrors.ctan.org/install/graphics/pgf/contrib/pgfplots.tds.zip -O /tmp/pgfplots.zip
+      - run: unzip /tmp/pgfplots.zip -d $TEXMFLOCAL
+      - run: texhash
+      # install
+      - run: pip3 install -r test_requirements.txt
+      - run: pip3 install .
+      # lint
+      - run: pylint setup.py
+      - run: pylint matplotlib2tikz/
+      - run: pylint test/*.py
+      # The actual test
+      - run: cd test/ && MPLBACKEND=Agg pytest --cov matplotlib2tikz
+      # submit to codecov
+      - run: apt-get install -y curl
+      - run: bash <(curl -s https://codecov.io/bash)
+
+# workflow builds don't support forked PRs yet, cf.
+# <https://circleci.com/docs/2.0/faq/#can-i-build-fork-prs-using-workflows>.
+# workflows:
+#   version: 2
+#   build-and-test:
+#     jobs:
+#       - python2
+#       - python3

.travis.yml

@@ -3,7 +3,8 @@ dist: trusty
 language: python
 
 python:
-    - '2.7'
+    # The images have different hashes on Python 2.7.
+    # - '2.7'
     - '3.6'
 
 addons:
@@ -31,14 +32,14 @@ addons:
       - python-tk
 
 before_install:
-  - pip install pytest pytest-cov code_extract pylint
+  - pip3 install pytest pytest-cov code_extract pylint
   # Make sure to put the readme test at the very end; otherwise it's messing
   # around with the other tests.
   - code_extract README.md test/zzz_readme_test.py --filter python,test
 
 install:
-  - pip install -r test_requirements.txt
-  - pip install .
+  - pip3 install -r test_requirements.txt
+  - pip3 install .
 
 cache: pip
 

README.md

@@ -1,6 +1,6 @@
 # matplotlib2tikz
 
-[![Build Status](https://travis-ci.org/nschloe/matplotlib2tikz.svg?branch=master)](https://travis-ci.org/nschloe/matplotlib2tikz)
+[![CircleCI](https://circleci.com/gh/nschloe/matplotlib2tikz.svg?style=svg)](https://circleci.com/gh/nschloe/matplotlib2tikz)
 [![codecov](https://codecov.io/gh/nschloe/matplotlib2tikz/branch/master/graph/badge.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)

matplotlib2tikz/color.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 #
+from __future__ import division
+
 import matplotlib as mpl
 import numpy
 
@@ -18,6 +20,15 @@ def mpl_color2xcolor(data, matplotlib_color):
     xcol = None
     # RGB values (as taken from xcolor.dtx):
     available_colors = {
+        # List white first such that for gray values, the combination
+        # white!<x>!black is preferred over, e.g., gray!<y>!black. Note that
+        # the order of the dictionary is respected from Python 3.6 on.
+        'white': numpy.array([1, 1, 1]),
+        'lightgray': numpy.array([0.75, 0.75, 0.75]),
+        'gray': numpy.array([0.5, 0.5, 0.5]),
+        'darkgray': numpy.array([0.25, 0.25, 0.25]),
+        'black': numpy.array([0, 0, 0]),
+        #
         'red':  numpy.array([1, 0, 0]),
         'green': numpy.array([0, 1, 0]),
         'blue': numpy.array([0, 0, 1]),
@@ -28,11 +39,6 @@ def mpl_color2xcolor(data, matplotlib_color):
         'purple': numpy.array([0.75, 0, 0.25]),
         'teal': numpy.array([0, 0.5, 0.5]),
         'violet': numpy.array([0.5, 0, 0.5]),
-        'black': numpy.array([0, 0, 0]),
-        'darkgray': numpy.array([0.25, 0.25, 0.25]),
-        'gray': numpy.array([0.5, 0.5, 0.5]),
-        'lightgray': numpy.array([0.75, 0.75, 0.75]),
-        'white': numpy.array([1, 1, 1])
         # The colors cyan, magenta, yellow, and olive are also
         # predefined by xcolor, but their RGB approximation of the
         # native CMYK values is not very good. Don't use them here.
@@ -71,4 +77,5 @@ def mpl_color2xcolor(data, matplotlib_color):
     # Lookup failed, add it to the custom list.
     xcol = 'color' + str(len(data['custom colors']))
     data['custom colors'][xcol] = my_col[:3]
+
     return data, xcol, my_col

matplotlib2tikz/image.py

@@ -43,9 +43,15 @@ def draw_image(data, obj):
         # RGB (+alpha) information at each point
         assert len(dims) == 3 and dims[2] in [3, 4]
         # convert to PIL image
-        if obj.origin == "lower":
+        if obj.origin == 'lower':
             img_array = numpy.flipud(img_array)
-        image = PIL.Image.fromarray(img_array)
+
+        # Convert mpl image to PIL
+        image = PIL.Image.fromarray(numpy.uint8(img_array*255))
+
+        # If the input image is PIL:
+        # image = PIL.Image.fromarray(img_array)
+
         image.save(filename, origin=obj.origin)
 
     # write the corresponding information to the TikZ file

matplotlib2tikz/text.py

@@ -150,9 +150,21 @@ def draw_text(data, obj):
     #     'heavy'      : 800,
     #     'extra bold' : 800,
     #     'black'      : 900}
-    if obj.get_weight() > 550:
+    #
+    # get_weights returns a numeric value in the range 0-1000 or one of
+    # ‘light’, ‘normal’, ‘regular’, ‘book’, ‘medium’, ‘roman’, ‘semibold’,
+    # ‘demibold’, ‘demi’, ‘bold’, ‘heavy’, ‘extra bold’, ‘black’
+    weight = obj.get_weight()
+    if weight in [
+            'semibold', 'demibold', 'demi', 'bold', 'heavy', 'extra bold',
+            'black'
+            ] or (isinstance(weight, int) and weight > 550):
         style.append('\\bfseries')
 
+    # \lfseries isn't that common yet
+    # elif weight == 'light' or (isinstance(weight, int) and weight < 300):
+    #     style.append('\\lfseries')
+
     if obj.axes:
         # If the coordinates are relative to an axis, use `axis cs`.
         tikz_pos = '(axis cs:%.15g,%.15g)' % pos

setup.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-from setuptools import setup
-import os
 import codecs
+import os
+
+from setuptools import setup, find_packages
 
 # https://packaging.python.org/single_source_version/
 base_dir = os.path.abspath(os.path.dirname(__file__))
 about = {}
 with open(os.path.join(base_dir, 'matplotlib2tikz', '__about__.py'), 'rb') as f:
+    # pylint: disable=exec-used
     exec(f.read(), about)
 
 
@@ -17,15 +19,15 @@ def read(fname):
             os.path.join(os.path.dirname(__file__), fname),
             encoding='utf-8'
             ).read()
-    except Exception:
+    except IOError:
         content = ''
     return content
 
 
 setup(
     name='matplotlib2tikz',
     version=about['__version__'],
-    packages=['matplotlib2tikz'],
+    packages=find_packages(),
     url='https://github.com/nschloe/matplotlib2tikz',
     download_url='https://pypi.python.org/pypi/matplotlib2tikz',
     author=about['__author__'],

test/helpers.py

@@ -71,13 +71,6 @@ def __init__(self, fig):
             print('=' * 70)
             print(e.output)
             print('=' * 70)
-            if 'DISPLAY' not in os.environ:
-                cmd = ['curl', '-sT', tikz_file, 'chunk.io']
-                out = subprocess.check_output(
-                    cmd,
-                    stderr=subprocess.STDOUT
-                    )
-                print('Uploaded TikZ file to %s' % out.decode('utf-8'))
             raise
 
         pdf_file = tmp_base + '.pdf'
@@ -121,35 +114,6 @@ def get_details(self):
 
         print('pdftoppm output:')
         print(self.ptp_out.decode('utf-8'))
-
-        if 'DISPLAY' not in os.environ:
-            # upload to chunk.io if we're on a headless client
-            out = subprocess.check_output(
-                ['curl', '-sT', self.mpl_reference, 'chunk.io'],
-                stderr=subprocess.STDOUT
-                )
-            print(
-                'Uploaded reference matplotlib PDF file to %s' %
-                out.decode('utf-8')
-                )
-
-            out = subprocess.check_output(
-                ['curl', '-sT', self.tikz_file, 'chunk.io'],
-                stderr=subprocess.STDOUT
-                )
-            print('Uploaded TikZ file to %s' % out.decode('utf-8'))
-
-            out = subprocess.check_output(
-                ['curl', '-sT', self.pdf_file, 'chunk.io'],
-                stderr=subprocess.STDOUT
-                )
-            print('Uploaded output PDF file to %s' % out.decode('utf-8'))
-
-            out = subprocess.check_output(
-                ['curl', '-sT', self.png_file, 'chunk.io'],
-                stderr=subprocess.STDOUT
-                )
-            print('Uploaded output PNG file to %s' % out.decode('utf-8'))
         return
 
 

test/test_image_plot.py

@@ -1,49 +1,51 @@
 # -*- coding: utf-8 -*-
 #
 import helpers
+
+import matplotlib.pyplot as plt
 import pytest
 
 # the picture 'lena.png' with origin='lower' is flipped upside-down.
 # So it has to be upside-down in the pdf-file as well.
 
 
-# test for monochrome picture
-def plot1():
+def plot_upper():
     from matplotlib import rcParams
-    import matplotlib.pyplot as plt
-    from PIL import Image
+    import matplotlib.image as mpimg
     import os
 
     this_dir = os.path.dirname(os.path.realpath(__file__))
-    lena = Image.open(os.path.join(this_dir, 'lena.png'))
-    lena = lena.convert('L')
+    img = mpimg.imread(os.path.join(this_dir, 'lena.png'))
+
     dpi = rcParams['figure.dpi']
-    figsize = lena.size[0]/dpi, lena.size[1]/dpi
+    figsize = img.shape[0]/dpi, img.shape[1]/dpi
     fig = plt.figure(figsize=figsize)
     ax = plt.axes([0, 0, 1, 1], frameon=False)
     ax.set_axis_off()
-    plt.imshow(lena, cmap='viridis', origin='lower')
+
+    plt.imshow(img, cmap='viridis', origin='upper')
+
     # Set the current color map to HSV.
     plt.hsv()
     plt.colorbar()
     return fig
 
 
-# test for rgb picture
-def plot2():
+def plot_lower():
     from matplotlib import rcParams
-    import matplotlib.pyplot as plt
-    from PIL import Image
+    import matplotlib.image as mpimg
     import os
 
     this_dir = os.path.dirname(os.path.realpath(__file__))
-    lena = Image.open(os.path.join(this_dir, 'lena.png'))
+    img = mpimg.imread(os.path.join(this_dir, 'lena.png'))
+
     dpi = rcParams['figure.dpi']
-    figsize = lena.size[0] / dpi, lena.size[1] / dpi
+    figsize = img.shape[0] / dpi, img.shape[1] / dpi
+
     fig = plt.figure(figsize=figsize)
     ax = plt.axes([0, 0, 1, 1], frameon=False)
     ax.set_axis_off()
-    plt.imshow(lena, cmap='viridis', origin='lower')
+    plt.imshow(img, cmap='viridis', origin='lower')
     # Set the current color map to HSV.
     plt.hsv()
     plt.colorbar()
@@ -52,11 +54,16 @@ def plot2():
 
 @pytest.mark.parametrize(
     'plot, reference_phash', [
-        (plot1, '455361ec211d72fb'),
-        (plot2, '7558d3b30f634b06'),
+        (plot_upper, '75c3d36d1f090ba1'),
+        (plot_lower, '7548d3b34f234b07'),
     ]
     )
 def test(plot, reference_phash):
     phash = helpers.Phash(plot())
     assert phash.phash == reference_phash, phash.get_details()
     return
+
+
+if __name__ == '__main__':
+    plot_upper()
+    plt.show()

test/test_legend_best_location.py

@@ -62,5 +62,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '879d990d0e8f7c1c', phash.get_details()
+    assert phash.phash == '971d991d1c877c1c', phash.get_details()
     return