Skip to content

Commit 4ae2cf5

Browse files
lithomas1simonjayhawkins
authored andcommitted
Backport PR pandas-dev#41987: TST: Un-xfail tests on numpy-dev
1 parent fd81954 commit 4ae2cf5

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

pandas/tests/frame/methods/test_to_records.py

+2-12
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.compat.numpy import is_numpy_dev
7-
86
from pandas import (
97
CategoricalDtype,
108
DataFrame,
@@ -164,28 +162,20 @@ def test_to_records_with_categorical(self):
164162
),
165163
),
166164
# Pass in a type instance.
167-
pytest.param(
165+
(
168166
{"column_dtypes": str},
169167
np.rec.array(
170168
[("0", "1", "0.2", "a"), ("1", "2", "1.5", "bc")],
171169
dtype=[("index", "<i8"), ("A", "<U"), ("B", "<U"), ("C", "<U")],
172170
),
173-
marks=pytest.mark.xfail(
174-
is_numpy_dev,
175-
reason="https://github.com/numpy/numpy/issues/19078",
176-
),
177171
),
178172
# Pass in a dtype instance.
179-
pytest.param(
173+
(
180174
{"column_dtypes": np.dtype("unicode")},
181175
np.rec.array(
182176
[("0", "1", "0.2", "a"), ("1", "2", "1.5", "bc")],
183177
dtype=[("index", "<i8"), ("A", "<U"), ("B", "<U"), ("C", "<U")],
184178
),
185-
marks=pytest.mark.xfail(
186-
is_numpy_dev,
187-
reason="https://github.com/numpy/numpy/issues/19078",
188-
),
189179
),
190180
# Pass in a dictionary (name-only).
191181
(

0 commit comments

Comments
 (0)