Skip to content

Commit 4b04a2f

Browse files
TST (string dtype): avoid explicit object dtype Index in fixture data (#60217)
* TST (string dtype): avoid explicit object dtype Index in fixture data * test updates
1 parent 5929ae9 commit 4b04a2f

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

pandas/_testing/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,8 @@ def shares_memory(left, right) -> bool:
501501
if isinstance(left, MultiIndex):
502502
return shares_memory(left._codes, right)
503503
if isinstance(left, (Index, Series)):
504+
if isinstance(right, (Index, Series)):
505+
return shares_memory(left._values, right._values)
504506
return shares_memory(left._values, right)
505507

506508
if isinstance(left, NDArrayBackedExtensionArray):

pandas/conftest.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ def multiindex_year_month_day_dataframe_random_data():
600600
"""
601601
tdf = DataFrame(
602602
np.random.default_rng(2).standard_normal((100, 4)),
603-
columns=Index(list("ABCD"), dtype=object),
603+
columns=Index(list("ABCD")),
604604
index=date_range("2000-01-01", periods=100, freq="B"),
605605
)
606606
ymd = tdf.groupby([lambda x: x.year, lambda x: x.month, lambda x: x.day]).sum()
@@ -787,7 +787,7 @@ def string_series() -> Series:
787787
"""
788788
return Series(
789789
np.arange(30, dtype=np.float64) * 1.1,
790-
index=Index([f"i_{i}" for i in range(30)], dtype=object),
790+
index=Index([f"i_{i}" for i in range(30)]),
791791
name="series",
792792
)
793793

@@ -798,7 +798,7 @@ def object_series() -> Series:
798798
Fixture for Series of dtype object with Index of unique strings
799799
"""
800800
data = [f"foo_{i}" for i in range(30)]
801-
index = Index([f"bar_{i}" for i in range(30)], dtype=object)
801+
index = Index([f"bar_{i}" for i in range(30)])
802802
return Series(data, index=index, name="objects", dtype=object)
803803

804804

@@ -890,8 +890,8 @@ def int_frame() -> DataFrame:
890890
"""
891891
return DataFrame(
892892
np.ones((30, 4), dtype=np.int64),
893-
index=Index([f"foo_{i}" for i in range(30)], dtype=object),
894-
columns=Index(list("ABCD"), dtype=object),
893+
index=Index([f"foo_{i}" for i in range(30)]),
894+
columns=Index(list("ABCD")),
895895
)
896896

897897

pandas/tests/frame/test_reductions.py

-1
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,6 @@ def test_sum_bools(self):
10471047
# ----------------------------------------------------------------------
10481048
# Index of max / min
10491049

1050-
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
10511050
@pytest.mark.parametrize("axis", [0, 1])
10521051
def test_idxmin(self, float_frame, int_frame, skipna, axis):
10531052
frame = float_frame

pandas/tests/series/indexing/test_setitem.py

-1
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ def test_setitem_with_expansion_type_promotion(self):
545545
expected = Series([Timestamp("2016-01-01"), 3.0, "foo"], index=["a", "b", "c"])
546546
tm.assert_series_equal(ser, expected)
547547

548-
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
549548
def test_setitem_not_contained(self, string_series):
550549
# set item that's not contained
551550
ser = string_series.copy()

pandas/tests/series/methods/test_reindex.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
def test_reindex(datetime_series, string_series):
2424
identity = string_series.reindex(string_series.index)
2525

26-
assert np.may_share_memory(string_series.index, identity.index)
26+
assert tm.shares_memory(string_series.index, identity.index)
2727

2828
assert identity.index.is_(string_series.index)
2929
assert identity.index.identical(string_series.index)

pandas/tests/series/methods/test_to_csv.py

-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import numpy as np
55
import pytest
66

7-
from pandas._config import using_string_dtype
8-
97
import pandas as pd
108
from pandas import Series
119
import pandas._testing as tm
@@ -26,7 +24,6 @@ def read_csv(self, path, **kwargs):
2624

2725
return out
2826

29-
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
3027
def test_from_csv(self, datetime_series, string_series, temp_file):
3128
# freq doesn't round-trip
3229
datetime_series.index = datetime_series.index._with_freq(None)

0 commit comments

Comments
 (0)