Skip to content

STYLE Reduce merge conflicts with force_single_line #50275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 5 additions & 7 deletions asv_bench/benchmarks/algos/isin.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import numpy as np

from pandas import (
Categorical,
Index,
NaT,
Series,
date_range,
)
from pandas import Categorical
from pandas import Index
from pandas import NaT
from pandas import Series
from pandas import date_range

from ..pandas_vb_common import tm

Expand Down
12 changes: 5 additions & 7 deletions asv_bench/benchmarks/arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
import numpy as np

import pandas as pd
from pandas import (
DataFrame,
Series,
Timestamp,
date_range,
to_timedelta,
)
from pandas import DataFrame
from pandas import Series
from pandas import Timestamp
from pandas import date_range
from pandas import to_timedelta
import pandas._testing as tm
from pandas.core.algorithms import checked_add_with_arr

Expand Down
14 changes: 6 additions & 8 deletions asv_bench/benchmarks/ctors.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import numpy as np

from pandas import (
DatetimeIndex,
Index,
MultiIndex,
Series,
Timestamp,
date_range,
)
from pandas import DatetimeIndex
from pandas import Index
from pandas import MultiIndex
from pandas import Series
from pandas import Timestamp
from pandas import date_range

from .pandas_vb_common import tm

Expand Down
18 changes: 7 additions & 11 deletions asv_bench/benchmarks/dtypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
import pandas as pd
from pandas import DataFrame
import pandas._testing as tm
from pandas.api.types import (
is_extension_array_dtype,
pandas_dtype,
)

from .pandas_vb_common import (
datetime_dtypes,
extension_dtypes,
numeric_dtypes,
string_dtypes,
)
from pandas.api.types import is_extension_array_dtype
from pandas.api.types import pandas_dtype

from .pandas_vb_common import datetime_dtypes
from .pandas_vb_common import extension_dtypes
from .pandas_vb_common import numeric_dtypes
from .pandas_vb_common import string_dtypes

_numpy_dtypes = [
np.dtype(dtype) for dtype in (numeric_dtypes + datetime_dtypes + string_dtypes)
Expand Down
30 changes: 12 additions & 18 deletions asv_bench/benchmarks/frame_ctor.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
import numpy as np

import pandas as pd
from pandas import (
NA,
Categorical,
DataFrame,
Float64Dtype,
MultiIndex,
Series,
Timestamp,
date_range,
)
from pandas import Categorical
from pandas import DataFrame
from pandas import Float64Dtype
from pandas import MultiIndex
from pandas import NA
from pandas import Series
from pandas import Timestamp
from pandas import date_range

from .pandas_vb_common import tm

try:
from pandas.tseries.offsets import (
Hour,
Nano,
)
from pandas.tseries.offsets import Hour
from pandas.tseries.offsets import Nano
except ImportError:
# For compatibility with older versions
from pandas.core.datetools import (
Hour,
Nano,
)
from pandas.core.datetools import Hour
from pandas.core.datetools import Nano


class FromDicts:
Expand Down
18 changes: 8 additions & 10 deletions asv_bench/benchmarks/frame_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@

import numpy as np

from pandas import (
DataFrame,
MultiIndex,
NaT,
Series,
date_range,
isnull,
period_range,
timedelta_range,
)
from pandas import DataFrame
from pandas import MultiIndex
from pandas import NaT
from pandas import Series
from pandas import date_range
from pandas import isnull
from pandas import period_range
from pandas import timedelta_range

from .pandas_vb_common import tm

Expand Down
31 changes: 13 additions & 18 deletions asv_bench/benchmarks/gil.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,24 @@

import numpy as np

from pandas import (
DataFrame,
Series,
date_range,
factorize,
read_csv,
)
from pandas import DataFrame
from pandas import Series
from pandas import date_range
from pandas import factorize
from pandas import read_csv
from pandas.core.algorithms import take_nd

from .pandas_vb_common import tm

try:
from pandas import (
rolling_kurt,
rolling_max,
rolling_mean,
rolling_median,
rolling_min,
rolling_skew,
rolling_std,
rolling_var,
)
from pandas import rolling_kurt
from pandas import rolling_max
from pandas import rolling_mean
from pandas import rolling_median
from pandas import rolling_min
from pandas import rolling_skew
from pandas import rolling_std
from pandas import rolling_var

have_rolling_methods = True
except ImportError:
Expand All @@ -34,7 +30,6 @@
except ImportError:
from pandas import algos


from .pandas_vb_common import BaseIO # isort:skip


Expand Down
22 changes: 10 additions & 12 deletions asv_bench/benchmarks/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@

import numpy as np

from pandas import (
NA,
Categorical,
DataFrame,
Index,
MultiIndex,
Series,
Timestamp,
date_range,
period_range,
to_timedelta,
)
from pandas import Categorical
from pandas import DataFrame
from pandas import Index
from pandas import MultiIndex
from pandas import NA
from pandas import Series
from pandas import Timestamp
from pandas import date_range
from pandas import period_range
from pandas import to_timedelta

from .pandas_vb_common import tm

Expand Down
16 changes: 7 additions & 9 deletions asv_bench/benchmarks/index_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

import numpy as np

from pandas import (
DatetimeIndex,
Index,
IntervalIndex,
MultiIndex,
RangeIndex,
Series,
date_range,
)
from pandas import DatetimeIndex
from pandas import Index
from pandas import IntervalIndex
from pandas import MultiIndex
from pandas import RangeIndex
from pandas import Series
from pandas import date_range

from .pandas_vb_common import tm

Expand Down
24 changes: 11 additions & 13 deletions asv_bench/benchmarks/indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@

import numpy as np

from pandas import (
NA,
CategoricalIndex,
DataFrame,
Index,
IntervalIndex,
MultiIndex,
Series,
concat,
date_range,
option_context,
period_range,
)
from pandas import CategoricalIndex
from pandas import DataFrame
from pandas import Index
from pandas import IntervalIndex
from pandas import MultiIndex
from pandas import NA
from pandas import Series
from pandas import concat
from pandas import date_range
from pandas import option_context
from pandas import period_range

from .pandas_vb_common import tm

Expand Down
22 changes: 9 additions & 13 deletions asv_bench/benchmarks/inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,15 @@

import numpy as np

from pandas import (
NaT,
Series,
date_range,
to_datetime,
to_numeric,
to_timedelta,
)

from .pandas_vb_common import (
lib,
tm,
)
from pandas import NaT
from pandas import Series
from pandas import date_range
from pandas import to_datetime
from pandas import to_numeric
from pandas import to_timedelta

from .pandas_vb_common import lib
from .pandas_vb_common import tm


class ToNumeric:
Expand Down
28 changes: 11 additions & 17 deletions asv_bench/benchmarks/io/csv.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
from io import (
BytesIO,
StringIO,
)
from io import BytesIO
from io import StringIO
import random
import string

import numpy as np

from pandas import (
Categorical,
DataFrame,
concat,
date_range,
read_csv,
to_datetime,
)

from ..pandas_vb_common import (
BaseIO,
tm,
)
from pandas import Categorical
from pandas import DataFrame
from pandas import concat
from pandas import date_range
from pandas import read_csv
from pandas import to_datetime

from ..pandas_vb_common import BaseIO
from ..pandas_vb_common import tm


class ToCSV(BaseIO):
Expand Down
18 changes: 7 additions & 11 deletions asv_bench/benchmarks/io/excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@

import numpy as np
from odf.opendocument import OpenDocumentSpreadsheet
from odf.table import (
Table,
TableCell,
TableRow,
)
from odf.table import Table
from odf.table import TableCell
from odf.table import TableRow
from odf.text import P

from pandas import (
DataFrame,
ExcelWriter,
date_range,
read_excel,
)
from pandas import DataFrame
from pandas import ExcelWriter
from pandas import date_range
from pandas import read_excel

from ..pandas_vb_common import tm

Expand Down
18 changes: 7 additions & 11 deletions asv_bench/benchmarks/io/hdf.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
import numpy as np

from pandas import (
DataFrame,
HDFStore,
date_range,
read_hdf,
)

from ..pandas_vb_common import (
BaseIO,
tm,
)
from pandas import DataFrame
from pandas import HDFStore
from pandas import date_range
from pandas import read_hdf

from ..pandas_vb_common import BaseIO
from ..pandas_vb_common import tm


class HDFStoreDataFrame(BaseIO):
Expand Down
Loading