Skip to content

Commit 9b023e6

Browse files
Formatting changes after running pre-commit
1 parent e372424 commit 9b023e6

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

pandas/tests/reshape/merge/test_merge.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,19 +1842,20 @@ def test_merge_empty(self, left_empty, how, exp):
18421842
expected = expected.sort_values("A", ignore_index=True)
18431843

18441844
tm.assert_frame_equal(result, expected)
1845-
1845+
18461846
def test_merge_with_uintc_columns(dataframes_with_uintc):
18471847
"""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+
)
18561858
tm.assert_frame_equal(result.reset_index(drop=True), expected)
1857-
18581859

18591860

18601861
@pytest.fixture

0 commit comments

Comments
 (0)