Skip to content

Commit ec836bd

Browse files
Albert Villanova del Moraljreback
Albert Villanova del Moral
authored andcommitted
Fix Travis errors
1 parent b977278 commit ec836bd

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

pandas/tests/frame/test_join.py

+2-12
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@
22

33
from __future__ import print_function
44

5-
from datetime import datetime
6-
7-
import numpy as np
8-
from numpy import nan
9-
105
import pandas as pd
116

12-
from pandas import DataFrame, Index, Series, Timestamp, date_range
13-
from pandas.compat import lrange
14-
157
from pandas.tests.frame.common import TestData
168

179
import pandas.util.testing as tm
1810
from pandas.util.testing import (assertRaisesRegexp,
19-
assert_frame_equal,
20-
assert_series_equal)
11+
assert_frame_equal)
2112

2213

2314
class TestDataFrameJoin(tm.TestCase, TestData):
@@ -109,5 +100,4 @@ def test_join_overlap(self):
109100
expected = df1_suf.join(df2_suf).join(no_overlap)
110101

111102
# column order not necessarily sorted
112-
assert_frame_equal(joined, expected.loc[:, joined.columns])
113-
103+
assert_frame_equal(joined, expected.loc[:, joined.columns])

0 commit comments

Comments
 (0)