Skip to content

Commit 219e934

Browse files
basnijholtproost
authored andcommitted
STYLE: run pre-commit filters on the repo (pandas-dev#27915)
* add isort:skip to "from .pandas_vb_common import setup" * add isort:skip to noqa: E402 marked lines * run black * add noqa: E402 isort:skip where needed * run pre-commit filters on asv_bench/benchmarks/ * parse the isort config when using pre-commit * run isort on pandas/core/api.py * run pre-commit filters and commit trivial import sorting changes * specify flake8 errors in pandas/io/msgpack/__init__.py * fix imports for doc/source/conf.py * fix the [isort] skip entry in setup.cfg Also I removed the files for which I have fixed the problems.
1 parent 7eb65d1 commit 219e934

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+255
-248
lines changed

.pre-commit-config.yaml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
repos:
2-
- repo: https://github.com/python/black
3-
rev: stable
4-
hooks:
5-
- id: black
6-
language_version: python3.7
7-
- repo: https://gitlab.com/pycqa/flake8
8-
rev: 3.7.7
9-
hooks:
10-
- id: flake8
11-
language: python_venv
12-
additional_dependencies: [flake8-comprehensions]
13-
- repo: https://github.com/pre-commit/mirrors-isort
14-
rev: v4.3.20
15-
hooks:
16-
- id: isort
17-
language: python_venv
2+
- repo: https://github.com/python/black
3+
rev: stable
4+
hooks:
5+
- id: black
6+
language_version: python3.7
7+
- repo: https://gitlab.com/pycqa/flake8
8+
rev: 3.7.7
9+
hooks:
10+
- id: flake8
11+
language: python_venv
12+
additional_dependencies: [flake8-comprehensions]
13+
- repo: https://github.com/pre-commit/mirrors-isort
14+
rev: v4.3.20
15+
hooks:
16+
- id: isort
17+
language: python_venv
18+
- repo: https://github.com/asottile/seed-isort-config
19+
rev: v1.9.2
20+
hooks:
21+
- id: seed-isort-config

asv_bench/benchmarks/attrs_caching.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import numpy as np
2+
23
from pandas import DataFrame
34

45
try:
@@ -32,4 +33,4 @@ def time_cache_readonly(self):
3233
self.obj.prop
3334

3435

35-
from .pandas_vb_common import setup # noqa: F401
36+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/binary_ops.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import numpy as np
2+
23
from pandas import DataFrame, Series, date_range
34
from pandas.core.algorithms import checked_add_with_arr
45

@@ -155,4 +156,4 @@ def time_add_overflow_both_arg_nan(self):
155156
)
156157

157158

158-
from .pandas_vb_common import setup # noqa: F401
159+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/categoricals.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import warnings
2+
13
import numpy as np
4+
25
import pandas as pd
36
import pandas.util.testing as tm
4-
import warnings
57

68
try:
79
from pandas.api.types import union_categoricals
@@ -280,4 +282,4 @@ def time_sort_values(self):
280282
self.index.sort_values(ascending=False)
281283

282284

283-
from .pandas_vb_common import setup # noqa: F401
285+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/ctors.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import numpy as np
2+
3+
from pandas import DatetimeIndex, Index, MultiIndex, Series, Timestamp
24
import pandas.util.testing as tm
3-
from pandas import Series, Index, DatetimeIndex, Timestamp, MultiIndex
45

56

67
def no_change(arr):
@@ -113,4 +114,4 @@ def time_multiindex_from_iterables(self):
113114
MultiIndex.from_product(self.iterables)
114115

115116

116-
from .pandas_vb_common import setup # noqa: F401
117+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/dtypes.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import numpy as np
2+
13
from pandas.api.types import pandas_dtype
24

3-
import numpy as np
45
from .pandas_vb_common import (
5-
numeric_dtypes,
66
datetime_dtypes,
7-
string_dtypes,
87
extension_dtypes,
8+
numeric_dtypes,
9+
string_dtypes,
910
)
1011

11-
1212
_numpy_dtypes = [
1313
np.dtype(dtype) for dtype in (numeric_dtypes + datetime_dtypes + string_dtypes)
1414
]
@@ -40,4 +40,4 @@ def time_pandas_dtype_invalid(self, dtype):
4040
pass
4141

4242

43-
from .pandas_vb_common import setup # noqa: F401
43+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/eval.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import numpy as np
2+
23
import pandas as pd
34

45
try:
@@ -62,4 +63,4 @@ def time_query_with_boolean_selection(self):
6263
self.df.query("(a >= @self.min_val) & (a <= @self.max_val)")
6364

6465

65-
from .pandas_vb_common import setup # noqa: F401
66+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/frame_ctor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import numpy as np
2+
3+
from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range
24
import pandas.util.testing as tm
3-
from pandas import DataFrame, Series, MultiIndex, Timestamp, date_range
45

56
try:
67
from pandas.tseries.offsets import Nano, Hour
@@ -104,4 +105,4 @@ def time_frame_from_lists(self):
104105
self.df = DataFrame(self.data)
105106

106107

107-
from .pandas_vb_common import setup # noqa: F401
108+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/frame_methods.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import warnings
21
import string
2+
import warnings
33

44
import numpy as np
55

@@ -609,4 +609,4 @@ def time_dataframe_describe(self):
609609
self.df.describe()
610610

611611

612-
from .pandas_vb_common import setup # noqa: F401
612+
from .pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/gil.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import numpy as np
2-
import pandas.util.testing as tm
3-
from pandas import DataFrame, Series, read_csv, factorize, date_range
2+
3+
from pandas import DataFrame, Series, date_range, factorize, read_csv
44
from pandas.core.algorithms import take_1d
5+
import pandas.util.testing as tm
56

67
try:
78
from pandas import (
@@ -36,7 +37,7 @@ def wrapper(fname):
3637
return wrapper
3738

3839

39-
from .pandas_vb_common import BaseIO
40+
from .pandas_vb_common import BaseIO # noqa: E402 isort:skip
4041

4142

4243
class ParallelGroupbyMethods:
@@ -301,4 +302,4 @@ def time_loop(self, threads):
301302
self.loop()
302303

303304

304-
from .pandas_vb_common import setup # noqa: F401
305+
from .pandas_vb_common import setup # noqa: F401 isort:skip

0 commit comments

Comments
 (0)