Merge branch 'main' into packaging-governance

Author: warsaw

.github/CODEOWNERS

@@ -658,6 +658,14 @@ peps/pep-0776.rst  @hoodmane @ambv
 peps/pep-0777.rst  @warsaw
 # ...
 peps/pep-0779.rst  @Yhg1s @colesbury @mpage
+peps/pep-0780.rst  @lysnikolaou
+peps/pep-0781.rst  @methane
+peps/pep-0782.rst  @vstinner
+peps/pep-0783.rst  @hoodmane @ambv
+peps/pep-0784.rst  @gpshead
+peps/pep-0785.rst  @gpshead
+# ...
+peps/pep-0787.rst  @ncoghlan
 # ...
 peps/pep-0789.rst  @njsmith
 # ...

…PLATE/Mark a PEP Accepted or Rejected.md …TE/Mark a PEP as Accepted or Rejected.md.github/PULL_REQUEST_TEMPLATE/Mark a PEP Accepted or Rejected.md renamed to .github/PULL_REQUEST_TEMPLATE/Mark a PEP as Accepted or Rejected.md .github/PULL_REQUEST_TEMPLATE/Mark a PEP Accepted or Rejected.md renamed to .github/PULL_REQUEST_TEMPLATE/Mark a PEP as Accepted or Rejected.md

@@ -8,6 +8,6 @@ If you're unsure about anything, just leave it blank and we'll take a look.
 * [ ] SC/PEP Delegate has formally accepted/rejected the PEP and posted to the ``Discussions-To`` thread
 * [ ] Pull request title in appropriate format (``PEP 123: Mark as Accepted``)
 * [ ] ``Status`` changed to ``Accepted``/``Rejected``
-* [ ] ``Resolution`` link points directly to SC/PEP Delegate official acceptance/rejected post
+* [ ] ``Resolution`` field points directly to SC/PEP Delegate official acceptance/rejected post, including the date (e.g. `` `01-Jan-2000 <https://discuss.python.org/t/12345/100>`__ ``)
 * [ ] Acceptance/rejection notice added, if the SC/PEP delegate had major conditions or comments
 * [ ] ``Discussions-To``, ``Post-History`` and ``Python-Version`` up to date

…ULL_REQUEST_TEMPLATE/Mark a PEP Final.md …_REQUEST_TEMPLATE/Mark a PEP as Final.md.github/PULL_REQUEST_TEMPLATE/Mark a PEP Final.md renamed to .github/PULL_REQUEST_TEMPLATE/Mark a PEP as Final.md .github/PULL_REQUEST_TEMPLATE/Mark a PEP Final.md renamed to .github/PULL_REQUEST_TEMPLATE/Mark a PEP as Final.md

@@ -7,7 +7,7 @@ If you're unsure about something, just leave it blank and we'll take a look.
 * [ ] Final implementation has been merged (including tests and docs)
 * [ ] PEP matches the final implementation
 * [ ] Any substantial changes since the accepted version approved by the SC/PEP delegate
-* [ ] Pull request title in appropriate format (``PEP 123: Mark Final``)
+* [ ] Pull request title in appropriate format (``PEP 123: Mark as Final``)
 * [ ] ``Status`` changed to ``Final`` (and ``Python-Version`` is correct)
 * [ ] Canonical docs/spec linked with a ``canonical-doc`` directive
       (or ``canonical-pypa-spec`` for packaging PEPs,

check-peps.py

@@ -303,6 +303,8 @@ def _validate_discussions_to(line_num: int, line: str) -> MessageIterator:
     """'Discussions-To' must be a thread URL"""
 
     yield from _thread(line_num, line, "Discussions-To", discussions_to=True)
+    if line == "Pending":
+        return
     if line.startswith("https://"):
         return
     for suffix in "@python.org", "@googlegroups.com":
@@ -311,7 +313,7 @@ def _validate_discussions_to(line_num: int, line: str) -> MessageIterator:
             if re.fullmatch(r"[\w\-]+", remainder) is None:
                 yield line_num, "Discussions-To must be a valid mailing list"
             return
-    yield line_num, "Discussions-To must be a valid thread URL or mailing list"
+    yield line_num, "Discussions-To must be a valid thread URL, mailing list, or 'Pending'"
 
 
 def _validate_status(line_num: int, line: str) -> MessageIterator:

pep_sphinx_extensions/LICENCE.rst

@@ -1,2 +1,2 @@
-This files in this directory are placed in the public domain or under the
+The files in this directory are placed in the public domain or under the
 CC0-1.0-Universal license, whichever is more permissive.

pep_sphinx_extensions/generate_rss.py

@@ -60,8 +60,10 @@ def pep_abstract(document: nodes.document) -> str:
             continue
 
         if title_node.astext() == "Abstract":
-            return node.next_node(nodes.paragraph).astext().strip().replace("\n", " ")
-        elif title_node.astext() == "Introduction":
+            if (para_node := node.next_node(nodes.paragraph)) is not None:
+                return para_node.astext().strip().replace("\n", " ")
+            return ""
+        if title_node.astext() == "Introduction":
             introduction = node.next_node(nodes.paragraph).astext().strip().replace("\n", " ")
 
     return introduction

pep_sphinx_extensions/tests/pep_lint/test_pep_lint.py

@@ -37,7 +37,7 @@ def test_with_fake_pep():
         (14, "Topic must be for a valid sub-index"),
         (14, "Topic must be sorted lexicographically"),
         (16, "PEP references must be separated by comma-spaces (', ')"),
-        (17, "Discussions-To must be a valid thread URL or mailing list"),
+        (17, "Discussions-To must be a valid thread URL, mailing list, or 'Pending'"),
         (18, "Post-History must be a 'DD-mmm-YYYY' date: '2-Feb-2000'"),
         (18, "Post-History must be a valid thread URL"),
         (19, "Post-History must be a 'DD-mmm-YYYY' date: '3-Mar-2001'"),

pep_sphinx_extensions/tests/pep_lint/test_post_url.py

@@ -5,6 +5,7 @@
 @pytest.mark.parametrize(
     "line",
     [
+        "Pending",
         "list-name@python.org",
         "distutils-sig@python.org",
         "csv@python.org",
@@ -52,7 +53,7 @@ def test_validate_discussions_to_invalid_list_domain(line: str):
         warning for (_, warning) in check_peps._validate_discussions_to(1, line)
     ]
     assert warnings == [
-        "Discussions-To must be a valid thread URL or mailing list"
+        "Discussions-To must be a valid thread URL, mailing list, or 'Pending'"
     ], warnings
 
 

peps/api/index.rst

@@ -20,7 +20,7 @@ The structure of each JSON object is as follows:
        "topic": "governance" | "packaging" | "release" | "typing" | "",
        "created": string,
        "python_version": string | null,
-       "post_history": string,
+       "post_history": string | null,
        "resolution": string | null,
        "requires": string | null,
        "replaces": string | null,

peps/pep-0008.rst

@@ -617,9 +617,8 @@ Other Recommendations
 
 - Always surround these binary operators with a single space on either
   side: assignment (``=``), augmented assignment (``+=``, ``-=``
-  etc.), comparisons (``==``, ``<``, ``>``, ``!=``, ``<>``, ``<=``,
-  ``>=``, ``in``, ``not in``, ``is``, ``is not``), Booleans (``and``,
-  ``or``, ``not``).
+  etc.), comparisons (``==``, ``<``, ``>``, ``!=``, ``<=``, ``>=``, ``in``,
+  ``not in``, ``is``, ``is not``), Booleans (``and``, ``or``, ``not``).
 
 - If operators with different priorities are used, consider adding
   whitespace around the operators with the lowest priority(ies). Use