fixup! ENH: Native conversion from/to scipy.sparse matrix to SparseDataFrame

Author: kernc

pandas/tests/sparse/test_frame.py

@@ -1120,10 +1120,8 @@ def test_isnotnull(self):
 
     def test_from_to_scipy(self):
         # GH 4343
-        try:
-            from scipy.sparse import csr_matrix
-        except ImportError:
-            return  # scipy not available
+        tm._skip_if_no_scipy()
+        from scipy.sparse import csr_matrix
 
         arr = np.array([[0, 1, 0],
                         [0, 0, 1],

pandas/util/testing.py

@@ -297,6 +297,11 @@ def _skip_if_no_scipy():
     except ImportError:
         import pytest
         pytest.skip('scipy.interpolate missing')
+    try:
+        import scipy.sparse
+    except ImportError:
+        import pytest
+        pytest.skip('scipy.sparse missing')
 
 
 def _skip_if_scipy_0_17():