Address merge conflicts.

pydata · Jan 16, 2024 · 5f5c993 · 5f5c993
1 parent cab44be
commit 5f5c993
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/sparse/_coo/core.py b/sparse/_coo/core.py
@@ -8,7 +8,6 @@
 import numba
 
 import numpy as np
-import scipy.sparse
 from numpy.lib.mixins import NDArrayOperatorsMixin
 
 from .._sparse_array import SparseArray
@@ -1177,6 +1176,8 @@ def to_scipy_sparse(self):
         COO.tocsr : Convert to a :obj:`scipy.sparse.csr_matrix`.
         COO.tocsc : Convert to a :obj:`scipy.sparse.csc_matrix`.
         """
+        import scipy.sparse
+
         check_zero_fill_value(self)
 
         if self.ndim != 2:
@@ -1187,6 +1188,8 @@ def to_scipy_sparse(self):
         return result
 
     def _tocsr(self):
+        import scipy.sparse
+
         if self.ndim != 2:
             raise ValueError("This array must be two-dimensional for this conversion to work.")
         row, col = self.coords