ASV: compatibility import for testing module

asv_bench/benchmarks/algorithms.py

@@ -5,7 +5,8 @@
 from pandas._libs import lib
 
 import pandas as pd
-from pandas.util import testing as tm
+
+from .pandas_vb_common import tm
 
 for imp in ["pandas.util", "pandas.tools.hashing"]:
     try:

asv_bench/benchmarks/categoricals.py

@@ -3,7 +3,8 @@
 import numpy as np
 
 import pandas as pd
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 try:
     from pandas.api.types import union_categoricals

asv_bench/benchmarks/ctors.py

@@ -1,7 +1,8 @@
 import numpy as np
 
 from pandas import DatetimeIndex, Index, MultiIndex, Series, Timestamp
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 
 def no_change(arr):

asv_bench/benchmarks/frame_ctor.py

@@ -1,7 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 try:
     from pandas.tseries.offsets import Nano, Hour

asv_bench/benchmarks/frame_methods.py

@@ -4,7 +4,8 @@
 import numpy as np
 
 from pandas import DataFrame, MultiIndex, NaT, Series, date_range, isnull, period_range
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 
 class GetNumericData:

asv_bench/benchmarks/gil.py

@@ -2,7 +2,8 @@
 
 from pandas import DataFrame, Series, date_range, factorize, read_csv
 from pandas.core.algorithms import take_1d
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 try:
     from pandas import (

asv_bench/benchmarks/groupby.py

@@ -13,7 +13,8 @@
     date_range,
     period_range,
 )
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 method_blacklist = {
     "object": {

asv_bench/benchmarks/index_object.py

@@ -12,7 +12,8 @@
     Series,
     date_range,
 )
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 
 class SetOperations:

asv_bench/benchmarks/indexing.py

@@ -17,7 +17,8 @@
     option_context,
     period_range,
 )
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 
 class NumericSeriesIndexing:

asv_bench/benchmarks/inference.py

@@ -1,9 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, Series, to_numeric
-import pandas.util.testing as tm
 
-from .pandas_vb_common import lib, numeric_dtypes
+from .pandas_vb_common import lib, numeric_dtypes, tm
 
 
 class NumericInferOps:

asv_bench/benchmarks/io/csv.py

@@ -5,9 +5,8 @@
 import numpy as np
 
 from pandas import Categorical, DataFrame, date_range, read_csv, to_datetime
-import pandas.util.testing as tm
 
-from ..pandas_vb_common import BaseIO
+from ..pandas_vb_common import BaseIO, tm
 
 
 class ToCSV(BaseIO):

asv_bench/benchmarks/io/excel.py

@@ -6,7 +6,8 @@
 from odf.text import P
 
 from pandas import DataFrame, ExcelWriter, date_range, read_excel
-import pandas.util.testing as tm
+
+from ..pandas_vb_common import tm
 
 
 def _generate_dataframe():

asv_bench/benchmarks/io/hdf.py

@@ -1,9 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, HDFStore, date_range, read_hdf
-import pandas.util.testing as tm
 
-from ..pandas_vb_common import BaseIO
+from ..pandas_vb_common import BaseIO, tm
 
 
 class HDFStoreDataFrame(BaseIO):

asv_bench/benchmarks/io/json.py

@@ -1,9 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, concat, date_range, read_json, timedelta_range
-import pandas.util.testing as tm
 
-from ..pandas_vb_common import BaseIO
+from ..pandas_vb_common import BaseIO, tm
 
 
 class ReadJSON(BaseIO):

asv_bench/benchmarks/io/pickle.py

@@ -1,9 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, date_range, read_pickle
-import pandas.util.testing as tm
 
-from ..pandas_vb_common import BaseIO
+from ..pandas_vb_common import BaseIO, tm
 
 
 class Pickle(BaseIO):

asv_bench/benchmarks/io/sql.py

@@ -4,7 +4,8 @@
 from sqlalchemy import create_engine
 
 from pandas import DataFrame, date_range, read_sql_query, read_sql_table
-import pandas.util.testing as tm
+
+from ..pandas_vb_common import tm
 
 
 class SQL:

asv_bench/benchmarks/io/stata.py

@@ -1,9 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, date_range, read_stata
-import pandas.util.testing as tm
 
-from ..pandas_vb_common import BaseIO
+from ..pandas_vb_common import BaseIO, tm
 
 
 class Stata(BaseIO):

asv_bench/benchmarks/join_merge.py

@@ -3,7 +3,8 @@
 import numpy as np
 
 from pandas import DataFrame, MultiIndex, Series, concat, date_range, merge, merge_asof
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 try:
     from pandas import merge_ordered

asv_bench/benchmarks/multiindex_object.py

@@ -3,7 +3,8 @@
 import numpy as np
 
 from pandas import DataFrame, MultiIndex, RangeIndex, date_range
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 
 class GetLoc:

asv_bench/benchmarks/pandas_vb_common.py

@@ -13,6 +13,13 @@
     except (ImportError, TypeError, ValueError):
         pass
 
+# Compatibility import for the testing module
+try:
+    import pandas._testing as tm  # noqa
+except ImportError:
+    import pandas.util.testing as tm  # noqa
+
+
 numeric_dtypes = [
     np.int64,
     np.int32,

asv_bench/benchmarks/reindex.py

@@ -1,9 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, Index, MultiIndex, Series, date_range, period_range
-import pandas.util.testing as tm
 
-from .pandas_vb_common import lib
+from .pandas_vb_common import lib, tm
 
 
 class Reindex:

asv_bench/benchmarks/series_methods.py

@@ -3,7 +3,8 @@
 import numpy as np
 
 from pandas import NaT, Series, date_range
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 
 class SeriesConstructor:

asv_bench/benchmarks/strings.py

@@ -3,7 +3,8 @@
 import numpy as np
 
 from pandas import DataFrame, Series
-import pandas.util.testing as tm
+
+from .pandas_vb_common import tm
 
 
 class Methods: