Skip to content
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

Fix ASV import error #22978

Merged
merged 1 commit into from
Oct 4, 2018
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions asv_bench/benchmarks/indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import numpy as np
import pandas.util.testing as tm
from pandas import (Series, DataFrame, MultiIndex, Int64Index, Float64Index,
IntervalIndex, CategoricalIndex,
IndexSlice, concat, date_range)
from .pandas_vb_common import setup, Panel # noqa
from pandas import (Series, DataFrame, MultiIndex, Panel,
Int64Index, Float64Index, IntervalIndex,
CategoricalIndex, IndexSlice, concat, date_range)
from .pandas_vb_common import setup # noqa


class NumericSeriesIndexing(object):
Expand Down
7 changes: 4 additions & 3 deletions asv_bench/benchmarks/join_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

import numpy as np
import pandas.util.testing as tm
from pandas import (DataFrame, Series, MultiIndex, date_range, concat, merge,
merge_asof)
from pandas import (DataFrame, Series, Panel, MultiIndex,
date_range, concat, merge, merge_asof)

try:
from pandas import merge_ordered
except ImportError:
from pandas import ordered_merge as merge_ordered

from .pandas_vb_common import Panel, setup # noqa
from .pandas_vb_common import setup # noqa


class Append(object):
Expand Down
4 changes: 2 additions & 2 deletions asv_bench/benchmarks/panel_ctor.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import warnings
from datetime import datetime, timedelta

from pandas import DataFrame, DatetimeIndex, date_range
from pandas import DataFrame, Panel, DatetimeIndex, date_range

from .pandas_vb_common import Panel, setup # noqa
from .pandas_vb_common import setup # noqa


class DifferentIndexes(object):
Expand Down
3 changes: 2 additions & 1 deletion asv_bench/benchmarks/panel_methods.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import warnings

import numpy as np
from pandas import Panel

from .pandas_vb_common import Panel, setup # noqa
from .pandas_vb_common import setup # noqa


class PanelMethods(object):
Expand Down