Skip to content

Commit d0221e3

Browse files
committed
Fix more tests
1 parent 52ce001 commit d0221e3

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

pandas/tests/frame/test_arithmetic.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,8 @@ def test_bool_flex_frame_complex_dtype(self):
417417

418418
def test_bool_flex_frame_object_dtype(self):
419419
# corner, dtype=object
420-
df1 = DataFrame({"col": ["foo", np.nan, "bar"]})
421-
df2 = DataFrame({"col": ["foo", datetime.now(), "bar"]})
420+
df1 = DataFrame({"col": ["foo", np.nan, "bar"]}, dtype=object)
421+
df2 = DataFrame({"col": ["foo", datetime.now(), "bar"]}, dtype=object)
422422
result = df1.ne(df2)
423423
exp = DataFrame({"col": [False, True, False]})
424424
tm.assert_frame_equal(result, exp)
@@ -1997,7 +1997,12 @@ def test_dataframe_blockwise_slicelike():
19971997
"df, col_dtype",
19981998
[
19991999
(DataFrame([[1.0, 2.0], [4.0, 5.0]], columns=list("ab")), "float64"),
2000-
(DataFrame([[1.0, "b"], [4.0, "b"]], columns=list("ab")), "object"),
2000+
(
2001+
DataFrame([[1.0, "b"], [4.0, "b"]], columns=list("ab")).astype(
2002+
{"b": object}
2003+
),
2004+
"object",
2005+
),
20012006
],
20022007
)
20032008
def test_dataframe_operation_with_non_numeric_types(df, col_dtype):

pandas/tests/frame/test_query_eval.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ def test_query_with_string_columns(self, parser, engine):
10311031
with pytest.raises(NotImplementedError, match=msg):
10321032
df.query("a in b and c < d", parser=parser, engine=engine)
10331033

1034-
def test_object_array_eq_ne(self, parser, engine):
1034+
def test_object_array_eq_ne(self, parser, engine, using_infer_string):
10351035
df = DataFrame(
10361036
{
10371037
"a": list("aaaabbbbcccc"),
@@ -1040,11 +1040,14 @@ def test_object_array_eq_ne(self, parser, engine):
10401040
"d": np.random.default_rng(2).integers(9, size=12),
10411041
}
10421042
)
1043-
res = df.query("a == b", parser=parser, engine=engine)
1043+
warning = RuntimeWarning if using_infer_string and engine == "numexpr" else None
1044+
with tm.assert_produces_warning(warning):
1045+
res = df.query("a == b", parser=parser, engine=engine)
10441046
exp = df[df.a == df.b]
10451047
tm.assert_frame_equal(res, exp)
10461048

1047-
res = df.query("a != b", parser=parser, engine=engine)
1049+
with tm.assert_produces_warning(warning):
1050+
res = df.query("a != b", parser=parser, engine=engine)
10481051
exp = df[df.a != df.b]
10491052
tm.assert_frame_equal(res, exp)
10501053

@@ -1083,12 +1086,16 @@ def test_query_with_nested_special_character(self, parser, engine):
10831086
[">=", operator.ge],
10841087
],
10851088
)
1086-
def test_query_lex_compare_strings(self, parser, engine, op, func):
1089+
def test_query_lex_compare_strings(
1090+
self, parser, engine, op, func, using_infer_string
1091+
):
10871092
a = Series(np.random.default_rng(2).choice(list("abcde"), 20))
10881093
b = Series(np.arange(a.size))
10891094
df = DataFrame({"X": a, "Y": b})
10901095

1091-
res = df.query(f'X {op} "d"', engine=engine, parser=parser)
1096+
warning = RuntimeWarning if using_infer_string and engine == "numexpr" else None
1097+
with tm.assert_produces_warning(warning):
1098+
res = df.query(f'X {op} "d"', engine=engine, parser=parser)
10921099
expected = df[func(df.X, "d")]
10931100
tm.assert_frame_equal(res, expected)
10941101

pandas/tests/frame/test_reductions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,7 +1888,7 @@ def test_minmax_extensionarray(method, numeric_only):
18881888
expected = Series(
18891889
[getattr(int64_info, method)],
18901890
dtype="Int64",
1891-
index=Index(["Int64"], dtype="object"),
1891+
index=Index(["Int64"]),
18921892
)
18931893
tm.assert_series_equal(result, expected)
18941894

@@ -1906,7 +1906,7 @@ def test_prod_sum_min_count_mixed_object():
19061906
df = DataFrame([1, "a", True])
19071907

19081908
result = df.prod(axis=0, min_count=1, numeric_only=False)
1909-
expected = Series(["a"])
1909+
expected = Series(["a"], dtype=object)
19101910
tm.assert_series_equal(result, expected)
19111911

19121912
msg = re.escape("unsupported operand type(s) for +: 'int' and 'str'")

0 commit comments

Comments
 (0)