Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLN: Consistent pandas.util.testing imports in pandas/tests/reshape #29285

Merged
merged 1 commit into from
Oct 31, 2019
Merged

CLN: Consistent pandas.util.testing imports in pandas/tests/reshape #29285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions pandas/tests/reshape/merge/test_join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from pandas import DataFrame, Index, MultiIndex, Series, concat, merge
from pandas.tests.reshape.merge.test_merge import NGROUPS, N, get_test_data
import pandas.util.testing as tm
from pandas.util.testing import assert_frame_equal

a_ = np.array

Expand Down Expand Up @@ -194,7 +193,7 @@ def test_join_on(self):
expected = DataFrame(
{"key": ["a", "a", "b", "b", "c"], "value": [0, 0, 1, 1, 2]}
)
assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)

# Test when some are missing
df_a = DataFrame([[1], [2], [3]], index=["a", "b", "c"], columns=["one"])
Expand Down Expand Up @@ -281,7 +280,7 @@ def test_join_on_pass_vector(self):

join_col = self.target.pop("C")
result = self.target.join(self.source, on=join_col)
assert_frame_equal(result, expected)
tm.assert_frame_equal(result, expected)

def test_join_with_len0(self):
# nothing to merge
Expand Down Expand Up @@ -314,12 +313,12 @@ def test_join_on_singlekey_list(self):
joined = df.join(df2, on=["key"])
expected = df.join(df2, on="key")

assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)

def test_join_on_series(self):
result = self.target.join(self.source["MergedA"], on="C")
expected = self.target.join(self.source[["MergedA"]], on="C")
assert_frame_equal(result, expected)
tm.assert_frame_equal(result, expected)

def test_join_on_series_buglet(self):
# GH #638
Expand All @@ -341,11 +340,11 @@ def test_join_index_mixed(self, join_type):

joined = df1.join(df2, how=join_type)
expected = _join_by_hand(df1, df2, how=join_type)
assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)

joined = df2.join(df1, how=join_type)
expected = _join_by_hand(df2, df1, how=join_type)
assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)

def test_join_index_mixed_overlap(self):
df1 = DataFrame(
Expand Down Expand Up @@ -377,7 +376,7 @@ def test_join_index_mixed_overlap(self):
df1.columns = expected_columns[:4]
df2.columns = expected_columns[4:]
expected = _join_by_hand(df1, df2)
assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)

def test_join_empty_bug(self):
# generated an exception in 0.4.3
Expand Down Expand Up @@ -416,7 +415,7 @@ def test_join_multiindex(self):
ex_index = Index(index1.values).union(Index(index2.values))
expected = df1.reindex(ex_index).join(df2.reindex(ex_index))
expected.index.names = index1.names
assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)
assert joined.index.names == index1.names

df1 = df1.sort_index(level=1)
Expand All @@ -427,7 +426,7 @@ def test_join_multiindex(self):
expected = df1.reindex(ex_index).join(df2.reindex(ex_index))
expected.index.names = index1.names

assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)
assert joined.index.names == index1.names

def test_join_inner_multiindex(self):
Expand Down Expand Up @@ -475,7 +474,7 @@ def test_join_inner_multiindex(self):
how="inner",
sort=False,
)
assert_frame_equal(joined, expected2.reindex_like(joined))
tm.assert_frame_equal(joined, expected2.reindex_like(joined))

expected2 = merge(
to_join,
Expand All @@ -490,7 +489,7 @@ def test_join_inner_multiindex(self):
expected.index = joined.index

assert joined.index.is_monotonic
assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)

# _assert_same_contents(expected, expected2.loc[:, expected.columns])

Expand Down Expand Up @@ -528,7 +527,7 @@ def test_join_float64_float32(self):
assert rs.dtypes["md"] == "float32"

xp = xpdf.merge(s, left_on="a", right_index=True)
assert_frame_equal(rs, xp)
tm.assert_frame_equal(rs, xp)

def test_join_many_non_unique_index(self):
df1 = DataFrame({"a": [1, 1], "b": [1, 1], "c": [10, 20]})
Expand All @@ -547,7 +546,7 @@ def test_join_many_non_unique_index(self):
expected = expected[result.columns]
expected["a"] = expected.a.astype("int64")
expected["b"] = expected.b.astype("int64")
assert_frame_equal(result, expected)
tm.assert_frame_equal(result, expected)

df1 = DataFrame({"a": [1, 1, 1], "b": [1, 1, 1], "c": [10, 20, 30]})
df2 = DataFrame({"a": [1, 1, 1], "b": [1, 1, 2], "d": [100, 200, 300]})
Expand All @@ -562,7 +561,7 @@ def test_join_many_non_unique_index(self):

result = result.reset_index()

assert_frame_equal(result, expected.loc[:, result.columns])
tm.assert_frame_equal(result, expected.loc[:, result.columns])

# GH 11519
df = DataFrame(
Expand All @@ -580,9 +579,9 @@ def test_join_many_non_unique_index(self):
outer = df.join(s, how="outer")
left = df.join(s, how="left")
right = df.join(s, how="right")
assert_frame_equal(inner, outer)
assert_frame_equal(inner, left)
assert_frame_equal(inner, right)
tm.assert_frame_equal(inner, outer)
tm.assert_frame_equal(inner, left)
tm.assert_frame_equal(inner, right)

def test_join_sort(self):
left = DataFrame({"key": ["foo", "bar", "baz", "foo"], "value": [1, 2, 3, 4]})
Expand All @@ -597,7 +596,7 @@ def test_join_sort(self):
},
index=[1, 2, 0, 3],
)
assert_frame_equal(joined, expected)
tm.assert_frame_equal(joined, expected)

# smoke test
joined = left.join(right, on="key", sort=False)
Expand Down Expand Up @@ -684,7 +683,7 @@ def test_join_many_mixed(self):
df3 = df.loc[:, ["key"]]

result = df1.join([df2, df3])
assert_frame_equal(result, df)
tm.assert_frame_equal(result, df)

def test_join_dups(self):

Expand All @@ -702,7 +701,7 @@ def test_join_dups(self):
expected = concat([df, df], axis=1)
result = df.join(df, rsuffix="_2")
result.columns = expected.columns
assert_frame_equal(result, expected)
tm.assert_frame_equal(result, expected)

# GH 4975, invalid join on dups
w = DataFrame(np.random.randn(4, 2), columns=["x", "y"])
Expand All @@ -716,7 +715,7 @@ def test_join_dups(self):
dta = dta.merge(w, left_index=True, right_index=True)
expected = concat([x, y, z, w], axis=1)
expected.columns = ["x_x", "y_x", "x_y", "y_y", "x_x", "y_x", "x_y", "y_y"]
assert_frame_equal(dta, expected)
tm.assert_frame_equal(dta, expected)

def test_join_multi_to_multi(self, join_type):
# GH 20475
Expand All @@ -736,7 +735,7 @@ def test_join_multi_to_multi(self, join_type):
.merge(right.reset_index(), on=["abc", "xy"], how=join_type)
.set_index(["abc", "xy", "num"])
)
assert_frame_equal(expected, result)
tm.assert_frame_equal(expected, result)

msg = (
r"len\(left_on\) must equal the number of levels in the index" ' of "right"'
Expand Down Expand Up @@ -769,7 +768,7 @@ def test_join_on_tz_aware_datetimeindex(self):
result = df1.join(df2.set_index("date"), on="date")
expected = df1.copy()
expected["vals_2"] = pd.Series([np.nan] * 2 + list("tuv"), dtype=object)
assert_frame_equal(result, expected)
tm.assert_frame_equal(result, expected)


def _check_join(left, right, result, join_col, how="left", lsuffix="_x", rsuffix="_y"):
Expand Down
Loading