Merge pull request #171 from nschloe/remove-landscape-badge

Remove landscape badge

Author: nschloe

.travis.yml

@@ -31,7 +31,10 @@ addons:
       - python-tk
 
 before_install:
-  - pip install pytest pytest-cov
+  - pip install pytest pytest-cov code_extract
+  # 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

Makefile

@@ -10,6 +10,7 @@ default:
 
 README.rst: README.md
 	pandoc README.md -o README.rst
+	sed -i 's/python,test/python/g' README.rst
 	python setup.py check -r -s || exit 1
 
 upload: setup.py README.rst

README.md

@@ -1,7 +1,6 @@
 # matplotlib2tikz
 
 [![Build Status](https://travis-ci.org/nschloe/matplotlib2tikz.svg?branch=master)](https://travis-ci.org/nschloe/matplotlib2tikz)
-[![Code Health](https://landscape.io/github/nschloe/matplotlib2tikz/master/landscape.png)](https://landscape.io/github/nschloe/matplotlib2tikz/master)
 [![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)
@@ -11,7 +10,7 @@ This is matplotlib2tikz, a Python tool for converting matplotlib figures into
 [PGFPlots](https://www.ctan.org/pkg/pgfplots)
 ([TikZ](https://www.ctan.org/pkg/pgf)) figures like
 
-![](https://nschloe.github.io/matplotlib2tikz/latex3.png)
+![](https://nschloe.github.io/matplotlib2tikz/example.png)
 
 for native inclusion into LaTeX documents.
 
@@ -21,12 +20,12 @@ sits on top of TikZ and describes graphs in terms of axes, data etc.
 Consequently, the output of matplotlib2tikz retains more information, can be
 more easily understood, and is more easily editable than [raw TikZ output](http://matplotlib.org/users/whats_new.html#pgf-tikz-backend).
 For example, the matplotlib figure
-```python
-from matplotlib import pyplot as plt
-from matplotlib import style
+```python,test
+import matplotlib.pyplot as plt
 import numpy as np
-fig = plt.figure()
-style.use('ggplot')
+
+plt.style.use('ggplot')
+
 t = np.arange(0.0, 2.0, 0.1)
 s = np.sin(2*np.pi*t)
 s2 = np.cos(2*np.pi*t)
@@ -52,24 +51,25 @@ tikz_save('test.tex')
 title={Simple plot $\frac{\alpha}{2}$},
 xlabel={time(s)},
 ylabel={Voltage (mV)},
-xmin=0, xmax=2,
-ymin=-1, ymax=1,
+xmin=-0.095, xmax=1.995,
+ymin=-1.1, ymax=1.1,
 tick align=outside,
+tick pos=left,
 xmajorgrids,
 x grid style={white},
 ymajorgrids,
 y grid style={white},
 axis line style={white},
 axis background/.style={fill=white!89.803921568627459!black}
 ]
-\addplot [line width=1.64pt, color0, mark=*, mark size=3, mark options={solid,draw=black}]
+\addplot [line width=1.64pt, color0, mark=*, mark size=3, mark options={solid}]
 table {%
 0 0
 0.1 0.587785252292473
 % [...]
 1.9 -0.587785252292473
 };
-\addplot [line width=1.64pt, color1, mark=*, mark size=3, mark options={solid,draw=black}]
+\addplot [line width=1.64pt, color1, mark=*, mark size=3, mark options={solid}]
 table {%
 0 1
 0.1 0.809016994374947

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.7'
+__version__ = '0.6.8'
 __maintainer__ = u'Nico Schlömer'
 __status__ = 'Development Status :: 5 - Production/Stable'

matplotlib2tikz/axes.py

@@ -346,7 +346,7 @@ def __init__(self, data, obj):
                         data, 'minor y', colorbar_ticks_minor,
                         colorbar_ticklabels_minor)
                     )
-                colorbar_styles.append('ylabel={'+ colorbar_ylabel +'}')
+                colorbar_styles.append('ylabel={' + colorbar_ylabel + '}')
 
             mycolormap, is_custom_cmap = _mpl_cmap2pgf_cmap(
                     colorbar.get_cmap()
@@ -390,8 +390,9 @@ def __get_label_rotation_and_horizontal_alignment(self, obj, data, axes):
         tick_label_text_width = None
         tick_label_text_width_identifier = "%s tick label text width" % axes
         if tick_label_text_width_identifier in data['extra axis options']:
-            tick_label_text_width = data['extra axis options [base]'] \
-                [tick_label_text_width_identifier]
+            tick_label_text_width = data['extra axis options [base]'][
+                        tick_label_text_width_identifier
+                        ]
             del data['extra axis options'][tick_label_text_width_identifier]
 
         label_style = ""

matplotlib2tikz/line2d.py

@@ -3,6 +3,8 @@
 from . import color as mycol
 from . import path as mypath
 
+import six
+
 
 def draw_line2d(data, obj):
     '''Returns the PGFPlots code for an Line2D environment.
@@ -58,7 +60,9 @@ def draw_line2d(data, obj):
         mark_options = ['solid']
         if extra_mark_options:
             mark_options.append(extra_mark_options)
-        if marker_face_color in [None, 'none']:
+        if marker_face_color is None or \
+           (isinstance(marker_face_color, six.string_types) and
+               marker_face_color == 'none'):
             mark_options.append('fill opacity=0')
         else:
             data, face_xcolor, _ = mycol.mpl_color2xcolor(

matplotlib2tikz/patch.py

@@ -63,17 +63,21 @@ def _draw_rectangle(data, obj, draw_options):
 
     # get real label, bar charts by default only give rectangles
     # labels of "_nolegend_"
-    # See http://stackoverflow.com/questions/35881290/how-to-get-the-label-on-bar-plot-stacked-bar-plot-in-matplotlib
-    handles,labels = obj.axes.get_legend_handles_labels()
-    labelsFound = [label for h,label in zip(handles, labels) if obj in h.get_children()]
+    # See
+    # <http://stackoverflow.com/questions/35881290/how-to-get-the-label-on-bar-plot-stacked-bar-plot-in-matplotlib>
+    handles, labels = obj.axes.get_legend_handles_labels()
+    labelsFound = [
+        label for h, label in zip(handles, labels) if obj in h.get_children()
+        ]
     if len(labelsFound) == 1:
         label = labelsFound[0]
 
     legend = ''
     if label != '_nolegend_' and label not in data['rectangle_legends']:
         data['rectangle_legends'].add(label)
-        legend = ('\\addlegendimage{ybar,ybar legend,%s};\n'
-                 ) % (','.join(draw_options))
+        legend = (
+            '\\addlegendimage{ybar,ybar legend,%s};\n'
+            ) % (','.join(draw_options))
 
     left_lower_x = obj.get_x()
     left_lower_y = obj.get_y()

matplotlib2tikz/save.py

@@ -235,6 +235,7 @@ def _print_pgfplot_libs_message(data):
     print('=========================================================')
     return
 
+
 class _ContentManager(object):
     """ Basic Content Manager for matplotlib2tikz
 

setup.py

@@ -35,6 +35,7 @@ def read(fname):
         'numpy',
         'Pillow >= 3.0.0',
         'pipdated',
+        'six',
         ],
     description='convert matplotlib figures into TikZ/PGFPlots',
     long_description=read('README.rst'),