Skip to content

Commit 654288b

Browse files
Albert Villanova del Moraljreback
Albert Villanova del Moral
authored andcommitted
Fix Travis errors
1 parent 33eb740 commit 654288b

File tree

2 files changed

+31
-16
lines changed

2 files changed

+31
-16
lines changed

pandas/tests/frame/test_merge.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -55,32 +55,37 @@ def test_merge_on_indexes_sort(self):
5555
tm.assert_frame_equal(result, expected)
5656

5757
# how='left'
58-
result = df1.merge(df2, left_index=True, right_index=True, how='left', sort=True)
58+
result = df1.merge(df2, left_index=True, right_index=True, how='left',
59+
sort=True)
5960
expected = pd.DataFrame({'a': [0, 10, 20], 'b': [np.nan, 100, 200]},
6061
index=[0, 1, 2])
6162
tm.assert_frame_equal(result, expected)
6263

6364
# how='right' (already sorted)
64-
result = df1.merge(df2, left_index=True, right_index=True, how='right', sort=True)
65+
result = df1.merge(df2, left_index=True, right_index=True,
66+
how='right', sort=True)
6567
expected = pd.DataFrame({'a': [10, 20, np.nan], 'b': [100, 200, 300]},
6668
index=[1, 2, 3])
6769
tm.assert_frame_equal(result, expected)
6870

6971
# how='right'
70-
result = df2.merge(df1, left_index=True, right_index=True, how='right', sort=True)
72+
result = df2.merge(df1, left_index=True, right_index=True,
73+
how='right', sort=True)
7174
expected = pd.DataFrame([[np.nan, 0], [100, 10], [200, 20]],
7275
columns=['b', 'a'], index=[0, 1, 2])
7376
tm.assert_frame_equal(result, expected)
7477

7578
# how='inner'
76-
result = df1.merge(df2, left_index=True, right_index=True, how='inner', sort=True)
79+
result = df1.merge(df2, left_index=True, right_index=True,
80+
how='inner', sort=True)
7781
expected = pd.DataFrame({'a': [10, 20], 'b': [100, 200]},
7882
index=[1, 2])
7983
tm.assert_frame_equal(result, expected)
8084

8185
# how='outer'
82-
result = df1.merge(df2, left_index=True, right_index=True, how='outer', sort=True)
86+
result = df1.merge(df2, left_index=True, right_index=True,
87+
how='outer', sort=True)
8388
expected = pd.DataFrame({'a': [0, 10, 20, np.nan],
8489
'b': [np.nan, 100, 200, 300]},
8590
index=[0, 1, 2, 3])
86-
tm.assert_frame_equal(result, expected)
91+
tm.assert_frame_equal(result, expected)

pandas/tests/tools/test_merge.py

+20-10
Original file line numberDiff line numberDiff line change
@@ -1369,25 +1369,29 @@ def test_merge_on_indexes(self):
13691369
tm.assert_frame_equal(result, expected)
13701370

13711371
# how='left'
1372-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='left')
1372+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1373+
how='left')
13731374
expected = pd.DataFrame({'a': [20, 10, 0], 'b': [200, 100, np.nan]},
13741375
index=[2, 1, 0])
13751376
tm.assert_frame_equal(result, expected)
13761377

13771378
# how='right'
1378-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='right')
1379+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1380+
how='right')
13791381
expected = pd.DataFrame({'a': [10, 20, np.nan], 'b': [100, 200, 300]},
13801382
index=[1, 2, 3])
13811383
tm.assert_frame_equal(result, expected)
13821384

13831385
# how='inner'
1384-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='inner')
1386+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1387+
how='inner')
13851388
expected = pd.DataFrame({'a': [20, 10], 'b': [200, 100]},
13861389
index=[2, 1])
13871390
tm.assert_frame_equal(result, expected)
13881391

13891392
# how='outer'
1390-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='outer')
1393+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1394+
how='outer')
13911395
expected = pd.DataFrame({'a': [0, 10, 20, np.nan],
13921396
'b': [np.nan, 100, 200, 300]},
13931397
index=[0, 1, 2, 3])
@@ -1398,37 +1402,43 @@ def test_merge_on_indexes_sort(self):
13981402
df2 = pd.DataFrame({'b': [100, 200, 300]}, index=[1, 2, 3])
13991403

14001404
# default how='inner'
1401-
result = pd.merge(df1, df2, left_index=True, right_index=True, sort=True)
1405+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1406+
sort=True)
14021407
expected = pd.DataFrame({'a': [10, 20], 'b': [100, 200]},
14031408
index=[1, 2])
14041409
tm.assert_frame_equal(result, expected)
14051410

14061411
# how='left'
1407-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='left', sort=True)
1412+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1413+
how='left', sort=True)
14081414
expected = pd.DataFrame({'a': [0, 10, 20], 'b': [np.nan, 100, 200]},
14091415
index=[0, 1, 2])
14101416
tm.assert_frame_equal(result, expected)
14111417

14121418
# how='right' (already sorted)
1413-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='right', sort=True)
1419+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1420+
how='right', sort=True)
14141421
expected = pd.DataFrame({'a': [10, 20, np.nan], 'b': [100, 200, 300]},
14151422
index=[1, 2, 3])
14161423
tm.assert_frame_equal(result, expected)
14171424

14181425
# how='right'
1419-
result = pd.merge(df2, df1, left_index=True, right_index=True, how='right', sort=True)
1426+
result = pd.merge(df2, df1, left_index=True, right_index=True,
1427+
how='right', sort=True)
14201428
expected = pd.DataFrame([[np.nan, 0], [100, 10], [200, 20]],
14211429
columns=['b', 'a'], index=[0, 1, 2])
14221430
tm.assert_frame_equal(result, expected)
14231431

14241432
# how='inner'
1425-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='inner', sort=True)
1433+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1434+
how='inner', sort=True)
14261435
expected = pd.DataFrame({'a': [10, 20], 'b': [100, 200]},
14271436
index=[1, 2])
14281437
tm.assert_frame_equal(result, expected)
14291438

14301439
# how='outer'
1431-
result = pd.merge(df1, df2, left_index=True, right_index=True, how='outer', sort=True)
1440+
result = pd.merge(df1, df2, left_index=True, right_index=True,
1441+
how='outer', sort=True)
14321442
expected = pd.DataFrame({'a': [0, 10, 20, np.nan],
14331443
'b': [np.nan, 100, 200, 300]},
14341444
index=[0, 1, 2, 3])

0 commit comments

Comments
 (0)