Merge pull request #858 from arokem/fixes-for-np-1.11

Updates for upcoming numpy 1.11 release
dipy · Feb 9, 2016 · f1ea967 · f1ea967
2 parents 52d564c + 4b33282
commit f1ea967
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dipy/direction/peaks.py b/dipy/direction/peaks.py
@@ -243,7 +243,7 @@ def _peaks_from_model_parallel(model, data, sphere, relative_peak_threshold,
                            mode='w+',
                            shape=(data.shape[0], npeaks))
         if return_sh:
-            nbr_shm_coeff = (sh_order + 2) * (sh_order + 1) / 2
+            nbr_shm_coeff = (sh_order + 2) * (sh_order + 1) // 2
             pam.shm_coeff = np.memmap(path.join(tmpdir, 'shm.npy'),
                                       dtype=pam_res[0].shm_coeff.dtype,
                                       mode='w+',

diff --git a/dipy/reconst/tests/test_shm.py b/dipy/reconst/tests/test_shm.py
@@ -278,7 +278,7 @@ def test_SphHarmFit():
     assert_equal(item.shape, ())
     slice = fit[0]
     assert_equal(slice.shape, (4, 5))
-    slice = fit[..., 0]
+    slice = fit[:, :, 0]
     assert_equal(slice.shape, (3, 4))
 
 

diff --git a/dipy/tracking/local/tests/test_local_tracking.py b/dipy/tracking/local/tests/test_local_tracking.py
@@ -39,7 +39,7 @@ class SimpleDirectionGetter(DirectionGetter):
         def initial_direction(self, point):
             # Test tracking along the rows (z direction)
             # of the tissue array above
-            p = np.round(point)
+            p = np.round(point).astype(int)
             if (any(p < 0) or
                 any(p >= tissue.shape) or
                 tissue[p[0], p[1], p[2]] == TissueTypes.INVALIDPOINT):
@@ -151,10 +151,10 @@ def get_direction(self, p, d):
     npt.assert_equal(sl[-1], seeds[y])
     npt.assert_equal(len(sl), 1)
 
-    bad_affine = np.eye(3.)
+    bad_affine = np.eye(3)
     npt.assert_raises(ValueError, LocalTracking, dg, tc, seeds, bad_affine, 1.)
 
-    bad_affine = np.eye(4.)
+    bad_affine = np.eye(4)
     bad_affine[0, 1] = 1.
     npt.assert_raises(ValueError, LocalTracking, dg, tc, seeds, bad_affine, 1.)
 

diff --git a/dipy/tracking/tests/test_markov.py b/dipy/tracking/tests/test_markov.py
@@ -250,7 +250,7 @@ def fit(self, data):
 
     class MyFit(object):
         def __init__(self, n):
-            self.n = n
+            self.n = int(n)
 
         def odf(self, sphere):
             return odf_list[self.n]