CLN: updates to benchmarks after repo reorg

asv_bench/benchmarks/binary_ops.py

@@ -1,5 +1,8 @@
 from .pandas_vb_common import *
-import pandas.core.computation.expressions as expr
+try:
+    import pandas.core.computation.expressions as expr
+except ImportError:
+    import pandas.computation.expressions as expr
 
 
 class Ops(object):

asv_bench/benchmarks/categoricals.py

@@ -1,8 +1,11 @@
 from .pandas_vb_common import *
 try:
-    from pandas.core.dtypes.concat import union_categoricals
+    from pandas.api.types import union_categoricals
 except ImportError:
-    pass
+    try:
+        from pandas.types.concat import union_categoricals
+    except ImportError:
+        pass
 
 
 class Categoricals(object):

asv_bench/benchmarks/eval.py

@@ -1,6 +1,9 @@
 from .pandas_vb_common import *
 import pandas as pd
-import pandas.core.computation.expressions as expr
+try:
+    import pandas.core.computation.expressions as expr
+except ImportError:
+    import pandas.computation.expressions as expr
 
 
 class Eval(object):

asv_bench/benchmarks/indexing.py

@@ -1,8 +1,4 @@
 from .pandas_vb_common import *
-try:
-    import pandas.core.computation.expressions as expr
-except:
-    expr = None
 
 
 class Int64Indexing(object):

asv_bench/benchmarks/plotting.py

@@ -4,7 +4,10 @@
 except ImportError:
     def date_range(start=None, end=None, periods=None, freq=None):
         return DatetimeIndex(start, end, periods=periods, offset=freq)
-from pandas.tools.plotting import andrews_curves
+try:
+    from pandas.plotting import andrews_curves
+except ImportError:
+    from pandas.tools.plotting import andrews_curves
 
 
 class TimeseriesPlotting(object):

asv_bench/benchmarks/reshape.py

@@ -1,5 +1,5 @@
 from .pandas_vb_common import *
-from pandas.core.reshape import melt, wide_to_long
+from pandas import melt, wide_to_long
 
 
 class melt_dataframe(object):

asv_bench/benchmarks/sparse.py

@@ -1,8 +1,6 @@
 from .pandas_vb_common import *
-import pandas.core.sparse.series
 import scipy.sparse
-from pandas.core.sparse import SparseSeries, SparseDataFrame
-from pandas.core.sparse import SparseDataFrame
+from pandas import SparseSeries, SparseDataFrame
 
 
 class sparse_series_to_frame(object):
@@ -37,7 +35,7 @@ def setup(self):
         self.A = scipy.sparse.coo_matrix(([3.0, 1.0, 2.0], ([1, 0, 0], [0, 2, 3])), shape=(100, 100))
 
     def time_sparse_series_from_coo(self):
-        self.ss = pandas.core.sparse.series.SparseSeries.from_coo(self.A)
+        self.ss = SparseSeries.from_coo(self.A)
 
 
 class sparse_series_to_coo(object):

asv_bench/benchmarks/timeseries.py

@@ -1,4 +1,7 @@
-from pandas.tseries.converter import DatetimeConverter
+try:
+    from pandas.plotting._converter import DatetimeConverter
+except ImportError:
+    from pandas.tseries.converter import DatetimeConverter
 from .pandas_vb_common import *
 import pandas as pd
 from datetime import timedelta