From 869b1fd448f02cc74f5dff665639f177430ba452 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Sun, 16 Apr 2017 12:06:24 +0200
Subject: [PATCH] CLN: updates to benchmarks after repo reorg

---
 asv_bench/benchmarks/binary_ops.py   | 5 ++++-
 asv_bench/benchmarks/categoricals.py | 7 +++++--
 asv_bench/benchmarks/eval.py         | 5 ++++-
 asv_bench/benchmarks/indexing.py     | 4 ----
 asv_bench/benchmarks/plotting.py     | 5 ++++-
 asv_bench/benchmarks/reshape.py      | 2 +-
 asv_bench/benchmarks/sparse.py       | 6 ++----
 asv_bench/benchmarks/timeseries.py   | 5 ++++-
 8 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/asv_bench/benchmarks/binary_ops.py b/asv_bench/benchmarks/binary_ops.py
index cc869996b49cd..0ca21b929ea17 100644
--- a/asv_bench/benchmarks/binary_ops.py
+++ b/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):
diff --git a/asv_bench/benchmarks/categoricals.py b/asv_bench/benchmarks/categoricals.py
index 5b0dd126acdea..6432ccfb19efe 100644
--- a/asv_bench/benchmarks/categoricals.py
+++ b/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):
diff --git a/asv_bench/benchmarks/eval.py b/asv_bench/benchmarks/eval.py
index ee091e57c6403..6f33590ee9e33 100644
--- a/asv_bench/benchmarks/eval.py
+++ b/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):
diff --git a/asv_bench/benchmarks/indexing.py b/asv_bench/benchmarks/indexing.py
index 79844414f2746..8947a0fdd796c 100644
--- a/asv_bench/benchmarks/indexing.py
+++ b/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):
diff --git a/asv_bench/benchmarks/plotting.py b/asv_bench/benchmarks/plotting.py
index 757c3e27dd333..dda684b35e301 100644
--- a/asv_bench/benchmarks/plotting.py
+++ b/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):
diff --git a/asv_bench/benchmarks/reshape.py b/asv_bench/benchmarks/reshape.py
index b9346c497b9ef..177e3e7cb87fa 100644
--- a/asv_bench/benchmarks/reshape.py
+++ b/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):
diff --git a/asv_bench/benchmarks/sparse.py b/asv_bench/benchmarks/sparse.py
index 7d424592ed877..500149b89b08b 100644
--- a/asv_bench/benchmarks/sparse.py
+++ b/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):
diff --git a/asv_bench/benchmarks/timeseries.py b/asv_bench/benchmarks/timeseries.py
index dfe3f0ef87c11..b63b3386a7563 100644
--- a/asv_bench/benchmarks/timeseries.py
+++ b/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