Fix after rebase with master

Author: kdorr

mplaltair/tests/baseline_images/test_axis/test_axis_scale_basic_df1-years

@@ -150,10 +150,10 @@ def test_axis_tickCount(df, x, tickCount):
 
 
 @pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_axis')
-@pytest.mark.parametrize('df,column,type', [(df_quant, 'log', 'log'), (df_temp, 'years:T', 'time')])
-def test_axis_scale_basic(df, column, type):
+@pytest.mark.parametrize('df,column,scale_type', [(df_quant, 'log', 'log'), (df_temp, 'years', 'time')])
+def test_axis_scale_basic(df, column, scale_type):
     chart = alt.Chart(df).mark_point().encode(
-        alt.X(column, scale=alt.Scale(type=type)),
+        alt.X(column, scale=alt.Scale(type=scale_type)),
         alt.Y('a')
     )
     mapping = convert(chart)

mplaltair/tests/baseline_images/test_axis/test_axis_scale_basic_df1-years-time.png

@@ -83,13 +83,6 @@ def test_data_dtype_fail():
     for channel in chart.to_dict()['encoding']:
         with pytest.raises(NotImplementedError):
             dtype = _data._locate_channel_dtype(chart, channel)
-    assert dtype == 'quantitative'
-
-
-# TODO: _locate_channel_scale() tests
-
-# TODO: _locate channel_axis() tests
-
 
 # test date conversion: