Skip to content

Commit 73cf41e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into release-toml
# Conflicts: # peps/pep-0596.rst # peps/pep-0619.rst # peps/pep-0664.rst # peps/pep-0693.rst # peps/pep-0719.rst
2 parents e4f42ac + 755b62f commit 73cf41e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3576
-722
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,6 @@ peps/pep-0745.rst @hugovk
626626
peps/pep-0746.rst @JelleZijlstra
627627
peps/pep-0747.rst @JelleZijlstra
628628
peps/pep-0748.rst @ncoghlan
629-
# ...
630629
peps/pep-0749.rst @JelleZijlstra
631630
peps/pep-0750.rst @gvanrossum @lysnikolaou
632631
peps/pep-0751.rst @brettcannon
@@ -660,8 +659,16 @@ peps/pep-0777.rst @warsaw
660659
peps/pep-0779.rst @Yhg1s @colesbury @mpage
661660
peps/pep-0780.rst @lysnikolaou
662661
peps/pep-0781.rst @methane
662+
peps/pep-0782.rst @vstinner
663+
peps/pep-0783.rst @hoodmane @ambv
664+
peps/pep-0784.rst @gpshead
665+
peps/pep-0785.rst @gpshead
666+
# ...
667+
peps/pep-0787.rst @ncoghlan
668+
peps/pep-0788.rst @ZeroIntensity @vstinner
663669
# ...
664670
peps/pep-0789.rst @njsmith
671+
peps/pep-0790.rst @hugovk
665672
# ...
666673
peps/pep-0801.rst @warsaw
667674
# ...

.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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ If you're unsure about anything, just leave it blank and we'll take a look.
88
* [ ] SC/PEP Delegate has formally accepted/rejected the PEP and posted to the ``Discussions-To`` thread
99
* [ ] Pull request title in appropriate format (``PEP 123: Mark as Accepted``)
1010
* [ ] ``Status`` changed to ``Accepted``/``Rejected``
11-
* [ ] ``Resolution`` link points directly to SC/PEP Delegate official acceptance/rejected post
11+
* [ ] ``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>`__ ``)
1212
* [ ] Acceptance/rejection notice added, if the SC/PEP delegate had major conditions or comments
1313
* [ ] ``Discussions-To``, ``Post-History`` and ``Python-Version`` up to date

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

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

.github/workflows/documentation-links.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ concurrency:
1616
jobs:
1717
documentation-links:
1818
runs-on: ubuntu-latest
19+
if: github.event.repository.fork == false
1920
steps:
2021
- uses: readthedocs/actions/preview@v1
2122
with:

check-peps.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@ def _validate_discussions_to(line_num: int, line: str) -> MessageIterator:
303303
"""'Discussions-To' must be a thread URL"""
304304

305305
yield from _thread(line_num, line, "Discussions-To", discussions_to=True)
306+
if line == "Pending":
307+
return
306308
if line.startswith("https://"):
307309
return
308310
for suffix in "@python.org", "@googlegroups.com":
@@ -311,7 +313,7 @@ def _validate_discussions_to(line_num: int, line: str) -> MessageIterator:
311313
if re.fullmatch(r"[\w\-]+", remainder) is None:
312314
yield line_num, "Discussions-To must be a valid mailing list"
313315
return
314-
yield line_num, "Discussions-To must be a valid thread URL or mailing list"
316+
yield line_num, "Discussions-To must be a valid thread URL, mailing list, or 'Pending'"
315317

316318

317319
def _validate_status(line_num: int, line: str) -> MessageIterator:

pep_sphinx_extensions/LICENCE.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
This files in this directory are placed in the public domain or under the
1+
The files in this directory are placed in the public domain or under the
22
CC0-1.0-Universal license, whichever is more permissive.

pep_sphinx_extensions/generate_rss.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ def pep_abstract(document: nodes.document) -> str:
6060
continue
6161

6262
if title_node.astext() == "Abstract":
63-
return node.next_node(nodes.paragraph).astext().strip().replace("\n", " ")
64-
elif title_node.astext() == "Introduction":
63+
if (para_node := node.next_node(nodes.paragraph)) is not None:
64+
return para_node.astext().strip().replace("\n", " ")
65+
return ""
66+
if title_node.astext() == "Introduction":
6567
introduction = node.next_node(nodes.paragraph).astext().strip().replace("\n", " ")
6668

6769
return introduction

pep_sphinx_extensions/pep_theme/templates/page.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,7 @@ <h2>Contents</h2>
6363
<script src="{{ pathto('_static/colour_scheme.js', resource=True) }}"></script>
6464
<script src="{{ pathto('_static/wrap_tables.js', resource=True) }}"></script>
6565
<script src="{{ pathto('_static/sticky_banner.js', resource=True) }}"></script>
66+
<script src="https://analytics.python.org/js/script.outbound-links.js"
67+
data-domain="peps.python.org" defer></script>
6668
</body>
6769
</html>

pep_sphinx_extensions/tests/pep_lint/test_pep_lint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_with_fake_pep():
3737
(14, "Topic must be for a valid sub-index"),
3838
(14, "Topic must be sorted lexicographically"),
3939
(16, "PEP references must be separated by comma-spaces (', ')"),
40-
(17, "Discussions-To must be a valid thread URL or mailing list"),
40+
(17, "Discussions-To must be a valid thread URL, mailing list, or 'Pending'"),
4141
(18, "Post-History must be a 'DD-mmm-YYYY' date: '2-Feb-2000'"),
4242
(18, "Post-History must be a valid thread URL"),
4343
(19, "Post-History must be a 'DD-mmm-YYYY' date: '3-Mar-2001'"),

pep_sphinx_extensions/tests/pep_lint/test_post_url.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@pytest.mark.parametrize(
66
"line",
77
[
8+
"Pending",
89
910
1011
@@ -52,7 +53,7 @@ def test_validate_discussions_to_invalid_list_domain(line: str):
5253
warning for (_, warning) in check_peps._validate_discussions_to(1, line)
5354
]
5455
assert warnings == [
55-
"Discussions-To must be a valid thread URL or mailing list"
56+
"Discussions-To must be a valid thread URL, mailing list, or 'Pending'"
5657
], warnings
5758

5859

0 commit comments

Comments
 (0)