Skip to content

Commit 4bd55a4

Browse files
authored
CLN: Remove pre-1.5 deprecations (pandas-dev#50377)
* CLN: Remove pre-1.5 deprecations * fix stacklevel
1 parent 280fbf6 commit 4bd55a4

File tree

5 files changed

+9
-22
lines changed

5 files changed

+9
-22
lines changed

doc/source/whatsnew/v2.0.0.rst

+3
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,9 @@ Removal of prior version deprecations/changes
723723
- Removed deprecated methods :meth:`ExcelWriter.write_cells`, :meth:`ExcelWriter.save`, :meth:`ExcelWriter.cur_sheet`, :meth:`ExcelWriter.handles`, :meth:`ExcelWriter.path` (:issue:`45795`)
724724
- The :class:`ExcelWriter` attribute ``book`` can no longer be set; it is still available to be accessed and mutated (:issue:`48943`)
725725
- Removed unused ``*args`` and ``**kwargs`` in :class:`Rolling`, :class:`Expanding`, and :class:`ExponentialMovingWindow` ops (:issue:`47851`)
726+
- Removed the deprecated argument ``line_terminator`` from :meth:`DataFrame.to_csv` (:issue:`45302`)
727+
- Removed the deprecated argument ``label`` from :func:`lreshape` (:issue:`30219`)
728+
- Arguments after ``expr`` in :meth:`DataFrame.eval` and :meth:`DataFrame.query` are keyword-only (:issue:`47587`)
726729
-
727730

728731
.. ---------------------------------------------------------------------------

pandas/core/frame.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
from pandas.util._decorators import (
9797
Appender,
9898
Substitution,
99-
deprecate_nonkeyword_arguments,
10099
doc,
101100
rewrite_axis_style_signature,
102101
)
@@ -4189,8 +4188,7 @@ def query(self, expr: str, *, inplace: Literal[True], **kwargs) -> None:
41894188
def query(self, expr: str, *, inplace: bool = ..., **kwargs) -> DataFrame | None:
41904189
...
41914190

4192-
@deprecate_nonkeyword_arguments(version=None, allowed_args=["self", "expr"])
4193-
def query(self, expr: str, inplace: bool = False, **kwargs) -> DataFrame | None:
4191+
def query(self, expr: str, *, inplace: bool = False, **kwargs) -> DataFrame | None:
41944192
"""
41954193
Query the columns of a DataFrame with a boolean expression.
41964194
@@ -4334,7 +4332,7 @@ def query(self, expr: str, inplace: bool = False, **kwargs) -> DataFrame | None:
43344332
if not isinstance(expr, str):
43354333
msg = f"expr must be a string to be evaluated, {type(expr)} given"
43364334
raise ValueError(msg)
4337-
kwargs["level"] = kwargs.pop("level", 0) + 2
4335+
kwargs["level"] = kwargs.pop("level", 0) + 1
43384336
kwargs["target"] = None
43394337
res = self.eval(expr, **kwargs)
43404338

@@ -4359,8 +4357,7 @@ def eval(self, expr: str, *, inplace: Literal[False] = ..., **kwargs) -> Any:
43594357
def eval(self, expr: str, *, inplace: Literal[True], **kwargs) -> None:
43604358
...
43614359

4362-
@deprecate_nonkeyword_arguments(version=None, allowed_args=["self", "expr"])
4363-
def eval(self, expr: str, inplace: bool = False, **kwargs) -> Any | None:
4360+
def eval(self, expr: str, *, inplace: bool = False, **kwargs) -> Any | None:
43644361
"""
43654362
Evaluate a string describing operations on DataFrame columns.
43664363
@@ -4466,7 +4463,7 @@ def eval(self, expr: str, inplace: bool = False, **kwargs) -> Any | None:
44664463
from pandas.core.computation.eval import eval as _eval
44674464

44684465
inplace = validate_bool_kwarg(inplace, "inplace")
4469-
kwargs["level"] = kwargs.pop("level", 0) + 2
4466+
kwargs["level"] = kwargs.pop("level", 0) + 1
44704467
index_resolvers = self._get_index_resolvers()
44714468
column_resolvers = self._get_cleaned_column_resolvers()
44724469
resolvers = column_resolvers, index_resolvers

pandas/core/reshape/melt.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88

99
import numpy as np
1010

11-
from pandas.util._decorators import (
12-
Appender,
13-
deprecate_kwarg,
14-
)
11+
from pandas.util._decorators import Appender
1512

1613
from pandas.core.dtypes.common import (
1714
is_extension_array_dtype,
@@ -161,8 +158,7 @@ def melt(
161158
return result
162159

163160

164-
@deprecate_kwarg(old_arg_name="label", new_arg_name=None)
165-
def lreshape(data: DataFrame, groups, dropna: bool = True, label=None) -> DataFrame:
161+
def lreshape(data: DataFrame, groups, dropna: bool = True) -> DataFrame:
166162
"""
167163
Reshape wide-format data to long. Generalized inverse of DataFrame.pivot.
168164
@@ -178,10 +174,6 @@ def lreshape(data: DataFrame, groups, dropna: bool = True, label=None) -> DataFr
178174
{new_name : list_of_columns}.
179175
dropna : bool, default True
180176
Do not include columns whose entries are all NaN.
181-
label : None
182-
Not used.
183-
184-
.. deprecated:: 1.0.0
185177
186178
Returns
187179
-------

pandas/io/formats/format.py

-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
StorageOptions,
6363
WriteBuffer,
6464
)
65-
from pandas.util._decorators import deprecate_kwarg
6665

6766
from pandas.core.dtypes.common import (
6867
is_categorical_dtype,
@@ -1135,7 +1134,6 @@ def to_string(
11351134
string = string_formatter.to_string()
11361135
return save_to_buffer(string, buf=buf, encoding=encoding)
11371136

1138-
@deprecate_kwarg(old_arg_name="line_terminator", new_arg_name="lineterminator")
11391137
def to_csv(
11401138
self,
11411139
path_or_buf: FilePath | WriteBuffer[bytes] | WriteBuffer[str] | None = None,

pandas/tests/reshape/test_melt.py

-3
Original file line numberDiff line numberDiff line change
@@ -658,9 +658,6 @@ def test_pairs(self):
658658
exp = DataFrame(exp_data, columns=result.columns)
659659
tm.assert_frame_equal(result, exp)
660660

661-
with tm.assert_produces_warning(FutureWarning):
662-
lreshape(df, spec, dropna=False, label="foo")
663-
664661
spec = {
665662
"visitdt": [f"visitdt{i:d}" for i in range(1, 3)],
666663
"wt": [f"wt{i:d}" for i in range(1, 4)],

0 commit comments

Comments
 (0)