pandas._join -> pandas.libs.join

Author: jreback

doc/source/whatsnew/v0.20.0.txt

@@ -471,6 +471,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
     "pandas.lib", "pandas.libs.lib", "X"
     "pandas.hashtable", "pandas.libs.hashtable", ""
     "pandas._window", "pandas.core.libwindow", ""
+    "pandas._join", "pandas.libs.join", ""
 
 
 .. _whatsnew_0200.api_breaking.groupby_describe:

pandas/indexes/base.py

@@ -3,9 +3,8 @@
 import operator
 
 import numpy as np
-from pandas.libs import index as _index, tslib, algos as _algos
-import pandas.libs.lib as lib
-import pandas._join as _join
+from pandas.libs import (lib, index as _index, tslib,
+                         algos as _algos, join as _join)
 from pandas.libs.lib import Timestamp, Timedelta, is_datetime_array
 
 from pandas.compat import range, u

pandas/indexes/numeric.py

@@ -1,7 +1,6 @@
 import numpy as np
-import pandas.libs.lib as lib
-import pandas._join as _join
-from pandas.libs import index as _index, algos as _algos
+from pandas.libs import (lib, index as _index,
+                         algos as _algos, join as _join)
 
 from pandas.types.common import (is_dtype_equal, pandas_dtype,
                                  is_float_dtype, is_object_dtype,

pandas/src/join.pyx renamed to pandas/libs/join.pyx

@@ -35,7 +35,7 @@ cdef double nan = NaN
 from pandas.libs.algos import groupsort_indexer, ensure_platform_int
 from pandas.core.algorithms import take_nd
 
-include "joins_func_helper.pxi"
+include "join_func_helper.pxi"
 
 
 def inner_join(ndarray[int64_t] left, ndarray[int64_t] right,

pandas/src/joins_func_helper.pxi.in renamed to pandas/libs/join_func_helper.pxi.in

@@ -23,7 +23,7 @@ on_dtypes = ['uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
 }}
 
 
-from libs.hashtable cimport *
+from hashtable cimport *
 
 {{for table_type, by_dtype in by_dtypes}}
 {{for on_dtype in on_dtypes}}

pandas/src/join_helper.pxi.in renamed to pandas/libs/join_helper.pxi.in

@@ -3,7 +3,7 @@
 import numpy as np
 from pandas import Index
 
-import pandas._join as _join
+from pandas.libs import join as _join
 import pandas.util.testing as tm
 from pandas.util.testing import assert_almost_equal
 

pandas/tests/test_join.py

@@ -9,7 +9,7 @@
 from pandas.util.testing import assert_frame_equal
 from pandas import DataFrame, MultiIndex, Series, Index, merge, concat
 
-import pandas._join as _join
+from pandas.libs import join as _join
 import pandas.util.testing as tm
 from pandas.tests.tools.test_merge import get_test_data, N, NGROUPS
 

pandas/tests/tools/test_join.py

@@ -37,9 +37,7 @@
 from pandas.core.sorting import is_int64_overflow_possible
 import pandas.core.algorithms as algos
 import pandas.core.common as com
-
-import pandas._join as _join
-from pandas.libs import hashtable as _hash
+from pandas.libs import hashtable as _hash, join as _join
 
 
 # back-compat of pseudo-public API

pandas/tools/merge.py

@@ -44,11 +44,10 @@
 import pandas.tseries.offsets as offsets
 import pandas.tseries.tools as tools
 
+from pandas.libs import (lib, index as _index, tslib,
+                         algos as _algos, join as _join)
 from pandas.libs.lib import Timestamp
-from pandas.libs import index as _index, tslib, algos as _algos
-import pandas.libs.lib as lib
 import pandas._period as period
-import pandas._join as _join
 
 
 def _utc():

pandas/tseries/index.py

@@ -30,10 +30,7 @@
 from pandas.tseries.timedeltas import (to_timedelta,
                                        _coerce_scalar_to_timedelta_type)
 from pandas.tseries.offsets import Tick, DateOffset
-
-import pandas.libs.lib as lib
-from pandas.libs import index as _index, tslib
-import pandas._join as _join
+from pandas.libs import lib, index as _index, tslib, join as _join
 
 Timedelta = tslib.Timedelta
 

pandas/tseries/tdi.py

@@ -112,7 +112,7 @@ def is_platform_mac():
 _pxi_dep_template = {
     'algos': ['src/algos_common_helper.pxi.in', 'src/algos_groupby_helper.pxi.in',
                'src/algos_take_helper.pxi.in', 'src/algos_rank_helper.pxi.in'],
-    'join': ['src/join_helper.pxi.in', 'src/joins_func_helper.pxi.in'],
+    'join': ['libs/join_helper.pxi.in', 'libs/join_func_helper.pxi.in'],
     'hashtable': ['src/hashtable_class_helper.pxi.in',
                    'src/hashtable_func_helper.pxi.in'],
     'index': ['src/index_class_helper.pxi.in'],
@@ -331,8 +331,8 @@ class CheckSDist(sdist_class):
                  'pandas/libs/tslib.pyx',
                  'pandas/libs/index.pyx',
                  'pandas/libs/algos.pyx',
+                 'pandas/libs/join.pyx',
                  'pandas/core/window.pyx',
-                 'pandas/join.pyx',
                  'pandas/src/period.pyx',
                  'pandas/sparse/sparse.pyx',
                  'pandas/util/testing.pyx',
@@ -496,9 +496,9 @@ def pxd(name):
     'libs.algos': {'pyxfile': 'libs/algos',
                    'pxdfiles': ['src/util', 'libs/hashtable'],
               'depends': _pxi_dep['algos']},
-    '_join': {'pyxfile': 'src/join',
-              'pxdfiles': ['src/util', 'libs/hashtable'],
-              'depends': _pxi_dep['join']},
+    'libs.join': {'pyxfile': 'libs/join',
+                  'pxdfiles': ['src/util', 'libs/hashtable'],
+                  'depends': _pxi_dep['join']},
     'core.libwindow': {'pyxfile': 'core/window',
                        'pxdfiles': ['src/skiplist', 'src/util'],
                        'depends': ['pandas/src/skiplist.pyx',