From 22b0731fd54ee828392f49057f6389ad81a9fd0b Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Thu, 20 Jan 2022 05:00:21 +0000 Subject: [PATCH 1/7] Relax CODEOWNERS rule to allow PEP editors to "own" PEPs --- pep-0001.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pep-0001.txt b/pep-0001.txt index af34fdea5e4..fb83fbdc7db 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -188,9 +188,9 @@ The standard PEP workflow is: "Informational", or "Process" as appropriate, and for the "Status:" field enter "Draft". For full details, see `PEP Header Preamble`_. -* Update `.github/CODEOWNERS` [7]_ such that any core developer co-author(s) or - sponsor are listed for your new file such that any future pull requests will - be assigned to them. +* Update `.github/CODEOWNERS` [7]_ such that any co-author(s) or sponsors + with the commit bit on the `PEP repository`_are listed for your new file + such that any future pull requests will be assigned to them. * Push this to your GitHub fork and submit a pull request. @@ -696,7 +696,7 @@ For each new PEP that comes in an editor does the following: * The file name extension is correct (i.e. ``.rst``). -* Make sure the appropriate core developer(s) is added to +* Make sure the appropriate sponsor or co-author(s) are added to `.github/CODEOWNERS` [7]_. * Skim the PEP for obvious defects in language (spelling, grammar, From fe48157e306b44e6c0d5f1792adca14c348c55ea Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Thu, 20 Jan 2022 05:03:02 +0000 Subject: [PATCH 2/7] fix spacing --- pep-0001.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pep-0001.txt b/pep-0001.txt index fb83fbdc7db..8965e3c443d 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -189,7 +189,7 @@ The standard PEP workflow is: field enter "Draft". For full details, see `PEP Header Preamble`_. * Update `.github/CODEOWNERS` [7]_ such that any co-author(s) or sponsors - with the commit bit on the `PEP repository`_are listed for your new file + with the commit bit on the `PEP repository`_ are listed for your new file such that any future pull requests will be assigned to them. * Push this to your GitHub fork and submit a pull request. From c04eab63352bd6cad4fbba03177a08b973a87a6e Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Thu, 20 Jan 2022 05:20:07 +0000 Subject: [PATCH 3/7] Standardise access wording --- pep-0001.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0001.txt b/pep-0001.txt index 8965e3c443d..58d60738167 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -189,7 +189,7 @@ The standard PEP workflow is: field enter "Draft". For full details, see `PEP Header Preamble`_. * Update `.github/CODEOWNERS` [7]_ such that any co-author(s) or sponsors - with the commit bit on the `PEP repository`_ are listed for your new file + with write access to the `PEP repository`_ are listed for your new file such that any future pull requests will be assigned to them. * Push this to your GitHub fork and submit a pull request. @@ -229,7 +229,7 @@ not providing proper motivation or addressing backwards compatibility, or not in keeping with the Python philosophy. The Steering Council can be consulted during the approval phase, and are the final arbiter of a draft's PEP-ability. -Developers with git push privileges for the `PEP repository`_ may claim PEP +Developers with write access to the `PEP repository`_ may claim PEP numbers directly by creating and committing a new PEP. When doing so, the developer must handle the tasks that would normally be taken care of by the PEP editors (see `PEP Editor Responsibilities & Workflow`_). This includes From 5fa4f99257a8dd14a234003a6dbbc68667d3c45e Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Thu, 20 Jan 2022 05:21:43 +0000 Subject: [PATCH 4/7] Standardise access wording redux --- pep-0001.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pep-0001.txt b/pep-0001.txt index 58d60738167..66f013e2592 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -240,7 +240,7 @@ if you need assistance from PEP editors, mention ``@python/pep-editors`` on GitHub. As updates are necessary, the PEP author can check in new versions if they -(or a collaborating developer) have git push privileges. +(or a collaborating developer) have write access to the `PEP repository`_. After a PEP number has been assigned, a draft PEP may be discussed further on python-ideas (getting a PEP number assigned early can be useful for ease of @@ -642,7 +642,7 @@ your changes don't get lost. When in doubt about where to send your changes, please check first with the PEP author and/or a PEP editor. -PEP authors with git push privileges for the PEP repository can update the +PEP authors with write access to the PEP repository can update the PEPs themselves by using "git push" or the GitHub PR interface to submit their changes. @@ -677,7 +677,7 @@ PEP Editor Responsibilities & Workflow A PEP editor must be added to the ``@python/pep-editors`` group on GitHub and must watch the `PEP repository`_. -Note that developers with git push privileges for the `PEP repository`_ may +Note that developers with write access to the `PEP repository`_ may handle the tasks that would normally be taken care of by the PEP editors. Alternately, even developers may request assistance from PEP editors by mentioning ``@python/pep-editors`` on GitHub. From 50ba35e6b90417ba9083d64cd4d3f16005b0e988 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Thu, 20 Jan 2022 05:23:24 +0000 Subject: [PATCH 5/7] Don't use such that twice --- pep-0001.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0001.txt b/pep-0001.txt index 66f013e2592..20f59b434c4 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -189,8 +189,8 @@ The standard PEP workflow is: field enter "Draft". For full details, see `PEP Header Preamble`_. * Update `.github/CODEOWNERS` [7]_ such that any co-author(s) or sponsors - with write access to the `PEP repository`_ are listed for your new file - such that any future pull requests will be assigned to them. + with write access to the `PEP repository`_ are listed for your new file. + This means that any future pull requests will be assigned to them. * Push this to your GitHub fork and submit a pull request. From 8e7bd519c7fb3e487450b77c0a446aa79b8393d8 Mon Sep 17 00:00:00 2001 From: CAM Gerlach Date: Thu, 20 Jan 2022 05:30:18 +0000 Subject: [PATCH 6/7] Wording update --- pep-0001.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pep-0001.txt b/pep-0001.txt index 20f59b434c4..cf5e99eca81 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -190,7 +190,8 @@ The standard PEP workflow is: * Update `.github/CODEOWNERS` [7]_ such that any co-author(s) or sponsors with write access to the `PEP repository`_ are listed for your new file. - This means that any future pull requests will be assigned to them. + This ensures any future pull requests changing the file will be assigned + to them. * Push this to your GitHub fork and submit a pull request. From d5c36452ff70a4378a8549b5d2a1045a64d7b051 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 20 Jan 2022 14:27:17 +0000 Subject: [PATCH 7/7] Plural agreement Co-authored-by: Chris Angelico --- pep-0001.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0001.txt b/pep-0001.txt index cf5e99eca81..d8ff86ca8ff 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -697,8 +697,8 @@ For each new PEP that comes in an editor does the following: * The file name extension is correct (i.e. ``.rst``). -* Make sure the appropriate sponsor or co-author(s) are added to - `.github/CODEOWNERS` [7]_. +* Ensure that everyone listed as a sponsor or co-author of the PEP who has write + access to the `PEP repository`_ is added to `.github/CODEOWNERS` [7]_. * Skim the PEP for obvious defects in language (spelling, grammar, sentence structure, etc.), and code style (examples should conform to