Skip to content

Commit c761bab

Browse files
fixed a bunch of failing tests
1 parent f5ed452 commit c761bab

File tree

10 files changed

+34
-31
lines changed

10 files changed

+34
-31
lines changed

pandas/tests/frame/test_apply.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_nunique_empty(self):
133133
tm.assert_series_equal(result, expected)
134134

135135
result = df.T.nunique()
136-
expected = Series([], index=pd.Index([]))
136+
expected = Series(index=pd.Index([]), dtype=np.float64)
137137
tm.assert_series_equal(result, expected)
138138

139139
def test_apply_standard_nonunique(self):
@@ -1268,16 +1268,16 @@ def test_non_callable_aggregates(self):
12681268
_get_cython_table_params(
12691269
DataFrame(),
12701270
[
1271-
("sum", Series()),
1272-
("max", Series()),
1273-
("min", Series()),
1271+
("sum", Series(dtype="float64")),
1272+
("max", Series(dtype="float64")),
1273+
("min", Series(dtype="float64")),
12741274
("all", Series(dtype=bool)),
12751275
("any", Series(dtype=bool)),
1276-
("mean", Series()),
1277-
("prod", Series()),
1278-
("std", Series()),
1279-
("var", Series()),
1280-
("median", Series()),
1276+
("mean", Series(dtype="float64")),
1277+
("prod", Series(dtype="float64")),
1278+
("std", Series(dtype="float64")),
1279+
("var", Series(dtype="float64")),
1280+
("median", Series(dtype="float64")),
12811281
],
12821282
),
12831283
_get_cython_table_params(

pandas/tests/frame/test_constructors.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2442,7 +2442,7 @@ def test_from_records_series_list_dict(self):
24422442
def test_to_frame_with_falsey_names(self):
24432443
# GH 16114
24442444
result = Series(name=0).to_frame().dtypes
2445-
expected = Series({0: np.float64})
2445+
expected = Series({0: object})
24462446
tm.assert_series_equal(result, expected)
24472447

24482448
result = DataFrame(Series(name=0)).dtypes

pandas/tests/frame/test_indexing.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -2574,7 +2574,9 @@ def test_xs_corner(self):
25742574
# no columns but Index(dtype=object)
25752575
df = DataFrame(index=["a", "b", "c"])
25762576
result = df.xs("a")
2577-
expected = Series([], name="a", index=pd.Index([], dtype=object))
2577+
expected = Series(
2578+
[], name="a", index=pd.Index([], dtype=object), dtype="float64"
2579+
)
25782580
tm.assert_series_equal(result, expected)
25792581

25802582
def test_xs_duplicates(self):

pandas/tests/generic/test_generic.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -713,11 +713,8 @@ def test_squeeze(self):
713713
# don't fail with 0 length dimensions GH11229 & GH8999
714714
empty_series = Series([], name="five")
715715
empty_frame = DataFrame([empty_series])
716-
717-
[
718-
tm.assert_series_equal(empty_series, higher_dim.squeeze())
719-
for higher_dim in [empty_series, empty_frame]
720-
]
716+
tm.assert_series_equal(empty_series, empty_series.squeeze())
717+
tm.assert_series_equal(empty_series, empty_frame.squeeze())
721718

722719
# axis argument
723720
df = tm.makeTimeDataFrame(nper=1).iloc[:, :1]

pandas/tests/groupby/test_grouping.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ def test_evaluate_with_empty_groups(self, func, expected):
602602

603603
def test_groupby_empty(self):
604604
# https://github.com/pandas-dev/pandas/issues/27190
605-
s = pd.Series([], name="name")
605+
s = pd.Series(name="name", dtype="float64")
606606
gr = s.groupby([])
607607

608608
result = gr.mean()

pandas/tests/indexing/multiindex/test_loc.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ def test_loc_getitem_series(self):
5050

5151
empty = Series(data=[], dtype=np.float64)
5252
expected = Series(
53-
[], index=MultiIndex(levels=index.levels, codes=[[], []], dtype=np.float64)
53+
[],
54+
index=MultiIndex(levels=index.levels, codes=[[], []], dtype=np.float64),
55+
dtype=np.float64,
5456
)
5557
result = x.loc[empty]
5658
tm.assert_series_equal(result, expected)
@@ -72,7 +74,9 @@ def test_loc_getitem_array(self):
7274
# empty array:
7375
empty = np.array([])
7476
expected = Series(
75-
[], index=MultiIndex(levels=index.levels, codes=[[], []], dtype=np.float64)
77+
[],
78+
index=MultiIndex(levels=index.levels, codes=[[], []], dtype=np.float64),
79+
dtype="float64",
7680
)
7781
result = x.loc[empty]
7882
tm.assert_series_equal(result, expected)

pandas/tests/io/json/test_pandas.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ def test_series_roundtrip_object(self, orient, numpy, dtype):
683683
def test_series_roundtrip_empty(self, orient, numpy):
684684
data = self.empty_series.to_json(orient=orient)
685685
result = pd.read_json(data, typ="series", orient=orient, numpy=numpy)
686-
expected = self.empty_series.copy()
686+
expected = self.empty_series.copy().astype("float64")
687687

688688
# TODO: see what causes inconsistency
689689
if not numpy and PY35 and orient == "index":

pandas/tests/reductions/test_reductions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ def test_timedelta64_analytics(self):
900900
@pytest.mark.parametrize(
901901
"test_input,error_type",
902902
[
903-
(pd.Series([]), ValueError),
903+
(pd.Series(dtype="float64"), ValueError),
904904
# For strings, or any Series with dtype 'O'
905905
(pd.Series(["foo", "bar", "baz"]), TypeError),
906906
(pd.Series([(1,), (2,)]), TypeError),

pandas/tests/reshape/test_concat.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2196,7 +2196,7 @@ def test_concat_period_other_series(self):
21962196
def test_concat_empty_series(self):
21972197
# GH 11082
21982198
s1 = pd.Series([1, 2, 3], name="x")
2199-
s2 = pd.Series(name="y")
2199+
s2 = pd.Series(name="y", dtype="float64")
22002200
res = pd.concat([s1, s2], axis=1)
22012201
exp = pd.DataFrame(
22022202
{"x": [1, 2, 3], "y": [np.nan, np.nan, np.nan]},
@@ -2205,15 +2205,15 @@ def test_concat_empty_series(self):
22052205
tm.assert_frame_equal(res, exp)
22062206

22072207
s1 = pd.Series([1, 2, 3], name="x")
2208-
s2 = pd.Series(name="y")
2208+
s2 = pd.Series(name="y", dtype="float64")
22092209
res = pd.concat([s1, s2], axis=0)
22102210
# name will be reset
22112211
exp = pd.Series([1, 2, 3])
22122212
tm.assert_series_equal(res, exp)
22132213

22142214
# empty Series with no name
22152215
s1 = pd.Series([1, 2, 3], name="x")
2216-
s2 = pd.Series(name=None)
2216+
s2 = pd.Series(name=None, dtype="float64")
22172217
res = pd.concat([s1, s2], axis=1)
22182218
exp = pd.DataFrame(
22192219
{"x": [1, 2, 3], 0: [np.nan, np.nan, np.nan]},
@@ -2228,7 +2228,7 @@ def test_concat_empty_series_timelike(self, tz, values):
22282228
# GH 18447
22292229

22302230
first = Series([], dtype="M8[ns]").dt.tz_localize(tz)
2231-
second = Series(values)
2231+
second = Series(values, dtype="float64")
22322232
expected = DataFrame(
22332233
{
22342234
0: pd.Series([pd.NaT] * len(values), dtype="M8[ns]").dt.tz_localize(tz),

pandas/tests/window/test_moments.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ def f(x):
643643

644644
self._check_moment_func(np.mean, name="apply", func=f, raw=raw)
645645

646-
expected = Series([])
646+
expected = Series(dtype="float64")
647647
result = expected.rolling(10).apply(lambda x: x.mean(), raw=raw)
648648
tm.assert_series_equal(result, expected)
649649

@@ -1170,7 +1170,7 @@ def _check_ew(self, name=None, preserve_nan=False):
11701170

11711171
# check series of length 0
11721172
result = getattr(Series().ewm(com=50, min_periods=min_periods), name)()
1173-
tm.assert_series_equal(result, Series())
1173+
tm.assert_series_equal(result, Series(dtype="float64"))
11741174

11751175
# check series of length 1
11761176
result = getattr(Series([1.0]).ewm(50, min_periods=min_periods), name)()
@@ -1965,8 +1965,8 @@ def func(A, B, com, **kwargs):
19651965
assert not np.isnan(result.values[11:]).any()
19661966

19671967
# check series of length 0
1968-
result = func(Series([]), Series([]), 50, min_periods=min_periods)
1969-
tm.assert_series_equal(result, Series([]))
1968+
result = func(Series(), Series(), 50, min_periods=min_periods)
1969+
tm.assert_series_equal(result, Series(dtype="float64"))
19701970

19711971
# check series of length 1
19721972
result = func(Series([1.0]), Series([1.0]), 50, min_periods=min_periods)
@@ -2166,7 +2166,7 @@ def test_rolling_functions_window_non_shrinkage_binary(self):
21662166

21672167
def test_moment_functions_zero_length(self):
21682168
# GH 8056
2169-
s = Series()
2169+
s = Series(dtype="float64")
21702170
s_expected = s
21712171
df1 = DataFrame()
21722172
df1_expected = df1
@@ -2385,7 +2385,7 @@ def expanding_mean(x, min_periods=1):
23852385
# here to make this pass
23862386
self._check_expanding(expanding_mean, np.mean, preserve_nan=False)
23872387

2388-
ser = Series([])
2388+
ser = Series([], dtype="float64")
23892389
tm.assert_series_equal(ser, ser.expanding().apply(lambda x: x.mean(), raw=raw))
23902390

23912391
# GH 8080

0 commit comments

Comments
 (0)