Remove sph_harm workaround for older (<1.15) scipy

pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
     "psutil",
     "pymanopt",
     "PyWavelets",
-    "scipy >= 1.10.0",
+    "scipy >= 1.15.0",
     "scikit-learn >= 1.5.0",
     "scikit-image",
     "setuptools >= 0.41",

src/aspire/basis/basis.py

@@ -2,10 +2,9 @@
 import warnings
 
 import numpy as np
-from scipy.sparse.linalg import LinearOperator
+from scipy.sparse.linalg import LinearOperator, cg
 
 from aspire.image import Image
-from aspire.numeric.scipy import cg
 from aspire.utils import mdim_mat_fun_conj
 from aspire.volume import Volume
 

src/aspire/covariance/covar.py

@@ -2,12 +2,12 @@
 from functools import partial
 
 import numpy as np
+import scipy
 from scipy.linalg import norm
 from scipy.sparse.linalg import LinearOperator
 
 from aspire.nufft import anufft
 from aspire.numeric import fft
-from aspire.numeric.scipy import cg
 from aspire.operators import evaluate_src_filters_on_grid
 from aspire.reconstruction import Estimator, FourierKernel, MeanEstimator
 from aspire.utils import make_symmat, symmat_to_vec_iso, trange, vec_to_symmat_iso
@@ -123,7 +123,9 @@ def cb(xk):
                 f"Delta {norm(b_coef - self.apply_kernel(xk, packed=True))} (target {target_residual})"
             )
 
-        x, info = cg(operator, b_coef, M=M, callback=cb, rtol=tol, atol=0)
+        x, info = scipy.sparse.linalg.cg(
+            operator, b_coef, M=M, callback=cb, rtol=tol, atol=0
+        )
 
         if info != 0:
             raise RuntimeError("Unable to converge!")

src/aspire/reconstruction/mean.py

@@ -3,13 +3,12 @@
 
 import numpy as np
 from scipy.linalg import norm
-from scipy.sparse.linalg import LinearOperator
+from scipy.sparse.linalg import LinearOperator, cg
 
 from aspire import config
 from aspire.basis import Coef
 from aspire.nufft import anufft
 from aspire.numeric import fft
-from aspire.numeric.scipy import cg
 from aspire.operators import evaluate_src_filters_on_grid
 from aspire.reconstruction import Estimator, FourierKernel, FourierKernelMatrix
 from aspire.volume import Volume, rotated_grids

tests/test_basis_utils.py

@@ -1,22 +1,7 @@
 from unittest import TestCase
 
 import numpy as np
-
-# This can be removed when project requires scipy>=1.15.0
-# scipy<1.15.0 provide `sph_harm`
-import scipy
-from packaging.version import Version
-
-if Version(scipy.__version__) < Version("1.15.0"):
-    from scipy.special import sph_harm as sp_sph_harm
-
-    # This has a different convention from upstream sph_harm_y
-    def sph_harm_y(j, m, x, y):
-        return sp_sph_harm(m, j, y, x)
-
-else:
-    # scipy>=1.15.0 provide `sph_harm_y`
-    from scipy.special import sph_harm_y
+from scipy.special import sph_harm_y
 
 from aspire.basis.basis_utils import (
     all_besselj_zeros,