Merge branch 'python:main' into pep-767

Author: Enegg

.github/CODEOWNERS

@@ -625,6 +625,7 @@ peps/pep-0744.rst  @brandtbucher @savannahostrowski
 peps/pep-0745.rst  @hugovk
 peps/pep-0746.rst  @JelleZijlstra
 peps/pep-0747.rst  @JelleZijlstra
+peps/pep-0748.rst  @ncoghlan
 # ...
 peps/pep-0749.rst  @JelleZijlstra
 peps/pep-0750.rst  @gvanrossum @lysnikolaou
@@ -644,6 +645,7 @@ peps/pep-0763.rst  @dstufft
 peps/pep-0765.rst  @iritkatriel @ncoghlan
 peps/pep-0766.rst  @warsaw
 peps/pep-0767.rst  @carljm
+peps/pep-0768.rst  @pablogsal
 # ...
 peps/pep-0777.rst  @warsaw
 # ...

.pre-commit-config.yaml

@@ -93,6 +93,7 @@ repos:
     hooks:
       - id: codespell
         name: "Check for common misspellings in text files"
+        require_serial: true
         stages: [manual]
 
   # Local checks for PEP headers and more

.readthedocs.yaml

@@ -5,7 +5,7 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
     python: "3"
 
@@ -17,6 +17,7 @@ build:
 
 sphinx:
   builder: dirhtml
+  configuration: peps/conf.py
 
 search:
   ignore: ['*']

peps/pep-0013.rst

@@ -20,15 +20,15 @@ to exercise as rarely as possible.
 Current steering council
 ========================
 
-The 2024 term steering council consists of:
+The 2025 term steering council consists of:
 
 * Barry Warsaw
+* Donghee Na
 * Emily Morehouse
 * Gregory P. Smith
 * Pablo Galindo Salgado
-* Thomas Wouters
 
-Per the results of the vote tracked in :pep:`8105`.
+Per the results of the vote tracked in :pep:`8106`.
 
 The core team consists of those listed in the private
 https://github.com/python/voters/ repository which is publicly
@@ -105,9 +105,11 @@ A council election consists of two phases:
   must be nominated by a core team member. Self-nominations are
   allowed.
 
-* Phase 2: Each core team member can vote for zero or more of the
-  candidates. Voting is performed anonymously. Candidates are ranked
-  by the total number of votes they receive. If a tie occurs, it may
+* Phase 2: Each core team member can assign zero to five stars to each
+  candidate. Voting is performed anonymously. The outcome of the vote
+  is determined using the `STAR voting system <https://www.starvoting.org/>`__,
+  modified to use the `Multi-winner Bloc STAR <https://www.starvoting.org/multi_winner>`__)
+  approach. If a tie occurs, it may
   be resolved by mutual agreement among the candidates, or else the
   winner will be chosen at random.
 
@@ -190,7 +192,7 @@ council member, or the entire council, via a vote of no confidence.
 
 A no-confidence vote is triggered when a core team member calls for
 one publicly on an appropriate project communication channel, and
-another core team member seconds the proposal.
+another core team member seconds the proposal within one week.
 
 The vote lasts for two weeks. Core team members vote for or against.
 If at least two thirds of voters express a lack of confidence, then
@@ -270,6 +272,10 @@ It is granted by receiving at least two-thirds positive votes in a
 core team vote that is open for one week and is not vetoed by the
 steering council.
 
+.. note:: The devguide has a `suggested template
+   <https://devguide.python.org/core-developers/become-core-developer/#poll-template>`__
+   to use for such votes.
+
 Core team members are always looking for promising contributors,
 teaching them how the project is managed, and submitting their names
 to the core team's vote when they're ready.
@@ -301,6 +307,10 @@ Changing this document
 Changes to this document require at least a two-thirds majority of
 votes cast in a core team vote which should be open for two weeks.
 
+No vote is required to update note blocks and the "Current steering
+council" and "History of council elections" sections with current
+information.
+
 
 History
 =======
@@ -337,12 +347,17 @@ History of council elections
 * December 2021: :pep:`8103`
 * December 2022: :pep:`8104`
 * December 2023: :pep:`8105`
+* December 2024: :pep:`8106`
 
 
 History of amendments
 ---------------------
 
-2019-04-17: Added the vote length for core devs and changes to this document.
+* 2019-04-17: Added the vote length for core devs and changes to this document.
+* `2024-12-10 <https://discuss.python.org/t/64971>`__:
+  Adopted Multi-winner Bloc STAR voting for council elections.
+* `2024-12-10 <https://discuss.python.org/t/72293/4>`__:
+  Added a one-week deadline for seconding a vote of no confidence.
 
 
 

peps/pep-0376.rst

@@ -4,7 +4,6 @@ Author: Tarek Ziadé <tarek@ziade.org>
 Status: Final
 Type: Standards Track
 Topic: Packaging
-Content-Type: text/x-rst
 Created: 22-Feb-2009
 Python-Version: 2.7, 3.2
 Post-History: `22-Jun-2009 <https://mail.python.org/archives/list/python-dev@python.org/thread/ILLTIOZAULMDY5CAS6GOITEYJ4HNFATQ/>`__
@@ -607,32 +606,26 @@ formats in addition to the new format, in order to ease the transition.
 References
 ==========
 
-.. [#distutils]
-   http://docs.python.org/distutils
-
-.. [#distutils2]
-   http://hg.python.org/distutils2
-
 .. [#setuptools]
-   http://peak.telecommunity.com/DevCenter/setuptools
+   https://peak.telecommunity.com/DevCenter/setuptools
 
 .. [#easyinstall]
-   http://peak.telecommunity.com/DevCenter/EasyInstall
+   https://peak.telecommunity.com/DevCenter/EasyInstall
 
 .. [#pip]
-   http://pypi.python.org/pypi/pip
+   https://pypi.org/project/pip/
 
 .. [#eggformats]
-   http://peak.telecommunity.com/DevCenter/EggFormats
+   https://peak.telecommunity.com/DevCenter/EggFormats
 
 .. [#fedora]
-   http://fedoraproject.org/wiki/Packaging/Python/Eggs#Providing_Eggs_using_Setuptools
+   https://fedoraproject.org/wiki/Packaging/Python/Eggs#Providing_Eggs_using_Setuptools
 
 .. [#debian]
-   http://wiki.debian.org/DebianPython/NewPolicy
+   https://wiki.debian.org/DebianPython/NewPolicy
 
 .. [#prototype]
-   http://bitbucket.org/tarek/pep376/
+   https://web.archive.org/web/20090726092550/http://bitbucket.org/tarek/pep376/
 
 Acknowledgements
 ================
@@ -644,14 +637,3 @@ Copyright
 =========
 
 This document has been placed in the public domain.
-
-
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 70
-   coding: utf-8
-   End:

peps/pep-0386.rst

@@ -1,12 +1,9 @@
 PEP: 386
 Title: Changing the version comparison module in Distutils
-Version: $Revision$
-Last-Modified: $Date$
 Author: Tarek Ziadé <tarek@ziade.org>
 Status: Superseded
 Type: Standards Track
 Topic: Packaging
-Content-Type: text/x-rst
 Created: 04-Jun-2009
 Superseded-By: 440
 
@@ -475,34 +472,31 @@ References
 ==========
 
 .. [#distutils]
-   http://docs.python.org/distutils
+   https://docs.python.org/3.11/distutils/
 
 .. [#setuptools]
-   http://peak.telecommunity.com/DevCenter/setuptools
+   https://peak.telecommunity.com/DevCenter/setuptools
 
 .. [#setuptools-version]
-   http://peak.telecommunity.com/DevCenter/setuptools#specifying-your-project-s-version
+   https://peak.telecommunity.com/DevCenter/setuptools#specifying-your-project-s-version
 
 .. [#pypi]
-   http://pypi.python.org/pypi
+   https://pypi.org/
 
 .. [#pip]
-   http://pypi.python.org/pypi/pip
+   https://pypi.org/project/pip/
 
 .. [#ezinstall]
-   http://peak.telecommunity.com/DevCenter/EasyInstall
+   https://peak.telecommunity.com/DevCenter/EasyInstall
 
 .. [#zc.buildout]
-   http://pypi.python.org/pypi/zc.buildout
+   https://pypi.org/project/zc.buildout/
 
 .. [#twisted]
-   http://twistedmatrix.com/trac/
-
-.. [#requires]
-   http://peak.telecommunity.com/DevCenter/setuptools
+   https://twisted.org/
 
 .. [#prototype]
-   http://bitbucket.org/tarek/distutilsversion/
+   https://web.archive.org/web/20090726093825/http://bitbucket.org/tarek/distutilsversion/
 
 Acknowledgments
 ===============
@@ -514,14 +508,3 @@ Copyright
 =========
 
 This document has been placed in the public domain.
-
-
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 70
-   coding: utf-8
-   End:

peps/pep-0421.rst

@@ -1,12 +1,9 @@
 PEP: 421
 Title: Adding sys.implementation
-Version: $Revision$
-Last-Modified: $Date$
 Author: Eric Snow <ericsnowcurrently@gmail.com>
 BDFL-Delegate: Barry Warsaw
 Status: Final
 Type: Standards Track
-Content-Type: text/x-rst
 Created: 26-Apr-2012
 Python-Version: 3.3
 Post-History: 26-Apr-2012
@@ -466,15 +463,12 @@ References
 .. [#ironpython] Feedback from the IronPython developers:
    https://mail.python.org/pipermail/ironpython-users/2012-May/015980.html
 
-.. [#dino_viehland_2009] (2009) Dino Viehland offers his opinion:
-   https://mail.python.org/pipermail/python-dev/2009-October/092894.html
+* (2009) Dino Viehland offers his opinion:
+  https://mail.python.org/pipermail/python-dev/2009-October/092894.html
 
 .. [#jeff_hardy_2012] (2012) Jeff Hardy offers his opinion:
    https://mail.python.org/pipermail/ironpython-users/2012-May/015981.html
 
-.. [#jython] Feedback from the Jython developers:
-   ???
-
 .. [#frank_wierzbicki_2009] (2009) Frank Wierzbicki offers his opinion:
    https://mail.python.org/pipermail/python-dev/2009-October/092974.html
 
@@ -485,22 +479,23 @@ References
    https://mail.python.org/pipermail/pypy-dev/2012-May/009884.html
 
 .. [#guess] The ``platform`` code which divines the implementation name:
-   http://hg.python.org/cpython/file/2f563908ebc5/Lib/platform.py#l1247
+   https://hg.python.org/cpython/file/2f563908ebc5/Lib/platform.py#l1247
+
+* The original implementation of the cache tag in CPython:
+  https://hg.python.org/cpython/file/2f563908ebc5/Python/import.c#l121
 
-.. [#tag_impl] The original implementation of the cache tag in CPython:
-   http://hg.python.org/cpython/file/2f563908ebc5/Python/import.c#l121
+* Examples of implementation-specific handling in test.support:
 
-.. [#tests] Examples of implementation-specific handling in test.support:
-   * http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l509
-   * http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1246
-   * http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1252
-   * http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1275
+  * https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l509
+  * https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1246
+  * https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1252
+  * https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1275
 
 .. [#os_name] The standard library entry for os.name:
    http://docs.python.org/3.3/library/os.html#os.name
 
 .. [#javatest] The use of ``os.name`` as 'java' in the stdlib test suite.
-   http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l512
+   https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l512
 
 .. [#Alyssa] Alyssa (Nick) Coghlan's proposal for ``sys.implementation.metadata``:
    https://mail.python.org/pipermail/python-ideas/2012-May/014984.html
@@ -510,23 +505,12 @@ References
 
 .. _issue #14673: http://bugs.python.org/issue14673
 
-.. _Lib/test/support.py: http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py
+.. _Lib/test/support.py: https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py
 
-.. _Python/import.c:  http://hg.python.org/cpython/file/2f563908ebc5/Python/import.c
+.. _Python/import.c:  https://hg.python.org/cpython/file/2f563908ebc5/Python/import.c
 
 
 Copyright
 =========
 
 This document has been placed in the public domain.
-
-
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 70
-   coding: utf-8
-   End: