Lint: Update headers and checks per current guidance & provide helpful feedback (#2484)

* Lint: Disable a couple potentially problematic/unneeded hooks * Lint: Refine regex for existing Content-Type and PEP references checks * Lint: Refine regex for Python-Version check and fix a couple deviations * Lint: Refine regex for Created check and fix a couple deviations * Lint: Refine regex for Resolution check and fix a few deviations * Lint: Add new check for Post-History header * Lint: Add check for Discussions-To header link * Lint: Add basic check for PEP title presense & excessive length * Lint: Add check for PEP/BDFL-Delegate header * Lint: Add check for Sponsor header * Lint: Add check for legacy Author field format * Lint: Add check for RST Author field * Lint: Use more helpful, user-oriented descriptions for header checks * PEP 245: Add historical note and archive links to wiki page/email lsit * PEP 628: Add direct link to resolution in acceptance message * Lint: Explictly allow all valid RFC 2822 line continuations in headers * Lint: Tweak Post-History and Resolution checks to accept fragments
2022-04-20 04:53:08 -05:00 · 2022-04-20 04:53:08 -05:00 · a6336e9d74
parent 07b9d0cd51
commit a6336e9d74
46 changed files with 164 additions and 74 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -17,8 +17,6 @@ repos:
      - id: mixed-line-ending
        name: "Normalize mixed line endings"
        args: [--fix=lf]
-      - id: fix-byte-order-marker
-        name: "Remove Unicode BOM"
      - id: file-contents-sorter
        name: "Sort codespell ignore list"
        files: '.codespell/ignore-words.txt'
@ -35,8 +33,8 @@ repos:
      - id: check-vcs-permalinks
        name: "Check that VCS links are permalinks"

-      - id: check-ast
-        name: "Check Python AST"
+      # - id: check-ast
+      #   name: "Check Python AST"
      - id: check-json
        name: "Check JSON"
      - id: check-toml
@ -76,63 +74,128 @@ repos:
        entry: '\t'
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: check-required-fields
-        name: "Check PEPs have all required fields"
+        name: "Check PEPs have all required headers"
        language: pygrep
        entry: '(?-m:^PEP:(?=[\s\S]*\nTitle:)(?=[\s\S]*\nAuthor:)(?=[\s\S]*\nStatus:)(?=[\s\S]*\nType:)(?=[\s\S]*\nContent-Type:)(?=[\s\S]*\nCreated:))'
        args: ['--negate', '--multiline']
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: validate-pep-number
-        name: "Validate PEP number field"
+        name: "'PEP' header must be a number 1-9999"
        language: pygrep
        entry: '(?-m:^PEP:(?:(?! +(0|[1-9][0-9]{0,3})\n)))'
        args: ['--multiline']
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
+      - id: validate-title
+        name: "'Title' must be 1-79 characters"
+        language: pygrep
+        entry: '(?<=\n)Title:(?:(?! +\S.{1,78}\n(?=[A-Z])))'
+        args: ['--multiline']
+        files: '^pep-\d+\.(rst|txt)$'
+        exclude: '^pep-(0499)\.(rst|txt)$'
+        types: [text]
+
+      - id: validate-author
+        name: "'Author' must be list of 'Name <email@example.com>, ...'"
+        language: pygrep
+        entry: '(?<=\n)Author:(?:(?!((( +|\n {1,8})[^!#$%&()*+,/:;<=>?@\[\\\]\^_`{|}~]+( <[\w!#$%&''*+\-/=?^_{|}~.]+(@| at )[\w\-.]+\.[A-Za-z0-9]+>)?)(,|(?=\n[^ ])))+\n(?=[A-Z])))'
+        args: [--multiline]
+        files: '^pep-\d+\.rst$'
+        types: [text]
+
+      - id: validate-author-legacy
+        name: "Legacy 'Author' must be a list of names/emails"
+        language: pygrep
+        entry: '(?<=\n)Author:(?:(?!((((( +|\n {1,8})[^!#$%&()*+,/:;<=>?@\[\\\]\^_`{|}~]+( <[\w!#$%&''*+\-/=?^_{|}~.]+(@| at )[\w\-.]+\.[A-Za-z0-9]+>)?)(,|(?=\n[^ ])))+)|(((( +|\n {1,8})[\w!#$%&''*+\-/=?^_{|}~.]+(@| at )[\w\-.]+\.[A-Za-z0-9]+) \(([^!#$%&()*+,/:;<=>?@\[\\\]\^_`{|}~]+)\)(,|(?=\n[^ ])))+))\n(?=[A-Z])))'
+        args: [--multiline]
+        files: '^pep-\d+\.(rst|txt)$'
+        types: [text]
+
+      - id: validate-sponsor
+        name: "'Sponsor' must have format 'Name <email@example.com>'"
+        language: pygrep
+        entry: '^Sponsor:(?: (?! *[^!#$%&()*+,/:;<=>?@\[\\\]\^_`{|}~]+( <[\w!#$%&''*+\-/=?^_{|}~.]+(@| at )[\w\-.]+\.[A-Za-z0-9]+>)?$))'
+        files: '^pep-\d+\.(rst|txt)$'
+        types: [text]
+
+      - id: validate-delegate
+        name: "'Delegate' must have format 'Name <email@example.com>'"
+        language: pygrep
+        entry: '^(PEP|BDFL)-Delegate: (?:(?! *[^!#$%&()*+,/:;<=>?@\[\\\]\^_`{|}~]+( <[\w!#$%&''*+\-/=?^_{|}~.]+(@| at )[\w\-.]+\.[A-Za-z0-9]+>)?$))'
+        files: '^pep-\d+\.(rst|txt)$'
+        exclude: '^pep-(0451)\.(rst|txt)$'
+        types: [text]
+
+      - id: validate-discussions-to
+        name: "'Discussions-To' must be a thread URL"
+        language: pygrep
+        entry: '^Discussions-To: (?:(?!([\w\-]+@(python\.org|googlegroups\.com))|https://((discuss\.python\.org/t/([\w\-]+/)?\d+/?)|(mail\.python\.org/pipermail/[\w\-]+/\d{4}-[A-Za-z]+/[A-Za-z0-9]+\.html)|(mail\.python\.org/archives/list/[\w\-]+@python\.org/thread/[A-Za-z0-9]+/?))$))'
+        files: '^pep-\d+\.(rst|txt)$'
+        types: [text]
+
      - id: validate-status
-        name: "Validate PEP 'Status' field"
+        name: "'Status' must be a valid PEP status"
        language: pygrep
        entry: '^Status:(?:(?! +(Draft|Withdrawn|Rejected|Accepted|Final|Active|Provisional|Deferred|Superseded|April Fool!)$))'
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: validate-type
-        name: "Validate PEP 'Type' field"
+        name: "'Type' must be a valid PEP type"
        language: pygrep
        entry: '^Type:(?:(?! +(Standards Track|Informational|Process)$))'
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: validate-content-type
-        name: "Validate PEP 'Content-Type' field"
+        name: "'Content-Type' must be 'text/x-rst'"
        language: pygrep
-        entry: '^Content-Type:(?:(?! +text\/x-rst$))'
+        entry: '^Content-Type:(?:(?! +text/x-rst$))'
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: validate-pep-references
-        name: "Validate PEP reference fields"
+        name: "`Requires`/`Replaces`/`Superseded-By` must be 'NNN' PEP IDs"
        language: pygrep
-        entry: '^(Requires|Replaces|Superseded-By):(?:(?! +( ?(0|[1-9][0-9]{0,3}),?)+$))'
+        entry: '^(Requires|Replaces|Superseded-By):(?:(?! *( (0|[1-9][0-9]{0,3})(,|$))+$))'
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: validate-created
-        name: "Validate PEP 'Created' field"
+        name: "'Created' must be a 'DD-mmm-YYYY' date"
        language: pygrep
-        entry: '^Created:(?:(?! +([0-2][0-9]|(3[01]))-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(199[0-9]|20[0-9][0-9])( \([^()]+\))?$))'
+        entry: '^Created:(?:(?! +([0-2][0-9]|(3[01]))-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(199[0-9]|20[0-9][0-9])$))'
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: validate-python-version
-        name: "Validate PEP 'Python-Version' field"
+        name: "'Python-Version' must be a 'X.Y[.Z]` version"
        language: pygrep
-        entry: '^Python-Version:(?:(?! +( ?[1-9]\.([0-9][0-9]?|x)(\.[1-9][0-9]?)?\??,?)+( \([^()]+\))?$))'
+        entry: '^Python-Version:(?:(?! *( [1-9]\.([0-9][0-9]?|x)(\.[1-9][0-9]?)?(,|$))+$))'
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
-      - id: validate-resolution
-        name: "Validate PEP 'Resolution' field"
+
+      - id: validate-post-history
+        name: "'Post-History' must be '`DD-mmm-YYYY <Thread URL>`__, ...'"
        language: pygrep
-        entry: '(?<!\n\n)^Resolution: (?:(?!(https:\/\/\S*|:pep:`[a-zA-Z\d \-<>#]*?`)\n))'
+        entry: '(?<=\n)Post-History:(?:(?! ?\n|((( +|\n {1,14})(([0-2][0-9]|(3[01]))-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(199[0-9]|20[0-9][0-9])|`([0-2][0-9]|(3[01]))-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(199[0-9]|20[0-9][0-9]) <https://((discuss\.python\.org/t/([\w\-]+/)?\d+/?)|(mail\.python\.org/pipermail/[\w\-]+/\d{4}-[A-Za-z]+/[A-Za-z0-9]+\.html)|(mail\.python\.org/archives/list/[\w\-]+@python\.org/thread/[A-Za-z0-9]+/?(#[A-Za-z0-9]+)?))>`__)(,|(?=\n[^ ])))+\n(?=[A-Z\n]))))'
+        args: [--multiline]
+        files: '^pep-\d+\.(rst|txt)$'
+        types: [text]
+
+      - id: validate-resolution
+        name: "'Resolution' must be a direct thread/message URL"
+        language: pygrep
+        entry: '(?<!\n\n)(?<=\n)Resolution: (?:(?!https://((discuss\.python\.org/t/([\w\-]+/)?\d+(/\d+)?/?)|(mail\.python\.org/pipermail/[\w\-]+/\d{4}-[A-Za-z]+/[A-Za-z0-9]+\.html)|(mail\.python\.org/archives/list/[\w\-]+@python\.org/(message|thread)/[A-Za-z0-9]+/?(#[A-Za-z0-9]+)?))\n(?=\n)))'
        args: ['--multiline']
        files: '^pep-\d+\.(rst|txt)$'
        types: [text]
+
      - id: check-direct-pep-links
        name: "Check that PEPs aren't linked directly"
        language: pygrep
@ -140,6 +203,7 @@ repos:
        files: '^pep-\d+\.(rst|txt)$'
        exclude: '^pep-(0009|0287|0676|8001)\.(rst|txt)$'
        types: [text]
+
      - id: check-direct-rfc-links
        name: "Check that RFCs aren't linked directly"
        language: pygrep
--- a/pep-0042.txt
+++ b/pep-0042.txt
@ -3,15 +3,14 @@ Title: Feature Requests
 Version: $Revision$
 Last-Modified: $Date$
 Author: Jeremy Hylton <jeremy@alum.mit.edu>
-Status: Rejected
+Status: Withdrawn
 Type: Process
 Content-Type: text/x-rst
 Created: 12-Sep-2000
 Post-History:
-Resolution: https://github.com/python/peps/pull/108#issuecomment-249603204


-.. note:: This PEP has been rejected as obsolete.
+.. note:: This PEP has been `withdrawn as obsolete`_.
   All new feature requests should  either go to the `Python bug tracker`_
   for very simple requests or the `python-ideas`_ mailing list for
   everything else.  The rest of this document is retained for historical
@ -335,6 +334,8 @@ Building and Installing

 .. _`Python bug tracker`: https://bugs.python.org
 .. _`python-ideas`: https://mail.python.org/mailman/listinfo/python-ideas
+.. _`withdrawn as obsolete`: https://github.com/python/peps/pull/108#issuecomment-249603204
+

 ..
   Local Variables:
--- a/pep-0102.txt
+++ b/pep-0102.txt
@ -8,7 +8,7 @@ Author: anthony@interlink.com.au (Anthony Baxter),
 Status: Superseded
 Type: Informational
 Content-Type: text/x-rst
-Created: 22-Aug-2001 (edited down on 9-Jan-2002 to become :pep:`102`)
+Created: 09-Jan-2002
 Post-History:
 Superseded-By: 101

--- a/pep-0211.txt
+++ b/pep-0211.txt
@ -9,7 +9,14 @@ Content-Type: text/x-rst
 Created: 15-Jul-2000
 Python-Version: 2.1
 Post-History:
-Resolution: :pep:`PEP 465 -- Rejected alternatives to adding a new operator <465#rejected-alternatives-to-adding-a-new-operator>`
+
+
+.. note::
+
+   The approach in the later :pep:`465` was eventually accepted
+   in lieu of this PEP. The :pep:`Rejected Ideas
+   <465#rejected-alternatives-to-adding-a-new-operator>`
+   of that PEP explains the rationale in more detail.


 Introduction
--- a/pep-0225.txt
+++ b/pep-0225.txt
@ -10,7 +10,14 @@ Content-Type: text/x-rst
 Created: 19-Sep-2000
 Python-Version: 2.1
 Post-History:
-Resolution: :pep:`PEP 465 -- Rejected alternatives to adding a new operator <465#rejected-alternatives-to-adding-a-new-operator>`
+
+
+.. note::
+
+   The approach in the later :pep:`465` was eventually accepted
+   in lieu of this PEP. The :pep:`Rejected Ideas
+   <465#rejected-alternatives-to-adding-a-new-operator>`
+   of that PEP explains the rationale in more detail.


 Introduction
--- a/pep-0245.txt
+++ b/pep-0245.txt
@ -3,7 +3,6 @@ Title: Python Interface Syntax
 Version: $Revision$
 Last-Modified: $Date$
 Author: Michel Pelletier <michel@users.sourceforge.net>
-Discussions-To: http://www.zope.org/Wikis/Interfaces
 Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
@ -12,6 +11,18 @@ Python-Version: 2.2
 Post-History: 21-Mar-2001


+.. note::
+
+   The no-longer-available Zope interfaces wiki page
+   (``https://www.zope.org/Wikis/Interfaces``) originally linked here,
+   containing links to further resources for this PEP,
+   can be `found on the Wayback Machine archive
+   <https://web.archive.org/web/20050327013919/http://www.zope.org/Wikis/Interfaces/FrontPage>`__.
+   Also, the Interface-Dev Zope mailing list on which this PEP was discussed
+   was shut down, but `its archives remain available
+   <https://mail.zope.dev/pipermail/interface-dev/>`__.
+
+
 Rejection Notice
 ================

--- a/pep-0246.txt
+++ b/pep-0246.txt
@ -3,7 +3,7 @@ Title: Object Adaptation
 Version: $Revision$
 Last-Modified: $Date$
 Author: aleaxit@gmail.com (Alex Martelli),
-    cce@clarkevans.com (Clark C. Evans)
+        cce@clarkevans.com (Clark C. Evans)
 Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0255.txt
+++ b/pep-0255.txt
@ -5,7 +5,6 @@ Last-Modified: $Date$
 Author: nas@arctrix.com (Neil Schemenauer),
        tim.peters@gmail.com (Tim Peters),
        magnus@hetland.org (Magnus Lie Hetland)
-Discussions-To: python-iterators@lists.sourceforge.net
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0263.txt
+++ b/pep-0263.txt
@ -3,7 +3,7 @@ Title: Defining Python Source Code Encodings
 Version: $Revision$
 Last-Modified: $Date$
 Author: mal@lemburg.com (Marc-André Lemburg),
-  martin@v.loewis.de (Martin von Löwis)
+        martin@v.loewis.de (Martin von Löwis)
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0274.txt
+++ b/pep-0274.txt
@ -7,7 +7,7 @@ Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 25-Oct-2001
-Python-Version: 2.7, 3.0 (originally 2.3)
+Python-Version: 2.7, 3.0
 Post-History: 29-Oct-2001


--- a/pep-0282.txt
+++ b/pep-0282.txt
@ -2,7 +2,8 @@ PEP: 282
 Title: A Logging System
 Version: $Revision$
 Last-Modified: $Date$
-Author: vinay_sajip at red-dove.com (Vinay Sajip), trentm@activestate.com (Trent Mick)
+Author: vinay_sajip at red-dove.com (Vinay Sajip),
+        trentm@activestate.com (Trent Mick)
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0310.txt
+++ b/pep-0310.txt
@ -3,7 +3,7 @@ Title: Reliable Acquisition/Release Pairs
 Version: $Revision$
 Last-Modified: $Date$
 Author: Michael Hudson <mwh@python.net>,
-   Paul Moore <p.f.moore@gmail.com>
+        Paul Moore <p.f.moore@gmail.com>
 Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0319.txt
+++ b/pep-0319.txt
@ -7,7 +7,7 @@ Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 24-Feb-2003
-Python-Version: 2.4?
+Python-Version: 2.4
 Post-History:


--- a/pep-0330.txt
+++ b/pep-0330.txt
@ -7,7 +7,7 @@ Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 17-Jun-2004
-Python-Version: 2.6?
+Python-Version: 2.6
 Post-History:


--- a/pep-0372.txt
+++ b/pep-0372.txt
@ -2,7 +2,7 @@ PEP: 372
 Title: Adding an ordered dictionary to collections
 Version: $Revision$
 Last-Modified: $Date$
-Author: Armin Ronacher <armin.ronacher@active-4.com>
+Author: Armin Ronacher <armin.ronacher@active-4.com>,
        Raymond Hettinger <python@rcn.com>
 Status: Final
 Type: Standards Track
--- a/pep-0387.txt
+++ b/pep-0387.txt
@ -3,8 +3,8 @@ Title: Backwards Compatibility Policy
 Version: $Revision$
 Last-Modified: $Date$
 Author: Benjamin Peterson <benjamin@python.org>
-BDFL-Delegate: Brett Cannon (on behalf of the steering council)
-Discussions-To: https://discuss.python.org/t/pep-387-backwards-compatibilty-policy/
+PEP-Delegate: Brett Cannon <brett@python.org>
+Discussions-To: https://discuss.python.org/t/pep-387-backwards-compatibilty-policy/4421
 Status: Active
 Type: Process
 Content-Type: text/x-rst
--- a/pep-0465.txt
+++ b/pep-0465.txt
@ -9,6 +9,8 @@ Content-Type: text/x-rst
 Created: 20-Feb-2014
 Python-Version: 3.5
 Post-History: 13-Mar-2014
+Resolution: https://mail.python.org/archives/list/python-dev@python.org/message/D63NDWHPF7OC2Z455MPHOW6QLLSNQUJ5/
+

 Abstract
 ========
--- a/pep-0477.txt
+++ b/pep-0477.txt
@ -2,7 +2,7 @@ PEP: 477
 Title: Backport ensurepip (PEP 453) to Python 2.7
 Version: $Revision$
 Last-Modified: $Date$
-Author: Donald Stufft <donald@stufft.io>
+Author: Donald Stufft <donald@stufft.io>,
        Nick Coghlan <ncoghlan@gmail.com>
 BDFL-Delegate: Benjamin Peterson <benjamin@python.org>
 Status: Final
--- a/pep-0480.txt
+++ b/pep-0480.txt
@ -6,7 +6,7 @@ Author: Trishank Karthik Kuppusamy <karthik@trishank.com>,
        Vladimir Diaz <vladimir.diaz@nyu.edu>,
        Justin Cappos <jcappos@nyu.edu>, Marina Moore <mm9693@nyu.edu>
 BDFL-Delegate: Donald Stufft <donald@stufft.io>
-Discussions-To: https://discuss.python.org/c/packaging
+Discussions-To: https://discuss.python.org/t/5666
 Status: Draft
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0484.txt
+++ b/pep-0484.txt
@ -10,7 +10,7 @@ Type: Standards Track
 Content-Type: text/x-rst
 Created: 29-Sep-2014
 Python-Version: 3.5
-Post-History: 16-Jan-2015,20-Mar-2015,17-Apr-2015,20-May-2015,22-May-2015
+Post-History: 16-Jan-2015, 20-Mar-2015, 17-Apr-2015, 20-May-2015, 22-May-2015
 Resolution: https://mail.python.org/pipermail/python-dev/2015-May/140104.html


--- a/pep-0497.txt
+++ b/pep-0497.txt
@ -3,7 +3,7 @@ Title: A standard mechanism for backward compatibility
 Version: $Revision$
 Last-Modified: $Date$
 Author: Ed Schofield <ed at pythoncharmers.com>
-BDFL-Delegate: Brett Cannon (on behalf of the steering council)
+PEP-Delegate: Brett Cannon <brett@python.org>
 Status: Rejected
 Type: Process
 Content-Type: text/x-rst
--- a/pep-0500.txt
+++ b/pep-0500.txt
@ -1,6 +1,5 @@
 PEP: 500
-Title: A protocol for delegating datetime methods to their
-       tzinfo implementations
+Title: A protocol for delegating datetime methods to their tzinfo implementations
 Version: $Revision$
 Last-Modified: $Date$
 Author: Alexander Belopolsky <alexander.belopolsky@gmail.com>, Tim Peters <tim.peters@gmail.com>
--- a/pep-0549.rst
+++ b/pep-0549.rst
@ -2,7 +2,7 @@ PEP: 549
 Title: Instance Descriptors
 Version: $Revision$
 Last-Modified: $Date$
-Author: larry@hastings.org (Larry Hastings)
+Author: Larry Hastings <larry@hastings.org>
 Discussions-To: python-dev@python.org
 Status: Rejected
 Type: Standards Track
--- a/pep-0572.rst
+++ b/pep-0572.rst
@ -1,7 +1,7 @@
 PEP: 572
 Title: Assignment Expressions
 Author: Chris Angelico <rosuav@gmail.com>, Tim Peters <tim.peters@gmail.com>,
-    Guido van Rossum <guido@python.org>
+        Guido van Rossum <guido@python.org>
 Status: Accepted
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0573.rst
+++ b/pep-0573.rst
@ -4,7 +4,7 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Petr Viktorin <encukou@gmail.com>,
        Nick Coghlan <ncoghlan@gmail.com>,
-        Eric Snow <ericsnowcurrently@gmail.com>
+        Eric Snow <ericsnowcurrently@gmail.com>,
        Marcel Plch <gmarcel.plch@gmail.com>
 BDFL-Delegate: Stefan Behnel
 Discussions-To: import-sig@python.org
--- a/pep-0581.rst
+++ b/pep-0581.rst
@ -4,7 +4,7 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Mariatta <mariatta@python.org>
 BDFL-Delegate: Barry Warsaw <barry@python.org>
-Discussions-To: https://discuss.python.org/c/core-workflow
+Discussions-To: https://discuss.python.org/t/535
 Status: Accepted
 Type: Process
 Content-Type: text/x-rst
--- a/pep-0588.rst
+++ b/pep-0588.rst
@ -2,7 +2,7 @@ PEP: 588
 Title: GitHub Issues Migration Plan
 Author: Mariatta <mariatta@python.org>
 BDFL-Delegate: Barry Warsaw <barry@python.org>
-Discussions-To: https://discuss.python.org/c/core-workflow
+Discussions-To: https://discuss.python.org/t/13791
 Status: Draft
 Type: Informational
 Content-Type: text/x-rst
--- a/pep-0592.rst
+++ b/pep-0592.rst
@ -2,7 +2,7 @@ PEP: 592
 Title: Adding "Yank" Support to the Simple API
 Author: Donald Stufft <donald@stufft.io>
 BDFL-Delegate: Paul Moore <p.f.moore@gmail.com>
-Discussions-To: https://discuss.python.org/c/packaging
+Discussions-To: https://discuss.python.org/t/1629
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-0599.rst
+++ b/pep-0599.rst
@ -5,7 +5,7 @@ Last-Modified: $Date$
 Author: Dustin Ingram <di@python.org>
 Sponsor: Paul Moore <p.f.moore@gmail.com>
 BDFL-Delegate: Paul Moore <p.f.moore@gmail.com>
-Discussions-To: https://discuss.python.org/t/the-next-manylinux-specification/
+Discussions-To: https://discuss.python.org/t/the-next-manylinux-specification/1043
 Status: Superseded
 Type: Informational
 Content-Type: text/x-rst
--- a/pep-0600.rst
+++ b/pep-0600.rst
@ -2,7 +2,7 @@ PEP: 600
 Title: Future 'manylinux' Platform Tags for Portable Linux Built Distributions
 Version: $Revision$
 Last-Modified: $Date$
-Author: Nathaniel J. Smith <njs@pobox.com>
+Author: Nathaniel J. Smith <njs@pobox.com>,
        Thomas Kluyver <thomas@kluyver.me.uk>
 Sponsor: Paul Moore <p.f.moore@gmail.com>
 BDFL-Delegate: Paul Moore <p.f.moore@gmail.com>
--- a/pep-0602.rst
+++ b/pep-0602.rst
@ -3,7 +3,7 @@ Title: Annual Release Cycle for Python
 Version: $Revision$
 Last-Modified: $Date$
 Author: Łukasz Langa <lukasz@python.org>
-BDFL-Delegate: Brett Cannon (on behalf of the steering council)
+PEP-Delegate: Brett Cannon <brett@python.org>
 Discussions-To: https://discuss.python.org/t/pep-602-annual-release-cycle-for-python/2296/
 Status: Accepted
 Type: Informational
--- a/pep-0609.rst
+++ b/pep-0609.rst
@ -3,11 +3,10 @@ Title: PyPA Governance
 Version: $Revision$
 Last-Modified: $Date$
 Author: Dustin Ingram <di@python.org>,
-        Pradyun Gedam <pradyunsg@gmail.com>
+        Pradyun Gedam <pradyunsg@gmail.com>,
        Sumana Harihareswara <sh@changeset.nyc>
 Sponsor: Paul Ganssle <paul@ganssle.io>
-BDFL-Delegate: TBD
-Discussions-To: https://discuss.python.org/t/pep-609-pypa-governance/
+Discussions-To: https://discuss.python.org/t/pep-609-pypa-governance/2619
 Status: Active
 Type: Process
 Content-Type: text/x-rst
--- a/pep-0617.rst
+++ b/pep-0617.rst
@ -3,8 +3,8 @@ Title: New PEG parser for CPython
 Version: $Revision$
 Last-Modified: $Date$
 Author: Guido van Rossum <guido@python.org>,
- Pablo Galindo <pablogsal@python.org>,
- Lysandros Nikolaou <lisandrosnik@gmail.com>
+        Pablo Galindo <pablogsal@python.org>,
+        Lysandros Nikolaou <lisandrosnik@gmail.com>
 Discussions-To: python-dev@python.org
 Status: Accepted
 Type: Standards Track
--- a/pep-0628.txt
+++ b/pep-0628.txt
@ -9,7 +9,6 @@ Content-Type: text/x-rst
 Created: 28-Jun-2011
 Python-Version: 3.6
 Post-History: 28-Jun-2011
-Resolution: https://bugs.python.org/issue12345


 Abstract
@ -27,12 +26,13 @@ of assigning a name to the value ``2 * pi`` (``2π``).
 PEP Acceptance
 ==============

-This PEP is now accepted and math.tau will be a part of Python 3.6.
+This PEP is now `accepted`_ and ``math.tau`` will be a part of Python 3.6.
 Happy birthday Nick!

 The idea in this PEP has been implemented in the auspiciously named
 `issue 12345`_.

+.. _accepted: https://bugs.python.org/issue12345#msg272287
 .. _issue 12345: http://bugs.python.org/issue12345


--- a/pep-0644.rst
+++ b/pep-0644.rst
@ -1,7 +1,6 @@
 PEP: 644
 Title: Require OpenSSL 1.1.1 or newer
 Author: Christian Heimes <christian@python.org>
-BDFL-Delegate: n/a
 Discussions-To: https://discuss.python.org/t/pep-644-require-openssl-1-1-or-newer/5584
 Status: Final
 Type: Standards Track
@ -9,8 +8,8 @@ Content-Type: text/x-rst
 Created: 27-Oct-2020
 Python-Version: 3.10
 Post-History: 27-Oct-2020, 03-Mar-2021, 17-Mar-2021, 17-Apr-2021
-Resolution: https://mail.python.org/archives/list/python-dev@python.org/message/INLCO2EZVQW7R7J2OL6HWVLVU3TQRAZV/,
-    https://bugs.python.org/issue43669
+Resolution: https://mail.python.org/archives/list/python-dev@python.org/message/INLCO2EZVQW7R7J2OL6HWVLVU3TQRAZV/
+

 Abstract
 ========
--- a/pep-0648.rst
+++ b/pep-0648.rst
@ -2,7 +2,6 @@ PEP: 648
 Title: Extensible customizations of the interpreter at startup
 Author: Mario Corchero <mariocj89@gmail.com>
 Sponsor: Pablo Galindo
-BDFL-Delegate: XXXX
 Discussions-To: https://discuss.python.org/t/pep-648-extensible-customizations-of-the-interpreter-at-startup/6403
 Status: Rejected
 Type: Standards Track
--- a/pep-0660.rst
+++ b/pep-0660.rst
@ -8,7 +8,8 @@ Type: Standards Track
 Content-Type: text/x-rst
 Created: 30-Mar-2021
 Post-History: 
-Resolution: https://discuss.python.org/t/pronouncement-on-peps-660-and-662-editable-installs
+Resolution: https://discuss.python.org/t/pronouncement-on-peps-660-and-662-editable-installs/9450
+

 Abstract
 ========
--- a/pep-0662.rst
+++ b/pep-0662.rst
@ -8,7 +8,8 @@ Type: Standards Track
 Content-Type: text/x-rst
 Created: 28-May-2021
 Post-History:
-Resolution: https://discuss.python.org/t/pronouncement-on-peps-660-and-662-editable-installs
+Resolution: https://discuss.python.org/t/pronouncement-on-peps-660-and-662-editable-installs/9450
+

 Abstract
 ========
--- a/pep-0670.rst
+++ b/pep-0670.rst
@ -8,7 +8,7 @@ Content-Type: text/x-rst
 Created: 19-Oct-2021
 Python-Version: 3.11
 Post-History: `20-Oct-2021 <https://mail.python.org/archives/list/python-dev@python.org/thread/2GN646CGWGTO6ZHHU7JTA5XWDF4ULM77/>`__,
-              `08-Feb-2022 <https://mail.python.org/archives/list/python-dev@python.org/message/IJ3IBVY3JDPROKX55YNDT6XZTVTTPGOP/>`__,
+              `08-Feb-2022 <https://mail.python.org/archives/list/python-dev@python.org/thread/IJ3IBVY3JDPROKX55YNDT6XZTVTTPGOP/>`__,
              `22-Feb-2022 <https://mail.python.org/archives/list/python-dev@python.org/thread/VM6I3UHVMME6QRSUOYLK6N2OZHP454W6/>`__
 Resolution: https://mail.python.org/archives/list/python-dev@python.org/thread/QQFCJ7LR36RUZSC3WI6WZZMQVQ3ZI4MS/

--- a/pep-0754.txt
+++ b/pep-0754.txt
@ -2,7 +2,7 @@ PEP: 754
 Title: IEEE 754 Floating Point Special Values
 Version: $Revision$
 Last-Modified: $Date$
-Author: Gregory R. Warnes <gregory_r_warnes@groton.pfizer.com> (Pfizer, Inc.)
+Author: Gregory R. Warnes <gregory_r_warnes@groton.pfizer.com>
 Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-3111.txt
+++ b/pep-3111.txt
@ -2,7 +2,7 @@ PEP: 3111
 Title: Simple input built-in in Python 3000
 Version: $Revision$
 Last-Modified: $Date$
-Author: Andre Roberge <andre.roberge at gmail.com >
+Author: Andre Roberge <andre.roberge at gmail.com>
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-3138.txt
+++ b/pep-3138.txt
@ -2,7 +2,7 @@ PEP: 3138
 Title: String representation in Python 3000
 Version: $Revision$
 Last-Modified: $Date$
-Author: Atsuo Ishimoto <ishimoto--at--gembook.org>
+Author: Atsuo Ishimoto <ishimoto at gembook.org>
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-3140.txt
+++ b/pep-3140.txt
@ -3,7 +3,7 @@ Title: str(container) should call str(item), not repr(item)
 Version: $Revision$
 Last-Modified: $Date$
 Author: Oleg Broytman <phd@phdru.name>,
-   Jim J. Jewett <jimjjewett@gmail.com>
+        Jim J. Jewett <jimjjewett@gmail.com>
 Discussions-To: python-3000@python.org
 Status: Rejected
 Type: Standards Track
--- a/pep-3145.txt
+++ b/pep-3145.txt
@ -2,7 +2,7 @@ PEP: 3145
 Title: Asynchronous I/O For subprocess.Popen
 Version: $Revision$
 Last-Modified: $Date$
-Author: (James) Eric Pruitt, Charles R. McCreary, Josiah Carlson
+Author: Eric Pruitt, Charles R. McCreary, Josiah Carlson
 Status: Withdrawn
 Type: Standards Track
 Content-Type: text/x-rst
--- a/pep-8001.rst
+++ b/pep-8001.rst
@ -5,7 +5,7 @@ Author: Brett Cannon <brett@python.org>,
        Donald Stufft <donald@stufft.io>,
        Eric Snow <ericsnowcurrently@gmail.com>,
        Gregory P. Smith <greg@krypto.org>,
-        Łukasz Langa <lukasz@python.org>
+        Łukasz Langa <lukasz@python.org>,
        Mariatta <mariatta@python.org>,
        Nathaniel J. Smith <njs@pobox.com>,
        Pablo Galindo Salgado <pablogsal@python.org>,
--- a/pep-8002.rst
+++ b/pep-8002.rst
@ -1,8 +1,8 @@
 PEP: 8002
 Title: Open Source Governance Survey
 Author: Barry Warsaw <barry@python.org>, Łukasz Langa <lukasz@python.org>,
-   Antoine Pitrou <solipsis@pitrou.net>, Doug Hellmann <doug@doughellmann.com>,
-   Carol Willing <willingc@gmail.com>
+        Antoine Pitrou <solipsis@pitrou.net>, Doug Hellmann <doug@doughellmann.com>,
+        Carol Willing <willingc@gmail.com>
 Status: Active
 Type: Informational
 Content-Type: text/x-rst