Skip to content

Commit 2a915bc

Browse files
jrebackjreback
committed
CLN: move pandas.computation -> pandas.core.computation
1 parent da408cc commit 2a915bc

32 files changed

+79
-73
lines changed

‎asv_bench/benchmarks/binary_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .pandas_vb_common import *
2-
import pandas.computation.expressions as expr
2+
import pandas.core.computation.expressions as expr
33

44

55
class Ops(object):

‎asv_bench/benchmarks/eval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from .pandas_vb_common import *
22
import pandas as pd
3-
import pandas.computation.expressions as expr
3+
import pandas.core.computation.expressions as expr
44

55

66
class Eval(object):

‎asv_bench/benchmarks/indexing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from .pandas_vb_common import *
22
try:
3-
import pandas.computation.expressions as expr
3+
import pandas.core.computation.expressions as expr
44
except:
55
expr = None
66

‎doc/source/whatsnew/v0.20.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
10171017
"pandas.tslib", "pandas._libs.tslib", "X"
10181018
"pandas._join", "pandas._libs.join", ""
10191019
"pandas._period", "pandas._libs.period", ""
1020+
"pandas.computation", "pandas.core.computation", ""
10201021
"pandas.msgpack", "pandas.io.msgpack", ""
10211022
"pandas.index", "pandas._libs.index", ""
10221023
"pandas.algos", "pandas._libs.algos", ""

‎pandas/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
from pandas.sparse.api import *
4444
from pandas.stats.api import *
4545
from pandas.tseries.api import *
46-
from pandas.computation.api import *
46+
from pandas.core.computation.api import *
4747

4848
from pandas.tools.concat import concat
4949
from pandas.tools.merge import (merge, ordered_merge,

‎pandas/computation/__init__.py renamed to ‎pandas/core/computation/__init__.py

File renamed without changes.

‎pandas/computation/align.py renamed to ‎pandas/core/computation/align.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from pandas import compat
1212
from pandas.errors import PerformanceWarning
1313
from pandas.core.common import flatten
14-
from pandas.computation.common import _result_type_many
14+
from pandas.core.computation.common import _result_type_many
1515

1616

1717
def _align_core_single_unary_op(term):

‎pandas/computation/api.py renamed to ‎pandas/core/computation/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# flake8: noqa
22

3-
from pandas.computation.eval import eval
3+
from pandas.core.computation.eval import eval
44

55

66
# deprecation, xref #13790
@@ -10,5 +10,5 @@ def Expr(*args, **kwargs):
1010
warnings.warn("pd.Expr is deprecated as it is not "
1111
"applicable to user code",
1212
FutureWarning, stacklevel=2)
13-
from pandas.computation.expr import Expr
13+
from pandas.core.computation.expr import Expr
1414
return Expr(*args, **kwargs)

‎pandas/computation/common.py renamed to ‎pandas/core/computation/common.py

File renamed without changes.

‎pandas/computation/engines.py renamed to ‎pandas/core/computation/engines.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
from pandas import compat
88
from pandas.compat import map
99
import pandas.formats.printing as printing
10-
from pandas.computation.align import _align, _reconstruct_object
11-
from pandas.computation.ops import (UndefinedVariableError,
12-
_mathops, _reductions)
10+
from pandas.core.computation.align import _align, _reconstruct_object
11+
from pandas.core.computation.ops import (
12+
UndefinedVariableError,
13+
_mathops, _reductions)
1314

1415

1516
_ne_builtins = frozenset(_mathops + _reductions)

‎pandas/computation/eval.py renamed to ‎pandas/core/computation/eval.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import warnings
77
import tokenize
88
from pandas.formats.printing import pprint_thing
9-
from pandas.computation import _NUMEXPR_INSTALLED
10-
from pandas.computation.expr import Expr, _parsers, tokenize_string
11-
from pandas.computation.scope import _ensure_scope
9+
from pandas.core.computation import _NUMEXPR_INSTALLED
10+
from pandas.core.computation.expr import Expr, _parsers, tokenize_string
11+
from pandas.core.computation.scope import _ensure_scope
1212
from pandas.compat import string_types
13-
from pandas.computation.engines import _engines
13+
from pandas.core.computation.engines import _engines
1414
from pandas.util.validators import validate_bool_kwarg
1515

1616

‎pandas/computation/expr.py renamed to ‎pandas/core/computation/expr.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
from pandas.core import common as com
1515
import pandas.formats.printing as printing
1616
from pandas.tools.util import compose
17-
from pandas.computation.ops import (_cmp_ops_syms, _bool_ops_syms,
18-
_arith_ops_syms, _unary_ops_syms, is_term)
19-
from pandas.computation.ops import _reductions, _mathops, _LOCAL_TAG
20-
from pandas.computation.ops import Op, BinOp, UnaryOp, Term, Constant, Div
21-
from pandas.computation.ops import UndefinedVariableError, FuncNode
22-
from pandas.computation.scope import Scope
17+
from pandas.core.computation.ops import (
18+
_cmp_ops_syms, _bool_ops_syms,
19+
_arith_ops_syms, _unary_ops_syms, is_term)
20+
from pandas.core.computation.ops import _reductions, _mathops, _LOCAL_TAG
21+
from pandas.core.computation.ops import Op, BinOp, UnaryOp, Term, Constant, Div
22+
from pandas.core.computation.ops import UndefinedVariableError, FuncNode
23+
from pandas.core.computation.scope import Scope
2324

2425

2526
def tokenize_string(source):

‎pandas/computation/expressions.py renamed to ‎pandas/core/computation/expressions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import warnings
1010
import numpy as np
1111
from pandas.core.common import _values_from_object
12-
from pandas.computation import _NUMEXPR_INSTALLED
12+
from pandas.core.computation import _NUMEXPR_INSTALLED
1313

1414
if _NUMEXPR_INSTALLED:
1515
import numexpr as ne

‎pandas/computation/ops.py renamed to ‎pandas/core/computation/ops.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import pandas.core.common as com
1414
from pandas.formats.printing import pprint_thing, pprint_thing_encoded
1515
from pandas.core.base import StringMixin
16-
from pandas.computation.common import _ensure_decoded, _result_type_many
17-
from pandas.computation.scope import _DEFAULT_GLOBALS
16+
from pandas.core.computation.common import _ensure_decoded, _result_type_many
17+
from pandas.core.computation.scope import _DEFAULT_GLOBALS
1818

1919

2020
_reductions = 'sum', 'prod'

‎pandas/computation/pytables.py renamed to ‎pandas/core/computation/pytables.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
from pandas.compat import u, string_types, DeepChainMap
1111
from pandas.core.base import StringMixin
1212
from pandas.formats.printing import pprint_thing, pprint_thing_encoded
13-
from pandas.computation import expr, ops
14-
from pandas.computation.ops import is_term, UndefinedVariableError
15-
from pandas.computation.expr import BaseExprVisitor
16-
from pandas.computation.common import _ensure_decoded
13+
from pandas.core.computation import expr, ops
14+
from pandas.core.computation.ops import is_term, UndefinedVariableError
15+
from pandas.core.computation.expr import BaseExprVisitor
16+
from pandas.core.computation.common import _ensure_decoded
1717
from pandas.tseries.timedeltas import _coerce_scalar_to_timedelta_type
1818

1919

‎pandas/computation/scope.py renamed to ‎pandas/core/computation/scope.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import pandas as pd # noqa
1616
from pandas.compat import DeepChainMap, map, StringIO
1717
from pandas.core.base import StringMixin
18-
import pandas.computation as compu
18+
import pandas.core.computation as compu
1919

2020

2121
def _ensure_scope(level, global_dict=None, local_dict=None, resolvers=(),

‎pandas/core/frame.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
create_block_manager_from_blocks)
7373
from pandas.core.series import Series
7474
from pandas.core.categorical import Categorical
75-
import pandas.computation.expressions as expressions
75+
import pandas.core.computation.expressions as expressions
7676
import pandas.core.algorithms as algorithms
77-
from pandas.computation.eval import eval as _eval
77+
from pandas.core.computation.eval import eval as _eval
7878
from pandas.compat import (range, map, zip, lrange, lmap, lzip, StringIO, u,
7979
OrderedDict, raise_with_traceback)
8080
from pandas import compat

‎pandas/core/internals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
from pandas._libs.tslib import Timedelta
6464
from pandas._libs.lib import BlockPlacement
6565

66-
import pandas.computation.expressions as expressions
66+
import pandas.core.computation.expressions as expressions
6767
from pandas.util.decorators import cache_readonly
6868
from pandas.util.validators import validate_bool_kwarg
6969

‎pandas/core/ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from pandas import compat
1818
from pandas.util.decorators import Appender
19-
import pandas.computation.expressions as expressions
19+
import pandas.core.computation.expressions as expressions
2020

2121
from pandas.compat import bind_method
2222
import pandas.core.missing as missing

‎pandas/core/panel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
is_string_like, is_scalar)
1515
from pandas.core.typed.missing import notnull
1616

17-
import pandas.computation.expressions as expressions
17+
import pandas.core.computation.expressions as expressions
1818
import pandas.core.common as com
1919
import pandas.core.ops as ops
2020
import pandas.core.missing as missing

‎pandas/io/pytables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
from pandas import compat
4545
from pandas.compat import u_safe as u, PY3, range, lrange, string_types, filter
4646
from pandas.core.config import get_option
47-
from pandas.computation.pytables import Expr, maybe_expression
47+
from pandas.core.computation.pytables import Expr, maybe_expression
4848

4949
from pandas._libs import tslib, algos, lib
5050

‎pandas/tests/api/test_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class TestPDApi(Base, tm.TestCase):
3030
ignored = ['tests', 'locale', 'conftest']
3131

3232
# top-level sub-packages
33-
lib = ['api', 'compat', 'computation', 'core',
33+
lib = ['api', 'compat', 'core',
3434
'indexes', 'formats', 'errors', 'pandas',
3535
'test', 'tools', 'tseries', 'sparse',
3636
'util', 'options', 'io']
@@ -39,8 +39,8 @@ class TestPDApi(Base, tm.TestCase):
3939
deprecated_modules = ['stats', 'datetools', 'parser',
4040
'json', 'lib', 'tslib']
4141

42-
# to be deprecated
43-
to_be_deprecated_moduels = ['types']
42+
# to be deprecated or removed
43+
to_be_deprecated_moduels = ['computation', 'types']
4444

4545
# misc
4646
misc = ['IndexSlice', 'NaT']

‎pandas/tests/computation/__init__.py renamed to ‎pandas/tests/core/computation/__init__.py

File renamed without changes.

‎pandas/tests/computation/test_compat.py renamed to ‎pandas/tests/core/computation/test_compat.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
import pandas as pd
55
from pandas.util import testing as tm
66

7-
from pandas.computation.engines import _engines
8-
import pandas.computation.expr as expr
9-
from pandas.computation import _MIN_NUMEXPR_VERSION
7+
from pandas.core.computation.engines import _engines
8+
import pandas.core.computation.expr as expr
9+
from pandas.core.computation import _MIN_NUMEXPR_VERSION
1010

1111

1212
def test_compat():
1313
# test we have compat with our version of nu
1414

15-
from pandas.computation import _NUMEXPR_INSTALLED
15+
from pandas.core.computation import _NUMEXPR_INSTALLED
1616
try:
1717
import numexpr as ne
1818
ver = ne.__version__

‎pandas/tests/computation/test_eval.py renamed to ‎pandas/tests/core/computation/test_eval.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@
1515
from pandas import DataFrame, Series, Panel, date_range
1616
from pandas.util.testing import makeCustomDataframe as mkdf
1717

18-
from pandas.computation import pytables
19-
from pandas.computation.engines import _engines, NumExprClobberingError
20-
from pandas.computation.expr import PythonExprVisitor, PandasExprVisitor
21-
from pandas.computation.expressions import _USE_NUMEXPR, _NUMEXPR_INSTALLED
22-
from pandas.computation.ops import (_binary_ops_dict,
23-
_special_case_arith_ops_syms,
24-
_arith_ops_syms, _bool_ops_syms,
25-
_unary_math_ops, _binary_math_ops)
26-
27-
import pandas.computation.expr as expr
18+
from pandas.core.computation import pytables
19+
from pandas.core.computation.engines import _engines, NumExprClobberingError
20+
from pandas.core.computation.expr import PythonExprVisitor, PandasExprVisitor
21+
from pandas.core.computation.expressions import (
22+
_USE_NUMEXPR, _NUMEXPR_INSTALLED)
23+
from pandas.core.computation.ops import (
24+
_binary_ops_dict,
25+
_special_case_arith_ops_syms,
26+
_arith_ops_syms, _bool_ops_syms,
27+
_unary_math_ops, _binary_math_ops)
28+
29+
import pandas.core.computation.expr as expr
2830
import pandas.util.testing as tm
2931
from pandas.util.testing import (assert_frame_equal, randbool,
3032
assertRaisesRegexp, assert_numpy_array_equal,

‎pandas/tests/frame/test_query_eval.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
makeCustomDataframe as mkdf)
2020

2121
import pandas.util.testing as tm
22-
from pandas.computation import _NUMEXPR_INSTALLED
22+
from pandas.core.computation import _NUMEXPR_INSTALLED
2323

2424
from pandas.tests.frame.common import TestData
2525

@@ -511,7 +511,7 @@ def test_query_syntax_error(self):
511511
df.query('i - +', engine=engine, parser=parser)
512512

513513
def test_query_scope(self):
514-
from pandas.computation.ops import UndefinedVariableError
514+
from pandas.core.computation.ops import UndefinedVariableError
515515
engine, parser = self.engine, self.parser
516516
skip_if_no_pandas_parser(parser)
517517

@@ -535,7 +535,7 @@ def test_query_scope(self):
535535
df.query('@a > b > c', engine=engine, parser=parser)
536536

537537
def test_query_doesnt_pickup_local(self):
538-
from pandas.computation.ops import UndefinedVariableError
538+
from pandas.core.computation.ops import UndefinedVariableError
539539

540540
engine, parser = self.engine, self.parser
541541
n = m = 10
@@ -546,7 +546,7 @@ def test_query_doesnt_pickup_local(self):
546546
df.query('sin > 5', engine=engine, parser=parser)
547547

548548
def test_query_builtin(self):
549-
from pandas.computation.engines import NumExprClobberingError
549+
from pandas.core.computation.engines import NumExprClobberingError
550550
engine, parser = self.engine, self.parser
551551

552552
n = m = 10
@@ -624,7 +624,7 @@ def test_nested_scope(self):
624624
assert_frame_equal(result, expected)
625625

626626
def test_nested_raises_on_local_self_reference(self):
627-
from pandas.computation.ops import UndefinedVariableError
627+
from pandas.core.computation.ops import UndefinedVariableError
628628

629629
df = DataFrame(np.random.randn(5, 3))
630630

@@ -683,7 +683,7 @@ def test_at_inside_string(self):
683683
assert_frame_equal(result, expected)
684684

685685
def test_query_undefined_local(self):
686-
from pandas.computation.ops import UndefinedVariableError
686+
from pandas.core.computation.ops import UndefinedVariableError
687687
engine, parser = self.engine, self.parser
688688
skip_if_no_pandas_parser(parser)
689689
df = DataFrame(np.random.rand(10, 2), columns=list('ab'))
@@ -803,7 +803,7 @@ def test_date_index_query_with_NaT_duplicates(self):
803803
df.query('index < 20130101 < dates3', engine=engine, parser=parser)
804804

805805
def test_nested_scope(self):
806-
from pandas.computation.ops import UndefinedVariableError
806+
from pandas.core.computation.ops import UndefinedVariableError
807807
engine = self.engine
808808
parser = self.parser
809809
# smoke test

‎pandas/tests/test_expressions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import numpy as np
1313

1414
from pandas.core.api import DataFrame, Panel
15-
from pandas.computation import expressions as expr
15+
from pandas.core.computation import expressions as expr
1616
from pandas import compat, _np_version_under1p11
1717
from pandas.util.testing import (assert_almost_equal, assert_series_equal,
1818
assert_frame_equal, assert_panel_equal,

‎pandas/util/testing.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
StringIO, PY3
4444
)
4545

46-
from pandas.computation import expressions as expr
46+
from pandas.core.computation import expressions as expr
4747

4848
from pandas import (bdate_range, CategoricalIndex, Categorical, IntervalIndex,
4949
DatetimeIndex, TimedeltaIndex, PeriodIndex, RangeIndex,
@@ -402,8 +402,9 @@ def _incompat_bottleneck_version(method):
402402

403403

404404
def skip_if_no_ne(engine='numexpr'):
405-
from pandas.computation.expressions import (_USE_NUMEXPR,
406-
_NUMEXPR_INSTALLED)
405+
from pandas.core.computation.expressions import (
406+
_USE_NUMEXPR,
407+
_NUMEXPR_INSTALLED)
407408

408409
if engine == 'numexpr':
409410
if not _USE_NUMEXPR:

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,9 @@ def pxd(name):
639639
'pandas.api.lib',
640640
'pandas.compat',
641641
'pandas.compat.numpy',
642-
'pandas.computation',
643642
'pandas.core',
644643
'pandas.core.typed',
644+
'pandas.core.computation',
645645
'pandas.indexes',
646646
'pandas.errors',
647647
'pandas.io',
@@ -655,8 +655,8 @@ def pxd(name):
655655
'pandas.util',
656656
'pandas.tests',
657657
'pandas.tests.api',
658-
'pandas.tests.computation',
659658
'pandas.tests.core.typed',
659+
'pandas.tests.core.computation',
660660
'pandas.tests.frame',
661661
'pandas.tests.indexes',
662662
'pandas.tests.indexes.datetimes',

0 commit comments

Comments
 (0)