Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions doc/source/user_guide/timeseries.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1294,15 +1294,6 @@ frequencies. We will refer to these aliases as *offset aliases*.
"us", "microseconds"
"ns", "nanoseconds"

.. deprecated:: 2.2.0

Aliases ``H``, ``BH``, ``CBH``, ``T``, ``S``, ``L``, ``U``, and ``N``
are deprecated in favour of the aliases ``h``, ``bh``, ``cbh``,
``min``, ``s``, ``ms``, ``us``, and ``ns``.

Aliases ``Y``, ``M``, and ``Q`` are deprecated in favour of the aliases
``YE``, ``ME``, ``QE``.


.. note::

Expand Down Expand Up @@ -1358,11 +1349,6 @@ frequencies. We will refer to these aliases as *period aliases*.
"us", "microseconds"
"ns", "nanoseconds"

.. deprecated:: 2.2.0

Aliases ``H``, ``T``, ``S``, ``L``, ``U``, and ``N`` are deprecated in favour of the aliases
``h``, ``min``, ``s``, ``ms``, ``us``, and ``ns``.


Combining aliases
~~~~~~~~~~~~~~~~~
Expand Down
10 changes: 2 additions & 8 deletions pandas/core/algorithms.py
Original file line number Diff line number Diff line change
Expand Up @@ -1140,14 +1140,8 @@ def take(

Parameters
----------
arr : array-like or scalar value
Non array-likes (sequences/scalars without a dtype) are coerced
to an ndarray.

.. deprecated:: 2.1.0
Passing an argument other than a numpy.ndarray, ExtensionArray,
Index, or Series is deprecated.

arr : numpy.ndarray, ExtensionArray, Index, or Series
Input array.
indices : sequence of int or one-dimensional np.ndarray of int
Indices to be taken.
axis : int, default 0
Expand Down
4 changes: 0 additions & 4 deletions pandas/core/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -10965,10 +10965,6 @@ def pct_change(
Periods to shift for forming percent change.
fill_method : None
Must be None. This argument will be removed in a future version of pandas.

.. deprecated:: 2.1
All options of `fill_method` are deprecated except `fill_method=None`.

freq : DateOffset, timedelta, or str, optional
Increment to use from time series API (e.g. 'ME' or BDay()).
**kwargs
Expand Down
6 changes: 1 addition & 5 deletions pandas/core/groupby/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def aggregate(self, func=None, *args, engine=None, engine_kwargs=None, **kwargs)

Parameters
----------
func : function, str, list, dict or None
func : function, str, list or None
Function to use for aggregating the data. If a function, must either
work when passed a Series or when passed to Series.apply.

Expand All @@ -399,10 +399,6 @@ def aggregate(self, func=None, *args, engine=None, engine_kwargs=None, **kwargs)
Each group's index will be passed to the user defined function
and optionally available for use.

.. deprecated:: 2.1.0

Passing a dictionary is deprecated and will raise in a future version
of pandas. Pass a list of aggregations instead.
*args
Positional arguments to pass to func.
engine : str, default None
Expand Down
3 changes: 0 additions & 3 deletions pandas/core/groupby/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -5366,9 +5366,6 @@ def pct_change(
fill_method : None
Must be None. This argument will be removed in a future version of pandas.

.. deprecated:: 2.1
All options of `fill_method` are deprecated except `fill_method=None`.

freq : str, pandas offset object, or None, default None
The frequency increment for time series data (e.g., 'M' for month-end).
If None, the frequency is inferred from the index. Relevant for time
Expand Down
8 changes: 2 additions & 6 deletions pandas/core/tools/timedeltas.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,15 @@ def to_timedelta(

* 'W'
* 'D' / 'days' / 'day'
* 'hours' / 'hour' / 'hr' / 'h' / 'H'
* 'hours' / 'hour' / 'hr' / 'h'
* 'm' / 'minute' / 'min' / 'minutes'
* 's' / 'seconds' / 'sec' / 'second' / 'S'
* 's' / 'seconds' / 'sec' / 'second'
* 'ms' / 'milliseconds' / 'millisecond' / 'milli' / 'millis'
* 'us' / 'microseconds' / 'microsecond' / 'micro' / 'micros'
* 'ns' / 'nanoseconds' / 'nano' / 'nanos' / 'nanosecond'

Must not be specified when `arg` contains strings and ``errors="raise"``.

.. deprecated:: 2.2.0
Units 'H'and 'S' are deprecated and will be removed
in a future version. Please use 'h' and 's'.

errors : {'raise', 'coerce'}, default 'raise'
- If 'raise', then invalid parsing will raise an exception.
- If 'coerce', then invalid parsing will be set as NaT.
Expand Down
2 changes: 0 additions & 2 deletions pandas/core/window/expanding.py
Original file line number Diff line number Diff line change
Expand Up @@ -1078,8 +1078,6 @@ def quantile(
q : float
Quantile to compute. 0 <= quantile <= 1.

.. deprecated:: 2.1.0
This was renamed from 'quantile' to 'q' in version 2.1.0.
interpolation : {'linear', 'lower', 'higher', 'midpoint', 'nearest'}
This optional parameter specifies the interpolation method to use,
when the desired quantile lies between two data points `i` and `j`:
Expand Down
3 changes: 0 additions & 3 deletions pandas/core/window/rolling.py
Original file line number Diff line number Diff line change
Expand Up @@ -3088,9 +3088,6 @@ def quantile(
q : float
Quantile to compute. 0 <= quantile <= 1.

.. deprecated:: 2.1.0
This was renamed from 'quantile' to 'q' in version 2.1.0.

interpolation : {'linear', 'lower', 'higher', 'midpoint', 'nearest'}
This optional parameter specifies the interpolation method to use,
when the desired quantile lies between two data points `i` and `j`:
Expand Down
3 changes: 0 additions & 3 deletions pandas/io/excel/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,6 @@ def read_excel(
such as a file handle (e.g. via builtin ``open`` function)
or ``StringIO``.

.. deprecated:: 2.1.0
Passing byte strings is deprecated. To read from a
byte string, wrap it in a ``BytesIO`` object.
sheet_name : str, int, list, or None, default 0
Strings are used for sheet names. Integers are used in zero-indexed
sheet positions (chart sheets do not count as a sheet position).
Expand Down
6 changes: 1 addition & 5 deletions pandas/io/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -1052,16 +1052,12 @@ def read_html(
Parameters
----------
io : str, path object, or file-like object
String, path object (implementing ``os.PathLike[str]``), or file-like
String path, path object (implementing ``os.PathLike[str]``), or file-like
object implementing a string ``read()`` function.
The string can represent a URL. Note that
lxml only accepts the http, ftp and file url protocols. If you have a
URL that starts with ``'https'`` you might try removing the ``'s'``.

.. deprecated:: 2.1.0
Passing html literal strings is deprecated.
Wrap literal string/bytes input in ``io.StringIO``/``io.BytesIO`` instead.

match : str or compiled regular expression, optional
The set of tables containing text matching this regex or string will be
returned. Unless the HTML is extremely simple you will probably need to
Expand Down
3 changes: 0 additions & 3 deletions pandas/io/json/_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,6 @@ def read_json(
such as a file handle (e.g. via builtin ``open`` function)
or ``StringIO``.

.. deprecated:: 2.1.0
Passing json literal strings is deprecated.

orient : str, optional
Indication of expected JSON string format.
Compatible JSON strings can be produced by ``to_json()`` with a
Expand Down
6 changes: 1 addition & 5 deletions pandas/io/xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -853,15 +853,11 @@ def read_xml(
Parameters
----------
path_or_buffer : str, path object, or file-like object
String, path object (implementing ``os.PathLike[str]``), or file-like
String path, path object (implementing ``os.PathLike[str]``), or file-like
object implementing a ``read()`` function. The string can be a path.
The string can further be a URL. Valid URL schemes
include http, ftp, s3, and file.
.. deprecated:: 2.1.0
Passing xml literal strings is deprecated.
Wrap literal xml input in ``io.StringIO`` or ``io.BytesIO`` instead.
xpath : str, optional, default './\*'
The ``XPath`` to parse required set of nodes for migration to
:class:`~pandas.DataFrame`.``XPath`` should return a collection of elements
Expand Down
Loading