@@ -1842,19 +1842,20 @@ def test_merge_empty(self, left_empty, how, exp):
1842
1842
expected = expected .sort_values ("A" , ignore_index = True )
1843
1843
1844
1844
tm .assert_frame_equal (result , expected )
1845
-
1845
+
1846
1846
def test_merge_with_uintc_columns (dataframes_with_uintc ):
1847
1847
"""To test if pd.merge works with numpy.uintc on windows"""
1848
-
1849
- df1 = pd .DataFrame ({'a' : ['foo' , 'bar' ], 'b' : np .array ([1 , 2 ], dtype = np .uintc )})
1850
- df2 = pd .DataFrame ({'a' : ['foo' , 'baz' ], 'b' : np .array ([3 , 4 ], dtype = np .uintc )})
1851
- result = df1 .merge (df2 , how = 'outer' )
1852
- expected = pd .DataFrame ({
1853
- 'a' : ['bar' , 'baz' , 'foo' ,'foo' ],
1854
- 'b' : np .array ([2 ,4 ,1 ,3 ],dtype = np .uintc )
1855
- })
1848
+
1849
+ df1 = pd .DataFrame ({"a" : ["foo" , "bar" ], "b" : np .array ([1 , 2 ], dtype = np .uintc )})
1850
+ df2 = pd .DataFrame ({"a" : ["foo" , "baz" ], "b" : np .array ([3 , 4 ], dtype = np .uintc )})
1851
+ result = df1 .merge (df2 , how = "outer" )
1852
+ expected = pd .DataFrame (
1853
+ {
1854
+ "a" : ["bar" , "baz" , "foo" , "foo" ],
1855
+ "b" : np .array ([2 , 4 , 1 , 3 ], dtype = np .uintc ),
1856
+ }
1857
+ )
1856
1858
tm .assert_frame_equal (result .reset_index (drop = True ), expected )
1857
-
1858
1859
1859
1860
1860
1861
@pytest .fixture
0 commit comments