Skip to content

Commit 5a53dfc

Browse files
Add additional tests of original pd.concat (typing) functionality
1 parent cdd21f8 commit 5a53dfc

File tree

1 file changed

+45
-4
lines changed

1 file changed

+45
-4
lines changed

tests/test_pandas.py

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,23 @@ def test_types_to_datetime() -> None:
5656
def test_types_concat_none() -> None:
5757
"""Test concatenation with None values."""
5858
series = pd.Series([7, -5, 10])
59+
series2 = pd.Series([object(), object(), object()])
5960
df = pd.DataFrame({"a": [7, -5, 10]})
6061

61-
check(assert_type(pd.concat([None, series]), pd.Series), pd.Series)
62+
check(assert_type(pd.concat([None, series]), pd.Series), pd.Series, np.integer)
63+
check(assert_type(pd.concat([None, series2]), pd.Series), pd.Series)
6264
check(assert_type(pd.concat([None, df]), pd.DataFrame), pd.DataFrame)
6365
check(
6466
assert_type(pd.concat([None, series, df], axis=1), pd.DataFrame), pd.DataFrame
6567
)
6668
check(assert_type(pd.concat([None, series, df]), pd.DataFrame), pd.DataFrame)
6769

68-
check(assert_type(pd.concat({"a": None, "b": series}), pd.Series), pd.Series)
70+
check(
71+
assert_type(pd.concat({"a": None, "b": series}), pd.Series),
72+
pd.Series,
73+
np.integer,
74+
)
75+
check(assert_type(pd.concat({"a": None, "b": series2}), pd.Series), pd.Series)
6976
check(assert_type(pd.concat({"a": None, "b": df}), pd.DataFrame), pd.DataFrame)
7077
check(
7178
assert_type(pd.concat({"a": None, "b": series, "c": df}, axis=1), pd.DataFrame),
@@ -85,42 +92,76 @@ def test_types_concat_none() -> None:
8592
def test_types_concat() -> None:
8693
s = pd.Series([0, 1, -10])
8794
s2 = pd.Series([7, -5, 10])
95+
s3 = pd.Series([7.0, -5.0, 10.0])
8896

89-
check(assert_type(pd.concat([s, s2]), pd.Series), pd.Series)
97+
check(assert_type(pd.concat([s, s2]), pd.Series), pd.Series, np.integer)
98+
check(assert_type(pd.concat([s, s3]), pd.Series), pd.Series)
9099
check(assert_type(pd.concat([s, s2], axis=1), pd.DataFrame), pd.DataFrame)
91100
check(
92101
assert_type(pd.concat([s, s2], keys=["first", "second"], sort=True), pd.Series),
93102
pd.Series,
103+
np.integer,
104+
)
105+
check(
106+
assert_type(pd.concat([s, s3], keys=["first", "second"], sort=True), pd.Series),
107+
pd.Series,
94108
)
95109
check(
96110
assert_type(
97111
pd.concat([s, s2], keys=["first", "second"], names=["source", "row"]),
98112
pd.Series,
99113
),
100114
pd.Series,
115+
np.integer,
116+
)
117+
check(
118+
assert_type(
119+
pd.concat([s, s3], keys=["first", "second"], names=["source", "row"]),
120+
pd.Series,
121+
),
122+
pd.Series,
101123
)
102124
check(
103125
assert_type(
104126
pd.concat([s, s2], keys=["first", "second"], names=None),
105127
pd.Series,
106128
),
107129
pd.Series,
130+
np.integer,
131+
)
132+
check(
133+
assert_type(
134+
pd.concat([s, s3], keys=["first", "second"], names=None),
135+
pd.Series,
136+
),
137+
pd.Series,
108138
)
109139

110140
# Depends on the axis
111141
check(
112142
assert_type(pd.concat({"a": s, "b": s2}), pd.Series),
113143
pd.Series,
144+
np.integer,
145+
)
146+
check(
147+
assert_type(pd.concat({"a": s, "b": s3}), pd.Series),
148+
pd.Series,
114149
)
115150
check(
116151
assert_type(pd.concat({"a": s, "b": s2}, axis=1), pd.DataFrame),
117152
pd.DataFrame,
118153
)
119-
check(assert_type(pd.concat({1: s, 2: s2}), pd.Series), pd.Series)
154+
check(assert_type(pd.concat({1: s, 2: s2}), pd.Series), pd.Series, np.integer)
155+
check(assert_type(pd.concat({1: s, 2: s3}), pd.Series), pd.Series)
120156
check(assert_type(pd.concat({1: s, 2: s2}, axis=1), pd.DataFrame), pd.DataFrame)
121157
check(
122158
assert_type(pd.concat({1: s, None: s2}), pd.Series),
123159
pd.Series,
160+
np.integer,
161+
)
162+
check(
163+
assert_type(pd.concat({1: s, None: s3}), pd.Series),
164+
pd.Series,
124165
)
125166
check(
126167
assert_type(

0 commit comments

Comments
 (0)