Skip to content

Commit 116ce62

Browse files
authored
DOC: Remove enforced 2.x .. deprecated sphinx refs (#63321)
1 parent 447249a commit 116ce62

File tree

12 files changed

+7
-61
lines changed

12 files changed

+7
-61
lines changed

doc/source/user_guide/timeseries.rst

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,15 +1294,6 @@ frequencies. We will refer to these aliases as *offset aliases*.
12941294
"us", "microseconds"
12951295
"ns", "nanoseconds"
12961296

1297-
.. deprecated:: 2.2.0
1298-
1299-
Aliases ``H``, ``BH``, ``CBH``, ``T``, ``S``, ``L``, ``U``, and ``N``
1300-
are deprecated in favour of the aliases ``h``, ``bh``, ``cbh``,
1301-
``min``, ``s``, ``ms``, ``us``, and ``ns``.
1302-
1303-
Aliases ``Y``, ``M``, and ``Q`` are deprecated in favour of the aliases
1304-
``YE``, ``ME``, ``QE``.
1305-
13061297

13071298
.. note::
13081299

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

1361-
.. deprecated:: 2.2.0
1362-
1363-
Aliases ``H``, ``T``, ``S``, ``L``, ``U``, and ``N`` are deprecated in favour of the aliases
1364-
``h``, ``min``, ``s``, ``ms``, ``us``, and ``ns``.
1365-
13661352

13671353
Combining aliases
13681354
~~~~~~~~~~~~~~~~~

pandas/core/algorithms.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,14 +1140,8 @@ def take(
11401140
11411141
Parameters
11421142
----------
1143-
arr : array-like or scalar value
1144-
Non array-likes (sequences/scalars without a dtype) are coerced
1145-
to an ndarray.
1146-
1147-
.. deprecated:: 2.1.0
1148-
Passing an argument other than a numpy.ndarray, ExtensionArray,
1149-
Index, or Series is deprecated.
1150-
1143+
arr : numpy.ndarray, ExtensionArray, Index, or Series
1144+
Input array.
11511145
indices : sequence of int or one-dimensional np.ndarray of int
11521146
Indices to be taken.
11531147
axis : int, default 0

pandas/core/generic.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10965,10 +10965,6 @@ def pct_change(
1096510965
Periods to shift for forming percent change.
1096610966
fill_method : None
1096710967
Must be None. This argument will be removed in a future version of pandas.
10968-
10969-
.. deprecated:: 2.1
10970-
All options of `fill_method` are deprecated except `fill_method=None`.
10971-
1097210968
freq : DateOffset, timedelta, or str, optional
1097310969
Increment to use from time series API (e.g. 'ME' or BDay()).
1097410970
**kwargs

pandas/core/groupby/generic.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def aggregate(self, func=None, *args, engine=None, engine_kwargs=None, **kwargs)
375375
376376
Parameters
377377
----------
378-
func : function, str, list, dict or None
378+
func : function, str, list or None
379379
Function to use for aggregating the data. If a function, must either
380380
work when passed a Series or when passed to Series.apply.
381381
@@ -399,10 +399,6 @@ def aggregate(self, func=None, *args, engine=None, engine_kwargs=None, **kwargs)
399399
Each group's index will be passed to the user defined function
400400
and optionally available for use.
401401
402-
.. deprecated:: 2.1.0
403-
404-
Passing a dictionary is deprecated and will raise in a future version
405-
of pandas. Pass a list of aggregations instead.
406402
*args
407403
Positional arguments to pass to func.
408404
engine : str, default None

pandas/core/groupby/groupby.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5366,9 +5366,6 @@ def pct_change(
53665366
fill_method : None
53675367
Must be None. This argument will be removed in a future version of pandas.
53685368
5369-
.. deprecated:: 2.1
5370-
All options of `fill_method` are deprecated except `fill_method=None`.
5371-
53725369
freq : str, pandas offset object, or None, default None
53735370
The frequency increment for time series data (e.g., 'M' for month-end).
53745371
If None, the frequency is inferred from the index. Relevant for time

pandas/core/tools/timedeltas.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,15 @@ def to_timedelta(
113113
114114
* 'W'
115115
* 'D' / 'days' / 'day'
116-
* 'hours' / 'hour' / 'hr' / 'h' / 'H'
116+
* 'hours' / 'hour' / 'hr' / 'h'
117117
* 'm' / 'minute' / 'min' / 'minutes'
118-
* 's' / 'seconds' / 'sec' / 'second' / 'S'
118+
* 's' / 'seconds' / 'sec' / 'second'
119119
* 'ms' / 'milliseconds' / 'millisecond' / 'milli' / 'millis'
120120
* 'us' / 'microseconds' / 'microsecond' / 'micro' / 'micros'
121121
* 'ns' / 'nanoseconds' / 'nano' / 'nanos' / 'nanosecond'
122122
123123
Must not be specified when `arg` contains strings and ``errors="raise"``.
124124
125-
.. deprecated:: 2.2.0
126-
Units 'H'and 'S' are deprecated and will be removed
127-
in a future version. Please use 'h' and 's'.
128-
129125
errors : {'raise', 'coerce'}, default 'raise'
130126
- If 'raise', then invalid parsing will raise an exception.
131127
- If 'coerce', then invalid parsing will be set as NaT.

pandas/core/window/expanding.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,8 +1078,6 @@ def quantile(
10781078
q : float
10791079
Quantile to compute. 0 <= quantile <= 1.
10801080
1081-
.. deprecated:: 2.1.0
1082-
This was renamed from 'quantile' to 'q' in version 2.1.0.
10831081
interpolation : {'linear', 'lower', 'higher', 'midpoint', 'nearest'}
10841082
This optional parameter specifies the interpolation method to use,
10851083
when the desired quantile lies between two data points `i` and `j`:

pandas/core/window/rolling.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3088,9 +3088,6 @@ def quantile(
30883088
q : float
30893089
Quantile to compute. 0 <= quantile <= 1.
30903090
3091-
.. deprecated:: 2.1.0
3092-
This was renamed from 'quantile' to 'q' in version 2.1.0.
3093-
30943091
interpolation : {'linear', 'lower', 'higher', 'midpoint', 'nearest'}
30953092
This optional parameter specifies the interpolation method to use,
30963093
when the desired quantile lies between two data points `i` and `j`:

pandas/io/excel/_base.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,6 @@ def read_excel(
214214
such as a file handle (e.g. via builtin ``open`` function)
215215
or ``StringIO``.
216216
217-
.. deprecated:: 2.1.0
218-
Passing byte strings is deprecated. To read from a
219-
byte string, wrap it in a ``BytesIO`` object.
220217
sheet_name : str, int, list, or None, default 0
221218
Strings are used for sheet names. Integers are used in zero-indexed
222219
sheet positions (chart sheets do not count as a sheet position).

pandas/io/html.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,16 +1052,12 @@ def read_html(
10521052
Parameters
10531053
----------
10541054
io : str, path object, or file-like object
1055-
String, path object (implementing ``os.PathLike[str]``), or file-like
1055+
String path, path object (implementing ``os.PathLike[str]``), or file-like
10561056
object implementing a string ``read()`` function.
10571057
The string can represent a URL. Note that
10581058
lxml only accepts the http, ftp and file url protocols. If you have a
10591059
URL that starts with ``'https'`` you might try removing the ``'s'``.
10601060
1061-
.. deprecated:: 2.1.0
1062-
Passing html literal strings is deprecated.
1063-
Wrap literal string/bytes input in ``io.StringIO``/``io.BytesIO`` instead.
1064-
10651061
match : str or compiled regular expression, optional
10661062
The set of tables containing text matching this regex or string will be
10671063
returned. Unless the HTML is extremely simple you will probably need to

0 commit comments

Comments
 (0)