Merge pull request #794 from 36000/bd_fixes

[FIX] Some fixes for nightly tests
yeatmanlab · Feb 10, 2022 · 5b3e32f · 5b3e32f
2 parents 2002e20 + 55ac541
commit 5b3e32f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/AFQ/_fixes.py b/AFQ/_fixes.py
@@ -1,4 +1,5 @@
 import numpy as np
+from scipy.sparse.linalg import ArpackNoConvergence
 
 from scipy.special import lpmv, gammaln
 
@@ -244,7 +245,9 @@ def solve_qp(P, Q, G, H):
     try:
         prob.solve()
         opt = np.array(x.value).reshape((Q.shape[0],))
-    except (cvx.error.SolverError, cvx.error.DCPError):
+    except (
+            cvx.error.SolverError, cvx.error.DCPError,
+            ArpackNoConvergence):
         opt = np.empty((Q.shape[0],))
         opt[:] = np.NaN
 

diff --git a/AFQ/tests/test_api.py b/AFQ/tests/test_api.py
@@ -460,7 +460,7 @@ def test_AFQ_slr():
 
     seg_sft = aus.SegmentedSFT.fromfile(
         myafq.clean_bundles["01"])
-    npt.assert_(len(seg_sft.get_bundle.streamlines('CST_L')) > 0)
+    npt.assert_(len(seg_sft.get_bundle('CST_L').streamlines) > 0)
 
 
 @pytest.mark.nightly_reco