Skip to content

Commit aa73611

Browse files
Dr-IrvDr-Irv
committed
Merge remote-tracking branch 'upstream/master' into sparsedepr
2 parents f08ffc9 + 4a039c6 commit aa73611

Some content is hidden

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

74 files changed

+733
-573
lines changed

‎asv_bench/benchmarks/algorithms.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from pandas._libs import lib
66

77
import pandas as pd
8-
from pandas.util import testing as tm
8+
9+
from .pandas_vb_common import tm
910

1011
for imp in ["pandas.util", "pandas.tools.hashing"]:
1112
try:

‎asv_bench/benchmarks/categoricals.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import numpy as np
44

55
import pandas as pd
6-
import pandas._testing as tm
6+
7+
from .pandas_vb_common import tm
78

89
try:
910
from pandas.api.types import union_categoricals

‎asv_bench/benchmarks/ctors.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import numpy as np
22

33
from pandas import DatetimeIndex, Index, MultiIndex, Series, Timestamp
4-
import pandas._testing as tm
4+
5+
from .pandas_vb_common import tm
56

67

78
def no_change(arr):

‎asv_bench/benchmarks/frame_ctor.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import numpy as np
22

33
from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range
4-
import pandas._testing as tm
4+
5+
from .pandas_vb_common import tm
56

67
try:
78
from pandas.tseries.offsets import Nano, Hour

‎asv_bench/benchmarks/frame_methods.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import numpy as np
55

66
from pandas import DataFrame, MultiIndex, NaT, Series, date_range, isnull, period_range
7-
import pandas._testing as tm
7+
8+
from .pandas_vb_common import tm
89

910

1011
class GetNumericData:

‎asv_bench/benchmarks/gil.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import numpy as np
22

33
from pandas import DataFrame, Series, date_range, factorize, read_csv
4-
import pandas._testing as tm
54
from pandas.core.algorithms import take_1d
65

6+
from .pandas_vb_common import tm
7+
78
try:
89
from pandas import (
910
rolling_median,

‎asv_bench/benchmarks/groupby.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
date_range,
1414
period_range,
1515
)
16-
import pandas._testing as tm
16+
17+
from .pandas_vb_common import tm
1718

1819
method_blacklist = {
1920
"object": {

‎asv_bench/benchmarks/index_object.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
Series,
1313
date_range,
1414
)
15-
import pandas._testing as tm
15+
16+
from .pandas_vb_common import tm
1617

1718

1819
class SetOperations:

‎asv_bench/benchmarks/indexing.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
option_context,
1818
period_range,
1919
)
20-
import pandas._testing as tm
20+
21+
from .pandas_vb_common import tm
2122

2223

2324
class NumericSeriesIndexing:

‎asv_bench/benchmarks/inference.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import numpy as np
22

33
from pandas import DataFrame, Series, to_numeric
4-
import pandas._testing as tm
54

6-
from .pandas_vb_common import lib, numeric_dtypes
5+
from .pandas_vb_common import lib, numeric_dtypes, tm
76

87

98
class NumericInferOps:

0 commit comments

Comments
 (0)