Skip to content

Commit 55b095a

Browse files
authored
Merge branch 'master' into timedelta_docstring
2 parents e6d45a7 + e75b239 commit 55b095a

25 files changed

+87
-87
lines changed

pandas/_libs/tslibs/period.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ cdef class _Period(object):
17391739
-------
17401740
Timestamp
17411741
1742-
See also
1742+
See Also
17431743
--------
17441744
Period.end_time : Return the end Timestamp.
17451745
Period.dayofyear : Return the day of year.

pandas/core/accessor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def plot(self):
247247
>>> ds.geo.plot()
248248
# plots data on a map
249249
250-
See also
250+
See Also
251251
--------
252252
%(others)s
253253
"""

pandas/core/arrays/categorical.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ class Categorical(ExtensionArray, PandasObject):
313313
See the `user guide
314314
<http://pandas.pydata.org/pandas-docs/stable/categorical.html>`_ for more.
315315
316-
See also
316+
See Also
317317
--------
318318
pandas.api.types.CategoricalDtype : Type for categorical data
319319
CategoricalIndex : An Index with an underlying ``Categorical``
@@ -457,7 +457,7 @@ def categories(self):
457457
If the new categories do not validate as categories or if the
458458
number of new categories is unequal the number of old categories
459459
460-
See also
460+
See Also
461461
--------
462462
rename_categories
463463
reorder_categories
@@ -823,7 +823,7 @@ def set_categories(self, new_categories, ordered=None, rename=False,
823823
-------
824824
cat : Categorical with reordered categories or None if inplace.
825825
826-
See also
826+
See Also
827827
--------
828828
rename_categories
829829
reorder_categories
@@ -894,7 +894,7 @@ def rename_categories(self, new_categories, inplace=False):
894894
With ``inplace=False``, the new categorical is returned.
895895
With ``inplace=True``, there is no return value.
896896
897-
See also
897+
See Also
898898
--------
899899
reorder_categories
900900
add_categories
@@ -971,7 +971,7 @@ def reorder_categories(self, new_categories, ordered=None, inplace=False):
971971
-------
972972
cat : Categorical with reordered categories or None if inplace.
973973
974-
See also
974+
See Also
975975
--------
976976
rename_categories
977977
add_categories
@@ -1010,7 +1010,7 @@ def add_categories(self, new_categories, inplace=False):
10101010
-------
10111011
cat : Categorical with new categories added or None if inplace.
10121012
1013-
See also
1013+
See Also
10141014
--------
10151015
rename_categories
10161016
reorder_categories
@@ -1058,7 +1058,7 @@ def remove_categories(self, removals, inplace=False):
10581058
-------
10591059
cat : Categorical with removed categories or None if inplace.
10601060
1061-
See also
1061+
See Also
10621062
--------
10631063
rename_categories
10641064
reorder_categories
@@ -1100,7 +1100,7 @@ def remove_unused_categories(self, inplace=False):
11001100
-------
11011101
cat : Categorical with unused categories dropped or None if inplace.
11021102
1103-
See also
1103+
See Also
11041104
--------
11051105
rename_categories
11061106
reorder_categories
@@ -1364,7 +1364,7 @@ def isna(self):
13641364
-------
13651365
a boolean array of whether my values are null
13661366
1367-
See also
1367+
See Also
13681368
--------
13691369
isna : top-level isna
13701370
isnull : alias of isna
@@ -1387,7 +1387,7 @@ def notna(self):
13871387
-------
13881388
a boolean array of whether my values are not null
13891389
1390-
See also
1390+
See Also
13911391
--------
13921392
notna : top-level notna
13931393
notnull : alias of notna
@@ -1503,7 +1503,7 @@ def argsort(self, *args, **kwargs):
15031503
-------
15041504
argsorted : numpy array
15051505
1506-
See also
1506+
See Also
15071507
--------
15081508
numpy.ndarray.argsort
15091509
@@ -2322,7 +2322,7 @@ def repeat(self, repeats, *args, **kwargs):
23222322
"""
23232323
Repeat elements of a Categorical.
23242324
2325-
See also
2325+
See Also
23262326
--------
23272327
numpy.ndarray.repeat
23282328

pandas/core/arrays/datetimes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ def to_period(self, freq=None):
874874
PeriodIndex(['2017-01-01', '2017-01-02'],
875875
dtype='period[D]', freq='D')
876876
877-
See also
877+
See Also
878878
--------
879879
pandas.PeriodIndex: Immutable ndarray holding ordinal values
880880
pandas.DatetimeIndex.to_pydatetime: Return DatetimeIndex as object

pandas/core/arrays/period.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ def repeat(self, repeats, *args, **kwargs):
636636
"""
637637
Repeat elements of a PeriodArray.
638638
639-
See also
639+
See Also
640640
--------
641641
numpy.ndarray.repeat
642642
"""

pandas/core/base.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ def argmax(self, axis=None):
820820
"""
821821
return a ndarray of the maximum argument indexer
822822
823-
See also
823+
See Also
824824
--------
825825
numpy.ndarray.argmax
826826
"""
@@ -863,7 +863,7 @@ def argmin(self, axis=None):
863863
"""
864864
return a ndarray of the minimum argument indexer
865865
866-
See also
866+
See Also
867867
--------
868868
numpy.ndarray.argmin
869869
"""

pandas/core/frame.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ class DataFrame(NDFrame):
346346
1 4 5 6
347347
2 7 8 9
348348
349-
See also
349+
See Also
350350
--------
351351
DataFrame.from_records : constructor from tuples, also record arrays
352352
DataFrame.from_dict : from dicts of Series, arrays, or dicts
@@ -1694,7 +1694,7 @@ def from_csv(cls, path, header=0, sep=',', index_col=0, parse_dates=True,
16941694
datetime format based on the first datetime string. If the format
16951695
can be inferred, there often will be a large parsing speed-up.
16961696
1697-
See also
1697+
See Also
16981698
--------
16991699
pandas.read_csv
17001700
@@ -5592,7 +5592,7 @@ def pivot(self, index=None, columns=None, values=None):
55925592
-------
55935593
table : DataFrame
55945594
5595-
See also
5595+
See Also
55965596
--------
55975597
DataFrame.pivot : pivot without aggregation that can handle
55985598
non-numeric data
@@ -5797,7 +5797,7 @@ def unstack(self, level=-1, fill_value=None):
57975797
57985798
.. versionadded:: 0.18.0
57995799
5800-
See also
5800+
See Also
58015801
--------
58025802
DataFrame.pivot : Pivot a table based on column values.
58035803
DataFrame.stack : Pivot a level of the column labels (inverse operation
@@ -5867,7 +5867,7 @@ def unstack(self, level=-1, fill_value=None):
58675867
col_level : int or string, optional
58685868
If columns are a MultiIndex then use this level to melt.
58695869
5870-
See also
5870+
See Also
58715871
--------
58725872
%(other)s
58735873
pivot_table
@@ -6108,7 +6108,7 @@ def _gotitem(self,
61086108
3 NaN
61096109
dtype: float64
61106110
6111-
See also
6111+
See Also
61126112
--------
61136113
DataFrame.apply : Perform any type of operations.
61146114
DataFrame.transform : Perform transformation type operations.
@@ -6242,7 +6242,7 @@ def apply(self, func, axis=0, broadcast=None, raw=False, reduce=None,
62426242
side-effects, as they will take effect twice for the first
62436243
column/row.
62446244
6245-
See also
6245+
See Also
62466246
--------
62476247
DataFrame.applymap: For elementwise operations
62486248
DataFrame.aggregate: only perform aggregating type operations
@@ -6351,7 +6351,7 @@ def applymap(self, func):
63516351
DataFrame
63526352
Transformed DataFrame.
63536353
6354-
See also
6354+
See Also
63556355
--------
63566356
DataFrame.apply : Apply a function along input axis of DataFrame
63576357
@@ -6434,7 +6434,7 @@ def append(self, other, ignore_index=False,
64346434
those rows to a list and then concatenate the list with the original
64356435
DataFrame all at once.
64366436
6437-
See also
6437+
See Also
64386438
--------
64396439
pandas.concat : General function to concatenate DataFrame, Series
64406440
or Panel objects

pandas/core/generic.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1850,7 +1850,7 @@ def empty(self):
18501850
>>> df.dropna().empty
18511851
True
18521852
1853-
See also
1853+
See Also
18541854
--------
18551855
pandas.Series.dropna
18561856
pandas.DataFrame.dropna
@@ -5309,7 +5309,7 @@ def astype(self, dtype, copy=True, errors='raise', **kwargs):
53095309
1 2
53105310
dtype: int64
53115311
5312-
See also
5312+
See Also
53135313
--------
53145314
pandas.to_datetime : Convert argument to datetime.
53155315
pandas.to_timedelta : Convert argument to timedelta.
@@ -10090,7 +10090,7 @@ def _doc_parms(cls):
1009010090
"""
1009110091

1009210092
_all_see_also = """\
10093-
See also
10093+
See Also
1009410094
--------
1009510095
pandas.Series.all : Return True if all elements are True
1009610096
pandas.DataFrame.any : Return True if one (or more) elements are True
@@ -10117,7 +10117,7 @@ def _doc_parms(cls):
1011710117
-------
1011810118
%(outname)s : %(name1)s or %(name2)s\n
1011910119
%(examples)s
10120-
See also
10120+
See Also
1012110121
--------
1012210122
pandas.core.window.Expanding.%(accum_func_name)s : Similar functionality
1012310123
but ignores ``NaN`` values.

pandas/core/groupby/generic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ def _selection_name(self):
734734
1 1 2
735735
2 3 4
736736
737-
See also
737+
See Also
738738
--------
739739
pandas.Series.groupby.apply
740740
pandas.Series.groupby.transform
@@ -1289,7 +1289,7 @@ class DataFrameGroupBy(NDFrameGroupBy):
12891289
1 1 2 0.590716
12901290
2 3 4 0.704907
12911291
1292-
See also
1292+
See Also
12931293
--------
12941294
pandas.DataFrame.groupby.apply
12951295
pandas.DataFrame.groupby.transform

pandas/core/groupby/groupby.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class providing the base-class of operations.
4343

4444
_doc_template = """
4545
46-
See also
46+
See Also
4747
--------
4848
pandas.Series.%(name)s
4949
pandas.DataFrame.%(name)s
@@ -91,7 +91,7 @@ class providing the base-class of operations.
9191
--------
9292
{examples}
9393
94-
See also
94+
See Also
9595
--------
9696
pipe : Apply function to the full GroupBy object instead of to each
9797
group.
@@ -253,7 +253,7 @@ class providing the base-class of operations.
253253
-------
254254
%(klass)s
255255
256-
See also
256+
See Also
257257
--------
258258
aggregate, transform
259259
@@ -1624,7 +1624,7 @@ def ngroup(self, ascending=True):
16241624
5 0
16251625
dtype: int64
16261626
1627-
See also
1627+
See Also
16281628
--------
16291629
.cumcount : Number the rows in each group.
16301630
"""
@@ -1680,7 +1680,7 @@ def cumcount(self, ascending=True):
16801680
5 0
16811681
dtype: int64
16821682
1683-
See also
1683+
See Also
16841684
--------
16851685
.ngroup : Number the groups themselves.
16861686
"""

0 commit comments

Comments
 (0)