Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d47cfd8

Browse filesBrowse files
committed
Merge branch 'main' into bug-hash-dt64
2 parents 32d479b + c4caed6 commit d47cfd8
Copy full SHA for d47cfd8

File tree

Expand file treeCollapse file tree

4 files changed

+5
-6
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+5
-6
lines changed

‎.circleci/config.yml

Copy file name to clipboardExpand all lines: .circleci/config.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then
4040
export IS_SCHEDULE_DISPATCH="true"
4141
# Look for the build label/[wheel build] in commit
42-
elif (git log --format=oneline -n 1 $CIRCLE_SHA1) | grep -q '[wheel build]'; then
42+
# grep takes a regex, so need to escape brackets
43+
elif (git log --format=oneline -n 1 $CIRCLE_SHA1) | grep -q '\[wheel build\]'; then
4344
: # Do nothing
4445
elif ! (curl https://api.github.com/repos/pandas-dev/pandas/issues/$CIRCLE_PR_NUMBER | jq '.labels' | grep -q 'Build'); then
4546
circleci-agent step halt

‎ci/code_checks.sh

Copy file name to clipboardExpand all lines: ci/code_checks.sh
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
578578
MSG='Partially validate docstrings (EX02)' ; echo $MSG
579579
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX02 --ignore_functions \
580580
pandas.DataFrame.plot.line \
581-
pandas.Period.strftime \
582-
pandas.Series.floordiv \
583581
pandas.Series.plot.line \
584-
pandas.Series.rfloordiv \
585582
pandas.Series.sparse.density \
586583
pandas.Series.sparse.npoints \
587584
pandas.Series.sparse.sp_values \

‎pandas/_libs/tslibs/period.pyx

Copy file name to clipboardExpand all lines: pandas/_libs/tslibs/period.pyx
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2474,6 +2474,7 @@ cdef class _Period(PeriodMixin):
24742474
Examples
24752475
--------
24762476

2477+
>>> from pandas import Period
24772478
>>> a = Period(freq='Q-JUL', year=2006, quarter=1)
24782479
>>> a.strftime('%F-Q%q')
24792480
'2006-Q1'

‎pandas/core/ops/docstrings.py

Copy file name to clipboardExpand all lines: pandas/core/ops/docstrings.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ def make_flex_doc(op_name: str, typ: str) -> str:
156156
+ """
157157
>>> a.floordiv(b, fill_value=0)
158158
a 1.0
159-
b NaN
160-
c NaN
159+
b inf
160+
c inf
161161
d 0.0
162162
e NaN
163163
dtype: float64

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.