Skip to content

Commit be5ccea

Browse files
committed
COMPAT: compat with released numpy 1.11 for IndexError -> TypeError
was a revert of # numpy/numpy#6271 closes pandas-dev#12729 closes pandas-dev#12736
1 parent 75a9fb9 commit be5ccea

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

pandas/compat/numpy_compat.py

+9-11
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@
44
from distutils.version import LooseVersion
55
from pandas.compat import string_types, string_and_binary_types
66

7-
# TODO: HACK for NumPy 1.5.1 to suppress warnings
8-
# is this necessary?
9-
try:
10-
np.seterr(all='ignore')
11-
except Exception: # pragma: no cover
12-
pass
7+
# turn off all numpy warnings
8+
np.seterr(all='ignore')
139

1410
# numpy versioning
1511
_np_version = np.version.short_version
16-
_np_version_under1p8 = LooseVersion(_np_version) < '1.8'
17-
_np_version_under1p9 = LooseVersion(_np_version) < '1.9'
18-
_np_version_under1p10 = LooseVersion(_np_version) < '1.10'
19-
_np_version_under1p11 = LooseVersion(_np_version) < '1.11'
12+
_nlv = LooseVersion(_np_version)
13+
_np_version_under1p8 = _nlv < '1.8'
14+
_np_version_under1p9 = _nlv < '1.9'
15+
_np_version_under1p10 = _nlv < '1.10'
16+
_np_version_under1p11 = _nlv < '1.11'
17+
_np_version_under1p12 = _nlv < '1.12'
2018

2119
if LooseVersion(_np_version) < '1.7.0':
2220
raise ImportError('this version of pandas is incompatible with '
@@ -67,9 +65,9 @@ def np_array_datetime64_compat(arr, *args, **kwargs):
6765
return np.array(arr, *args, **kwargs)
6866

6967
__all__ = ['np',
70-
'_np_version',
7168
'_np_version_under1p8',
7269
'_np_version_under1p9',
7370
'_np_version_under1p10',
7471
'_np_version_under1p11',
72+
'_np_version_under1p12',
7573
]

pandas/tseries/tests/test_period.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from pandas.compat.numpy_compat import np_datetime64_compat
2727

2828
from pandas import (Series, DataFrame,
29-
_np_version_under1p9, _np_version_under1p11)
29+
_np_version_under1p9, _np_version_under1p12)
3030
from pandas import tslib
3131
from pandas.util.testing import (assert_series_equal, assert_almost_equal,
3232
assertRaisesRegexp)
@@ -2607,8 +2607,9 @@ def test_range_slice_day(self):
26072607
didx = DatetimeIndex(start='2013/01/01', freq='D', periods=400)
26082608
pidx = PeriodIndex(start='2013/01/01', freq='D', periods=400)
26092609

2610-
# changed to TypeError in 1.11
2611-
exc = IndexError if _np_version_under1p11 else TypeError
2610+
# changed to TypeError in 1.12
2611+
# https://github.com/numpy/numpy/pull/6271
2612+
exc = IndexError if _np_version_under1p12 else TypeError
26122613

26132614
for idx in [didx, pidx]:
26142615
# slices against index should raise IndexError
@@ -2664,8 +2665,9 @@ def test_range_slice_seconds(self):
26642665
periods=4000)
26652666
pidx = PeriodIndex(start='2013/01/01 09:00:00', freq='S', periods=4000)
26662667

2667-
# changed to TypeError in 1.11
2668-
exc = IndexError if _np_version_under1p11 else TypeError
2668+
# changed to TypeError in 1.12
2669+
# https://github.com/numpy/numpy/pull/6271
2670+
exc = IndexError if _np_version_under1p12 else TypeError
26692671

26702672
for idx in [didx, pidx]:
26712673
# slices against index should raise IndexError

0 commit comments

Comments
 (0)