Skip to content

CLN: resolve isort mypy import confilict test_join #35380

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

Merged
merged 1 commit into from
Jul 29, 2020
Merged

CLN: resolve isort mypy import confilict test_join #35380

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
8 changes: 4 additions & 4 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 @@ -2,7 +2,7 @@
from numpy.random import randn
import pytest

from pandas._libs import join as libjoin
from pandas._libs.join import inner_join, left_outer_join

import pandas as pd
from pandas import DataFrame, Index, MultiIndex, Series, concat, merge
Expand Down Expand Up @@ -48,7 +48,7 @@ def test_cython_left_outer_join(self):
right = a_([1, 1, 0, 4, 2, 2, 1], dtype=np.int64)
max_group = 5

ls, rs = libjoin.left_outer_join(left, right, max_group)
ls, rs = left_outer_join(left, right, max_group)

exp_ls = left.argsort(kind="mergesort")
exp_rs = right.argsort(kind="mergesort")
Expand All @@ -70,7 +70,7 @@ def test_cython_right_outer_join(self):
right = a_([1, 1, 0, 4, 2, 2, 1], dtype=np.int64)
max_group = 5

rs, ls = libjoin.left_outer_join(right, left, max_group)
rs, ls = left_outer_join(right, left, max_group)

exp_ls = left.argsort(kind="mergesort")
exp_rs = right.argsort(kind="mergesort")
Expand Down Expand Up @@ -116,7 +116,7 @@ def test_cython_inner_join(self):
right = a_([1, 1, 0, 4, 2, 2, 1, 4], dtype=np.int64)
max_group = 5

ls, rs = libjoin.inner_join(left, right, max_group)
ls, rs = inner_join(left, right, max_group)

exp_ls = left.argsort(kind="mergesort")
exp_rs = right.argsort(kind="mergesort")
Expand Down