Skip to content

Commit 6917234

Browse files
committed
Merge branch 'master' of https://github.com/pandas-dev/pandas into tslibs-conversion11
2 parents 8170c8d + 17e0b13 commit 6917234

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+149
-2376
lines changed

ci/lint.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RET=0
99
if [ "$LINT" ]; then
1010

1111
# pandas/_libs/src is C code, so no need to search there.
12-
echo "Linting *.py"
12+
echo "Linting *.py"
1313
flake8 pandas --filename=*.py --exclude pandas/_libs/src
1414
if [ $? -ne "0" ]; then
1515
RET=1
@@ -38,10 +38,20 @@ if [ "$LINT" ]; then
3838
if [ $? -ne "0" ]; then
3939
RET=1
4040
fi
41-
4241
done
4342
echo "Linting *.pxi.in DONE"
4443

44+
echo "Linting *.pxd"
45+
for path in '_libs'
46+
do
47+
echo "linting -> pandas/$path"
48+
flake8 pandas/$path --filename=*.pxd --select=E501,E302,E203,E111,E114,E221,E303,E231,E126,F403
49+
if [ $? -ne "0" ]; then
50+
RET=1
51+
fi
52+
done
53+
echo "Linting *.pxd DONE"
54+
4555
# readability/casting: Warnings about C casting instead of C++ casting
4656
# runtime/int: Warnings about using C number types instead of C++ ones
4757
# build/include_subdir: Warnings about prefacing included header files with directory

doc/source/api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,7 @@ Interval
18221822
Properties
18231823
~~~~~~~~~~
18241824
.. autosummary::
1825-
:toctree generated/
1825+
:toctree: generated/
18261826

18271827
Interval.closed
18281828
Interval.closed_left
@@ -1843,7 +1843,7 @@ Timedelta
18431843
Properties
18441844
~~~~~~~~~~
18451845
.. autosummary::
1846-
:toctree generated/
1846+
:toctree: generated/
18471847

18481848
Timedelta.asm8
18491849
Timedelta.components
@@ -1860,7 +1860,7 @@ Properties
18601860
Methods
18611861
~~~~~~~
18621862
.. autosummary::
1863-
:toctree generated/
1863+
:toctree: generated/
18641864

18651865
Timedelta.ceil
18661866
Timedelta.floor

doc/source/computation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,7 @@ columns of a ``DataFrame``:
670670

671671
.. ipython:: python
672672
:okexcept:
673+
:okwarning:
673674
674675
r.agg({'A' : np.sum,
675676
'B' : lambda x: np.std(x, ddof=1)})

doc/source/conf.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,13 +358,12 @@
358358
# latex_use_modindex = True
359359

360360

361-
# Example configuration for intersphinx: refer to the Python standard library.
362361
intersphinx_mapping = {
363362
'statsmodels': ('http://www.statsmodels.org/devel/', None),
364363
'matplotlib': ('http://matplotlib.org/', None),
365-
'python': ('http://docs.python.org/3', None),
366-
'numpy': ('http://docs.scipy.org/doc/numpy', None),
367-
'scipy': ('http://docs.scipy.org/doc/scipy/reference', None),
364+
'python': ('https://docs.python.org/3/', None),
365+
'numpy': ('https://docs.scipy.org/doc/numpy/', None),
366+
'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
368367
'py': ('https://pylib.readthedocs.io/en/latest/', None)
369368
}
370369
import glob
@@ -573,6 +572,15 @@ def remove_flags_docstring(app, what, name, obj, options, lines):
573572
if what == "attribute" and name.endswith(".flags"):
574573
del lines[:]
575574

575+
576+
suppress_warnings = [
577+
# We "overwrite" autosummary with our PandasAutosummary, but
578+
# still want the regular autosummary setup to run. So we just
579+
# suppress this warning.
580+
'app.add_directive'
581+
]
582+
583+
576584
def setup(app):
577585
app.connect("autodoc-process-docstring", remove_flags_docstring)
578586
app.add_autodocumenter(AccessorDocumenter)

doc/source/contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Bug reports must:
6060

6161
The issue will then show up to the *pandas* community and be open to comments/ideas from others.
6262

63-
.. _contributing.github
63+
.. _contributing.github:
6464

6565
Working with the code
6666
=====================

doc/source/io.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ header : int or list of ints, default ``'infer'``
115115
names : array-like, default ``None``
116116
List of column names to use. If file contains no header row, then you should
117117
explicitly pass ``header=None``. Duplicates in this list will cause
118-
a ``UserWarning`` to be issued.
118+
a ``UserWarning`` to be issued.
119119
index_col : int or sequence or ``False``, default ``None``
120120
Column to use as the row labels of the DataFrame. If a sequence is given, a
121121
MultiIndex is used. If you have a malformed file with delimiters at the end of

doc/source/whatsnew/v0.15.2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Other enhancements:
163163
p.all()
164164

165165
- Added support for ``utcfromtimestamp()``, ``fromtimestamp()``, and ``combine()`` on `Timestamp` class (:issue:`5351`).
166-
- Added Google Analytics (`pandas.io.ga`) basic documentation (:issue:`8835`). See `here<http://pandas.pydata.org/pandas-docs/version/0.15.2/remote_data.html#remote-data-ga>`__.
166+
- Added Google Analytics (`pandas.io.ga`) basic documentation (:issue:`8835`). See `here <http://pandas.pydata.org/pandas-docs/version/0.15.2/remote_data.html#remote-data-ga>`__.
167167
- ``Timedelta`` arithmetic returns ``NotImplemented`` in unknown cases, allowing extensions by custom classes (:issue:`8813`).
168168
- ``Timedelta`` now supports arithemtic with ``numpy.ndarray`` objects of the appropriate dtype (numpy 1.8 or newer only) (:issue:`8884`).
169169
- Added ``Timedelta.to_timedelta64()`` method to the public API (:issue:`8884`).

doc/source/whatsnew/v0.19.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ contained the values ``[0, 3]``.
216216
**New behavior**:
217217

218218
.. ipython:: python
219+
:okwarning:
219220

220221
pd.read_csv(StringIO(data), names=names)
221222

doc/source/whatsnew/v0.20.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,6 +1375,7 @@ Convert to a MultiIndex DataFrame
13751375
Convert to an xarray DataArray
13761376

13771377
.. ipython:: python
1378+
:okwarning:
13781379

13791380
p.to_xarray()
13801381

pandas/_libs/period.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ cdef class _Period(object):
967967
def strftime(self, fmt):
968968
"""
969969
Returns the string representation of the :class:`Period`, depending
970-
on the selected :keyword:`format`. :keyword:`format` must be a string
970+
on the selected ``fmt``. ``fmt`` must be a string
971971
containing one or several directives. The method recognizes the same
972972
directives as the :func:`time.strftime` function of the standard Python
973973
distribution, as well as the specific additional directives ``%f``,

0 commit comments

Comments
 (0)