Skip to content

Commit 642b01a

Browse files
committed
py2 compat
1 parent afb1bee commit 642b01a

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

pandas/tests/extension/numpy_/conftest.py

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,42 @@
33
# A set of Base EA tests that are know to not work for
44
# the object-dtype PandasArray holding nested data.
55
skips = {
6-
'BaseCastingTests.test_astype_str',
7-
'BaseConstructorsTests.test_array_from_scalars',
6+
'TestCasting.test_astype_str',
7+
'TestConstructors.test_array_from_scalars',
88
# tuple isn't instance of np.object
9-
'BaseGetitemTests.test_getitem_scalar',
9+
'TestGetitem.test_getitem_scalar',
1010
# Can't pass tuples to _from_sequence
11-
'BaseGetitemTests.test_take_series',
11+
'TestGetitem.test_take_series',
1212
# np.array shape inference
13-
'BaseInterfaceTests.test_array_interface',
13+
'TestInterface.test_array_interface',
1414
# Can't construct expected.
15-
'BaseMethodsTests.test_unique',
16-
'BaseMethodsTests.test_combine_add',
17-
'BaseMethodsTests.test_shift_fill_value',
18-
'BaseMethodsTests.test_where_series',
19-
'BaseMethodsTests.test_repeat',
15+
'TestMethods.test_unique',
16+
'TestMethods.test_combine_add',
17+
'TestMethods.test_shift_fill_value',
18+
'TestMethods.test_where_series',
19+
'TestMethods.test_repeat',
2020
# Can't hash ndarray[tuple]
21-
'BaseMethodsTests.test_hash_pandas_object_works',
21+
'TestMethods.test_hash_pandas_object_works',
2222
# Can't construct expected.
23-
'BaseReshapingTests.test_merge',
24-
'BaseReshapingTests.test_merge_on_extension_array',
25-
'BaseReshapingTests.test_merge_on_extension_array_duplicates',
23+
'TestReshaping.test_merge',
24+
'TestReshaping.test_merge_on_extension_array',
25+
'TestReshaping.test_merge_on_extension_array_duplicates',
2626

2727
# ndarray setting
28-
'BaseSetitemTests.test_setitem_scalar_series',
29-
'BaseSetitemTests.test_setitem_sequence',
30-
'BaseSetitemTests.test_setitem_sequence_mismatched_length_raises',
31-
'BaseSetitemTests.test_setitem_sequence_broadcasts',
32-
'BaseSetitemTests.test_setitem_sequence_broadcasts',
33-
'BaseSetitemTests.test_setitem_loc_scalar_mixed',
34-
'BaseSetitemTests.test_setitem_iloc_scalar_mixed',
35-
'BaseSetitemTests.test_setitem_loc_scalar_multiple_homogoneous',
36-
'BaseSetitemTests.test_setitem_iloc_scalar_multiple_homogoneous',
37-
'BaseSetitemTests.test_setitem_mask_broadcast',
38-
'BaseSetitemTests.test_setitem_scalar_key_sequence_raise',
28+
'TestSetitem.test_setitem_scalar_series',
29+
'TestSetitem.test_setitem_sequence',
30+
'TestSetitem.test_setitem_sequence_mismatched_length_raises',
31+
'TestSetitem.test_setitem_sequence_broadcasts',
32+
'TestSetitem.test_setitem_sequence_broadcasts',
33+
'TestSetitem.test_setitem_loc_scalar_mixed',
34+
'TestSetitem.test_setitem_iloc_scalar_mixed',
35+
'TestSetitem.test_setitem_loc_scalar_multiple_homogoneous',
36+
'TestSetitem.test_setitem_iloc_scalar_multiple_homogoneous',
37+
'TestSetitem.test_setitem_mask_broadcast',
38+
'TestSetitem.test_setitem_scalar_key_sequence_raise',
3939

40-
'BaseParsingTests.test_EA_types',
40+
# parsing differs.
41+
'TestParsing.test_EA_types',
4142
}
4243

4344

@@ -48,6 +49,7 @@ def pytest_collection_modifyitems(config, items):
4849
# supplied to a fixture. Right now .keywords gets things
4950
# like 'object' or 'data-object'.
5051
parts = item.name.split("[")
52+
qualname = item.parent.obj.__class__.__name__ + '.' + item.obj.__name__
5153
if (len(parts) > 1 and 'object' in item.name.split('[')[1]
52-
and item.obj.__qualname__ in skips):
54+
and qualname in skips):
5355
item.add_marker(skip)

0 commit comments

Comments
 (0)