Merge branch 'main' into pep13-one-week-seconding-deadline

Author: hugovk

peps/pep-0013.rst

@@ -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.
 
@@ -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
 =======
@@ -344,6 +354,9 @@ History of amendments
 ---------------------
 
 * 2019-04-17: Added the vote length for core devs and changes to this document.
+* 2024-12-10: `Adopted
+  <https://discuss.python.org/t/changing-pep-13-to-adopt-bloc-star-voting/64971>`__
+  Multi-winner Bloc STAR voting for council elections.
 * 2024-12-10: Added a one-week deadline for seconding a vote of no confidence.