Skip to content

Commit 0aa1800

Browse files
committed
Merge pull request #5124 from JanSchulz/API_additions
Add indexer and str to API documentation
2 parents 724a1f3 + ea1a2d5 commit 0aa1800

File tree

2 files changed

+75
-4
lines changed

2 files changed

+75
-4
lines changed

doc/make.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ def upload_prev(ver, doc_root='./'):
7272
if os.system(pdf_cmd):
7373
raise SystemExit('Upload PDF to %s from %s failed' % (ver, doc_root))
7474

75-
75+
def build_pandas():
76+
os.chdir('..')
77+
os.system('python setup.py clean')
78+
os.system('python setup.py build_ext --inplace')
79+
os.chdir('doc')
80+
7681
def build_prev(ver):
7782
if os.system('git checkout v%s' % ver) != 1:
7883
os.chdir('..')
@@ -238,6 +243,7 @@ def _get_config():
238243
'clean': clean,
239244
'auto_dev': auto_dev_build,
240245
'auto_debug': lambda: auto_dev_build(True),
246+
'build_pandas': build_pandas,
241247
'all': all,
242248
}
243249

doc/source/api.rst

+68-3
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ Top-level dealing with datetimes
153153
:toctree: generated/
154154

155155
to_datetime
156+
to_timedelta
156157

157158
Top-level evaluation
158159
~~~~~~~~~~~~~~~~~~~~
@@ -253,10 +254,17 @@ Indexing, iteration
253254
:toctree: generated/
254255

255256
Series.get
257+
Series.at
258+
Series.iat
256259
Series.ix
260+
Series.loc
261+
Series.iloc
257262
Series.__iter__
258263
Series.iteritems
259264

265+
For more information on ``.at``, ``.iat``, ``.ix``, ``.loc``, and
266+
``.iloc``, see the :ref:`indexing documentation <indexing>`.
267+
260268
Binary operator functions
261269
~~~~~~~~~~~~~~~~~~~~~~~~~
262270
.. autosummary::
@@ -407,8 +415,49 @@ Time series-related
407415
Series.tz_convert
408416
Series.tz_localize
409417

418+
String handling
419+
~~~~~~~~~~~~~~~~~~~
420+
``Series.str`` can be used to access the values of the series as
421+
strings and apply several methods to it. Due to implementation
422+
details the methods show up here as methods of the
423+
``StringMethods`` class.
424+
425+
.. currentmodule:: pandas.core.strings
426+
427+
.. autosummary::
428+
:toctree: generated/
429+
430+
StringMethods.cat
431+
StringMethods.center
432+
StringMethods.contains
433+
StringMethods.count
434+
StringMethods.decode
435+
StringMethods.encode
436+
StringMethods.endswith
437+
StringMethods.extract
438+
StringMethods.findall
439+
StringMethods.get
440+
StringMethods.join
441+
StringMethods.len
442+
StringMethods.lower
443+
StringMethods.lstrip
444+
StringMethods.match
445+
StringMethods.pad
446+
StringMethods.repeat
447+
StringMethods.replace
448+
StringMethods.rstrip
449+
StringMethods.slice
450+
StringMethods.slice_replace
451+
StringMethods.split
452+
StringMethods.startswith
453+
StringMethods.strip
454+
StringMethods.title
455+
StringMethods.upper
456+
410457
Plotting
411458
~~~~~~~~
459+
.. currentmodule:: pandas
460+
412461
.. autosummary::
413462
:toctree: generated/
414463

@@ -476,7 +525,11 @@ Indexing, iteration
476525
:toctree: generated/
477526

478527
DataFrame.head
528+
DataFrame.at
529+
DataFrame.iat
479530
DataFrame.ix
531+
DataFrame.loc
532+
DataFrame.iloc
480533
DataFrame.insert
481534
DataFrame.__iter__
482535
DataFrame.iteritems
@@ -489,6 +542,10 @@ Indexing, iteration
489542
DataFrame.isin
490543
DataFrame.query
491544

545+
For more information on ``.at``, ``.iat``, ``.ix``, ``.loc``, and
546+
``.iloc``, see the :ref:`indexing documentation <indexing>`.
547+
548+
492549
Binary operator functions
493550
~~~~~~~~~~~~~~~~~~~~~~~~~
494551
.. autosummary::
@@ -733,14 +790,21 @@ Indexing, iteration, slicing
733790
.. autosummary::
734791
:toctree: generated/
735792

793+
Panel.at
794+
Panel.iat
736795
Panel.ix
796+
Panel.loc
797+
Panel.iloc
737798
Panel.__iter__
738799
Panel.iteritems
739800
Panel.pop
740801
Panel.xs
741802
Panel.major_xs
742803
Panel.minor_xs
743804

805+
For more information on ``.at``, ``.iat``, ``.ix``, ``.loc``, and
806+
``.iloc``, see the :ref:`indexing documentation <indexing>`.
807+
744808
Binary operator functions
745809
~~~~~~~~~~~~~~~~~~~~~~~~~
746810
.. autosummary::
@@ -878,8 +942,9 @@ Serialization / IO / Conversion
878942
Index
879943
-----
880944

881-
**Many of these methods or variants thereof are available on the objects that contain an index (Series/Dataframe)
882-
and those should most likely be used before calling these methods directly.**
945+
**Many of these methods or variants thereof are available on the objects
946+
that contain an index (Series/Dataframe) and those should most likely be
947+
used before calling these methods directly.**
883948

884949
.. autosummary::
885950
:toctree: generated/
@@ -1026,7 +1091,7 @@ Conversion
10261091

10271092
..
10281093
HACK - see github issue #4539. To ensure old links remain valid, include
1029-
here the autosummaries with previous currentmodules as a comment and add
1094+
here the autosummaries with previous currentmodules as a comment and add
10301095
them to a hidden toctree (to avoid warnings):
10311096
10321097
.. toctree::

0 commit comments

Comments
 (0)