Merge branch 'encodings' of git://github.com/palnabarun/mpl-altair into encodings

Author: kdorr

.travis.yml

@@ -6,6 +6,10 @@ cache:
     - $HOME/.cache/pip
     - $HOME/.cache/matplotlib
 
+env:
+  global:
+    - MPLBACKEND=agg
+
 matrix:
   fast_finish: true
   include:
@@ -23,7 +27,7 @@ install:
   - python -m pip install -ve .
 
 script:
-  - coverage run run_tests.py
+  - pytest --cov=mplaltair --mpl
   - coverage report -m
   - set -e
   - codecov

mplaltair/__init__.py

@@ -14,9 +14,10 @@ def convert(chart):
 
     Returns
     -------
-    mapping: dict
-        Mapping from parts of the encoding to the Matplotlib artists.
-        This is for later customization
+    mapping : dict
+        Mapping from parts of the encoding to the Matplotlib artists.  This is
+        for later customization.
+
 
     """
     return _convert(chart)

mplaltair/_convert.py

@@ -6,7 +6,6 @@ def _allowed_ranged_marks(enc_channel, mark):
     """
     return mark in ['area', 'bar', 'rect', 'rule'] if enc_channel in ['x2', 'y2'] else True
 
-
 def _process_x(dtype, data):
     """Returns the MPL encoding equivalent for Altair x channel
     """

mplaltair/_data.py

@@ -1,3 +1,5 @@
+from ._exceptions import ValidationError
+
 def _locate_channel_dtype(chart, channel):
     """Locates dtype used for each channel
         Parameters
@@ -36,6 +38,11 @@ def _locate_channel_data(chart, channel):
     -------
     A numpy ndarray containing the data used for the channel
 
+    Raises
+    ------
+    ValidationError
+        Raised when the specification does not contain any data attribute
+
     """
 
     channel_val = chart.to_dict()['encoding'][channel]

mplaltair/_exceptions.py

@@ -0,0 +1,2 @@
+class ValidationError(Exception):
+    pass

mplaltair/tests/test_basic.py

@@ -1,3 +1,10 @@
+import matplotlib.pyplot as plt
+
 def test_import():
     import mplaltair
     del mplaltair
+
+def test_mpl_figure():
+    fig = plt.figure()
+    del fig
+

mplaltair/tests/test_convert.py

@@ -104,9 +104,9 @@ def test_convert_color_fail():
     with pytest.raises(KeyError):
         convert(chart_spec)
 
-@pytest.mark.parametrize('channel', ['quant', 'ord'])
-def test_convert_fill(channel):
-    chart_spec = alt.Chart(df).encode(fill=channel).mark_point()
+@pytest.mark.parametrize('channel,type', [('quant', 'Q'), ('ord', 'O')])
+def test_convert_fill(channel, type):
+    chart_spec = alt.Chart(df).encode(fill='{}:{}'.format(channel, type)).mark_point()
     mapping = convert(chart_spec)
     assert list(mapping['c']) == list(df[channel].values)
 
@@ -121,6 +121,7 @@ def test_convert_fill_success_temporal(column):
     mapping = convert(chart)
     assert list(mapping['c']) == list(mdates.date2num(df[column].values))
 
+
 def test_convert_fill_fail():
     chart_spec = alt.Chart(df).encode(fill='b:N').mark_point()
     with pytest.raises(KeyError):
@@ -156,9 +157,9 @@ def test_convert_opacity_fail_temporal(column):
     chart = alt.Chart(df).mark_point().encode(alt.Opacity(column))
     convert(chart)
 
-@pytest.mark.parametrize('channel,dtype', [('quant','quantitative'), ('ord', 'ordinal')])
-def test_convert_size_success(channel, dtype):
-    chart_spec = alt.Chart(df).encode(size=alt.Size(field=channel, type=dtype)).mark_point()
+@pytest.mark.parametrize('channel,type', [('quant', 'Q'), ('ord', 'O')])
+def test_convert_size_success(channel, type):
+    chart_spec = alt.Chart(df).encode(size='{}:{}'.format(channel, type)).mark_point()
     mapping = convert(chart_spec)
     assert list(mapping['s']) == list(df[channel].values)
 

run_tests.py

@@ -1 +1,3 @@
 vega-datasets>=0.5.0
+pytest-mpl>=0.9
+pytest-cov>=2.5.1