Skip to content

Commit 5450233

Browse files
authored
Update deprecation warnings, which were already removed (#36292)
1 parent da82aef commit 5450233

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

doc/source/user_guide/indexing.rst

+12-7
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,10 @@ Selection by label
313313
314314
.. warning::
315315

316-
Starting in 0.21.0, pandas will show a ``FutureWarning`` if indexing with a list with missing labels. In the future
317-
this will raise a ``KeyError``. See :ref:`list-like Using loc with missing keys in a list is Deprecated <indexing.deprecate_loc_reindex_listlike>`.
316+
.. versionchanged:: 1.0.0
317+
318+
Pandas will raise a ``KeyError`` if indexing with a list with missing labels. See :ref:`list-like Using loc with
319+
missing keys in a list is Deprecated <indexing.deprecate_loc_reindex_listlike>`.
318320

319321
pandas provides a suite of methods in order to have **purely label based indexing**. This is a strict inclusion based protocol.
320322
Every label asked for must be in the index, or a ``KeyError`` will be raised.
@@ -578,8 +580,9 @@ IX indexer is deprecated
578580

579581
.. warning::
580582

581-
Starting in 0.20.0, the ``.ix`` indexer is deprecated, in favor of the more strict ``.iloc``
582-
and ``.loc`` indexers.
583+
.. versionchanged:: 1.0.0
584+
585+
The ``.ix`` indexer was removed, in favor of the more strict ``.iloc`` and ``.loc`` indexers.
583586

584587
``.ix`` offers a lot of magic on the inference of what the user wants to do. To wit, ``.ix`` can decide
585588
to index *positionally* OR via *labels* depending on the data type of the index. This has caused quite a
@@ -636,11 +639,13 @@ Indexing with list with missing labels is deprecated
636639

637640
.. warning::
638641

639-
Starting in 0.21.0, using ``.loc`` or ``[]`` with a list with one or more missing labels, is deprecated, in favor of ``.reindex``.
642+
.. versionchanged:: 1.0.0
643+
644+
Using ``.loc`` or ``[]`` with a list with one or more missing labels will no longer reindex, in favor of ``.reindex``.
640645

641646
In prior versions, using ``.loc[list-of-labels]`` would work as long as *at least 1* of the keys was found (otherwise it
642-
would raise a ``KeyError``). This behavior is deprecated and will show a warning message pointing to this section. The
643-
recommended alternative is to use ``.reindex()``.
647+
would raise a ``KeyError``). This behavior was changed and will now raise a ``KeyError`` if at least one label is missing.
648+
The recommended alternative is to use ``.reindex()``.
644649

645650
For example.
646651

doc/source/user_guide/io.rst

+3-10
Original file line numberDiff line numberDiff line change
@@ -3024,19 +3024,12 @@ It is often the case that users will insert columns to do temporary computations
30243024
in Excel and you may not want to read in those columns. ``read_excel`` takes
30253025
a ``usecols`` keyword to allow you to specify a subset of columns to parse.
30263026

3027-
.. deprecated:: 0.24.0
3027+
.. versionchanged:: 1.0.0
30283028

3029-
Passing in an integer for ``usecols`` has been deprecated. Please pass in a list
3029+
Passing in an integer for ``usecols`` will no longer work. Please pass in a list
30303030
of ints from 0 to ``usecols`` inclusive instead.
30313031

3032-
If ``usecols`` is an integer, then it is assumed to indicate the last column
3033-
to be parsed.
3034-
3035-
.. code-block:: python
3036-
3037-
pd.read_excel('path_to_file.xls', 'Sheet1', usecols=2)
3038-
3039-
You can also specify a comma-delimited set of Excel columns and ranges as a string:
3032+
You can specify a comma-delimited set of Excel columns and ranges as a string:
30403033

30413034
.. code-block:: python
30423035

doc/source/user_guide/timeseries.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,11 @@ which can be specified. These are computed from the starting point specified by
327327
that was discussed :ref:`above<timeseries.converting.format>`). The
328328
available units are listed on the documentation for :func:`pandas.to_datetime`.
329329

330+
.. versionchanged:: 1.0.0
331+
330332
Constructing a :class:`Timestamp` or :class:`DatetimeIndex` with an epoch timestamp
331-
with the ``tz`` argument specified will currently localize the epoch timestamps to UTC
332-
first then convert the result to the specified time zone. However, this behavior
333-
is :ref:`deprecated <whatsnew_0240.deprecations.integer_tz>`, and if you have
334-
epochs in wall time in another timezone, it is recommended to read the epochs
333+
with the ``tz`` argument specified will raise a ValueError. If you have
334+
epochs in wall time in another timezone, you can read the epochs
335335
as timezone-naive timestamps and then localize to the appropriate timezone:
336336

337337
.. ipython:: python

0 commit comments

Comments
 (0)