diff --git a/tests/test_atlases_query.py b/tests/test_atlases_query.py index fedb0a00d9fa30405c50d2a1a880d78288e20f4e..c90a122e7e3a5b4f12e51e0e5df36428f89f2cb4 100644 --- a/tests/test_atlases_query.py +++ b/tests/test_atlases_query.py @@ -85,7 +85,7 @@ def _get_zero_mask(aimg): elif isinstance(aimg, fslatlases.ProbabilisticAtlas): # Keep memory usage down - zmask = np.ones(aimg.shape[:3], dtype=np.bool) + zmask = np.ones(aimg.shape[:3], dtype=bool) for vol in range(aimg.shape[-1]): zmask = np.logical_and(zmask, aimg[..., vol] == 0) diff --git a/tests/test_image_resample.py b/tests/test_image_resample.py index 6961e7aa71c63a09d21f93ca5e128d8622b678a9..ccc0b8935780c2793b060a5065133e792fb823b1 100644 --- a/tests/test_image_resample.py +++ b/tests/test_image_resample.py @@ -75,7 +75,7 @@ def test_resample(seed): (np.isclose(np.modf(origtestcoords)[0], 0.5))) out = np.any(out, axis=1) | (resvals == 0) - origtestcoords = np.array(origtestcoords.round(), dtype=np.int) + origtestcoords = np.array(origtestcoords.round(), dtype=int) origtestcoords = origtestcoords[~out, :] restestcoords = restestcoords[ ~out, :] @@ -166,8 +166,8 @@ def test_resampleToPixdims(): img = fslimage.Image(make_random_image(dims=(10, 10, 10))) imglo, imghi = affine.axisBounds(img.shape, img.voxToWorldMat) - oldpix = np.array(img.pixdim, dtype=np.float) - oldshape = np.array(img.shape, dtype=np.float) + oldpix = np.array(img.pixdim, dtype=float) + oldshape = np.array(img.shape, dtype=float) for i, origin in it.product(range(25), ('centre', 'corner')): @@ -215,16 +215,16 @@ def test_resampleToReference2(): # More specific test - output # data gets transformed correctly # into reference space - img = np.zeros((5, 5, 5), dtype=np.float) + img = np.zeros((5, 5, 5), dtype=float) img[1, 1, 1] = 1 img = fslimage.Image(img) refv2w = affine.scaleOffsetXform([1, 1, 1], [-1, -1, -1]) - ref = np.zeros((5, 5, 5), dtype=np.float) + ref = np.zeros((5, 5, 5), dtype=float) ref = fslimage.Image(ref, xform=refv2w) res = resample.resampleToReference(img, ref, order=0) - exp = np.zeros((5, 5, 5), dtype=np.float) + exp = np.zeros((5, 5, 5), dtype=float) exp[2, 2, 2] = 1 assert np.all(np.isclose(res[0], exp)) diff --git a/tests/test_imagewrapper.py b/tests/test_imagewrapper.py index 868245fefd24738197b47c2eab4e3214ffc28837..9de727fc98040f2ab7dcb21c17ff198bb65faf0a 100644 --- a/tests/test_imagewrapper.py +++ b/tests/test_imagewrapper.py @@ -1195,7 +1195,7 @@ def test_3D_indexing(shape=None, img=None): assert type(img[0, 0, 0]) == np.float64 - mask1 = np.zeros(shape, dtype=np.bool) + mask1 = np.zeros(shape, dtype=bool) mask1[0, 0, 0] = True mask1[1, 0, 0] = True @@ -1252,7 +1252,7 @@ def test_3D_4D_indexing(): assert type(img[0, 0, 0, 0]) == np.float64 assert type(img[0, 0, 0, :]) == np.float64 - mask = np.zeros(padShape, dtype=np.bool) + mask = np.zeros(padShape, dtype=bool) mask[0, 0, 0, 0] = True assert type(img[mask]) == np.ndarray @@ -1282,13 +1282,13 @@ def test_3D_len_one_indexing(shape=None, img=None): assert type(img[0, 0]) == np.ndarray assert type(img[0, 0, 0]) == np.float64 - mask = np.zeros(shape[:2], dtype=np.bool) + mask = np.zeros(shape[:2], dtype=bool) mask[0, 0] = True assert type(img[mask]) == np.ndarray assert img[mask].shape == (1, ) - mask = np.zeros(shape, dtype=np.bool) + mask = np.zeros(shape, dtype=bool) mask[0, 0, 0] = True assert type(img[mask]) == np.ndarray @@ -1352,7 +1352,7 @@ def test_4D_indexing(shape=None, img=None): assert type(img[0, 0, 0, 0]) == np.float64 - mask1 = np.zeros(shape, dtype=np.bool) + mask1 = np.zeros(shape, dtype=bool) mask1[0, 0, 0, 0] = True mask1[1, 0, 0, 0] = True diff --git a/tests/test_transform/test_affine.py b/tests/test_transform/test_affine.py index 469c6c13d98950e379a9a042467b0a4f4d517dcb..f1dceb61312c7f05f97c9d871dc8a4a0ae95f492 100644 --- a/tests/test_transform/test_affine.py +++ b/tests/test_transform/test_affine.py @@ -395,7 +395,7 @@ def test_transform(): mask = np.array([[1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 1], - [0, 0, 0, 1]], dtype=np.bool) + [0, 0, 0, 1]], dtype=bool) return np.all((xform != 0) == mask) diff --git a/tests/test_transform/test_nonlinear.py b/tests/test_transform/test_nonlinear.py index 8bfb0c3aba0d7d0746cf48d56b19631dfc1c2536..1cb8cf8f7df8e2fea674961d00b898f72b1858f7 100644 --- a/tests/test_transform/test_nonlinear.py +++ b/tests/test_transform/test_nonlinear.py @@ -161,7 +161,7 @@ def test_convertDeformationSpace(): refcoords = [np.random.randint(0, basefield.shape[0], 5), np.random.randint(0, basefield.shape[1], 5), np.random.randint(0, basefield.shape[2], 5)] - refcoords = np.array(refcoords, dtype=np.int).T + refcoords = np.array(refcoords, dtype=int).T refcoords = affine.transform(refcoords, ref.voxToScaledVoxMat) srccoords = basefield.transform(refcoords)