TST: move all pandas imports to use pd fixture

tacaswell · tacaswell · commit 34ad36cf460e · 2017-12-31T18:44:14.000-05:00
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -593,8 +593,7 @@ def test_size_in_xy():
     ax.set_ylim(0, 30)
 
 
-def test_pandas_indexing():
-    pd = pytest.importorskip('pandas')
+def test_pandas_indexing(pd):
 
     # Should not fail break when faced with a
     # non-zero indexed series
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -604,8 +604,7 @@ def _azimuth2math(azimuth, elevation):
     return theta, phi
 
 
-def test_pandas_iterable():
-    pd = pytest.importorskip('pandas')
+def test_pandas_iterable(pd):
     # Using a list or series yields equivalent
     # color maps, i.e the series isn't seen as
     # a single color
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -552,12 +552,9 @@ def tz_convert(dt_list, tzinfo):
     _test_date2num_dst(date_range, tz_convert)
 
 
-def test_date2num_dst_pandas():
+def test_date2num_dst_pandas(pd):
     # Test for github issue #3896, but in date2num around DST transitions
     # with a timezone-aware pandas date_range object.
-    pd = pytest.importorskip('pandas')
-    from pandas.tseries import converter
-    converter.register()
 
     def tz_convert(*args):
         return pd.DatetimeIndex.tz_convert(*args).astype(object)
diff --git a/lib/matplotlib/tests/test_preprocess_data.py b/lib/matplotlib/tests/test_preprocess_data.py
@@ -162,10 +162,8 @@ def test_function_call_with_dict_data_not_in_data(func):
 
 
 @pytest.mark.parametrize('func', all_funcs, ids=all_func_ids)
-def test_function_call_with_pandas_data(func):
+def test_function_call_with_pandas_data(func, pd):
     """test with pandas dataframe -> label comes from data["col"].name """
-    pd = pytest.importorskip('pandas')
-
     data = pd.DataFrame({"a": np.array([1, 2], dtype=np.int32),
                          "b": np.array([8, 9], dtype=np.int32),
                          "w": ["NOT", "NOT"]})
