@@ -56,16 +56,23 @@ def test_types_to_datetime() -> None:
56
56
def test_types_concat_none () -> None :
57
57
"""Test concatenation with None values."""
58
58
series = pd .Series ([7 , - 5 , 10 ])
59
+ series2 = pd .Series ([object (), object (), object ()])
59
60
df = pd .DataFrame ({"a" : [7 , - 5 , 10 ]})
60
61
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 )
62
64
check (assert_type (pd .concat ([None , df ]), pd .DataFrame ), pd .DataFrame )
63
65
check (
64
66
assert_type (pd .concat ([None , series , df ], axis = 1 ), pd .DataFrame ), pd .DataFrame
65
67
)
66
68
check (assert_type (pd .concat ([None , series , df ]), pd .DataFrame ), pd .DataFrame )
67
69
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 )
69
76
check (assert_type (pd .concat ({"a" : None , "b" : df }), pd .DataFrame ), pd .DataFrame )
70
77
check (
71
78
assert_type (pd .concat ({"a" : None , "b" : series , "c" : df }, axis = 1 ), pd .DataFrame ),
@@ -85,42 +92,76 @@ def test_types_concat_none() -> None:
85
92
def test_types_concat () -> None :
86
93
s = pd .Series ([0 , 1 , - 10 ])
87
94
s2 = pd .Series ([7 , - 5 , 10 ])
95
+ s3 = pd .Series ([7.0 , - 5.0 , 10.0 ])
88
96
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 )
90
99
check (assert_type (pd .concat ([s , s2 ], axis = 1 ), pd .DataFrame ), pd .DataFrame )
91
100
check (
92
101
assert_type (pd .concat ([s , s2 ], keys = ["first" , "second" ], sort = True ), pd .Series ),
93
102
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 ,
94
108
)
95
109
check (
96
110
assert_type (
97
111
pd .concat ([s , s2 ], keys = ["first" , "second" ], names = ["source" , "row" ]),
98
112
pd .Series ,
99
113
),
100
114
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 ,
101
123
)
102
124
check (
103
125
assert_type (
104
126
pd .concat ([s , s2 ], keys = ["first" , "second" ], names = None ),
105
127
pd .Series ,
106
128
),
107
129
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 ,
108
138
)
109
139
110
140
# Depends on the axis
111
141
check (
112
142
assert_type (pd .concat ({"a" : s , "b" : s2 }), pd .Series ),
113
143
pd .Series ,
144
+ np .integer ,
145
+ )
146
+ check (
147
+ assert_type (pd .concat ({"a" : s , "b" : s3 }), pd .Series ),
148
+ pd .Series ,
114
149
)
115
150
check (
116
151
assert_type (pd .concat ({"a" : s , "b" : s2 }, axis = 1 ), pd .DataFrame ),
117
152
pd .DataFrame ,
118
153
)
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 )
120
156
check (assert_type (pd .concat ({1 : s , 2 : s2 }, axis = 1 ), pd .DataFrame ), pd .DataFrame )
121
157
check (
122
158
assert_type (pd .concat ({1 : s , None : s2 }), pd .Series ),
123
159
pd .Series ,
160
+ np .integer ,
161
+ )
162
+ check (
163
+ assert_type (pd .concat ({1 : s , None : s3 }), pd .Series ),
164
+ pd .Series ,
124
165
)
125
166
check (
126
167
assert_type (
0 commit comments