Skip to content

Commit 6cebfa6

Browse files
jrebackmattip
authored andcommitted
TST: suppress some numpy warnings (pandas-dev#15811)
* BUG: incorrect conversion on isin algos with m8 * TST: suppress some warnings
1 parent 4be5ada commit 6cebfa6

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

pandas/core/algorithms.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def isin(comps, values):
174174
" to isin(), you passed a "
175175
"[{0}]".format(type(values).__name__))
176176

177-
from pandas import DatetimeIndex, PeriodIndex
177+
from pandas import DatetimeIndex, TimedeltaIndex, PeriodIndex
178178

179179
if not isinstance(values, (ABCIndex, ABCSeries, np.ndarray)):
180180
values = np.array(list(values), dtype='object')
@@ -183,6 +183,9 @@ def isin(comps, values):
183183
if is_period_dtype(values):
184184
comps = PeriodIndex(comps)
185185
values = PeriodIndex(values)
186+
elif is_timedelta64_dtype(comps):
187+
comps = TimedeltaIndex(comps)
188+
values = TimedeltaIndex(values)
186189
else:
187190
comps = DatetimeIndex(comps)
188191
values = DatetimeIndex(values)

pandas/tests/test_algos.py

+2
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,8 @@ def test_basic(self):
431431
expected = np.array([False, False])
432432
tm.assert_numpy_array_equal(result, expected)
433433

434+
def test_i8(self):
435+
434436
arr = pd.date_range('20130101', periods=3).values
435437
result = algos.isin(arr, [arr[0]])
436438
expected = np.array([True, False, False])

pandas/tests/test_categorical.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -2913,10 +2913,12 @@ def test_info(self):
29132913
df['category'] = Series(np.array(list('abcdefghij')).take(
29142914
np.random.randint(0, 10, size=n))).astype('category')
29152915
df.isnull()
2916-
df.info()
2916+
buf = compat.StringIO()
2917+
df.info(buf=buf)
29172918

29182919
df2 = df[df['category'] == 'd']
2919-
df2.info()
2920+
buf = compat.StringIO()
2921+
df2.info(buf=buf)
29202922

29212923
def test_groupby_sort(self):
29222924

pandas/tests/test_nanops.py

+12-7
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,10 @@ def test_nanstd(self):
389389
def test_nansem(self):
390390
tm.skip_if_no_package('scipy', min_version='0.17.0')
391391
from scipy.stats import sem
392-
self.check_funs_ddof(nanops.nansem, sem, allow_complex=False,
393-
allow_str=False, allow_date=False,
394-
allow_tdelta=True, allow_obj='convert')
392+
with np.errstate(invalid='ignore'):
393+
self.check_funs_ddof(nanops.nansem, sem, allow_complex=False,
394+
allow_str=False, allow_date=False,
395+
allow_tdelta=False, allow_obj='convert')
395396

396397
def _minmax_wrap(self, value, axis=None, func=None):
397398
res = func(value, axis)
@@ -449,16 +450,20 @@ def test_nanskew(self):
449450
tm.skip_if_no_package('scipy', min_version='0.17.0')
450451
from scipy.stats import skew
451452
func = partial(self._skew_kurt_wrap, func=skew)
452-
self.check_funs(nanops.nanskew, func, allow_complex=False,
453-
allow_str=False, allow_date=False, allow_tdelta=False)
453+
with np.errstate(invalid='ignore'):
454+
self.check_funs(nanops.nanskew, func, allow_complex=False,
455+
allow_str=False, allow_date=False,
456+
allow_tdelta=False)
454457

455458
def test_nankurt(self):
456459
tm.skip_if_no_package('scipy', min_version='0.17.0')
457460
from scipy.stats import kurtosis
458461
func1 = partial(kurtosis, fisher=True)
459462
func = partial(self._skew_kurt_wrap, func=func1)
460-
self.check_funs(nanops.nankurt, func, allow_complex=False,
461-
allow_str=False, allow_date=False, allow_tdelta=False)
463+
with np.errstate(invalid='ignore'):
464+
self.check_funs(nanops.nankurt, func, allow_complex=False,
465+
allow_str=False, allow_date=False,
466+
allow_tdelta=False)
462467

463468
def test_nanprod(self):
464469
self.check_funs(nanops.nanprod, np.prod, allow_str=False,

0 commit comments

Comments
 (0)