Skip to content

Commit d6442c1

Browse files
committed
TEST: Minimum numpy >= 1.12
1 parent 9b43713 commit d6442c1

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

nibabel/tests/test_fileslice.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111

1212
import numpy as np
1313

14-
# np > 1.11 makes double ellipsis illegal in indices
15-
HAVE_NP_GT_1p11 = LooseVersion(np.__version__) > '1.11'
16-
1714
from ..fileslice import (is_fancy, canonical_slicers, fileslice,
1815
predict_shape, read_segments, _positive_slice,
1916
threshold_heuristic, optimize_slicer, slice2len,
@@ -46,7 +43,7 @@ def test_is_fancy():
4643
_check_slice(slice0)
4744
_check_slice((slice0,)) # tuple is same
4845
# Double ellipsis illegal in np 1.12dev - set up check for that case
49-
maybe_bad = HAVE_NP_GT_1p11 and slice0 is Ellipsis
46+
maybe_bad = slice0 is Ellipsis
5047
for slice1 in slices:
5148
if maybe_bad and slice1 is Ellipsis:
5249
continue

nibabel/tests/test_floating.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ def test_check_nmant_nexp():
108108
assert_true(_check_nmant(t, ti['nmant']))
109109
# Test fails for longdouble after blacklisting of OSX powl as of numpy
110110
# 1.12 - see https://github.com/numpy/numpy/issues/8307
111-
if (t != np.longdouble or
112-
sys.platform != 'darwin' or
113-
LooseVersion(np.__version__) < LooseVersion('1.12')):
111+
if t != np.longdouble or sys.platform != 'darwin':
114112
assert_true(_check_maxexp(t, ti['maxexp']))
115113

116114

0 commit comments

Comments
 (0)