Merge branch 'master' into master

Author: nschloe

.travis.yml

@@ -1,47 +1,44 @@
-# We cannot enable container-based infrastructure for now since we need TeXlive
-# from a PPA
-#sudo: false
-sudo: true
 dist: trusty
 
-
-# Work around travis bug:
-# https://github.com/travis-ci/travis-ci/issues/4948#issuecomment-152839021
-#language: generic
 language: python
 
 python:
-    # Get python 2.7 back in once travis bug
-    # <https://github.com/travis-ci/travis-ci/issues/4948> is solved.
     - '2.7'
     - '3.4'
-    #- '3.5.0'
 
 virtualenv:
   system_site_packages: true
 
+addons:
+  apt:
+    packages:
+      - pgf
+      - texlive-latex-base
+      - texlive-latex-extra
+      # for ImageHash
+      - python-scipy
+      - python3-scipy
+      #
+      - poppler-utils
+      - pandoc
+      # Dependencies of Pillow, see
+      # <https://pillow.readthedocs.org/en/latest/installation.html#linux-installation>.
+      - libtiff5-dev
+      - libjpeg8-dev
+      - zlib1g-dev
+      - libfreetype6-dev
+      - liblcms2-dev
+      - libwebp-dev
+      - tcl8.6-dev
+      - tk8.6-dev
+      - python-tk
+
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get -y install texlive-latex-base texlive-latex-extra
-  - sudo apt-get -y install python-scipy python3-scipy  # for ImageHash
-  - sudo apt-get -y install poppler-utils
-  - sudo apt-get -y install pandoc
-  - sudo apt-get -y build-dep python-matplotlib python3-matplotlib
-  - sudo apt-get -y install python-setuptools python3-setuptools
-  # Dependencies of Pillow, see
-  # <https://pillow.readthedocs.org/en/latest/installation.html#linux-installation>.
-  - sudo apt-get -y install libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python-tk
-  - sudo apt-get -y install python-pytest python3-pytest
-  - sudo apt-get -y install python-pip python3-pip
-  - pip install pytest-cov
+  - pip install pytest pytest-cov
 
 install:
-  - sudo pip install -r requirements.txt
-  - sudo pip3 install -r requirements.txt
-  # Alternative: setup.py install.
-  # Using pip makes sure that the package is pip-compatible, too.
-  - sudo pip install .
-  - sudo pip3 install .
+  - pip install -r test_requirements.txt
+  - pip install .
 
 cache: pip
 
@@ -57,7 +54,7 @@ script:
   # cd into test directory to make sure we're using the pip-installed
   # matplotlib2tikz.
   - cd test
-  - pytest --cov matplotlib2tikz
+  - MPLBACKEND=Agg pytest --cov matplotlib2tikz
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

matplotlib2tikz/__about__.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+#
+__author__ = 'Nico Schlömer'
+__email__ = '[email protected]'
+__copyright__ = 'Copyright (c) 2010-2016, %s <%s>' % (__author__, __email__)
+__credits__ = []
+__license__ = 'MIT License'
+__version__ = '0.6.0'
+__maintainer__ = 'Nico Schlömer'
+__status__ = 'Production'

matplotlib2tikz/__init__.py

@@ -3,13 +3,21 @@
 '''Script to convert Matplotlib generated figures into TikZ/PGFPlots figures.
 '''
 
-__author__ = 'Nico Schlömer'
-__email__ = '[email protected]'
-__copyright__ = 'Copyright (c) 2010-2016, %s <%s>' % (__author__, __email__)
-__credits__ = []
-__license__ = 'MIT License'
-__version__ = '0.5.16'
-__maintainer__ = 'Nico Schlömer'
-__status__ = 'Production'
+from matplotlib2tikz.__about__ import (
+        __author__,
+        __email__,
+        __copyright__,
+        __credits__,
+        __license__,
+        __version__,
+        __maintainer__,
+        __status__
+        )
 
 from matplotlib2tikz.save import save
+
+import pipdated
+if pipdated.needs_checking('matplotlib2tikz'):
+    msg = pipdated.check('matplotlib2tikz', __version__)
+    if msg:
+        print(msg)

matplotlib2tikz/axes.py

@@ -42,7 +42,7 @@ def __init__(self, data, obj):
                     # subplotspec geometry positioning is 0-based
                     self.subplot_index = geom[2] + 1
                     if 'is_in_groupplot_env' not in data \
-                      or not data['is_in_groupplot_env']:
+                            or not data['is_in_groupplot_env']:
                         self.content.append(
                             '\\begin{groupplot}[group style='
                             '{group size=%.d by %.d}]\n' % (geom[1], geom[0])
@@ -234,7 +234,13 @@ def __init__(self, data, obj):
             self.axis_options.append('axis line style={%s}' % col)
 
         # background color
-        bgcolor = obj.get_axis_bgcolor()
+        try:
+            # mpl 2.*
+            bgcolor = obj.get_facecolor()
+        except AttributeError:
+            # mpl 1.*
+            bgcolor = obj.get_axis_bgcolor()
+
         data, col, _ = color.mpl_color2xcolor(data, bgcolor)
         if col != 'white':
             self.axis_options.append('axis background/.style={fill=%s}' % col)

matplotlib2tikz/image.py

@@ -18,9 +18,10 @@ def draw_image(data, obj):
     file_exists = True
     while file_exists:
         data['img number'] = data['img number'] + 1
-        filename = os.path.join(data['output dir'],
-                                'img' + str(data['img number']) + '.png'
-                                )
+        filename = os.path.join(
+            data['output dir'],
+            data['base name'] + str(data['img number']) + '.png'
+        )
         file_exists = os.path.isfile(filename)
 
     # store the image as in a file

matplotlib2tikz/line2d.py

@@ -52,18 +52,27 @@ def draw_line2d(data, obj):
         mark_options = ['solid']
         if extra_mark_options:
             mark_options.append(extra_mark_options)
-        if marker_face_color == 'none':
+        if marker_face_color in [None, 'none']:
             mark_options.append('fill opacity=0')
-        elif marker_face_color is not None:
+        else:
             data, face_xcolor, _ = mycol.mpl_color2xcolor(
                     data,
                     marker_face_color
                     )
             if face_xcolor != line_xcolor:
                 mark_options.append('fill=' + face_xcolor)
-        if (marker_edge_color is not None) and \
-                ((type(marker_edge_color) != type(marker_face_color)) or
-                    (marker_edge_color != marker_face_color)):
+
+        face_and_edge_have_equal_color = \
+            marker_edge_color == marker_face_color
+        # Sometimes, the colors are given as arrays. Collapse them into a
+        # single boolean.
+        try:
+            face_and_edge_have_equal_color = \
+                all(face_and_edge_have_equal_color)
+        except TypeError:
+            pass
+
+        if not face_and_edge_have_equal_color:
             data, draw_xcolor, _ = mycol.mpl_color2xcolor(
                     data,
                     marker_edge_color

matplotlib2tikz/patch.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 #
-from . import color
 from . import path as mypath
 
 import matplotlib as mpl
@@ -34,8 +33,12 @@ def draw_patchcollection(data, obj):
     '''
     content = []
     # Gather the draw options.
+    edge_colors = obj.get_edgecolor()
+    edge_color = None if len(edge_colors) == 0 else edge_colors[0]
+    face_colors = obj.get_facecolor()
+    face_color = None if len(face_colors) == 0 else face_colors[0]
     data, draw_options = mypath.get_draw_options(
-            data, obj.get_edgecolor()[0], obj.get_facecolor()[0]
+            data, edge_color, face_color
             )
     for path in obj.get_paths():
         data, cont = mypath.draw_path(

matplotlib2tikz/save.py

@@ -11,7 +11,7 @@
 
 import os
 import matplotlib as mpl
-from matplotlib2tikz import __version__
+from .__about__ import __version__
 
 
 def save(filepath,
@@ -130,8 +130,13 @@ def save(filepath,
         data['extra axis options'] = extra.copy()
     else:
         data['extra axis options'] = set()
+
     if dpi is None:
-        data['dpi'] = mpl.rcParams['savefig.dpi']
+        savefig_dpi = mpl.rcParams['savefig.dpi']
+        if isinstance(savefig_dpi, int):
+            data['dpi'] = savefig_dpi
+        else:
+            data['dpi'] = mpl.rcParams['figure.dpi']
     else:
         data['dpi'] = dpi
 

requirements.txt

@@ -4,7 +4,11 @@
 import os
 import codecs
 
-from matplotlib2tikz import __version__, __license__, __author__, __email__
+# 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')) as f:
+    exec(f.read(), about)
 
 
 def read(fname):
@@ -17,18 +21,24 @@ def read(fname):
         content = ''
     return content
 
+
 setup(
     name='matplotlib2tikz',
-    version=__version__,
+    version=about['__version__'],
     packages=['matplotlib2tikz'],
     url='https://github.com/nschloe/matplotlib2tikz',
     download_url='https://pypi.python.org/pypi/matplotlib2tikz',
-    author=__author__,
-    author_email=__email__,
-    requires=['matplotlib (>=1.4.0)', 'numpy', 'Pillow (>= 3.0.0)'],
+    author=about['__author__'],
+    author_email=about['__email__'],
+    install_requires=[
+        'matplotlib >=1.4.0',
+        'numpy',
+        'Pillow >= 3.0.0',
+        'pipdated',
+        ],
     description='convert matplotlib figures into TikZ/PGFPlots',
     long_description=read('README.rst'),
-    license=__license__,
+    license=about['__license__'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: MIT License',