Skip to content

Commit 921654e

Browse files
authored
Merge branch 'main' into warsaw/pep-694-updates
2 parents 8e8ebd8 + 9f2b319 commit 921654e

File tree

16 files changed

+2190
-129
lines changed

16 files changed

+2190
-129
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ peps/pep-0744.rst @brandtbucher @savannahostrowski
625625
peps/pep-0745.rst @hugovk
626626
peps/pep-0746.rst @JelleZijlstra
627627
peps/pep-0747.rst @JelleZijlstra
628+
peps/pep-0748.rst @ncoghlan
628629
# ...
629630
peps/pep-0749.rst @JelleZijlstra
630631
peps/pep-0750.rst @gvanrossum @lysnikolaou
@@ -644,6 +645,7 @@ peps/pep-0763.rst @dstufft
644645
peps/pep-0765.rst @iritkatriel @ncoghlan
645646
peps/pep-0766.rst @warsaw
646647
peps/pep-0767.rst @carljm
648+
peps/pep-0768.rst @pablogsal
647649
# ...
648650
peps/pep-0777.rst @warsaw
649651
# ...

peps/pep-0013.rst

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ to exercise as rarely as possible.
2020
Current steering council
2121
========================
2222

23-
The 2024 term steering council consists of:
23+
The 2025 term steering council consists of:
2424

2525
* Barry Warsaw
26+
* Donghee Na
2627
* Emily Morehouse
2728
* Gregory P. Smith
2829
* Pablo Galindo Salgado
29-
* Thomas Wouters
3030

31-
Per the results of the vote tracked in :pep:`8105`.
31+
Per the results of the vote tracked in :pep:`8106`.
3232

3333
The core team consists of those listed in the private
3434
https://github.com/python/voters/ repository which is publicly
@@ -105,9 +105,11 @@ A council election consists of two phases:
105105
must be nominated by a core team member. Self-nominations are
106106
allowed.
107107

108-
* Phase 2: Each core team member can vote for zero or more of the
109-
candidates. Voting is performed anonymously. Candidates are ranked
110-
by the total number of votes they receive. If a tie occurs, it may
108+
* Phase 2: Each core team member can assign zero to five stars to each
109+
candidate. Voting is performed anonymously. The outcome of the vote
110+
is determined using the `STAR voting system <https://www.starvoting.org/>`__,
111+
modified to use the `Multi-winner Bloc STAR <https://www.starvoting.org/multi_winner>`__)
112+
approach. If a tie occurs, it may
111113
be resolved by mutual agreement among the candidates, or else the
112114
winner will be chosen at random.
113115

@@ -270,6 +272,10 @@ It is granted by receiving at least two-thirds positive votes in a
270272
core team vote that is open for one week and is not vetoed by the
271273
steering council.
272274

275+
.. note:: The devguide has a `suggested template
276+
<https://devguide.python.org/core-developers/become-core-developer/#poll-template>`__
277+
to use for such votes.
278+
273279
Core team members are always looking for promising contributors,
274280
teaching them how the project is managed, and submitting their names
275281
to the core team's vote when they're ready.
@@ -301,6 +307,10 @@ Changing this document
301307
Changes to this document require at least a two-thirds majority of
302308
votes cast in a core team vote which should be open for two weeks.
303309

310+
No vote is required to update note blocks and the "Current steering
311+
council" and "History of council elections" sections with current
312+
information.
313+
304314

305315
History
306316
=======
@@ -337,12 +347,16 @@ History of council elections
337347
* December 2021: :pep:`8103`
338348
* December 2022: :pep:`8104`
339349
* December 2023: :pep:`8105`
350+
* December 2024: :pep:`8106`
340351

341352

342353
History of amendments
343354
---------------------
344355

345-
2019-04-17: Added the vote length for core devs and changes to this document.
356+
* 2019-04-17: Added the vote length for core devs and changes to this document.
357+
* 2024-12-10: `Adopted
358+
<https://discuss.python.org/t/changing-pep-13-to-adopt-bloc-star-voting/64971>`__
359+
Multi-winner Bloc STAR voting for council elections.
346360

347361

348362

peps/pep-0421.rst

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
PEP: 421
22
Title: Adding sys.implementation
3-
Version: $Revision$
4-
Last-Modified: $Date$
53
Author: Eric Snow <ericsnowcurrently@gmail.com>
64
BDFL-Delegate: Barry Warsaw
75
Status: Final
86
Type: Standards Track
9-
Content-Type: text/x-rst
107
Created: 26-Apr-2012
118
Python-Version: 3.3
129
Post-History: 26-Apr-2012
@@ -466,15 +463,12 @@ References
466463
.. [#ironpython] Feedback from the IronPython developers:
467464
https://mail.python.org/pipermail/ironpython-users/2012-May/015980.html
468465
469-
.. [#dino_viehland_2009] (2009) Dino Viehland offers his opinion:
470-
https://mail.python.org/pipermail/python-dev/2009-October/092894.html
466+
* (2009) Dino Viehland offers his opinion:
467+
https://mail.python.org/pipermail/python-dev/2009-October/092894.html
471468

472469
.. [#jeff_hardy_2012] (2012) Jeff Hardy offers his opinion:
473470
https://mail.python.org/pipermail/ironpython-users/2012-May/015981.html
474471
475-
.. [#jython] Feedback from the Jython developers:
476-
???
477-
478472
.. [#frank_wierzbicki_2009] (2009) Frank Wierzbicki offers his opinion:
479473
https://mail.python.org/pipermail/python-dev/2009-October/092974.html
480474
@@ -485,22 +479,23 @@ References
485479
https://mail.python.org/pipermail/pypy-dev/2012-May/009884.html
486480
487481
.. [#guess] The ``platform`` code which divines the implementation name:
488-
http://hg.python.org/cpython/file/2f563908ebc5/Lib/platform.py#l1247
482+
https://hg.python.org/cpython/file/2f563908ebc5/Lib/platform.py#l1247
483+
484+
* The original implementation of the cache tag in CPython:
485+
https://hg.python.org/cpython/file/2f563908ebc5/Python/import.c#l121
489486

490-
.. [#tag_impl] The original implementation of the cache tag in CPython:
491-
http://hg.python.org/cpython/file/2f563908ebc5/Python/import.c#l121
487+
* Examples of implementation-specific handling in test.support:
492488

493-
.. [#tests] Examples of implementation-specific handling in test.support:
494-
* http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l509
495-
* http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1246
496-
* http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1252
497-
* http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1275
489+
* https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l509
490+
* https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1246
491+
* https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1252
492+
* https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l1275
498493

499494
.. [#os_name] The standard library entry for os.name:
500495
http://docs.python.org/3.3/library/os.html#os.name
501496
502497
.. [#javatest] The use of ``os.name`` as 'java' in the stdlib test suite.
503-
http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l512
498+
https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l512
504499
505500
.. [#Alyssa] Alyssa (Nick) Coghlan's proposal for ``sys.implementation.metadata``:
506501
https://mail.python.org/pipermail/python-ideas/2012-May/014984.html
@@ -510,23 +505,12 @@ References
510505
511506
.. _issue #14673: http://bugs.python.org/issue14673
512507

513-
.. _Lib/test/support.py: http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py
508+
.. _Lib/test/support.py: https://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py
514509

515-
.. _Python/import.c: http://hg.python.org/cpython/file/2f563908ebc5/Python/import.c
510+
.. _Python/import.c: https://hg.python.org/cpython/file/2f563908ebc5/Python/import.c
516511

517512

518513
Copyright
519514
=========
520515

521516
This document has been placed in the public domain.
522-
523-
524-
525-
..
526-
Local Variables:
527-
mode: indented-text
528-
indent-tabs-mode: nil
529-
sentence-end-double-space: t
530-
fill-column: 70
531-
coding: utf-8
532-
End:

peps/pep-0543.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Content-Type: text/x-rst
1010
Created: 17-Oct-2016
1111
Python-Version: 3.7
1212
Post-History: 11-Jan-2017, 19-Jan-2017, 02-Feb-2017, 09-Feb-2017
13-
13+
Superseded-By: 748
1414

1515
Abstract
1616
========

peps/pep-0596.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Provided irregularly on an "as-needed" basis until October 2025.
9595
- 3.9.18: Thursday, 2023-08-24
9696
- 3.9.19: Tuesday, 2024-03-19
9797
- 3.9.20: Friday, 2024-09-06
98+
- 3.9.21: Tuesday, 2024-12-03
9899

99100

100101
3.9 Lifespan

peps/pep-0619.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Provided irregularly on an "as-needed" basis until October 2026.
8383
- 3.10.13: Thursday, 2023-08-24
8484
- 3.10.14: Tuesday, 2024-03-19
8585
- 3.10.15: Saturday, 2024-09-07
86+
- 3.10.16: Tuesday, 2024-12-03
8687

8788
3.10 Lifespan
8889
-------------

peps/pep-0664.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Source-only security fix releases
8080
Provided irregularly on an "as-needed" basis until October 2027.
8181

8282
- 3.11.10: Saturday, 2024-09-07
83+
- 3.11.11: Tuesday, 2024-12-03
8384

8485
3.11 Lifespan
8586
-------------

peps/pep-0693.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ Actual:
6464
- 3.12.5: Tuesday, 2024-08-06
6565
- 3.12.6: Friday, 2024-09-06
6666
- 3.12.7: Tuesday, 2024-10-01
67+
- 3.12.8: Tuesday, 2024-12-03
6768

6869
Expected:
6970

70-
- 3.12.8: Tuesday, 2024-12-03
7171
- 3.12.9: Tuesday, 2025-02-04
7272
- 3.12.10: Tuesday, 2025-04-08
7373

peps/pep-0719.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ Actual:
5151
- 3.13.0 candidate 2: Friday, 2024-09-06
5252
- 3.13.0 candidate 3: Tuesday, 2024-10-01
5353
- 3.13.0 final: Monday, 2024-10-07
54+
- 3.13.1: Tuesday, 2024-12-03
5455

5556
Bugfix releases
5657
---------------
5758

5859
Expected:
5960

60-
- 3.13.1: Tuesday, 2024-12-03
6161
- 3.13.2: Tuesday, 2025-02-04
6262
- 3.13.3: Tuesday, 2025-04-08
6363
- 3.13.4: Tuesday, 2025-06-03

0 commit comments

Comments
 (0)