Skip to content

TST: fix period tests for numpy 1.9.3 (GH14183) #14331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2016
Merged

TST: fix period tests for numpy 1.9.3 (GH14183) #14331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pandas/tseries/tests/test_period.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
from pandas.compat.numpy import np_datetime64_compat

from pandas import (Series, DataFrame,
_np_version_under1p9, _np_version_under1p12)
_np_version_under1p9, _np_version_under1p10,
_np_version_under1p12)
from pandas import tslib
import pandas.util.testing as tm

Expand Down Expand Up @@ -4177,7 +4178,7 @@ def test_pi_ops_errors(self):
with tm.assertRaises(TypeError):
np.add(obj, ng)

if _np_version_under1p9:
if _np_version_under1p10:
self.assertIs(np.add(ng, obj), NotImplemented)
else:
with tm.assertRaises(TypeError):
Expand All @@ -4186,7 +4187,7 @@ def test_pi_ops_errors(self):
with tm.assertRaises(TypeError):
np.subtract(obj, ng)

if _np_version_under1p9:
if _np_version_under1p10:
self.assertIs(np.subtract(ng, obj), NotImplemented)
else:
with tm.assertRaises(TypeError):
Expand Down Expand Up @@ -4293,7 +4294,7 @@ def test_pi_sub_period(self):
tm.assert_index_equal(result, exp)

result = np.subtract(pd.Period('2012-01', freq='M'), idx)
if _np_version_under1p9:
if _np_version_under1p10:
self.assertIs(result, NotImplemented)
else:
tm.assert_index_equal(result, exp)
Expand Down