Merge remote-tracking branch 'upstream/master' into io_csv_docstring_…

…fixed

* upstream/master:
  CI: Allow to compile docs with ipython 7.11 pandas-dev#22990 (pandas-dev#23655)
  DOC: Fix name of the See Also section titles in docstrings (pandas-dev#23653)
  DOC: clean-up recent doc errors/warnings (pandas-dev#23636)

ci/deps/travis-36-doc.yaml

@@ -11,7 +11,7 @@ dependencies:
   - html5lib
   - hypothesis>=3.58.0
   - ipykernel
-  - ipython==6.5.0
+  - ipython
   - ipywidgets
   - lxml
   - matplotlib

doc/source/advanced.rst

@@ -702,7 +702,7 @@ Index Types
 
 We have discussed ``MultiIndex`` in the previous sections pretty extensively.
 Documentation about ``DatetimeIndex`` and ``PeriodIndex`` are shown :ref:`here <timeseries.overview>`,
-and documentation about ``TimedeltaIndex`` is found :ref:`here <timedeltas.timedeltaindex>`.
+and documentation about ``TimedeltaIndex`` is found :ref:`here <timedeltas.index>`.
 
 In the following sub-sections we will highlight some other index types.
 

doc/source/conf.py

@@ -388,6 +388,7 @@
                         category=FutureWarning)
 
 
+ipython_warning_is_error = False
 ipython_exec_lines = [
     'import numpy as np',
     'import pandas as pd',

doc/source/ecosystem.rst

@@ -140,7 +140,7 @@ which are utilized by Jupyter Notebook for displaying
 (Note: HTML tables may or may not be
 compatible with non-HTML Jupyter output formats.)
 
-See :ref:`Options and Settings <options>` and :ref:`options.available <available>`
+See :ref:`Options and Settings <options>` and :ref:`options.available`
 for pandas ``display.`` settings.
 
 `quantopian/qgrid <https://github.com/quantopian/qgrid>`__

doc/source/timeseries.rst

@@ -2372,7 +2372,8 @@ can be controlled by the ``nonexistent`` argument. The following options are ava
 * ``shift``: Shifts nonexistent times forward to the closest real time
 
 .. ipython:: python
-    dti = date_range(start='2015-03-29 01:30:00', periods=3, freq='H')
+
+    dti = pd.date_range(start='2015-03-29 01:30:00', periods=3, freq='H')
     # 2:30 is a nonexistent time
 
 Localization of nonexistent times will raise an error by default.
@@ -2385,6 +2386,7 @@ Localization of nonexistent times will raise an error by default.
 Transform nonexistent times to ``NaT`` or the closest real time forward in time.
 
 .. ipython:: python
+
     dti
     dti.tz_localize('Europe/Warsaw', nonexistent='shift')
     dti.tz_localize('Europe/Warsaw', nonexistent='NaT')

doc/source/whatsnew/v0.24.0.txt

@@ -14,11 +14,10 @@ New features
 ~~~~~~~~~~~~
 - :func:`merge` now directly allows merge between objects of type ``DataFrame`` and named ``Series``, without the need to convert the ``Series`` object into a ``DataFrame`` beforehand (:issue:`21220`)
 - ``ExcelWriter`` now accepts ``mode`` as a keyword argument, enabling append to existing workbooks when using the ``openpyxl`` engine (:issue:`3441`)
-- ``FrozenList`` has gained the ``.union()`` and ``.difference()`` methods. This functionality greatly simplifies groupby's that rely on explicitly excluding certain columns. See :ref:`Splitting an object into groups
-<groupby.split>` for more information (:issue:`15475`, :issue:`15506`)
+- ``FrozenList`` has gained the ``.union()`` and ``.difference()`` methods. This functionality greatly simplifies groupby's that rely on explicitly excluding certain columns. See :ref:`Splitting an object into groups <groupby.split>` for more information (:issue:`15475`, :issue:`15506`).
 - :func:`DataFrame.to_parquet` now accepts ``index`` as an argument, allowing
-the user to override the engine's default behavior to include or omit the
-dataframe's indexes from the resulting Parquet file. (:issue:`20768`)
+  the user to override the engine's default behavior to include or omit the
+  dataframe's indexes from the resulting Parquet file. (:issue:`20768`)
 - :meth:`DataFrame.corr` and :meth:`Series.corr` now accept a callable for generic calculation methods of correlation, e.g. histogram intersection (:issue:`22684`)
 
 
@@ -227,7 +226,7 @@ Other Enhancements
 - :class:`Series` and :class:`DataFrame` now support :class:`Iterable` in constructor (:issue:`2193`)
 - :class:`DatetimeIndex` gained :attr:`DatetimeIndex.timetz` attribute. Returns local time with timezone information. (:issue:`21358`)
 - :meth:`round`, :meth:`ceil`, and meth:`floor` for :class:`DatetimeIndex` and :class:`Timestamp` now support an ``ambiguous`` argument for handling datetimes that are rounded to ambiguous times (:issue:`18946`)
-- :meth:`round`, :meth:`ceil`, and meth:`floor` for :class:`DatetimeIndex` and :class:`Timestamp` now support a ``nonexistent`` argument for handling datetimes that are rounded to nonexistent times. See :ref:`timeseries.timezone_nonexsistent` (:issue:`22647`)
+- :meth:`round`, :meth:`ceil`, and meth:`floor` for :class:`DatetimeIndex` and :class:`Timestamp` now support a ``nonexistent`` argument for handling datetimes that are rounded to nonexistent times. See :ref:`timeseries.timezone_nonexistent` (:issue:`22647`)
 - :class:`Resampler` now is iterable like :class:`GroupBy` (:issue:`15314`).
 - :meth:`Series.resample` and :meth:`DataFrame.resample` have gained the :meth:`Resampler.quantile` (:issue:`15023`).
 - :meth:`pandas.core.dtypes.is_list_like` has gained a keyword ``allow_sets`` which is ``True`` by default; if ``False``,
@@ -237,7 +236,7 @@ Other Enhancements
 - Compatibility with Matplotlib 3.0 (:issue:`22790`).
 - Added :meth:`Interval.overlaps`, :meth:`IntervalArray.overlaps`, and :meth:`IntervalIndex.overlaps` for determining overlaps between interval-like objects (:issue:`21998`)
 - :func:`~DataFrame.to_parquet` now supports writing a ``DataFrame`` as a directory of parquet files partitioned by a subset of the columns when ``engine = 'pyarrow'`` (:issue:`23283`)
-- :meth:`Timestamp.tz_localize`, :meth:`DatetimeIndex.tz_localize`, and :meth:`Series.tz_localize` have gained the ``nonexistent`` argument for alternative handling of nonexistent times. See :ref:`timeseries.timezone_nonexsistent` (:issue:`8917`)
+- :meth:`Timestamp.tz_localize`, :meth:`DatetimeIndex.tz_localize`, and :meth:`Series.tz_localize` have gained the ``nonexistent`` argument for alternative handling of nonexistent times. See :ref:`timeseries.timezone_nonexistent` (:issue:`8917`)
 - :meth:`read_excel()` now accepts ``usecols`` as a list of column names or callable (:issue:`18273`)
 
 .. _whatsnew_0240.api_breaking:
@@ -283,37 +282,37 @@ and replaced it with references to `pyarrow` (:issue:`21639` and :issue:`23053`)
 .. _whatsnew_0240.api_breaking.csv_line_terminator:
 
 `os.linesep` is used for ``line_terminator`` of ``DataFrame.to_csv``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 :func:`DataFrame.to_csv` now uses :func:`os.linesep` rather than ``'\n'``
- for the default line terminator (:issue:`20353`).
+for the default line terminator (:issue:`20353`).
 This change only affects when running on Windows, where ``'\r\n'`` was used for line terminator
 even when ``'\n'`` was passed in ``line_terminator``.
 
 Previous Behavior on Windows:
 
 .. code-block:: ipython
 
-In [1]: data = pd.DataFrame({
-   ...:     "string_with_lf": ["a\nbc"],
-   ...:     "string_with_crlf": ["a\r\nbc"]
-   ...: })
+    In [1]: data = pd.DataFrame({
+    ...:     "string_with_lf": ["a\nbc"],
+    ...:     "string_with_crlf": ["a\r\nbc"]
+    ...: })
 
-In [2]: # When passing file PATH to to_csv, line_terminator does not work, and csv is saved with '\r\n'.
-   ...: # Also, this converts all '\n's in the data to '\r\n'.
-   ...: data.to_csv("test.csv", index=False, line_terminator='\n')
+    In [2]: # When passing file PATH to to_csv, line_terminator does not work, and csv is saved with '\r\n'.
+    ...: # Also, this converts all '\n's in the data to '\r\n'.
+    ...: data.to_csv("test.csv", index=False, line_terminator='\n')
 
-In [3]: with open("test.csv", mode='rb') as f:
-   ...:     print(f.read())
-b'string_with_lf,string_with_crlf\r\n"a\r\nbc","a\r\r\nbc"\r\n'
+    In [3]: with open("test.csv", mode='rb') as f:
+    ...:     print(f.read())
+    b'string_with_lf,string_with_crlf\r\n"a\r\nbc","a\r\r\nbc"\r\n'
 
-In [4]: # When passing file OBJECT with newline option to to_csv, line_terminator works.
-   ...: with open("test2.csv", mode='w', newline='\n') as f:
-   ...:     data.to_csv(f, index=False, line_terminator='\n')
+    In [4]: # When passing file OBJECT with newline option to to_csv, line_terminator works.
+    ...: with open("test2.csv", mode='w', newline='\n') as f:
+    ...:     data.to_csv(f, index=False, line_terminator='\n')
 
-In [5]: with open("test2.csv", mode='rb') as f:
-   ...:     print(f.read())
-b'string_with_lf,string_with_crlf\n"a\nbc","a\r\nbc"\n'
+    In [5]: with open("test2.csv", mode='rb') as f:
+    ...:     print(f.read())
+    b'string_with_lf,string_with_crlf\n"a\nbc","a\r\nbc"\n'
 
 
 New Behavior on Windows:
@@ -322,54 +321,54 @@ New Behavior on Windows:
 - The value of ``line_terminator`` only affects the line terminator of CSV,
   so it does not change the value inside the data.
 
-.. code-block:: ipython
+  .. code-block:: ipython
 
-In [1]: data = pd.DataFrame({
-   ...:     "string_with_lf": ["a\nbc"],
-   ...:     "string_with_crlf": ["a\r\nbc"]
-   ...: })
+    In [1]: data = pd.DataFrame({
+    ...:     "string_with_lf": ["a\nbc"],
+    ...:     "string_with_crlf": ["a\r\nbc"]
+    ...: })
 
-In [2]: data.to_csv("test.csv", index=False, line_terminator='\n')
+    In [2]: data.to_csv("test.csv", index=False, line_terminator='\n')
 
-In [3]: with open("test.csv", mode='rb') as f:
-   ...:     print(f.read())
-b'string_with_lf,string_with_crlf\n"a\nbc","a\r\nbc"\n'
+    In [3]: with open("test.csv", mode='rb') as f:
+    ...:     print(f.read())
+    b'string_with_lf,string_with_crlf\n"a\nbc","a\r\nbc"\n'
 
 
 - On Windows, the value of ``os.linesep`` is ``'\r\n'``,
   so if ``line_terminator`` is not set, ``'\r\n'`` is used for line terminator.
 - Again, it does not affect the value inside the data.
 
-.. code-block:: ipython
+  .. code-block:: ipython
 
-In [1]: data = pd.DataFrame({
-   ...: "string_with_lf": ["a\nbc"],
-   ...: "string_with_crlf": ["a\r\nbc"]
-   ...: })
+    In [1]: data = pd.DataFrame({
+    ...: "string_with_lf": ["a\nbc"],
+    ...: "string_with_crlf": ["a\r\nbc"]
+    ...: })
 
-In [2]: data.to_csv("test.csv", index=False)
+    In [2]: data.to_csv("test.csv", index=False)
 
-In [3]: with open("test.csv", mode='rb') as f:
-   ...:     print(f.read())
-b'string_with_lf,string_with_crlf\r\n"a\nbc","a\r\nbc"\r\n'
+    In [3]: with open("test.csv", mode='rb') as f:
+    ...:     print(f.read())
+    b'string_with_lf,string_with_crlf\r\n"a\nbc","a\r\nbc"\r\n'
 
 
 - For files objects, specifying ``newline`` is not sufficient to set the line terminator.
   You must pass in the ``line_terminator`` explicitly, even in this case.
 
-.. code-block:: ipython
+  .. code-block:: ipython
 
-In [1]: data = pd.DataFrame({
-   ...: "string_with_lf": ["a\nbc"],
-   ...: "string_with_crlf": ["a\r\nbc"]
-   ...: })
+    In [1]: data = pd.DataFrame({
+    ...: "string_with_lf": ["a\nbc"],
+    ...: "string_with_crlf": ["a\r\nbc"]
+    ...: })
 
-In [2]: with open("test2.csv", mode='w', newline='\n') as f:
-   ...:     data.to_csv(f, index=False)
+    In [2]: with open("test2.csv", mode='w', newline='\n') as f:
+    ...:     data.to_csv(f, index=False)
 
-In [3]: with open("test2.csv", mode='rb') as f:
-   ...:     print(f.read())
-b'string_with_lf,string_with_crlf\r\n"a\nbc","a\r\nbc"\r\n'
+    In [3]: with open("test2.csv", mode='rb') as f:
+    ...:     print(f.read())
+    b'string_with_lf,string_with_crlf\r\n"a\nbc","a\r\nbc"\r\n'
 
 .. _whatsnew_0240.api_breaking.interval_values:
 
@@ -777,17 +776,20 @@ Previous Behavior:
    df = pd.DataFrame(arr)
 
 .. ipython:: python
+
    # Comparison operations and arithmetic operations both broadcast.
    df == arr[[0], :]
    df + arr[[0], :]
 
 .. ipython:: python
+
    # Comparison operations and arithmetic operations both broadcast.
    df == (1, 2)
    df + (1, 2)
 
 .. ipython:: python
    :okexcept:
+
    # Comparison operations and arithmetic opeartions both raise ValueError.
    df == (1, 2, 3)
    df + (1, 2, 3)
@@ -797,8 +799,9 @@ Previous Behavior:
 
 DataFrame Arithmetic Operations Broadcasting Changes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 :class:`DataFrame` arithmetic operations when operating with 2-dimensional
-``np.ndarray`` objects now broadcast in the same way as ``np.ndarray``s
+``np.ndarray`` objects now broadcast in the same way as ``np.ndarray``
 broadcast.  (:issue:`23000`)
 
 Previous Behavior:
@@ -817,11 +820,13 @@ Previous Behavior:
 *Current Behavior*:
 
 .. ipython:: python
+
    arr = np.arange(6).reshape(3, 2)
    df = pd.DataFrame(arr)
    df
 
 .. ipython:: python
+
    df + arr[[0], :]   # 1 row, 2 columns
    df + arr[:, [1]]   # 1 column, 3 rows
 
@@ -888,7 +893,7 @@ Current Behavior:
     ...
     OverflowError: Trying to coerce negative values to unsigned integers
 
-.. _whatsnew_0240.api.crosstab_dtypes
+.. _whatsnew_0240.api.crosstab_dtypes:
 
 Crosstab Preserves Dtypes
 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1008,6 +1013,7 @@ Current Behavior:
 
 .. ipython:: python
     :okwarning:
+
     per = pd.Period('2016Q1')
     per + 3
 

pandas/_libs/tslibs/period.pyx

@@ -1739,7 +1739,7 @@ cdef class _Period(object):
         -------
         Timestamp
 
-        See also
+        See Also
         --------
         Period.end_time : Return the end Timestamp.
         Period.dayofyear : Return the day of year.

pandas/_libs/tslibs/timedeltas.pyx

@@ -1111,14 +1111,14 @@ class Timedelta(_Timedelta):
     Parameters
     ----------
     value : Timedelta, timedelta, np.timedelta64, string, or integer
-    unit : string, {'Y', 'M', 'W', 'D', 'days', 'day',
-                    'hours', hour', 'hr', 'h', 'm', 'minute', 'min', 'minutes',
-                    'T', 'S', 'seconds', 'sec', 'second', 'ms',
-                    'milliseconds', 'millisecond', 'milli', 'millis', 'L',
-                    'us', 'microseconds', 'microsecond', 'micro', 'micros',
-                    'U', 'ns', 'nanoseconds', 'nano', 'nanos', 'nanosecond'
-                    'N'}, optional
+    unit : str, optional
         Denote the unit of the input, if input is an integer. Default 'ns'.
+        Possible values:
+        {'Y', 'M', 'W', 'D', 'days', 'day', 'hours', hour', 'hr', 'h',
+        'm', 'minute', 'min', 'minutes', 'T', 'S', 'seconds', 'sec', 'second',
+        'ms', 'milliseconds', 'millisecond', 'milli', 'millis', 'L',
+        'us', 'microseconds', 'microsecond', 'micro', 'micros', 'U',
+        'ns', 'nanoseconds', 'nano', 'nanos', 'nanosecond', 'N'}
     days, seconds, microseconds,
     milliseconds, minutes, hours, weeks : numeric, optional
         Values for construction in compat with datetime.timedelta.

pandas/core/accessor.py

@@ -247,7 +247,7 @@ def plot(self):
     >>> ds.geo.plot()
     # plots data on a map
 
-See also
+See Also
 --------
 %(others)s
 """