Skip to content

Commit 2ec022f

Browse files
author
m-dz
committed
Merge remote-tracking branch 'upstream/master' into doc_to_csv
2 parents 1190c25 + 31afaf8 commit 2ec022f

26 files changed

+3875
-628
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,4 @@ doc/tmp.sv
109109
doc/source/styled.xlsx
110110
doc/source/templates/
111111
env/
112+
doc/source/savefig/

ci/requirements-3.6_NUMPY_DEV.build.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf
1212
pip install --pre --upgrade --timeout=60 -f $PRE_WHEELS numpy scipy
1313

1414
# install dateutil from master
15-
# pip install -U git+git://github.com/dateutil/dateutil.git
16-
pip install dateutil
15+
pip install -U git+git://github.com/dateutil/dateutil.git
1716

1817
# cython via pip
1918
pip install cython

doc/source/contributing.rst

+6-8
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,9 @@ after updating.
262262
Contributing to the documentation
263263
=================================
264264

265-
If you're not the developer type, contributing to the documentation is still of
266-
huge value. You don't even have to be an expert on *pandas* to do so! In fact,
265+
Contributing to the documentation benefits everyone who uses *pandas*.
266+
We encourage you to help us improve the documentation, and
267+
you don't have to be an expert on *pandas* to do so! In fact,
267268
there are sections of the docs that are worse off after being written by
268269
experts. If something in the docs doesn't make sense to you, updating the
269270
relevant section after you figure it out is a great way to ensure it will help
@@ -292,12 +293,9 @@ Some other important things to know about the docs:
292293
overviews per topic together with some other information (what's new,
293294
installation, etc).
294295

295-
- The docstrings follow the **Numpy Docstring Standard**, which is used widely
296-
in the Scientific Python community. This standard specifies the format of
297-
the different sections of the docstring. See `this document
298-
<https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt>`_
299-
for a detailed explanation, or look at some of the existing functions to
300-
extend it in a similar manner.
296+
- The docstrings follow a pandas convention, based on the **Numpy Docstring
297+
Standard**. Follow the :ref:`pandas docstring guide <docstring>` for detailed
298+
instructions on how to write a correct docstring.
301299

302300
- The tutorials make heavy use of the `ipython directive
303301
<http://matplotlib.org/sampledoc/ipython_directive.html>`_ sphinx extension.

0 commit comments

Comments
 (0)