Skip to content

Commit d40b713

Browse files
committed
Retry fix
1 parent 803b16c commit d40b713

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

pandas/tests/reshape/merge/test_merge_antijoin.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ def test_merge_antijoin_on_different_columns(self):
4040
"A": [3.0],
4141
"B": ["c"],
4242
"C": [np.nan],
43-
"D": np.array([np.nan], dtype=object),
43+
"D": [np.nan],
4444
},
4545
index=[2],
46-
)
46+
).astype({"B": object, "D": object})
4747
tm.assert_frame_equal(result, expected)
4848

4949
result = merge(left, right, how="right_anti", left_on="B", right_on="D")
5050
expected = DataFrame(
5151
{
5252
"A": [np.nan],
53-
"B": np.array([np.nan], dtype=object),
53+
"B": [np.nan],
5454
"C": [2.0],
5555
"D": ["d"],
5656
},
5757
index=[1],
58-
)
58+
).astype({"B": object, "D": object})
5959
tm.assert_frame_equal(result, expected)
6060

6161
def test_merge_antijoin_nonunique_keys(self):
@@ -72,22 +72,22 @@ def test_merge_antijoin_nonunique_keys(self):
7272
"A": [1.0],
7373
"B": ["a"],
7474
"C": [np.nan],
75-
"D": np.array([np.nan], dtype=object),
75+
"D": [np.nan],
7676
},
7777
index=[0],
78-
)
78+
).astype({"B": object, "D": object})
7979
tm.assert_frame_equal(result, expected)
8080

8181
result = merge(left, right, how="right_anti", left_on="B", right_on="D")
8282
expected = DataFrame(
8383
{
8484
"A": [np.nan, np.nan],
85-
"B": np.array([np.nan, np.nan], dtype=object),
85+
"B": [np.nan, np.nan],
8686
"C": [2.0, 4.0],
8787
"D": ["d", "d"],
8888
},
8989
index=[2, 3],
90-
)
90+
).astype({"B": object, "D": object})
9191
tm.assert_frame_equal(result, expected)
9292

9393
def test_merge_antijoin_same_df(self):
@@ -104,8 +104,8 @@ def test_merge_antijoin_nans(self):
104104
{"D": object}
105105
)
106106
result = merge(left, right, how="left_anti", on="A")
107-
expected = DataFrame(
108-
{"A": [1.0], "C": ["a"], "D": np.array([np.nan], dtype=object)}
107+
expected = DataFrame({"A": [1.0], "C": ["a"], "D": [np.nan]}).astype(
108+
{"C": object, "D": object}
109109
)
110110
tm.assert_frame_equal(result, expected)
111111

0 commit comments

Comments
 (0)