Merge pull request #922 from effigies/nep29/numpy_1_14

NEP29: Set minimum numpy to 1.14

Author: effigies

min-requirements.txt

@@ -1,3 +1,3 @@
 # Auto-generated by tools/update_requirements.py
-numpy ==1.13
+numpy ==1.14
 packaging ==14.3

nibabel/affines.py

@@ -205,12 +205,12 @@ def append_diag(aff, steps, starts=()):
     >>> aff = np.eye(4)
     >>> aff[:3,:3] = np.arange(9).reshape((3,3))
     >>> append_diag(aff, [9, 10], [99,100])
-    array([[   0.,    1.,    2.,    0.,    0.,    0.],
-           [   3.,    4.,    5.,    0.,    0.,    0.],
-           [   6.,    7.,    8.,    0.,    0.,    0.],
-           [   0.,    0.,    0.,    9.,    0.,   99.],
-           [   0.,    0.,    0.,    0.,   10.,  100.],
-           [   0.,    0.,    0.,    0.,    0.,    1.]])
+    array([[  0.,   1.,   2.,   0.,   0.,   0.],
+           [  3.,   4.,   5.,   0.,   0.,   0.],
+           [  6.,   7.,   8.,   0.,   0.,   0.],
+           [  0.,   0.,   0.,   9.,   0.,  99.],
+           [  0.,   0.,   0.,   0.,  10., 100.],
+           [  0.,   0.,   0.,   0.,   0.,   1.]])
     """
     aff = np.asarray(aff)
     steps = np.atleast_1d(steps)

nibabel/brikhead.py

@@ -421,7 +421,7 @@ def get_data_scaling(self):
         >>> fname = os.path.join(datadir, 'scaled+tlrc.HEAD')
         >>> header = AFNIHeader(parse_AFNI_header(fname))
         >>> header.get_data_scaling()
-        array([  3.88336300e-08])
+        array([3.883363e-08])
         """
         # BRICK_FLOAT_FACS has one value per sub-brick, such that the scaled
         # values for sub-brick array [n] are the values read from disk *

nibabel/casting.py

@@ -585,7 +585,7 @@ def int_abs(arr):
     >>> int_abs(np.array([-128, 127], dtype=np.int8))
     array([128, 127], dtype=uint8)
     >>> int_abs(np.array([-128, 127], dtype=np.float32))
-    array([ 128.,  127.], dtype=float32)
+    array([128., 127.], dtype=float32)
     """
     arr = np.array(arr, copy=False)
     dt = arr.dtype

nibabel/conftest.py

@@ -89,9 +89,9 @@ def nearest_pos_semi_def(B):
     --------
     >>> B = np.diag([1, 1, -1])
     >>> nearest_pos_semi_def(B)
-    array([[ 0.75,  0.  ,  0.  ],
-           [ 0.  ,  0.75,  0.  ],
-           [ 0.  ,  0.  ,  0.  ]])
+    array([[0.75, 0.  , 0.  ],
+           [0.  , 0.75, 0.  ],
+           [0.  , 0.  , 0.  ]])
     """
     B = np.asarray(B)
     vals, vecs = npl.eigh(B)
@@ -146,11 +146,11 @@ def q2bg(q_vector, tol=1e-5):
     Examples
     --------
     >>> q2bg([1, 0, 0])
-    (1.0, array([ 1.,  0.,  0.]))
+    (1.0, array([1., 0., 0.]))
     >>> q2bg([0, 10, 0])
-    (10.0, array([ 0.,  1.,  0.]))
+    (10.0, array([0., 1., 0.]))
     >>> q2bg([0, 0, 0])
-    (0.0, array([ 0.,  0.,  0.]))
+    (0.0, array([0., 0., 0.]))
     """
     q_vec = np.asarray(q_vector)
     norm = np.sqrt(np.sum(q_vec * q_vec))

nibabel/nicom/dwiparams.py

@@ -1879,10 +1879,10 @@ def set_qform(self, affine, code=None, strip_shears=True, **kwargs):
         >>> aff = np.diag([2, 3, 4, 1])
         >>> img = Nifti1Pair(data, aff)
         >>> img.get_qform()
-        array([[ 2.,  0.,  0.,  0.],
-               [ 0.,  3.,  0.,  0.],
-               [ 0.,  0.,  4.,  0.],
-               [ 0.,  0.,  0.,  1.]])
+        array([[2., 0., 0., 0.],
+               [0., 3., 0., 0.],
+               [0., 0., 4., 0.],
+               [0., 0., 0., 1.]])
         >>> img.get_qform(coded=True)
         (None, 0)
         >>> aff2 = np.diag([3, 4, 5, 1])
@@ -1962,16 +1962,16 @@ def set_sform(self, affine, code=None, **kwargs):
         >>> aff = np.diag([2, 3, 4, 1])
         >>> img = Nifti1Pair(data, aff)
         >>> img.get_sform()
-        array([[ 2.,  0.,  0.,  0.],
-               [ 0.,  3.,  0.,  0.],
-               [ 0.,  0.,  4.,  0.],
-               [ 0.,  0.,  0.,  1.]])
+        array([[2., 0., 0., 0.],
+               [0., 3., 0., 0.],
+               [0., 0., 4., 0.],
+               [0., 0., 0., 1.]])
         >>> saff, code = img.get_sform(coded=True)
         >>> saff
-        array([[ 2.,  0.,  0.,  0.],
-               [ 0.,  3.,  0.,  0.],
-               [ 0.,  0.,  4.,  0.],
-               [ 0.,  0.,  0.,  1.]])
+        array([[2., 0., 0., 0.],
+               [0., 3., 0., 0.],
+               [0., 0., 4., 0.],
+               [0., 0., 0., 1.]])
         >>> int(code)
         2
         >>> aff2 = np.diag([3, 4, 5, 1])

nibabel/nifti1.py

@@ -466,13 +466,13 @@ def quat2angle_axis(quat, identity_thresh=None):
     >>> np.allclose(theta, np.pi)
     True
     >>> vec
-    array([ 1.,  0.,  0.])
+    array([1., 0., 0.])
 
     If this is an identity rotation, we return a zero angle and an
     arbitrary vector
 
     >>> quat2angle_axis([1, 0, 0, 0])
-    (0.0, array([ 1.,  0.,  0.]))
+    (0.0, array([1., 0., 0.]))
 
     Notes
     -----

nibabel/quaternions.py

@@ -1200,7 +1200,7 @@ def int_scinter_ftype(ifmt, slope=1.0, inter=0.0, default=np.float32):
         >>> arr = np.array([np.finfo(np.float32).max], dtype=np.float32)
         >>> res = arr + np.iinfo(np.int16).max
         >>> arr == res
-        array([ True], dtype=bool)
+        array([ True])
     """
     ii = np.iinfo(ifmt)
     tst_arr = np.array([ii.min, ii.max], dtype=ifmt)

nibabel/volumeutils.py

@@ -1,3 +1,3 @@
 # Auto-generated by tools/update_requirements.py
-numpy >=1.13
+numpy >=1.14
 packaging >=14.3

requirements.txt

@@ -29,7 +29,7 @@ provides =
 [options]
 python_requires = >=3.6
 install_requires =
-    numpy >=1.13
+    numpy >=1.14
     packaging >=14.3
 zip_safe = False
 packages = find: