@@ -51,9 +51,9 @@ PR Review guidelines
5151 the threshold "is this better than it was?" as the review criteria.
5252
5353* For code changes (anything in ``src `` or ``lib ``) at least two
54- developers (those with commit rights) should review all pull
54+ core developers (those with commit rights) should review all pull
5555 requests. If you are the first to review a PR and approve of the
56- changes use the github `'approve review'
56+ changes use the GitHub `'approve review'
5757 <https://help.github.com/articles/reviewing-changes-in-pull-requests/> `__
5858 tool to mark it as such. If you are a subsequent reviewer please
5959 approve the review and if you think no more review is needed, merge
@@ -63,7 +63,19 @@ PR Review guidelines
6363 :file: `doc/api/api_changes ` and significant new features have and
6464 entry in :file: `doc/user/whats_new `.
6565
66- * Make sure the Travis, Appvyor, circle, and codecov tests are passing
66+ - If a PR already has a positive review, a core developer (e.g. the first
67+ reviewer, but not necessarily) may champion that PR for merging. In order
68+ to do so, they should ping all core devs both on GitHub and on the dev
69+ mailing list, and label the PR with the "Merge with single review?" label.
70+ Other core devs can then either review the PR and merge or reject it, or
71+ simply request that it gets a second review before being merged. If no one
72+ asks for such a second review within a week, the PR can then be merged on
73+ the basis of that single review.
74+
75+ A core dev should only champion one PR at a time and we should try to keep
76+ the flow of championed PRs reasonable.
77+
78+ * Make sure the Travis, Appveyor, CircleCI, and codecov tests are passing
6779 before merging.
6880
6981 - Whenever a pull request is created or updated, Travis and Appveyor
@@ -73,7 +85,7 @@ PR Review guidelines
7385
7486* Do not self merge, except for 'small' patches to un-break the CI or
7587 when another reviewer explicitly allows it (ex, "Approve modulo CI
76- passing, may self merge when green")
88+ passing, may self merge when green").
7789
7890* Squashing is case-by-case. The balance is between burden on the
7991 contributor, keeping a relatively clean history, and keeping a
@@ -94,8 +106,6 @@ PR Review guidelines
94106 with the contributor first.
95107
96108
97-
98-
99109Branches and Backports
100110======================
101111
@@ -159,7 +169,7 @@ We do a backport from master to v2.2.x assuming:
159169* ``matplotlib `` is a read-only remote branch of the matplotlib/matplotlib repo
160170
161171The ``TARGET_SHA `` is the hash of the merge commit you would like to
162- backport. This can be read off of the github PR page (in the UI with
172+ backport. This can be read off of the GitHub PR page (in the UI with
163173the merge notification) or through the git CLI tools.
164174
165175Assuming that you already have a local branch ``v2.2.x `` (if not, then
0 commit comments