Skip to content

Commit 5824637

Browse files
Merge pull request #6989 from jorisvandenbossche/doc-fixes2
DOC: fix some doc build warnings
2 parents 20ba83d + 77cbc42 commit 5824637

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

doc/source/computation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ accept the following arguments:
242242
instead of ``freq`` that referred to the legacy time rule constants
243243
- ``how``: optionally specify method for down or re-sampling. Default is
244244
is min for ``rolling_min``, max for ``rolling_max``, median for
245-
``rolling_median``, and mean for all other rolling functions. See
246-
:meth:`DataFrame.resample`'s how argument for more information.
245+
``rolling_median``, and mean for all other rolling functions. See
246+
:meth:`DataFrame.resample`'s how argument for more information.
247247

248248
These functions can be applied to ndarrays or Series objects:
249249

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. sphinxext.
3737

3838
extensions = ['sphinx.ext.autodoc',
39+
'sphinx.ext.autosummary',
3940
'sphinx.ext.doctest',
4041
'sphinx.ext.extlinks',
4142
'sphinx.ext.todo',
@@ -63,7 +64,6 @@
6364
autosummary_generate = False
6465

6566
if any([re.match("\s*api\s*",l) for l in lines]):
66-
extensions.append('sphinx.ext.autosummary')
6767
autosummary_generate = True
6868

6969
ds = []

doc/source/release.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ API Changes
164164
- ``False``: Do nothing (default).
165165
- ``True``: Draw a table using the ``DataFrame`` or ``Series`` called ``plot`` method. Data will be transposed to meet matplotlib's default layout.
166166
- ``DataFrame`` or ``Series``: Draw matplotlib.table using the passed data. The data will be drawn as displayed in print method (not transposed automatically).
167-
Also, helper function ``pandas.tools.plotting.table`` is added to create a table from ``DataFrame`` and ``Series``, and add it to an ``matplotlib.Axes``.
167+
Also, helper function ``pandas.tools.plotting.table`` is added to create a table from ``DataFrame`` and ``Series``, and add it to an ``matplotlib.Axes``.
168168

169169
- drop unused order argument from ``Series.sort``; args now in the same orders as ``Series.order``;
170170
add ``na_position`` arg to conform to ``Series.order`` (:issue:`6847`)
@@ -431,7 +431,7 @@ Bug Fixes
431431
- Bug in C parser with leading whitespace (:issue:`3374`)
432432
- Bug in C parser with ``delim_whitespace=True`` and ``\r``-delimited lines
433433
- Bug in ``Series.rank`` and ``DataFrame.rank`` that caused small floats (<1e-13) to all receive the same rank (:issue:`6886`)
434-
- Bug in ``DataFrame.apply`` with functions that used *args or **kwargs and returned
434+
- Bug in ``DataFrame.apply`` with functions that used \*args`` or \*\*kwargs and returned
435435
an empty result (:issue:`6952`)
436436
- Bug in sum/mean on 32-bit platforms on overflows (:issue:`6915`)
437437

doc/source/v0.11.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ Forcing Date coercion (and setting ``NaT`` when not datelike)
118118

119119
.. ipython:: python
120120

121+
from datetime import datetime
121122
s = Series([datetime(2001,1,1,0,0), 'foo', 1.0, 1,
122123
Timestamp('20010104'), '20010105'],dtype='O')
123124
s.convert_objects(convert_dates='coerce')

doc/source/v0.12.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ Experimental Features
370370
.. ipython:: python
371371

372372
from pandas.tseries.offsets import CustomBusinessDay
373+
from datetime import datetime
373374
# As an interesting example, let's look at Egypt where
374375
# a Friday-Saturday weekend is observed.
375376
weekmask_egypt = 'Sun Mon Tue Wed Thu'

0 commit comments

Comments
 (0)