using pytest.importorskip to handle test environments without pandas installed

gitsteph · gitsteph · commit 19ed2f3b099d · 2019-11-03T09:25:53.000-08:00
diff --git a/sklearn/datasets/tests/test_california_housing.py b/sklearn/datasets/tests/test_california_housing.py
@@ -3,8 +3,9 @@
 Skipped if california_housing is not already downloaded to data_home.
 """
 
+import pytest
+
 from sklearn.datasets import fetch_california_housing
-from sklearn.utils import check_pandas_support
 from sklearn.utils._testing import SkipTest
 from sklearn.datasets.tests.test_common import check_return_X_y
 from functools import partial
@@ -28,7 +29,7 @@ def test_fetch():
 
 
 def test_fetch_asframe():
-    pd = check_pandas_support('test_fetch_asframe with as_frame=True')
+    pd = pytest.importorskip('pandas')
     bunch = fetch(as_frame=True)
     frame = bunch.frame
     assert (hasattr(bunch, 'frame') is True)
