STYLE Reduce merge conflicts with force_grid_wrap=1

.pre-commit-config.yaml

@@ -409,9 +409,9 @@ repos:
         - flake8-pyi==22.8.1
     -   id: future-annotations
         name: import annotations from __future__
-        entry: 'from __future__ import annotations'
+        entry: 'from __future__ import \(\n    annotations'
         language: pygrep
-        args: [--negate]
+        args: [--negate, --multiline]
         files: ^pandas/
         types: [python]
         exclude: |

asv_bench/benchmarks/algorithms.py

@@ -1,10 +1,14 @@
-from importlib import import_module
+from importlib import (
+    import_module,
+)
 
 import numpy as np
 
 import pandas as pd
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 for imp in ["pandas.util", "pandas.tools.hashing"]:
     try:

asv_bench/benchmarks/algos/isin.py

@@ -8,7 +8,9 @@
     date_range,
 )
 
-from ..pandas_vb_common import tm
+from ..pandas_vb_common import (
+    tm,
+)
 
 
 class IsIn:

asv_bench/benchmarks/arithmetic.py

@@ -12,9 +12,13 @@
     to_timedelta,
 )
 import pandas._testing as tm
-from pandas.core.algorithms import checked_add_with_arr
+from pandas.core.algorithms import (
+    checked_add_with_arr,
+)
 
-from .pandas_vb_common import numeric_dtypes
+from .pandas_vb_common import (
+    numeric_dtypes,
+)
 
 try:
     import pandas.core.computation.expressions as expr

asv_bench/benchmarks/array.py

@@ -2,7 +2,9 @@
 
 import pandas as pd
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 
 class BooleanArray:

asv_bench/benchmarks/attrs_caching.py

@@ -1,10 +1,14 @@
 import numpy as np
 
 import pandas as pd
-from pandas import DataFrame
+from pandas import (
+    DataFrame,
+)
 
 try:
-    from pandas.core.construction import extract_array
+    from pandas.core.construction import (
+        extract_array,
+    )
 except ImportError:
     extract_array = None
 

asv_bench/benchmarks/categoricals.py

@@ -6,13 +6,19 @@
 
 import pandas as pd
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 try:
-    from pandas.api.types import union_categoricals
+    from pandas.api.types import (
+        union_categoricals,
+    )
 except ImportError:
     try:
-        from pandas.types.concat import union_categoricals
+        from pandas.types.concat import (
+            union_categoricals,
+        )
     except ImportError:
         pass
 

asv_bench/benchmarks/ctors.py

@@ -9,7 +9,9 @@
     date_range,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 
 def no_change(arr):

asv_bench/benchmarks/dtypes.py

@@ -3,7 +3,9 @@
 import numpy as np
 
 import pandas as pd
-from pandas import DataFrame
+from pandas import (
+    DataFrame,
+)
 import pandas._testing as tm
 from pandas.api.types import (
     is_extension_array_dtype,

asv_bench/benchmarks/frame_ctor.py

@@ -12,7 +12,9 @@
     date_range,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 try:
     from pandas.tseries.offsets import (

asv_bench/benchmarks/frame_methods.py

@@ -14,7 +14,9 @@
     timedelta_range,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 
 class Clip:

asv_bench/benchmarks/gil.py

@@ -1,4 +1,6 @@
-from functools import wraps
+from functools import (
+    wraps,
+)
 import threading
 
 import numpy as np
@@ -10,9 +12,13 @@
     factorize,
     read_csv,
 )
-from pandas.core.algorithms import take_nd
+from pandas.core.algorithms import (
+    take_nd,
+)
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 try:
     from pandas import (
@@ -30,11 +36,12 @@
 except ImportError:
     have_rolling_methods = False
 try:
-    from pandas._libs import algos
+    from pandas._libs import (
+        algos,
+    )
 except ImportError:
     from pandas import algos
 
-
 from .pandas_vb_common import BaseIO  # isort:skip
 
 

asv_bench/benchmarks/groupby.py

@@ -1,6 +1,12 @@
-from functools import partial
-from itertools import product
-from string import ascii_letters
+from functools import (
+    partial,
+)
+from itertools import (
+    product,
+)
+from string import (
+    ascii_letters,
+)
 
 import numpy as np
 
@@ -17,7 +23,9 @@
     to_timedelta,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 method_blocklist = {
     "object": {

asv_bench/benchmarks/index_object.py

@@ -12,7 +12,9 @@
     date_range,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 
 class SetOperations:

asv_bench/benchmarks/indexing.py

@@ -21,7 +21,9 @@
     period_range,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 
 class NumericSeriesIndexing:

asv_bench/benchmarks/indexing_engines.py

@@ -10,9 +10,13 @@
 
 import numpy as np
 
-from pandas._libs import index as libindex
+from pandas._libs import (
+    index as libindex,
+)
 
-from pandas.core.arrays import BaseMaskedArray
+from pandas.core.arrays import (
+    BaseMaskedArray,
+)
 
 
 def _get_numeric_engines():

asv_bench/benchmarks/io/excel.py

@@ -1,13 +1,19 @@
-from io import BytesIO
+from io import (
+    BytesIO,
+)
 
 import numpy as np
-from odf.opendocument import OpenDocumentSpreadsheet
+from odf.opendocument import (
+    OpenDocumentSpreadsheet,
+)
 from odf.table import (
     Table,
     TableCell,
     TableRow,
 )
-from odf.text import P
+from odf.text import (
+    P,
+)
 
 from pandas import (
     DataFrame,
@@ -16,7 +22,9 @@
     read_excel,
 )
 
-from ..pandas_vb_common import tm
+from ..pandas_vb_common import (
+    tm,
+)
 
 
 def _generate_dataframe():

asv_bench/benchmarks/io/sas.py

@@ -1,6 +1,10 @@
-from pathlib import Path
+from pathlib import (
+    Path,
+)
 
-from pandas import read_sas
+from pandas import (
+    read_sas,
+)
 
 ROOT = Path(__file__).parents[3] / "pandas" / "tests" / "io" / "sas" / "data"
 

asv_bench/benchmarks/io/sql.py

@@ -1,7 +1,9 @@
 import sqlite3
 
 import numpy as np
-from sqlalchemy import create_engine
+from sqlalchemy import (
+    create_engine,
+)
 
 from pandas import (
     DataFrame,
@@ -10,7 +12,9 @@
     read_sql_table,
 )
 
-from ..pandas_vb_common import tm
+from ..pandas_vb_common import (
+    tm,
+)
 
 
 class SQL:

asv_bench/benchmarks/join_merge.py

@@ -14,12 +14,18 @@
     merge_asof,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 try:
-    from pandas import merge_ordered
+    from pandas import (
+        merge_ordered,
+    )
 except ImportError:
-    from pandas import ordered_merge as merge_ordered
+    from pandas import (
+        ordered_merge as merge_ordered,
+    )
 
 
 class Concat:

asv_bench/benchmarks/libs.py

@@ -24,9 +24,13 @@
 )
 
 try:
-    from pandas.util import cache_readonly
+    from pandas.util import (
+        cache_readonly,
+    )
 except ImportError:
-    from pandas.util.decorators import cache_readonly
+    from pandas.util.decorators import (
+        cache_readonly,
+    )
 
 
 # TODO: share with something in pd._testing?

asv_bench/benchmarks/multiindex_object.py

@@ -12,7 +12,9 @@
     date_range,
 )
 
-from .pandas_vb_common import tm
+from .pandas_vb_common import (
+    tm,
+)
 
 
 class GetLoc:

asv_bench/benchmarks/pandas_vb_common.py

@@ -1,4 +1,6 @@
-from importlib import import_module
+from importlib import (
+    import_module,
+)
 import os
 
 import numpy as np

asv_bench/benchmarks/period.py

@@ -11,7 +11,9 @@
     period_range,
 )
 
-from pandas.tseries.frequencies import to_offset
+from pandas.tseries.frequencies import (
+    to_offset,
+)
 
 
 class PeriodIndexConstructor: