Skip to content

Commit 89677b0

Browse files
committed
Fix linting errors
1 parent 555fb91 commit 89677b0

File tree

3 files changed

+26
-17
lines changed

3 files changed

+26
-17
lines changed

pandas/core/internals.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2926,7 +2926,7 @@ def make_block(values, placement, klass=None, ndim=None, dtype=None,
29262926
elif klass is DatetimeTZBlock and not is_datetimetz(values):
29272927
return klass(values, ndim=ndim,
29282928
placement=placement, dtype=dtype)
2929-
2929+
29302930
return klass(values, ndim=ndim, placement=placement)
29312931

29322932
# TODO: flexible with index=None and/or items=None
@@ -5135,15 +5135,16 @@ def concatenate_block_managers(mgrs_indexers, axes, concat_axis, copy):
51355135
else:
51365136
b = make_block(
51375137
concatenate_join_units(join_units, concat_axis, copy=copy),
5138-
placement=placement
5139-
)
5138+
placement=placement)
51405139
blocks.append(b)
51415140

51425141
return BlockManager(blocks, axes)
51435142

5143+
51445144
def is_sparse_join_units(join_units):
51455145
return any(type(ju.block) is SparseBlock for ju in join_units)
51465146

5147+
51475148
def is_uniform_join_units(join_units):
51485149
"""
51495150
Check if the join units consist of blocks of uniform type that can

pandas/tests/reshape/merge/test_merge.py

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,18 +1802,28 @@ def test_merge_on_indexes(self, left_df, right_df, how, sort, expected):
18021802
sort=sort)
18031803
tm.assert_frame_equal(result, expected)
18041804

1805+
18051806
class TestMergeSparseDataFrames(object):
18061807
# 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']))
18081813
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)})
18111818

18121819
dense_merge = dense_evens.merge(dense_threes, how=how, on='A')
18131820

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')
18171827

18181828
sparse_evens = dense_evens.to_sparse(fill_value=fill_value)
18191829
sparse_threes = dense_threes.to_sparse(fill_value=fill_value)
@@ -1822,10 +1832,9 @@ def test_merge_two_sparse_frames(self, fill_value, how):
18221832

18231833
assert sparse_merge.default_fill_value is fill_value
18241834

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)
18271838

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):
18301840
"pass"
1831-

pandas/tests/sparse/frame/test_frame.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,14 +225,14 @@ class Unknown:
225225
@pytest.mark.parametrize('fill_value', [0, 1, np.nan, None])
226226
def test_constructor_preserve_attr(self, fill_value):
227227
# GH 13866
228-
arr = pd.SparseArray([1, 0, 3, 0], dtype=np.int64, fill_value=fill_value)
228+
arr = pd.SparseArray([1, 0, 3, 0], dtype=np.int64,
229+
fill_value=fill_value)
229230
assert arr.dtype == np.int64
230231
assert arr.fill_value == fill_value
231232

232233
df = pd.SparseDataFrame({'x': arr})
233234
assert df['x'].dtype == np.int64
234235
assert df['x'].fill_value == fill_value
235-
assert df.default_fill_value == fill_value
236236

237237
s = pd.SparseSeries(arr, name='x')
238238
assert s.dtype == np.int64
@@ -246,7 +246,6 @@ def test_constructor_preserve_attr(self, fill_value):
246246
assert df['x'].dtype == np.int64
247247
assert df['x'].fill_value == fill_value
248248

249-
250249
def test_constructor_nan_dataframe(self):
251250
# GH 10079
252251
trains = np.arange(100)

0 commit comments

Comments
 (0)