Skip to content

Commit 5ac6be0

Browse files
committed
Merge branch 'master' into release-toml
# Conflicts: # peps/pep-0790.rst
2 parents 69219cf + 03c7456 commit 5ac6be0

File tree

12 files changed

+387
-14
lines changed

12 files changed

+387
-14
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ peps/pep-0557.rst @ericvsmith
431431
peps/pep-0558.rst @ncoghlan
432432
peps/pep-0559.rst @warsaw
433433
peps/pep-0560.rst @ilevkivskyi
434-
# peps/pep-0561.rst
434+
peps/pep-0561.rst @emmatyping
435435
peps/pep-0562.rst @ilevkivskyi
436436
peps/pep-0563.rst @ambv
437437
peps/pep-0564.rst @vstinner
@@ -636,7 +636,7 @@ peps/pep-0755.rst @warsaw
636636
peps/pep-0756.rst @vstinner
637637
peps/pep-0757.rst @vstinner
638638
peps/pep-0758.rst @pablogsal @brettcannon
639-
peps/pep-0759.rst @warsaw
639+
peps/pep-0759.rst @warsaw @emmatyping
640640
peps/pep-0760.rst @pablogsal @brettcannon
641641
peps/pep-0761.rst @sethmlarson @hugovk
642642
peps/pep-0762.rst @pablogsal @ambv @lysnikolaou @emilyemorehouse
@@ -654,15 +654,15 @@ peps/pep-0773.rst @zooba
654654
peps/pep-0774.rst @savannahostrowski
655655
peps/pep-0775.rst @encukou
656656
peps/pep-0776.rst @hoodmane @ambv
657-
peps/pep-0777.rst @warsaw
658-
peps/pep-0778.rst @warsaw
657+
peps/pep-0777.rst @warsaw @emmatyping
658+
peps/pep-0778.rst @warsaw @emmatyping
659659
# ...
660660
peps/pep-0779.rst @Yhg1s @colesbury @mpage
661661
peps/pep-0780.rst @lysnikolaou
662662
peps/pep-0781.rst @methane
663663
peps/pep-0782.rst @vstinner
664664
peps/pep-0783.rst @hoodmane @ambv
665-
peps/pep-0784.rst @gpshead
665+
peps/pep-0784.rst @gpshead @emmatyping
666666
peps/pep-0785.rst @gpshead
667667
# ...
668668
peps/pep-0787.rst @ncoghlan
@@ -677,6 +677,7 @@ peps/pep-0798.rst @JelleZijlstra
677677
peps/pep-0799.rst @pablogsal
678678
peps/pep-0800.rst @JelleZijlstra
679679
peps/pep-0801.rst @warsaw
680+
peps/pep-0802.rst @AA-Turner
680681
# ...
681682
peps/pep-2026.rst @hugovk
682683
# ...

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You can find it in the merge box at the bottom of the PR page:
4949
Render PEPs locally
5050
-------------------
5151

52-
See the `build documentation <./docs/build.rst>`__ for full
52+
See the `build documentation <./peps/docs/build.rst>`__ for full
5353
instructions on how to render PEPs locally.
5454
In summary, run the following in a fresh, activated virtual environment:
5555

peps/contents.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ This is an internal Sphinx page; please go to the :doc:`PEP Index <pep-0000>`.
1515
:caption: PEP Table of Contents (needed for Sphinx):
1616

1717
api/*
18+
docs/*
1819
topic/*
1920
numerical
2021
pep-*
File renamed without changes.

peps/docs/index.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
..
2+
We can't use :pep:`N` references in this document, as they use links relative
3+
to the current file, which doesn't work in a subdirectory like this one.
4+
5+
PEPs Internal Documentation
6+
===========================
7+
8+
This is documentation for the internals of the PEPs website and PEP rendering
9+
system. To read the PEPs, see the :doc:`PEP Index <../pep-0000>`.
10+
11+
------------------------------------------------------------------------------
12+
13+
* :doc:`Building PEPs Locally <./build>`
14+
* :doc:`An Overview of the PEP Rendering System <./rendering_system>`

docs/rendering_system.rst renamed to peps/docs/rendering_system.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The configuration:
3535
----------------
3636

3737
``build.py`` manages the rendering process.
38-
Usage is covered in `Building PEPs Locally <./build.rst>`_.
38+
Usage is covered in :doc:`Building PEPs Locally <./build>`.
3939

4040

4141
3. Extension

peps/pep-0676.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PEP: 676
22
Title: PEP Infrastructure Process
3-
Author: Adam Turner <python@quite.org.uk>
3+
Author: Adam Turner <adam@python.org>
44
Sponsor: Mariatta <[email protected]>
55
PEP-Delegate: Barry Warsaw <[email protected]>
66
Discussions-To: https://discuss.python.org/t/10774

peps/pep-0694.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
PEP: 694
22
Title: Upload 2.0 API for Python Package Indexes
33
Author: Barry Warsaw <[email protected]>, Donald Stufft <[email protected]>, Ee Durbin <[email protected]>
4+
PEP-Delegate: Dustin Ingram <[email protected]>
45
Discussions-To: https://discuss.python.org/t/pep-694-upload-2-0-api-for-python-package-repositories/16879
56
Status: Draft
67
Type: Standards Track

peps/pep-0723.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PEP: 723
22
Title: Inline script metadata
33
Author: Ofek Lev <[email protected]>
4-
Sponsor: Adam Turner <python@quite.org.uk>
4+
Sponsor: Adam Turner <adam@python.org>
55
PEP-Delegate: Brett Cannon <[email protected]>
66
Discussions-To: https://discuss.python.org/t/31151
77
Status: Final

peps/pep-0726.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PEP: 726
22
Title: Module ``__setattr__`` and ``__delattr__``
33
Author: Sergey B Kirpichev <[email protected]>
4-
Sponsor: Adam Turner <python@quite.org.uk>
4+
Sponsor: Adam Turner <adam@python.org>
55
Discussions-To: https://discuss.python.org/t/32640/
66
Status: Rejected
77
Type: Standards Track

0 commit comments

Comments
 (0)