@@ -1802,18 +1802,28 @@ def test_merge_on_indexes(self, left_df, right_df, how, sort, expected):
1802
1802
sort = sort )
1803
1803
tm .assert_frame_equal (result , expected )
1804
1804
1805
+
1805
1806
class TestMergeSparseDataFrames (object ):
1806
1807
# Cannot seem to get 0 or 1 working with sparse data frame
1807
- @pytest .mark .parametrize ('fill_value,how' , itertools .product ([np .nan ], ['left' , 'right' , 'outer' , 'inner' ]))
1808
+ @pytest .mark .parametrize ('fill_value,how' , itertools .product ([np .nan ],
1809
+ ['left' ,
1810
+ 'right' ,
1811
+ 'outer' ,
1812
+ 'inner' ]))
1808
1813
def test_merge_two_sparse_frames (self , fill_value , how ):
1809
- dense_evens = pd .DataFrame ({'A' : list (range (0 , 200 , 2 )), 'B' : np .random .randint (0 ,100 , size = 100 )})
1810
- dense_threes = pd .DataFrame ({'A' : list (range (0 , 300 , 3 )), 'B' : np .random .randint (0 ,100 , size = 100 )})
1814
+ dense_evens = pd .DataFrame ({'A' : list (range (0 , 200 , 2 )),
1815
+ 'B' : np .random .randint (0 , 100 , size = 100 )})
1816
+ dense_threes = pd .DataFrame ({'A' : list (range (0 , 300 , 3 )),
1817
+ 'B' : np .random .randint (0 , 100 , size = 100 )})
1811
1818
1812
1819
dense_merge = dense_evens .merge (dense_threes , how = how , on = 'A' )
1813
1820
1814
- # If you merge two dense frames together it tends to default to float64 not the original dtype
1815
- dense_merge ['B_x' ] = dense_merge ['B_x' ].astype (np .int64 , errors = 'ignore' )
1816
- dense_merge ['B_y' ] = dense_merge ['B_y' ].astype (np .int64 , errors = 'ignore' )
1821
+ # If you merge two dense frames together it tends to default to
1822
+ # float64 not the original dtype
1823
+ dense_merge ['B_x' ] = dense_merge ['B_x' ].astype (np .int64 ,
1824
+ errors = 'ignore' )
1825
+ dense_merge ['B_y' ] = dense_merge ['B_y' ].astype (np .int64 ,
1826
+ errors = 'ignore' )
1817
1827
1818
1828
sparse_evens = dense_evens .to_sparse (fill_value = fill_value )
1819
1829
sparse_threes = dense_threes .to_sparse (fill_value = fill_value )
@@ -1822,10 +1832,9 @@ def test_merge_two_sparse_frames(self, fill_value, how):
1822
1832
1823
1833
assert sparse_merge .default_fill_value is fill_value
1824
1834
1825
- tm .assert_sp_frame_equal (dense_merge .to_sparse (fill_value = fill_value ), sparse_merge , exact_indices = False , check_dtype = False )
1826
-
1835
+ tm .assert_sp_frame_equal (dense_merge .to_sparse (fill_value = fill_value ),
1836
+ sparse_merge , exact_indices = False ,
1837
+ check_dtype = False )
1827
1838
1828
- @pytest .mark .parametrize ('fill_value,how' , itertools .product ([0 , 1 , np .nan , None ], ['left' , 'right' , 'outer' , 'inner' ]))
1829
- def test_merge_dense_sparse_frames (self , fill_value , how ):
1839
+ def test_merge_dense_sparse_frames (self , fill_value = 1 , how = None ):
1830
1840
"pass"
1831
-
0 commit comments