From 0cb6af8212f1cd859a58c0070e4663d215918083 Mon Sep 17 00:00:00 2001 From: Erfan Nariman Date: Wed, 23 Sep 2020 10:43:46 +0200 Subject: [PATCH 1/6] remove redundant paranthesis --- pandas/core/arrays/sparse/array.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index 528d78a5414ea..2cc872c0259eb 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -1161,9 +1161,9 @@ def __setstate__(self, state): def nonzero(self): if self.fill_value == 0: - return (self.sp_index.to_int_index().indices,) + return self.sp_index.to_int_index().indices else: - return (self.sp_index.to_int_index().indices[self.sp_values != 0],) + return self.sp_index.to_int_index().indices[self.sp_values != 0] # ------------------------------------------------------------------------ # Reductions From 211ba7d3e773592fd000498a66c280cc40f884ef Mon Sep 17 00:00:00 2001 From: Erfan Nariman Date: Wed, 23 Sep 2020 10:44:20 +0200 Subject: [PATCH 2/6] parameter copy not used --- pandas/core/arrays/sparse/array.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index 2cc872c0259eb..d5bee0abee061 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -452,7 +452,7 @@ def from_spmatrix(cls, data): return cls._simple_new(arr, index, dtype) - def __array__(self, dtype=None, copy=True) -> np.ndarray: + def __array__(self, dtype=None) -> np.ndarray: fill_value = self.fill_value if self.sp_index.ngaps == 0: From 088265de03c098d89530141951d2faa974dd9060 Mon Sep 17 00:00:00 2001 From: Erfan Nariman Date: Wed, 23 Sep 2020 10:45:06 +0200 Subject: [PATCH 3/6] remove whitespace and unused argument --- pandas/core/arrays/sparse/array.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index d5bee0abee061..5180d18419181 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -677,7 +677,7 @@ def shift(self, periods=1, fill_value=None): a = empty b = arr[:-periods] else: - a = arr[abs(periods) :] + a = arr[abs(periods):] b = empty return arr._concat_same_type([a, b]) @@ -1515,7 +1515,7 @@ def _formatter(self, boxed=False): SparseArray._add_unary_ops() -def make_sparse(arr: np.ndarray, kind="block", fill_value=None, dtype=None, copy=False): +def make_sparse(arr: np.ndarray, kind="block", fill_value=None, dtype=None): """ Convert ndarray to sparse format From d9b9d49a371fcfa7832a74457b0b580409e4d155 Mon Sep 17 00:00:00 2001 From: Erfan Nariman Date: Wed, 23 Sep 2020 11:28:18 +0200 Subject: [PATCH 4/6] revert changes paranthesis --- pandas/core/arrays/sparse/array.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index 5180d18419181..38dd7611c69cd 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -1161,9 +1161,9 @@ def __setstate__(self, state): def nonzero(self): if self.fill_value == 0: - return self.sp_index.to_int_index().indices + return (self.sp_index.to_int_index().indices,) else: - return self.sp_index.to_int_index().indices[self.sp_values != 0] + return (self.sp_index.to_int_index().indices[self.sp_values != 0], ) # ------------------------------------------------------------------------ # Reductions From a878fef2bf3d1fd67e774f11fa44918b5e09f519 Mon Sep 17 00:00:00 2001 From: Erfan Nariman Date: Wed, 23 Sep 2020 13:47:39 +0200 Subject: [PATCH 5/6] changes for black --- pandas/core/algorithms.py | 9 ++++---- pandas/core/arrays/sparse/array.py | 4 ++-- pandas/tests/io/formats/test_to_latex.py | 13 +++-------- .../scalar/timestamp/test_constructors.py | 23 ++++++++----------- 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index ba08d26fbc24f..edacacd3e26bd 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -1022,10 +1022,11 @@ def checked_add_with_arr(arr, b, arr_mask=None, b_mask=None): to_raise = ((np.iinfo(np.int64).max - b2 < arr) & not_nan).any() else: to_raise = ( - (np.iinfo(np.int64).max - b2[mask1] < arr[mask1]) & not_nan[mask1] - ).any() or ( - (np.iinfo(np.int64).min - b2[mask2] > arr[mask2]) & not_nan[mask2] - ).any() + ((np.iinfo(np.int64).max - b2[mask1] < arr[mask1]) & not_nan[mask1]).any() + or ( + (np.iinfo(np.int64).min - b2[mask2] > arr[mask2]) & not_nan[mask2] + ).any() + ) if to_raise: raise OverflowError("Overflow in int64 addition") diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index 38dd7611c69cd..7dbb6e7e47b23 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -677,7 +677,7 @@ def shift(self, periods=1, fill_value=None): a = empty b = arr[:-periods] else: - a = arr[abs(periods):] + a = arr[abs(periods) :] b = empty return arr._concat_same_type([a, b]) @@ -1163,7 +1163,7 @@ def nonzero(self): if self.fill_value == 0: return (self.sp_index.to_int_index().indices,) else: - return (self.sp_index.to_int_index().indices[self.sp_values != 0], ) + return (self.sp_index.to_int_index().indices[self.sp_values != 0],) # ------------------------------------------------------------------------ # Reductions diff --git a/pandas/tests/io/formats/test_to_latex.py b/pandas/tests/io/formats/test_to_latex.py index 7a0d305758802..cc9cdcacd1078 100644 --- a/pandas/tests/io/formats/test_to_latex.py +++ b/pandas/tests/io/formats/test_to_latex.py @@ -446,9 +446,7 @@ def test_to_latex_multirow_true(self, multicolumn_frame): def test_to_latex_multicolumnrow_with_multicol_format(self, multicolumn_frame): multicolumn_frame.index = multicolumn_frame.T.index result = multicolumn_frame.T.to_latex( - multirow=True, - multicolumn=True, - multicolumn_format="c", + multirow=True, multicolumn=True, multicolumn_format="c", ) expected = _dedent( r""" @@ -717,16 +715,11 @@ def test_to_latex_longtable_label_only(self, df_short, label_longtable): assert result == expected def test_to_latex_longtable_caption_and_label( - self, - df_short, - caption_longtable, - label_longtable, + self, df_short, caption_longtable, label_longtable, ): # GH 25436 result = df_short.to_latex( - longtable=True, - caption=caption_longtable, - label=label_longtable, + longtable=True, caption=caption_longtable, label=label_longtable, ) expected = _dedent( r""" diff --git a/pandas/tests/scalar/timestamp/test_constructors.py b/pandas/tests/scalar/timestamp/test_constructors.py index d1c3ad508d877..316a299ba1cbb 100644 --- a/pandas/tests/scalar/timestamp/test_constructors.py +++ b/pandas/tests/scalar/timestamp/test_constructors.py @@ -259,20 +259,17 @@ def test_constructor_keyword(self): Timestamp("20151112") ) - assert ( - repr( - Timestamp( - year=2015, - month=11, - day=12, - hour=1, - minute=2, - second=3, - microsecond=999999, - ) + assert repr( + Timestamp( + year=2015, + month=11, + day=12, + hour=1, + minute=2, + second=3, + microsecond=999999, ) - == repr(Timestamp("2015-11-12 01:02:03.999999")) - ) + ) == repr(Timestamp("2015-11-12 01:02:03.999999")) def test_constructor_fromordinal(self): base = datetime(2000, 1, 1) From 3633faec4d91316365aff8f7ea11a92306c3b092 Mon Sep 17 00:00:00 2001 From: Erfan Nariman Date: Wed, 23 Sep 2020 23:21:56 +0200 Subject: [PATCH 6/6] update black --- pandas/core/algorithms.py | 9 ++++---- pandas/tests/io/formats/test_to_latex.py | 13 ++++++++--- .../scalar/timestamp/test_constructors.py | 23 +++++++++++-------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index edacacd3e26bd..ba08d26fbc24f 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -1022,11 +1022,10 @@ def checked_add_with_arr(arr, b, arr_mask=None, b_mask=None): to_raise = ((np.iinfo(np.int64).max - b2 < arr) & not_nan).any() else: to_raise = ( - ((np.iinfo(np.int64).max - b2[mask1] < arr[mask1]) & not_nan[mask1]).any() - or ( - (np.iinfo(np.int64).min - b2[mask2] > arr[mask2]) & not_nan[mask2] - ).any() - ) + (np.iinfo(np.int64).max - b2[mask1] < arr[mask1]) & not_nan[mask1] + ).any() or ( + (np.iinfo(np.int64).min - b2[mask2] > arr[mask2]) & not_nan[mask2] + ).any() if to_raise: raise OverflowError("Overflow in int64 addition") diff --git a/pandas/tests/io/formats/test_to_latex.py b/pandas/tests/io/formats/test_to_latex.py index cc9cdcacd1078..7a0d305758802 100644 --- a/pandas/tests/io/formats/test_to_latex.py +++ b/pandas/tests/io/formats/test_to_latex.py @@ -446,7 +446,9 @@ def test_to_latex_multirow_true(self, multicolumn_frame): def test_to_latex_multicolumnrow_with_multicol_format(self, multicolumn_frame): multicolumn_frame.index = multicolumn_frame.T.index result = multicolumn_frame.T.to_latex( - multirow=True, multicolumn=True, multicolumn_format="c", + multirow=True, + multicolumn=True, + multicolumn_format="c", ) expected = _dedent( r""" @@ -715,11 +717,16 @@ def test_to_latex_longtable_label_only(self, df_short, label_longtable): assert result == expected def test_to_latex_longtable_caption_and_label( - self, df_short, caption_longtable, label_longtable, + self, + df_short, + caption_longtable, + label_longtable, ): # GH 25436 result = df_short.to_latex( - longtable=True, caption=caption_longtable, label=label_longtable, + longtable=True, + caption=caption_longtable, + label=label_longtable, ) expected = _dedent( r""" diff --git a/pandas/tests/scalar/timestamp/test_constructors.py b/pandas/tests/scalar/timestamp/test_constructors.py index 316a299ba1cbb..d1c3ad508d877 100644 --- a/pandas/tests/scalar/timestamp/test_constructors.py +++ b/pandas/tests/scalar/timestamp/test_constructors.py @@ -259,17 +259,20 @@ def test_constructor_keyword(self): Timestamp("20151112") ) - assert repr( - Timestamp( - year=2015, - month=11, - day=12, - hour=1, - minute=2, - second=3, - microsecond=999999, + assert ( + repr( + Timestamp( + year=2015, + month=11, + day=12, + hour=1, + minute=2, + second=3, + microsecond=999999, + ) ) - ) == repr(Timestamp("2015-11-12 01:02:03.999999")) + == repr(Timestamp("2015-11-12 01:02:03.999999")) + ) def test_constructor_fromordinal(self): base = datetime(2000, 1, 1)