CLN: move/reorg pandas.tools -> pandas.core.reshape

xref #13634

Author: jreback

doc/source/conf.py

@@ -230,7 +230,7 @@
 # the API pages as top-level functions) based on a template (GH9911)
 moved_api_pages = [
     'pandas.core.common.isnull', 'pandas.core.common.notnull', 'pandas.core.reshape.get_dummies',
-    'pandas.tools.merge.concat', 'pandas.tools.merge.merge', 'pandas.tools.pivot.pivot_table',
+    'pandas.core.reshape.merge.concat', 'pandas.tools.merge.merge', 'pandas.core.reshape.pivot.pivot_table',
     'pandas.tseries.tools.to_datetime', 'pandas.io.clipboard.read_clipboard', 'pandas.io.excel.ExcelFile.parse',
     'pandas.io.excel.read_excel', 'pandas.io.html.read_html', 'pandas.io.json.read_json',
     'pandas.io.parsers.read_csv', 'pandas.io.parsers.read_fwf', 'pandas.io.parsers.read_table',

doc/source/whatsnew/v0.20.0.txt

@@ -1335,7 +1335,7 @@ If indicated, a deprecation warning will be issued if you reference theses modul
 
 .. csv-table::
     :header: "Previous Location", "New Location", "Deprecated"
-    :widths: 30, 30, 4
+    :widths: 30, 30, 20
 
     "pandas.lib", "pandas._libs.lib", "X"
     "pandas.tslib", "pandas._libs.tslib", "X"
@@ -1348,6 +1348,7 @@ If indicated, a deprecation warning will be issued if you reference theses modul
     "pandas.parser", "pandas.io.libparsers", "X"
     "pandas.formats", "pandas.io.formats", ""
     "pandas.sparse", "pandas.core.sparse", ""
+    "pandas.tools", "pandas.core.tools", "pandas.tools.plotting"
     "pandas.types", "pandas.core.dtypes", ""
     "pandas.io.sas.saslib", "pandas.io.sas.libsas", ""
     "pandas._join", "pandas._libs.join", ""

pandas/__init__.py

@@ -45,10 +45,10 @@
 from pandas.tseries.api import *
 from pandas.core.computation.api import *
 
-from pandas.tools.concat import concat
-from pandas.tools.merge import (merge, ordered_merge,
+from pandas.core.reshape.concat import concat
+from pandas.core.reshape.merge import (merge, ordered_merge,
                                 merge_ordered, merge_asof)
-from pandas.tools.pivot import pivot_table, crosstab
+from pandas.core.reshape.pivot import pivot_table, crosstab
 
 # deprecate tools.plotting, plot_params and scatter_matrix on the top namespace
 import pandas.tools.plotting
@@ -58,9 +58,9 @@
     'pandas.scatter_matrix', pandas.plotting.scatter_matrix,
     'pandas.plotting.scatter_matrix')
 
-from pandas.tools.tile import cut, qcut
-from pandas.tools.util import to_numeric
-from pandas.core.reshape import melt
+from pandas.core.reshape.tile import cut, qcut
+from pandas.core.reshape.util import to_numeric
+from pandas.core.reshape.reshape import melt
 from pandas.util.print_versions import show_versions
 from pandas.io.api import *
 from pandas.util._tester import test

pandas/core/algorithms.py

@@ -605,7 +605,7 @@ def value_counts(values, sort=True, ascending=False, normalize=False,
 
     if bins is not None:
         try:
-            from pandas.tools.tile import cut
+            from pandas.core.reshape.tile import cut
             values = Series(values)
             ii = cut(values, bins, include_lowest=True)
         except TypeError:

pandas/core/api.py

@@ -18,7 +18,7 @@
 from pandas.core.frame import DataFrame
 from pandas.core.panel import Panel, WidePanel
 from pandas.core.panel4d import Panel4D
-from pandas.core.reshape import (pivot_simple as pivot, get_dummies,
+from pandas.core.reshape.reshape import (pivot_simple as pivot, get_dummies,
                                  lreshape, wide_to_long)
 
 from pandas.core.indexing import IndexSlice

pandas/core/base.py

@@ -522,7 +522,7 @@ def nested_renaming_depr(level=4):
                         len(obj.columns.intersection(keys)) != len(keys)):
                     nested_renaming_depr()
 
-            from pandas.tools.concat import concat
+            from pandas.core.reshape.concat import concat
 
             def _agg_1dim(name, how, subset=None):
                 """
@@ -671,7 +671,7 @@ def is_any_frame():
         return result, True
 
     def _aggregate_multiple_funcs(self, arg, _level, _axis):
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
 
         if _axis != 0:
             raise NotImplementedError("axis other than 0 is not supported")

pandas/core/categorical.py

@@ -1995,7 +1995,7 @@ def describe(self):
         counts = self.value_counts(dropna=False)
         freqs = counts / float(counts.sum())
 
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
         result = concat([counts, freqs], axis=1)
         result.columns = ['counts', 'freqs']
         result.index.name = 'categories'

pandas/core/computation/expr.py

@@ -13,7 +13,7 @@
 from pandas.core.base import StringMixin
 from pandas.core import common as com
 import pandas.io.formats.printing as printing
-from pandas.tools.util import compose
+from pandas.core.reshape.util import compose
 from pandas.core.computation.ops import (
     _cmp_ops_syms, _bool_ops_syms,
     _arith_ops_syms, _unary_ops_syms, is_term)

pandas/core/frame.py

@@ -3956,7 +3956,7 @@ def pivot(self, index=None, columns=None, values=None):
 
 
         """
-        from pandas.core.reshape import pivot
+        from pandas.core.reshape.reshape import pivot
         return pivot(self, index=index, columns=columns, values=values)
 
     def stack(self, level=-1, dropna=True):
@@ -3992,7 +3992,7 @@ def stack(self, level=-1, dropna=True):
         -------
         stacked : DataFrame or Series
         """
-        from pandas.core.reshape import stack, stack_multiple
+        from pandas.core.reshape.reshape import stack, stack_multiple
 
         if isinstance(level, (tuple, list)):
             return stack_multiple(self, level, dropna=dropna)
@@ -4057,7 +4057,7 @@ def unstack(self, level=-1, fill_value=None):
         -------
         unstacked : DataFrame or Series
         """
-        from pandas.core.reshape import unstack
+        from pandas.core.reshape.reshape import unstack
         return unstack(self, level, fill_value)
 
     _shared_docs['melt'] = ("""
@@ -4159,7 +4159,7 @@ def unstack(self, level=-1, fill_value=None):
                    other='melt'))
     def melt(self, id_vars=None, value_vars=None, var_name=None,
              value_name='value', col_level=None):
-        from pandas.core.reshape import melt
+        from pandas.core.reshape.reshape import melt
         return melt(self, id_vars=id_vars, value_vars=value_vars,
                     var_name=var_name, value_name=value_name,
                     col_level=col_level)
@@ -4609,7 +4609,7 @@ def append(self, other, ignore_index=False, verify_integrity=False):
             if (self.columns.get_indexer(other.columns) >= 0).all():
                 other = other.loc[:, self.columns]
 
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
         if isinstance(other, (list, tuple)):
             to_concat = [self] + other
         else:
@@ -4741,8 +4741,8 @@ def join(self, other, on=None, how='left', lsuffix='', rsuffix='',
 
     def _join_compat(self, other, on=None, how='left', lsuffix='', rsuffix='',
                      sort=False):
-        from pandas.tools.merge import merge
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.merge import merge
+        from pandas.core.reshape.concat import concat
 
         if isinstance(other, Series):
             if other.name is None:
@@ -4786,7 +4786,7 @@ def _join_compat(self, other, on=None, how='left', lsuffix='', rsuffix='',
     def merge(self, right, how='inner', on=None, left_on=None, right_on=None,
               left_index=False, right_index=False, sort=False,
               suffixes=('_x', '_y'), copy=True, indicator=False):
-        from pandas.tools.merge import merge
+        from pandas.core.reshape.merge import merge
         return merge(self, right, how=how, on=on, left_on=left_on,
                      right_on=right_on, left_index=left_index,
                      right_index=right_index, sort=sort, suffixes=suffixes,
@@ -4846,7 +4846,7 @@ def round(self, decimals=0, *args, **kwargs):
         Series.round
 
         """
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
 
         def _dict_round(df, decimals):
             for col, vals in df.iteritems():
@@ -5523,7 +5523,7 @@ def isin(self, values):
         """
         if isinstance(values, dict):
             from collections import defaultdict
-            from pandas.tools.concat import concat
+            from pandas.core.reshape.concat import concat
             values = defaultdict(list, values)
             return concat((self.iloc[:, [i]].isin(values[col])
                            for i, col in enumerate(self.columns)), axis=1)

pandas/core/groupby.py

@@ -870,7 +870,7 @@ def _wrap_applied_output(self, *args, **kwargs):
         raise AbstractMethodError(self)
 
     def _concat_objects(self, keys, values, not_indexed_same=False):
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
 
         def reset_identity(values):
             # reset the identities of the components
@@ -2985,7 +2985,7 @@ def transform(self, func, *args, **kwargs):
             s = klass(res, indexer)
             results.append(s)
 
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
         result = concat(results).sort_index()
 
         # we will only try to coerce the result type if
@@ -3126,8 +3126,8 @@ def value_counts(self, normalize=False, sort=True, ascending=False,
                      bins=None, dropna=True):
 
         from functools import partial
-        from pandas.tools.tile import cut
-        from pandas.tools.merge import _get_join_indexers
+        from pandas.core.reshape.tile import cut
+        from pandas.core.reshape.merge import _get_join_indexers
 
         if bins is not None and not np.iterable(bins):
             # scalar bins cannot be done at top level
@@ -3509,7 +3509,7 @@ def _decide_output_index(self, output, labels):
 
     def _wrap_applied_output(self, keys, values, not_indexed_same=False):
         from pandas.core.index import _all_indexes_same
-        from pandas.tools.util import to_numeric
+        from pandas.core.reshape.util import to_numeric
 
         if len(keys) == 0:
             return DataFrame(index=keys)
@@ -3600,7 +3600,7 @@ def first_non_None_value(values):
                         # still a series
                         # path added as of GH 5545
                         elif all_indexed_same:
-                            from pandas.tools.concat import concat
+                            from pandas.core.reshape.concat import concat
                             return concat(values)
 
                     if not all_indexed_same:
@@ -3633,7 +3633,7 @@ def first_non_None_value(values):
                         else:
                             # GH5788 instead of stacking; concat gets the
                             # dtypes correct
-                            from pandas.tools.concat import concat
+                            from pandas.core.reshape.concat import concat
                             result = concat(values, keys=key_index,
                                             names=key_index.names,
                                             axis=self.axis).unstack()
@@ -3684,7 +3684,7 @@ def first_non_None_value(values):
                                         not_indexed_same=not_indexed_same)
 
     def _transform_general(self, func, *args, **kwargs):
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
 
         applied = []
         obj = self._obj_with_exclusions
@@ -4071,7 +4071,7 @@ def _iterate_column_groupbys(self):
                                          exclusions=self.exclusions)
 
     def _apply_to_column_groupbys(self, func):
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
         return concat(
             (func(col_groupby) for _, col_groupby
              in self._iterate_column_groupbys()),
@@ -4151,7 +4151,7 @@ def groupby_series(obj, col=None):
         if isinstance(obj, Series):
             results = groupby_series(obj)
         else:
-            from pandas.tools.concat import concat
+            from pandas.core.reshape.concat import concat
             results = [groupby_series(obj[col], col) for col in obj.columns]
             results = concat(results, axis=1)
 

pandas/core/panel.py

@@ -33,7 +33,7 @@
                                    create_block_manager_from_blocks)
 from pandas.core.ops import _op_descriptions
 from pandas.core.series import Series
-from pandas.tools.util import cartesian_product
+from pandas.core.reshape.util import cartesian_product
 from pandas.util.decorators import (deprecate, Appender)
 
 _shared_doc_kwargs = dict(
@@ -1294,7 +1294,7 @@ def join(self, other, how='left', lsuffix='', rsuffix=''):
         -------
         joined : Panel
         """
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
 
         if isinstance(other, Panel):
             join_major, join_minor = self._get_join_index(other, how)

pandas/tests/tools/__init__.py renamed to pandas/core/reshape/__init__.py

@@ -47,7 +47,7 @@
 def concat_wrap():
 
     def wrapper(*args, **kwargs):
-        warnings.warn("pandas.tools.merge.concat is deprecated. "
+        warnings.warn("pandas.core.reshape.merge.concat is deprecated. "
                       "import from the public API: "
                       "pandas.concat instead",
                       FutureWarning, stacklevel=3)
@@ -149,7 +149,7 @@ def _groupby_and_merge(by, on, left, right, _merge_pieces,
 
     # preserve the original order
     # if we have a missing piece this can be reset
-    from pandas.tools.concat import concat
+    from pandas.core.reshape.concat import concat
     result = concat(pieces, ignore_index=True)
     result = result.reindex(columns=pieces[0].columns, copy=False)
     return result, lby

pandas/tools/concat.py renamed to pandas/core/reshape/concat.py

@@ -4,7 +4,7 @@
 from pandas.core.dtypes.common import is_list_like, is_scalar
 from pandas import Series, DataFrame, MultiIndex, Index, concat
 from pandas.core.groupby import Grouper
-from pandas.tools.util import cartesian_product
+from pandas.core.reshape.util import cartesian_product
 from pandas.compat import range, lrange, zip
 from pandas import compat
 import pandas.core.common as com

pandas/tools/merge.py renamed to pandas/core/reshape/merge.py

@@ -1151,7 +1151,7 @@ def get_dummies(data, prefix=None, prefix_sep='_', dummy_na=False,
     --------
     Series.str.get_dummies
     """
-    from pandas.tools.concat import concat
+    from pandas.core.reshape.concat import concat
     from itertools import cycle
 
     if isinstance(data, DataFrame):

pandas/tools/pivot.py renamed to pandas/core/reshape/pivot.py

@@ -1557,7 +1557,7 @@ def append(self, to_append, ignore_index=False, verify_integrity=False):
 
 
         """
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
 
         if isinstance(to_append, (list, tuple)):
             to_concat = [self] + to_append
@@ -2035,7 +2035,7 @@ def unstack(self, level=-1, fill_value=None):
         -------
         unstacked : DataFrame
         """
-        from pandas.core.reshape import unstack
+        from pandas.core.reshape.reshape import unstack
         return unstack(self, level, fill_value)
 
     # ----------------------------------------------------------------------

pandas/core/reshape.py renamed to pandas/core/reshape/reshape.py

@@ -3064,7 +3064,7 @@ def _join_multi(self, other, how, return_indexers=True):
                                   "implemented")
 
     def _join_non_unique(self, other, how='left', return_indexers=False):
-        from pandas.tools.merge import _get_join_indexers
+        from pandas.core.reshape.merge import _get_join_indexers
 
         left_idx, right_idx = _get_join_indexers([self.values],
                                                  [other._values], how=how,

pandas/tools/tile.py renamed to pandas/core/reshape/tile.py

@@ -1168,7 +1168,7 @@ def from_product(cls, iterables, sortorder=None, names=None):
         MultiIndex.from_tuples : Convert list of tuples to MultiIndex
         """
         from pandas.core.categorical import _factorize_from_iterables
-        from pandas.tools.util import cartesian_product
+        from pandas.core.reshape.util import cartesian_product
 
         labels, levels = _factorize_from_iterables(iterables)
         labels = cartesian_product(labels)

pandas/tools/util.py renamed to pandas/core/reshape/util.py

@@ -168,7 +168,7 @@ def __init__(self, series, buf=None, length=True, header=True, index=True,
         self._chk_truncate()
 
     def _chk_truncate(self):
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
         max_rows = self.max_rows
         truncate_v = max_rows and (len(self.series) > max_rows)
         series = self.series
@@ -409,7 +409,7 @@ def _chk_truncate(self):
         Checks whether the frame should be truncated. If so, slices
         the frame up.
         """
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
 
         # Column of which first element is used to determine width of a dot col
         self.tr_size_col = -1

pandas/core/series.py

@@ -2317,7 +2317,7 @@ def boxplot_frame_groupby(grouped, subplots=True, column=None, fontsize=None,
         fig.subplots_adjust(bottom=0.15, top=0.9, left=0.1,
                             right=0.9, wspace=0.2)
     else:
-        from pandas.tools.concat import concat
+        from pandas.core.reshape.concat import concat
         keys, frames = zip(*grouped)
         if grouped.axis == 0:
             df = concat(frames, keys=keys, axis=1)

pandas/indexes/base.py

@@ -12,7 +12,7 @@
 
 from pandas._libs import join as libjoin
 import pandas.util.testing as tm
-from pandas.tests.tools.test_merge import get_test_data, N, NGROUPS
+from pandas.tests.reshape.test_merge import get_test_data, N, NGROUPS
 
 
 a_ = np.array