Skip to content

Commit d2ab407

Browse files
authored
TST: xfail matmul under numpy < 1.12 (pandas-dev#20567)
1 parent 2eefe5a commit d2ab407

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

pandas/tests/extension/base/methods.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test_factorize(self, data_for_grouping, na_sentinel):
9090
na_sentinel=na_sentinel)
9191
expected_labels = np.array([0, 0, na_sentinel,
9292
na_sentinel, 1, 1, 0, 2],
93-
dtype='int64')
93+
dtype=np.intp)
9494
expected_uniques = data_for_grouping.take([0, 4, 7])
9595

9696
tm.assert_numpy_array_equal(labels, expected_labels)

pandas/tests/frame/test_analytics.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from pandas.compat import lrange, product, PY35
1616
from pandas import (compat, isna, notna, DataFrame, Series,
1717
MultiIndex, date_range, Timestamp, Categorical,
18-
_np_version_under1p15)
18+
_np_version_under1p12, _np_version_under1p15)
1919
import pandas as pd
2020
import pandas.core.nanops as nanops
2121
import pandas.core.algorithms as algorithms
@@ -2139,6 +2139,9 @@ def test_dot(self):
21392139

21402140
@pytest.mark.skipif(not PY35,
21412141
reason='matmul supported for Python>=3.5')
2142+
@pytest.mark.xfail(
2143+
_np_version_under1p12,
2144+
reason="unpredictable return types under numpy < 1.12")
21422145
def test_matmul(self):
21432146
# matmul test is for GH #10259
21442147
a = DataFrame(np.random.randn(3, 4), index=['a', 'b', 'c'],

0 commit comments

Comments
 (0)