CLN: move pandas.computation -> pandas.core.computation

jreback · jreback · commit 2a915bc254fc · 2017-04-14T14:24:08.000-04:00
diff --git a/asv_bench/benchmarks/binary_ops.py b/asv_bench/benchmarks/binary_ops.py
@@ -1,5 +1,5 @@
 from .pandas_vb_common import *
-import pandas.computation.expressions as expr
+import pandas.core.computation.expressions as expr
 
 
 class Ops(object):
diff --git a/asv_bench/benchmarks/eval.py b/asv_bench/benchmarks/eval.py
@@ -1,6 +1,6 @@
 from .pandas_vb_common import *
 import pandas as pd
-import pandas.computation.expressions as expr
+import pandas.core.computation.expressions as expr
 
 
 class Eval(object):
diff --git a/asv_bench/benchmarks/indexing.py b/asv_bench/benchmarks/indexing.py
@@ -1,6 +1,6 @@
 from .pandas_vb_common import *
 try:
-    import pandas.computation.expressions as expr
+    import pandas.core.computation.expressions as expr
 except:
     expr = None
 
diff --git a/doc/source/whatsnew/v0.20.0.txt b/doc/source/whatsnew/v0.20.0.txt
@@ -1017,6 +1017,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
     "pandas.tslib", "pandas._libs.tslib", "X"
     "pandas._join", "pandas._libs.join", ""
     "pandas._period", "pandas._libs.period", ""
+    "pandas.computation", "pandas.core.computation", ""
     "pandas.msgpack", "pandas.io.msgpack", ""
     "pandas.index", "pandas._libs.index", ""
     "pandas.algos", "pandas._libs.algos", ""
diff --git a/pandas/__init__.py b/pandas/__init__.py
@@ -43,7 +43,7 @@
 from pandas.sparse.api import *
 from pandas.stats.api import *
 from pandas.tseries.api import *
-from pandas.computation.api import *
+from pandas.core.computation.api import *
 
 from pandas.tools.concat import concat
 from pandas.tools.merge import (merge, ordered_merge,
diff --git a/pandas/core/computation/__init__.py b/pandas/core/computation/__init__.py
diff --git a/pandas/core/computation/align.py b/pandas/core/computation/align.py
@@ -11,7 +11,7 @@
 from pandas import compat
 from pandas.errors import PerformanceWarning
 from pandas.core.common import flatten
-from pandas.computation.common import _result_type_many
+from pandas.core.computation.common import _result_type_many
 
 
 def _align_core_single_unary_op(term):
diff --git a/pandas/core/computation/api.py b/pandas/core/computation/api.py
@@ -1,6 +1,6 @@
 # flake8: noqa
 
-from pandas.computation.eval import eval
+from pandas.core.computation.eval import eval
 
 
 # deprecation, xref #13790
@@ -10,5 +10,5 @@ def Expr(*args, **kwargs):
     warnings.warn("pd.Expr is deprecated as it is not "
                   "applicable to user code",
                   FutureWarning, stacklevel=2)
-    from pandas.computation.expr import Expr
+    from pandas.core.computation.expr import Expr
     return Expr(*args, **kwargs)
diff --git a/pandas/core/computation/common.py b/pandas/core/computation/common.py
diff --git a/pandas/core/computation/engines.py b/pandas/core/computation/engines.py
@@ -7,9 +7,10 @@
 from pandas import compat
 from pandas.compat import map
 import pandas.formats.printing as printing
-from pandas.computation.align import _align, _reconstruct_object
-from pandas.computation.ops import (UndefinedVariableError,
-                                    _mathops, _reductions)
+from pandas.core.computation.align import _align, _reconstruct_object
+from pandas.core.computation.ops import (
+    UndefinedVariableError,
+    _mathops, _reductions)
 
 
 _ne_builtins = frozenset(_mathops + _reductions)
diff --git a/pandas/core/computation/eval.py b/pandas/core/computation/eval.py
@@ -6,11 +6,11 @@
 import warnings
 import tokenize
 from pandas.formats.printing import pprint_thing
-from pandas.computation import _NUMEXPR_INSTALLED
-from pandas.computation.expr import Expr, _parsers, tokenize_string
-from pandas.computation.scope import _ensure_scope
+from pandas.core.computation import _NUMEXPR_INSTALLED
+from pandas.core.computation.expr import Expr, _parsers, tokenize_string
+from pandas.core.computation.scope import _ensure_scope
 from pandas.compat import string_types
-from pandas.computation.engines import _engines
+from pandas.core.computation.engines import _engines
 from pandas.util.validators import validate_bool_kwarg
 
 
diff --git a/pandas/core/computation/expr.py b/pandas/core/computation/expr.py
@@ -14,12 +14,13 @@
 from pandas.core import common as com
 import pandas.formats.printing as printing
 from pandas.tools.util import compose
-from pandas.computation.ops import (_cmp_ops_syms, _bool_ops_syms,
-                                    _arith_ops_syms, _unary_ops_syms, is_term)
-from pandas.computation.ops import _reductions, _mathops, _LOCAL_TAG
-from pandas.computation.ops import Op, BinOp, UnaryOp, Term, Constant, Div
-from pandas.computation.ops import UndefinedVariableError, FuncNode
-from pandas.computation.scope import Scope
+from pandas.core.computation.ops import (
+    _cmp_ops_syms, _bool_ops_syms,
+    _arith_ops_syms, _unary_ops_syms, is_term)
+from pandas.core.computation.ops import _reductions, _mathops, _LOCAL_TAG
+from pandas.core.computation.ops import Op, BinOp, UnaryOp, Term, Constant, Div
+from pandas.core.computation.ops import UndefinedVariableError, FuncNode
+from pandas.core.computation.scope import Scope
 
 
 def tokenize_string(source):
diff --git a/pandas/core/computation/expressions.py b/pandas/core/computation/expressions.py
@@ -9,7 +9,7 @@
 import warnings
 import numpy as np
 from pandas.core.common import _values_from_object
-from pandas.computation import _NUMEXPR_INSTALLED
+from pandas.core.computation import _NUMEXPR_INSTALLED
 
 if _NUMEXPR_INSTALLED:
     import numexpr as ne
diff --git a/pandas/core/computation/ops.py b/pandas/core/computation/ops.py
@@ -13,8 +13,8 @@
 import pandas.core.common as com
 from pandas.formats.printing import pprint_thing, pprint_thing_encoded
 from pandas.core.base import StringMixin
-from pandas.computation.common import _ensure_decoded, _result_type_many
-from pandas.computation.scope import _DEFAULT_GLOBALS
+from pandas.core.computation.common import _ensure_decoded, _result_type_many
+from pandas.core.computation.scope import _DEFAULT_GLOBALS
 
 
 _reductions = 'sum', 'prod'
diff --git a/pandas/core/computation/pytables.py b/pandas/core/computation/pytables.py
@@ -10,10 +10,10 @@
 from pandas.compat import u, string_types, DeepChainMap
 from pandas.core.base import StringMixin
 from pandas.formats.printing import pprint_thing, pprint_thing_encoded
-from pandas.computation import expr, ops
-from pandas.computation.ops import is_term, UndefinedVariableError
-from pandas.computation.expr import BaseExprVisitor
-from pandas.computation.common import _ensure_decoded
+from pandas.core.computation import expr, ops
+from pandas.core.computation.ops import is_term, UndefinedVariableError
+from pandas.core.computation.expr import BaseExprVisitor
+from pandas.core.computation.common import _ensure_decoded
 from pandas.tseries.timedeltas import _coerce_scalar_to_timedelta_type
 
 
diff --git a/pandas/core/computation/scope.py b/pandas/core/computation/scope.py
@@ -15,7 +15,7 @@
 import pandas as pd  # noqa
 from pandas.compat import DeepChainMap, map, StringIO
 from pandas.core.base import StringMixin
-import pandas.computation as compu
+import pandas.core.computation as compu
 
 
 def _ensure_scope(level, global_dict=None, local_dict=None, resolvers=(),
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -72,9 +72,9 @@
                                    create_block_manager_from_blocks)
 from pandas.core.series import Series
 from pandas.core.categorical import Categorical
-import pandas.computation.expressions as expressions
+import pandas.core.computation.expressions as expressions
 import pandas.core.algorithms as algorithms
-from pandas.computation.eval import eval as _eval
+from pandas.core.computation.eval import eval as _eval
 from pandas.compat import (range, map, zip, lrange, lmap, lzip, StringIO, u,
                            OrderedDict, raise_with_traceback)
 from pandas import compat
diff --git a/pandas/core/internals.py b/pandas/core/internals.py
@@ -63,7 +63,7 @@
 from pandas._libs.tslib import Timedelta
 from pandas._libs.lib import BlockPlacement
 
-import pandas.computation.expressions as expressions
+import pandas.core.computation.expressions as expressions
 from pandas.util.decorators import cache_readonly
 from pandas.util.validators import validate_bool_kwarg
 
diff --git a/pandas/core/ops.py b/pandas/core/ops.py
@@ -16,7 +16,7 @@
 
 from pandas import compat
 from pandas.util.decorators import Appender
-import pandas.computation.expressions as expressions
+import pandas.core.computation.expressions as expressions
 
 from pandas.compat import bind_method
 import pandas.core.missing as missing
diff --git a/pandas/core/panel.py b/pandas/core/panel.py
@@ -14,7 +14,7 @@
     is_string_like, is_scalar)
 from pandas.core.typed.missing import notnull
 
-import pandas.computation.expressions as expressions
+import pandas.core.computation.expressions as expressions
 import pandas.core.common as com
 import pandas.core.ops as ops
 import pandas.core.missing as missing
diff --git a/pandas/io/pytables.py b/pandas/io/pytables.py
@@ -44,7 +44,7 @@
 from pandas import compat
 from pandas.compat import u_safe as u, PY3, range, lrange, string_types, filter
 from pandas.core.config import get_option
-from pandas.computation.pytables import Expr, maybe_expression
+from pandas.core.computation.pytables import Expr, maybe_expression
 
 from pandas._libs import tslib, algos, lib
 
diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py
@@ -30,7 +30,7 @@ class TestPDApi(Base, tm.TestCase):
     ignored = ['tests', 'locale', 'conftest']
 
     # top-level sub-packages
-    lib = ['api', 'compat', 'computation', 'core',
+    lib = ['api', 'compat', 'core',
            'indexes', 'formats', 'errors', 'pandas',
            'test', 'tools', 'tseries', 'sparse',
            'util', 'options', 'io']
@@ -39,8 +39,8 @@ class TestPDApi(Base, tm.TestCase):
     deprecated_modules = ['stats', 'datetools', 'parser',
                           'json', 'lib', 'tslib']
 
-    # to be deprecated
-    to_be_deprecated_moduels = ['types']
+    # to be deprecated or removed
+    to_be_deprecated_moduels = ['computation', 'types']
 
     # misc
     misc = ['IndexSlice', 'NaT']
diff --git a/pandas/tests/core/computation/__init__.py b/pandas/tests/core/computation/__init__.py
diff --git a/pandas/tests/core/computation/test_compat.py b/pandas/tests/core/computation/test_compat.py
@@ -4,15 +4,15 @@
 import pandas as pd
 from pandas.util import testing as tm
 
-from pandas.computation.engines import _engines
-import pandas.computation.expr as expr
-from pandas.computation import _MIN_NUMEXPR_VERSION
+from pandas.core.computation.engines import _engines
+import pandas.core.computation.expr as expr
+from pandas.core.computation import _MIN_NUMEXPR_VERSION
 
 
 def test_compat():
     # test we have compat with our version of nu
 
-    from pandas.computation import _NUMEXPR_INSTALLED
+    from pandas.core.computation import _NUMEXPR_INSTALLED
     try:
         import numexpr as ne
         ver = ne.__version__
diff --git a/pandas/tests/core/computation/test_eval.py b/pandas/tests/core/computation/test_eval.py
@@ -15,16 +15,18 @@
 from pandas import DataFrame, Series, Panel, date_range
 from pandas.util.testing import makeCustomDataframe as mkdf
 
-from pandas.computation import pytables
-from pandas.computation.engines import _engines, NumExprClobberingError
-from pandas.computation.expr import PythonExprVisitor, PandasExprVisitor
-from pandas.computation.expressions import _USE_NUMEXPR, _NUMEXPR_INSTALLED
-from pandas.computation.ops import (_binary_ops_dict,
-                                    _special_case_arith_ops_syms,
-                                    _arith_ops_syms, _bool_ops_syms,
-                                    _unary_math_ops, _binary_math_ops)
-
-import pandas.computation.expr as expr
+from pandas.core.computation import pytables
+from pandas.core.computation.engines import _engines, NumExprClobberingError
+from pandas.core.computation.expr import PythonExprVisitor, PandasExprVisitor
+from pandas.core.computation.expressions import (
+    _USE_NUMEXPR, _NUMEXPR_INSTALLED)
+from pandas.core.computation.ops import (
+    _binary_ops_dict,
+    _special_case_arith_ops_syms,
+    _arith_ops_syms, _bool_ops_syms,
+    _unary_math_ops, _binary_math_ops)
+
+import pandas.core.computation.expr as expr
 import pandas.util.testing as tm
 from pandas.util.testing import (assert_frame_equal, randbool,
                                  assertRaisesRegexp, assert_numpy_array_equal,
diff --git a/pandas/tests/frame/test_query_eval.py b/pandas/tests/frame/test_query_eval.py
@@ -19,7 +19,7 @@
                                  makeCustomDataframe as mkdf)
 
 import pandas.util.testing as tm
-from pandas.computation import _NUMEXPR_INSTALLED
+from pandas.core.computation import _NUMEXPR_INSTALLED
 
 from pandas.tests.frame.common import TestData
 
@@ -511,7 +511,7 @@ def test_query_syntax_error(self):
             df.query('i - +', engine=engine, parser=parser)
 
     def test_query_scope(self):
-        from pandas.computation.ops import UndefinedVariableError
+        from pandas.core.computation.ops import UndefinedVariableError
         engine, parser = self.engine, self.parser
         skip_if_no_pandas_parser(parser)
 
@@ -535,7 +535,7 @@ def test_query_scope(self):
             df.query('@a > b > c', engine=engine, parser=parser)
 
     def test_query_doesnt_pickup_local(self):
-        from pandas.computation.ops import UndefinedVariableError
+        from pandas.core.computation.ops import UndefinedVariableError
 
         engine, parser = self.engine, self.parser
         n = m = 10
@@ -546,7 +546,7 @@ def test_query_doesnt_pickup_local(self):
             df.query('sin > 5', engine=engine, parser=parser)
 
     def test_query_builtin(self):
-        from pandas.computation.engines import NumExprClobberingError
+        from pandas.core.computation.engines import NumExprClobberingError
         engine, parser = self.engine, self.parser
 
         n = m = 10
@@ -624,7 +624,7 @@ def test_nested_scope(self):
         assert_frame_equal(result, expected)
 
     def test_nested_raises_on_local_self_reference(self):
-        from pandas.computation.ops import UndefinedVariableError
+        from pandas.core.computation.ops import UndefinedVariableError
 
         df = DataFrame(np.random.randn(5, 3))
 
@@ -683,7 +683,7 @@ def test_at_inside_string(self):
         assert_frame_equal(result, expected)
 
     def test_query_undefined_local(self):
-        from pandas.computation.ops import UndefinedVariableError
+        from pandas.core.computation.ops import UndefinedVariableError
         engine, parser = self.engine, self.parser
         skip_if_no_pandas_parser(parser)
         df = DataFrame(np.random.rand(10, 2), columns=list('ab'))
@@ -803,7 +803,7 @@ def test_date_index_query_with_NaT_duplicates(self):
             df.query('index < 20130101 < dates3', engine=engine, parser=parser)
 
     def test_nested_scope(self):
-        from pandas.computation.ops import UndefinedVariableError
+        from pandas.core.computation.ops import UndefinedVariableError
         engine = self.engine
         parser = self.parser
         # smoke test
diff --git a/pandas/tests/test_expressions.py b/pandas/tests/test_expressions.py
@@ -12,7 +12,7 @@
 import numpy as np
 
 from pandas.core.api import DataFrame, Panel
-from pandas.computation import expressions as expr
+from pandas.core.computation import expressions as expr
 from pandas import compat, _np_version_under1p11
 from pandas.util.testing import (assert_almost_equal, assert_series_equal,
                                  assert_frame_equal, assert_panel_equal,
diff --git a/pandas/util/testing.py b/pandas/util/testing.py
@@ -43,7 +43,7 @@
     StringIO, PY3
 )
 
-from pandas.computation import expressions as expr
+from pandas.core.computation import expressions as expr
 
 from pandas import (bdate_range, CategoricalIndex, Categorical, IntervalIndex,
                     DatetimeIndex, TimedeltaIndex, PeriodIndex, RangeIndex,
@@ -402,8 +402,9 @@ def _incompat_bottleneck_version(method):
 
 
 def skip_if_no_ne(engine='numexpr'):
-    from pandas.computation.expressions import (_USE_NUMEXPR,
-                                                _NUMEXPR_INSTALLED)
+    from pandas.core.computation.expressions import (
+        _USE_NUMEXPR,
+        _NUMEXPR_INSTALLED)
 
     if engine == 'numexpr':
         if not _USE_NUMEXPR:
diff --git a/setup.py b/setup.py
@@ -639,9 +639,9 @@ def pxd(name):
                 'pandas.api.lib',
                 'pandas.compat',
                 'pandas.compat.numpy',
-                'pandas.computation',
                 'pandas.core',
                 'pandas.core.typed',
+                'pandas.core.computation',
                 'pandas.indexes',
                 'pandas.errors',
                 'pandas.io',
@@ -655,8 +655,8 @@ def pxd(name):
                 'pandas.util',
                 'pandas.tests',
                 'pandas.tests.api',
-                'pandas.tests.computation',
                 'pandas.tests.core.typed',
+                'pandas.tests.core.computation',
                 'pandas.tests.frame',
                 'pandas.tests.indexes',
                 'pandas.tests.indexes.datetimes',
diff --git a/vb_suite/binary_ops.py b/vb_suite/binary_ops.py
diff --git a/vb_suite/eval.py b/vb_suite/eval.py
diff --git a/vb_suite/indexing.py b/vb_suite/indexing.py
