Merge branch 'main' into imaginary

Author: skirpichev

.github/CODEOWNERS

@@ -683,11 +683,12 @@ peps/pep-0804.rst  @pradyunsg
 # ...
 peps/pep-0806.rst  @JelleZijlstra
 peps/pep-0807.rst  @dstufft
-# ...
+peps/pep-0808.rst  @FFY00
 peps/pep-0809.rst  @zooba
 peps/pep-0810.rst  @pablogsal @DinoV @Yhg1s
 peps/pep-0811.rst  @sethmlarson @gpshead
 peps/pep-0812.rst  @serhiy-storchaka
+peps/pep-0814.rst  @vstinner @corona10
 # ...
 peps/pep-2026.rst  @hugovk
 # ...

.pre-commit-config.yaml

@@ -65,6 +65,11 @@ repos:
         args:
           - '--exit-non-zero-on-fix'
         files: '^pep_sphinx_extensions/tests/'
+      - id: ruff-format
+        name: "Format with Ruff"
+        args:
+          - '--check'
+        files: '^release_management/'
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
     rev: 1.4.1
@@ -111,3 +116,12 @@ repos:
         language: "python"
         files: '^peps/pep-\d{4}\.rst$'
         require_serial: true
+
+      # Hook to regenerate release schedules
+      - id: "regen-schedules"
+        name: "Regenerate release schedules from python-releases.toml"
+        entry: "python -m release_management update-peps"
+        language: "python"
+        files: "^release_management/"
+        pass_filenames: false
+        require_serial: true

Makefile

@@ -108,6 +108,11 @@ test: venv
 spellcheck: _ensure-pre-commit
 	$(VENVDIR)/bin/python3 -m pre_commit run --all-files --hook-stage manual codespell
 
+## regen-all      to regenerate generated source files
+.PHONY: regen-all
+regen-all:
+	$(PYTHON) -m release_management update-peps
+
 .PHONY: help
 help : Makefile
 	@echo "Please use \`make <target>' where <target> is one of"

pep_sphinx_extensions/pep_zero_generator/pep_index_generator.py

@@ -26,6 +26,7 @@
 from pep_sphinx_extensions.pep_zero_generator import subindices
 from pep_sphinx_extensions.pep_zero_generator import writer
 from pep_sphinx_extensions.pep_zero_generator.constants import SUBINDICES_BY_TOPIC
+from release_management.serialize import create_release_cycle, create_release_json
 
 if TYPE_CHECKING:
     from sphinx.application import Sphinx
@@ -55,7 +56,6 @@ def create_pep_json(peps: list[parser.PEP]) -> str:
 def write_peps_json(peps: list[parser.PEP], path: Path) -> None:
     # Create peps.json
     json_peps = create_pep_json(peps)
-    Path(path, "peps.json").write_text(json_peps, encoding="utf-8")
     os.makedirs(os.path.join(path, "api"), exist_ok=True)
     Path(path, "api", "peps.json").write_text(json_peps, encoding="utf-8")
 
@@ -73,3 +73,9 @@ def create_pep_zero(app: Sphinx, env: BuildEnvironment, docnames: list[str]) ->
     subindices.generate_subindices(SUBINDICES_BY_TOPIC, peps, docnames, env)
 
     write_peps_json(peps, Path(app.outdir))
+
+    release_cycle = create_release_cycle()
+    app.outdir.joinpath('api/release-cycle.json').write_text(release_cycle, encoding="utf-8")
+
+    release_json = create_release_json()
+    app.outdir.joinpath('api/python-releases.json').write_text(release_json, encoding="utf-8")

peps/pep-0013.rst

@@ -107,8 +107,8 @@ A council election consists of two phases:
 * 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
+  modified to use the `Multi-winner Bloc STAR <https://www.starvoting.org/multi_winner>`__
+  approach. If a tie that is not automatically resolved by the election software occurs, it may
   be resolved by mutual agreement among the candidates, or else the
   winner will be chosen at random.
 
@@ -358,6 +358,9 @@ History of amendments
   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.
+* `2025-11-12 <https://discuss.python.org/t/104607>`__:
+  Clarified that the software used for elections may resolve ties
+  automatically if possible.
 
 
 

peps/pep-0545.rst

@@ -322,9 +322,11 @@ and http://zanata.org/.
 python-docs-translations
 ''''''''''''''''''''''''
 
-The `python-docs-translations GitHub organization <https://github.com/python-docs-translations>`_
-is home to several useful translation tools such as the translations
-`dashboard <https://github.com/python-docs-translations/dashboard>`_.
+The `python-docs-translations GitHub organization <https://github.com/python-docs-translations>`__
+is home to several useful translation tools including
+`translations.python.org <https://translations.python.org>`__
+(`python-docs-translations/dashboard
+<https://github.com/python-docs-translations/dashboard>`__).
 
 
 Documentation Contribution Agreement

peps/pep-0569.rst

@@ -51,58 +51,76 @@ Release Schedule
 3.8.0 schedule
 --------------
 
+.. release schedule: feature
+
+Actual:
+
 - 3.8 development begins: Monday, 2018-01-29
 - 3.8.0 alpha 1: Sunday, 2019-02-03
 - 3.8.0 alpha 2: Monday, 2019-02-25
 - 3.8.0 alpha 3: Monday, 2019-03-25
 - 3.8.0 alpha 4: Monday, 2019-05-06
 - 3.8.0 beta 1: Tuesday, 2019-06-04
   (No new features beyond this point.)
-
 - 3.8.0 beta 2: Thursday, 2019-07-04
 - 3.8.0 beta 3: Monday, 2019-07-29
 - 3.8.0 beta 4: Friday, 2019-08-30
 - 3.8.0 candidate 1: Tuesday, 2019-10-01
 - 3.8.0 final: Monday, 2019-10-14
 
+.. release schedule: ends
+
 Bugfix releases
 ---------------
 
-- 3.8.1rc1: Tuesday, 2019-12-10
-- 3.8.1: Wednesday, 2019-12-18
-- 3.8.2rc1: Monday, 2020-02-10
-- 3.8.2rc2: Monday, 2020-02-17
-- 3.8.2: Monday, 2020-02-24
-- 3.8.3rc1: Wednesday, 2020-04-29
-- 3.8.3: Wednesday, 2020-05-13
-- 3.8.4rc1: Tuesday, 2020-06-30
-- 3.8.4: Monday, 2020-07-13
-- 3.8.5: Monday, 2020-07-20 (security hotfix)
-- 3.8.6rc1: Tuesday, 2020-09-08
-- 3.8.6: Thursday, 2020-09-24
-- 3.8.7rc1: Monday, 2020-12-07
-- 3.8.7: Monday, 2020-12-21
-- 3.8.8rc1: Tuesday, 2021-02-16
-- 3.8.8: Friday, 2021-02-19
-- 3.8.9: Friday, 2021-04-02 (security hotfix)
-- 3.8.10: Monday, 2021-05-03 (final regular bugfix release with binary
-  installers)
+.. release schedule: bugfix
+
+Actual:
+
+- 3.8.1 candidate 1: Tuesday, 2019-12-10
+- 3.8.1 final: Wednesday, 2019-12-18
+- 3.8.2 candidate 1: Monday, 2020-02-10
+- 3.8.2 candidate 2: Monday, 2020-02-17
+- 3.8.2 final: Monday, 2020-02-24
+- 3.8.3 candidate 1: Wednesday, 2020-04-29
+- 3.8.3 final: Wednesday, 2020-05-13
+- 3.8.4 candidate 1: Tuesday, 2020-06-30
+- 3.8.4 final: Monday, 2020-07-13
+- 3.8.5 final: Monday, 2020-07-20
+  (security hotfix)
+- 3.8.6 candidate 1: Tuesday, 2020-09-08
+- 3.8.6 final: Thursday, 2020-09-24
+- 3.8.7 candidate 1: Monday, 2020-12-07
+- 3.8.7 final: Monday, 2020-12-21
+- 3.8.8 candidate 1: Tuesday, 2021-02-16
+- 3.8.8 final: Friday, 2021-02-19
+- 3.8.9 final: Friday, 2021-04-02
+  (security hotfix)
+- 3.8.10 final: Monday, 2021-05-03
+  (Final regular bugfix release with binary installers)
+
+.. release schedule: ends
 
 Source-only security fix releases
 ---------------------------------
 
 Provided irregularly on an "as-needed" basis until October 7th 2024.
 
-- 3.8.11: Monday, 2021-06-28
-- 3.8.12: Monday, 2021-08-30
-- 3.8.13: Wednesday, 2022-03-16
-- 3.8.14: Tuesday, 2022-09-06
-- 3.8.15: Tuesday, 2022-10-11
-- 3.8.16: Tuesday, 2022-12-06
-- 3.8.17: Tuesday, 2023-06-06
-- 3.8.18: Thursday, 2023-08-24
-- 3.8.19: Tuesday, 2024-03-19
-- 3.8.20: Friday, 2024-09-06 (final security release)
+.. release schedule: security
+
+- 3.8.11 final: Monday, 2021-06-28
+- 3.8.12 final: Monday, 2021-08-30
+- 3.8.13 final: Wednesday, 2022-03-16
+- 3.8.14 final: Tuesday, 2022-09-06
+- 3.8.15 final: Tuesday, 2022-10-11
+- 3.8.16 final: Tuesday, 2022-12-06
+- 3.8.17 final: Tuesday, 2023-06-06
+- 3.8.18 final: Thursday, 2023-08-24
+- 3.8.19 final: Tuesday, 2024-03-19
+- 3.8.20 final: Friday, 2024-09-06
+  (final security release)
+
+.. release schedule: ends
 
 
 Features for 3.8

peps/pep-0570.rst

@@ -1,7 +1,7 @@
 PEP: 570
 Title: Python Positional-Only Parameters
 Author: Larry Hastings <[email protected]>,
-        Pablo Galindo <[email protected]>,
+        Pablo Galindo Salgado <[email protected]>,
         Mario Corchero <[email protected]>,
         Eric N. Vander Weele <[email protected]>
 BDFL-Delegate: Guido van Rossum <[email protected]>

peps/pep-0596.rst

@@ -40,6 +40,8 @@ Note: the dates below use a 17-month development period that results
 in a 12-month release cadence between feature versions, as defined by
 :pep:`602`.
 
+.. release schedule: feature
+
 Actual:
 
 - 3.9 development begins: Tuesday, 2019-06-04
@@ -59,47 +61,60 @@ Actual:
 - 3.9.0 candidate 2: Thursday, 2020-09-17
 - 3.9.0 final: Monday, 2020-10-05
 
+.. release schedule: ends
+
 
 Bugfix releases
 ---------------
 
+.. release schedule: bugfix
+
 Actual:
 
 - 3.9.1 candidate 1: Tuesday, 2020-11-24
 - 3.9.1 final: Monday, 2020-12-07
 - 3.9.2 candidate 1: Tuesday, 2021-02-16
 - 3.9.2 final: Friday, 2021-02-19
-- 3.9.3: Friday, 2021-04-02 (security hotfix; recalled due to bpo-43710)
-- 3.9.4: Sunday, 2021-04-04 (ABI compatibility hotfix)
-- 3.9.5: Monday, 2021-05-03
-- 3.9.6: Monday, 2021-06-28
-- 3.9.7: Monday, 2021-08-30
-- 3.9.8: Friday, 2021-11-05 (recalled due to bpo-45235)
-- 3.9.9: Monday, 2021-11-15
-- 3.9.10: Friday, 2022-01-14
-- 3.9.11: Wednesday, 2022-03-16
-- 3.9.12: Wednesday, 2022-03-23
-- 3.9.13: Tuesday, 2022-05-17 (final regular bugfix release with binary
-  installers)
+- 3.9.3 final: Friday, 2021-04-02
+  (security hotfix; recalled due to bpo-43710)
+- 3.9.4 final: Sunday, 2021-04-04
+  (ABI compatibility hotfix)
+- 3.9.5 final: Monday, 2021-05-03
+- 3.9.6 final: Monday, 2021-06-28
+- 3.9.7 final: Monday, 2021-08-30
+- 3.9.8 final: Friday, 2021-11-05
+  (recalled due to bpo-45235)
+- 3.9.9 final: Monday, 2021-11-15
+- 3.9.10 final: Friday, 2022-01-14
+- 3.9.11 final: Wednesday, 2022-03-16
+- 3.9.12 final: Wednesday, 2022-03-23
+- 3.9.13 final: Tuesday, 2022-05-17
+  (Final regular bugfix release with binary installers)
+
+.. release schedule: ends
 
 
 Source-only security fix releases
 ---------------------------------
 
 Provided irregularly on an "as-needed" basis until October 2025.
 
-- 3.9.14: Tuesday, 2022-09-06
-- 3.9.15: Tuesday, 2022-10-11
-- 3.9.16: Tuesday, 2022-12-06
-- 3.9.17: Tuesday, 2023-06-06
-- 3.9.18: Thursday, 2023-08-24
-- 3.9.19: Tuesday, 2024-03-19
-- 3.9.20: Friday, 2024-09-06
-- 3.9.21: Tuesday, 2024-12-03
-- 3.9.22: Tuesday, 2025-04-08
-- 3.9.23: Tuesday, 2025-06-03
-- 3.9.24: Thursday, 2025-10-09
-- 3.9.25: Thursday, 2025-10-31
+.. release schedule: security
+
+- 3.9.14 final: Tuesday, 2022-09-06
+- 3.9.15 final: Tuesday, 2022-10-11
+- 3.9.16 final: Tuesday, 2022-12-06
+- 3.9.17 final: Tuesday, 2023-06-06
+- 3.9.18 final: Thursday, 2023-08-24
+- 3.9.19 final: Tuesday, 2024-03-19
+- 3.9.20 final: Friday, 2024-09-06
+- 3.9.21 final: Tuesday, 2024-12-03
+- 3.9.22 final: Tuesday, 2025-04-08
+- 3.9.23 final: Tuesday, 2025-06-03
+- 3.9.24 final: Thursday, 2025-10-09
+- 3.9.25 final: Friday, 2025-10-31
+
+.. release schedule: ends
 
 
 3.9 Lifespan

peps/pep-0617.rst

@@ -1,7 +1,7 @@
 PEP: 617
 Title: New PEG parser for CPython
 Author: Guido van Rossum <[email protected]>,
-        Pablo Galindo <[email protected]>,
+        Pablo Galindo Salgado <[email protected]>,
         Lysandros Nikolaou <[email protected]>
 Discussions-To: [email protected]
 Status: Final