Skip to content

Commit c03c088

Browse files
DOC: resolve merge conflicts
2 parents 5663a73 + ea7bcd1 commit c03c088

File tree

7 files changed

+509
-41
lines changed

7 files changed

+509
-41
lines changed

ci/code_checks.sh

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,12 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7575
-i "pandas.DataFrame.median RT03,SA01" \
7676
-i "pandas.DataFrame.min RT03" \
7777
-i "pandas.DataFrame.plot PR02,SA01" \
78-
-i "pandas.DataFrame.sum RT03" \
7978
-i "pandas.DataFrame.swaplevel SA01" \
80-
-i "pandas.DataFrame.to_markdown SA01" \
81-
-i "pandas.DataFrame.var PR01,RT03,SA01" \
8279
-i "pandas.Grouper PR02" \
8380
-i "pandas.Index PR07" \
8481
-i "pandas.Index.join PR07,RT03,SA01" \
85-
-i "pandas.Index.names GL08" \
8682
-i "pandas.Index.ravel PR01,RT03" \
87-
-i "pandas.Index.str PR01,SA01" \
8883
-i "pandas.Interval PR02" \
89-
-i "pandas.Interval.closed SA01" \
90-
-i "pandas.Interval.left SA01" \
91-
-i "pandas.Interval.mid SA01" \
92-
-i "pandas.Interval.right SA01" \
9384
-i "pandas.IntervalIndex.closed SA01" \
9485
-i "pandas.IntervalIndex.contains RT03" \
9586
-i "pandas.IntervalIndex.get_loc PR07,RT03,SA01" \
@@ -206,13 +197,9 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
206197
-i "pandas.Series.list.flatten SA01" \
207198
-i "pandas.Series.list.len SA01" \
208199
-i "pandas.Series.lt PR07,SA01" \
209-
-i "pandas.Series.max RT03" \
210-
-i "pandas.Series.mean RT03,SA01" \
211-
-i "pandas.Series.median RT03,SA01" \
212200
-i "pandas.Series.min RT03" \
213201
-i "pandas.Series.mod PR07" \
214202
-i "pandas.Series.mode SA01" \
215-
-i "pandas.Series.mul PR07" \
216203
-i "pandas.Series.ne PR07,SA01" \
217204
-i "pandas.Series.pad PR01,SA01" \
218205
-i "pandas.Series.plot PR02,SA01" \
@@ -239,7 +226,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
239226
-i "pandas.Series.sparse.sp_values SA01" \
240227
-i "pandas.Series.sparse.to_coo PR07,RT03,SA01" \
241228
-i "pandas.Series.std PR01,RT03,SA01" \
242-
-i "pandas.Series.str PR01,SA01" \
243229
-i "pandas.Series.str.capitalize RT03" \
244230
-i "pandas.Series.str.casefold RT03" \
245231
-i "pandas.Series.str.center RT03,SA01" \
@@ -302,7 +288,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
302288
-i "pandas.TimedeltaIndex.nanoseconds SA01" \
303289
-i "pandas.TimedeltaIndex.seconds SA01" \
304290
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
305-
-i "pandas.Timestamp PR07,SA01" \
306291
-i "pandas.Timestamp.as_unit SA01" \
307292
-i "pandas.Timestamp.asm8 SA01" \
308293
-i "pandas.Timestamp.astimezone SA01" \
@@ -321,9 +306,9 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
321306
-i "pandas.Timestamp.isocalendar SA01" \
322307
-i "pandas.Timestamp.isoformat SA01" \
323308
-i "pandas.Timestamp.isoweekday SA01" \
324-
-i "pandas.Timestamp.max PR02,PR07,SA01" \
309+
-i "pandas.Timestamp.max PR02" \
325310
-i "pandas.Timestamp.microsecond GL08" \
326-
-i "pandas.Timestamp.min PR02,PR07,SA01" \
311+
-i "pandas.Timestamp.min PR02" \
327312
-i "pandas.Timestamp.minute GL08" \
328313
-i "pandas.Timestamp.month GL08" \
329314
-i "pandas.Timestamp.month_name SA01" \

pandas/_libs/interval.pyx

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,12 @@ cdef class IntervalMixin:
167167
"""
168168
Return the midpoint of the Interval.
169169
170+
See Also
171+
--------
172+
Interval.left : Return the left bound for the interval.
173+
Interval.right : Return the right bound for the interval.
174+
Interval.length : Return the length of the interval.
175+
170176
Examples
171177
--------
172178
>>> iv = pd.Interval(0, 5)
@@ -377,6 +383,12 @@ cdef class Interval(IntervalMixin):
377383
"""
378384
Left bound for the interval.
379385
386+
See Also
387+
--------
388+
Interval.right : Return the right bound for the interval.
389+
numpy.ndarray.left : A similar method in numpy for obtaining
390+
the left endpoint(s) of intervals.
391+
380392
Examples
381393
--------
382394
>>> interval = pd.Interval(left=1, right=2, closed='left')
@@ -390,6 +402,12 @@ cdef class Interval(IntervalMixin):
390402
"""
391403
Right bound for the interval.
392404
405+
See Also
406+
--------
407+
Interval.left : Return the left bound for the interval.
408+
numpy.ndarray.right : A similar method in numpy for obtaining
409+
the right endpoint(s) of intervals.
410+
393411
Examples
394412
--------
395413
>>> interval = pd.Interval(left=1, right=2, closed='left')
@@ -405,6 +423,13 @@ cdef class Interval(IntervalMixin):
405423
406424
Either ``left``, ``right``, ``both`` or ``neither``.
407425
426+
See Also
427+
--------
428+
Interval.closed_left : Check if the interval is closed on the left side.
429+
Interval.closed_right : Check if the interval is closed on the right side.
430+
Interval.open_left : Check if the interval is open on the left side.
431+
Interval.open_right : Check if the interval is open on the right side.
432+
408433
Examples
409434
--------
410435
>>> interval = pd.Interval(left=1, right=2, closed='left')

pandas/_libs/tslibs/timestamps.pyx

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,10 +1297,24 @@ class Timestamp(_Timestamp):
12971297
----------
12981298
ts_input : datetime-like, str, int, float
12991299
Value to be converted to Timestamp.
1300-
year, month, day : int
1301-
hour, minute, second, microsecond : int, optional, default 0
1300+
year : int
1301+
Value of year.
1302+
month : int
1303+
Value of month.
1304+
day : int
1305+
Value of day.
1306+
hour : int, optional, default 0
1307+
Value of hour.
1308+
minute : int, optional, default 0
1309+
Value of minute.
1310+
second : int, optional, default 0
1311+
Value of second.
1312+
microsecond : int, optional, default 0
1313+
Value of microsecond.
13021314
tzinfo : datetime.tzinfo, optional, default None
1315+
Timezone info.
13031316
nanosecond : int, optional, default 0
1317+
Value of nanosecond.
13041318
tz : str, pytz.timezone, dateutil.tz.tzfile or None
13051319
Time zone for time which Timestamp will have.
13061320
unit : str
@@ -1316,6 +1330,11 @@ class Timestamp(_Timestamp):
13161330
datetime-like corresponds to the first (0) or the second time (1)
13171331
the wall clock hits the ambiguous time.
13181332
1333+
See Also
1334+
--------
1335+
Timedelta : Represents a duration, the difference between two dates or times.
1336+
datetime.datetime : Python datetime.datetime object.
1337+
13191338
Notes
13201339
-----
13211340
There are essentially three calling conventions for the constructor. The

0 commit comments

Comments
 (0)