Skip to content

Commit 6660638

Browse files
topper-123jreback
authored andcommitted
CLN/DEPR: remove pd.ordered_merge (#18459)
1 parent 4fce784 commit 6660638

File tree

5 files changed

+5
-28
lines changed

5 files changed

+5
-28
lines changed

doc/source/whatsnew/v0.22.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Removal of prior version deprecations/changes
9595
- The ``levels`` and ``labels`` attributes of a ``MultiIndex`` can no longer be set directly (:issue:`4039`).
9696
- ``pd.tseries.util.pivot_annual`` has been removed (deprecated since v0.19). Use ``pivot_table`` instead (:issue:`18370`)
9797
- ``pd.tseries.util.isleapyear`` has been removed (deprecated since v0.19). Use ``.is_leap_year`` property in Datetime-likes instead (:issue:`18370`)
98+
- ``pd.ordered_merge`` has been removed (deprecated since v0.19). Use ``pd..merge_ordered`` instead (:issue:`18459`)
9899

99100
.. _whatsnew_0220.performance:
100101

pandas/core/reshape/api.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from pandas.core.reshape.concat import concat
44
from pandas.core.reshape.melt import melt, lreshape, wide_to_long
55
from pandas.core.reshape.reshape import pivot_simple as pivot, get_dummies
6-
from pandas.core.reshape.merge import (
7-
merge, ordered_merge, merge_ordered, merge_asof)
6+
from pandas.core.reshape.merge import merge, merge_ordered, merge_asof
87
from pandas.core.reshape.pivot import pivot_table, crosstab
98
from pandas.core.reshape.tile import cut, qcut

pandas/core/reshape/merge.py

+1-17
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,6 @@ def _groupby_and_merge(by, on, left, right, _merge_pieces,
139139
return result, lby
140140

141141

142-
def ordered_merge(left, right, on=None,
143-
left_on=None, right_on=None,
144-
left_by=None, right_by=None,
145-
fill_method=None, suffixes=('_x', '_y')):
146-
147-
warnings.warn("ordered_merge is deprecated and replaced by merge_ordered",
148-
FutureWarning, stacklevel=2)
149-
return merge_ordered(left, right, on=on,
150-
left_on=left_on, right_on=right_on,
151-
left_by=left_by, right_by=right_by,
152-
fill_method=fill_method, suffixes=suffixes)
153-
154-
155142
def merge_ordered(left, right, on=None,
156143
left_on=None, right_on=None,
157144
left_by=None, right_by=None,
@@ -204,7 +191,7 @@ def merge_ordered(left, right, on=None,
204191
4 c 2 b
205192
5 e 3 b
206193
207-
>>> ordered_merge(A, B, fill_method='ffill', left_by='group')
194+
>>> merge_ordered(A, B, fill_method='ffill', left_by='group')
208195
key lvalue group rvalue
209196
0 a 1 a NaN
210197
1 b 1 a 1
@@ -253,9 +240,6 @@ def _merger(x, y):
253240
return result
254241

255242

256-
ordered_merge.__doc__ = merge_ordered.__doc__
257-
258-
259243
def merge_asof(left, right, on=None,
260244
left_on=None, right_on=None,
261245
left_index=False, right_index=False,

pandas/tests/api/test_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class TestPDApi(Base):
103103
'rolling_kurt', 'rolling_max', 'rolling_mean',
104104
'rolling_median', 'rolling_min', 'rolling_quantile',
105105
'rolling_skew', 'rolling_std', 'rolling_sum',
106-
'rolling_var', 'rolling_window', 'ordered_merge',
106+
'rolling_var', 'rolling_window',
107107
'pnow', 'match', 'groupby', 'get_store',
108108
'plot_params', 'scatter_matrix']
109109

pandas/tests/reshape/test_merge_ordered.py

+1-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from numpy import nan
77

88

9-
class TestOrderedMerge(object):
9+
class TestMergeOrdered(object):
1010

1111
def setup_method(self, method):
1212
self.left = DataFrame({'key': ['a', 'c', 'e'],
@@ -15,13 +15,6 @@ def setup_method(self, method):
1515
self.right = DataFrame({'key': ['b', 'c', 'd', 'f'],
1616
'rvalue': [1, 2, 3., 4]})
1717

18-
def test_deprecation(self):
19-
20-
with tm.assert_produces_warning(FutureWarning):
21-
pd.ordered_merge(self.left, self.right, on='key')
22-
23-
# GH #813
24-
2518
def test_basic(self):
2619
result = merge_ordered(self.left, self.right, on='key')
2720
expected = DataFrame({'key': ['a', 'b', 'c', 'd', 'e', 'f'],

0 commit comments

Comments
 (0)