Merge branch 'main' of https://github.com/python/peps into wasi-support-pep

Author: brettcannon

.github/CODEOWNERS

@@ -683,10 +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-0814.rst  @vstinner @corona10
+peps/pep-0815.rst  @emmatyping
 # ...
 peps/pep-2026.rst  @hugovk
 # ...

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 

.github/workflows/render.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0  # fetch all history so that last modified date-times are accurate
 

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
         - "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 

.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

.pytest.toml

@@ -0,0 +1,35 @@
+# https://docs.pytest.org/en/stable/reference/customize.html
+
+[pytest]
+minversion = "9.0"
+
+# https://docs.pytest.org/en/stable/reference/reference.html#command-line-flags
+addopts = [
+    # Show extra summary information for all non-passing tests
+    "-r a",
+    # https://docs.pytest.org/en/stable/explanation/pythonpath.html#import-modes
+    "--import-mode=importlib",
+    # https://pytest-cov.readthedocs.io/en/latest/config.html#reference
+    "--cov=check_peps",
+    "--cov=pep_sphinx_extensions",
+    "--cov-report=html",
+    "--cov-report=xml",
+]
+
+# Fail if pytest.mark.parametrize() has no parameters
+empty_parameter_set_mark = "fail_at_collect"
+
+filterwarnings = ["error"]
+
+testpaths = [
+    "pep_sphinx_extensions",
+]
+
+# https://docs.pytest.org/en/stable/reference/reference.html#confval-strict
+strict_config = true
+strict_markers = true
+strict_parametrization_ids = true
+strict_xfail = true
+
+# Various tests use Unicode in pytest.mark.parametrize().
+disable_test_id_escaping_and_forfeit_all_rights_to_community_support = 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-0101.rst

@@ -646,61 +646,10 @@ permissions.
 
       curl -X PURGE https://www.python.org/downloads/release/python-XXX/
 
-- If this is a **final** release:
-
-  - Add the new version to the `"Python documentation by version"
-    page <https://www.python.org/doc/versions/>`__ and
-    remove the current version from any 'in development' section.
-
-  - For 3.X.Y, edit all the previous X.Y releases' page(s) to
-    point to the new release.  This includes the content field of the
-    ``Downloads -> Releases`` entry for the release::
-
-      Note: Python 3.x.(y-1) has been superseded by
-      `Python 3.x.y </downloads/release/python-3xy/>`_.
-
-    And, for those releases having separate release page entries
-    (phasing these out?), update those pages as well,
-    e.g. ``download/releases/3.x.y``::
-
-      Note: Python 3.x.(y-1) has been superseded by
-      `Python 3.x.y </download/releases/3.x.y/>`_.
-
-  - Update the `"Current pre-release testing versions" page
-    <https://www.python.org/download/pre-releases/>`__.
-
-    - If you're releasing a version before *3.x.0*,
-      add it to this page, removing the previous pre-release
-      of version *3.x* as needed.
-
-    - If you're releasing *3.x.0 final*, remove the pre-release
-      version from this page.
-
-    This is in the "Pages" category on the Django-based website, and finding
-    it through that UI is kind of a chore.  However!  If you're already logged
-    in to the admin interface (which, at this point, you should be), Django
-    will helpfully add a convenient "Edit this page" link to the top of the
-    page itself.  So you can simply follow the link above, click on the
-    "Edit this page" link, and make your changes as needed.  How convenient!
-
-  - If appropriate, update the `"Python documentation by version" page
-    <https://www.python.org/doc/versions/>`__.
-
-    This lists all releases of Python by version number and links to their
-    static (not built daily) online documentation.  There's a link at the
-    bottom to the in-development version.
-    And yes you can press the shiny, exciting "Edit this page" button.
-
 - Write the announcement on `discuss.python.org`_.  This is the
   fuzzy bit because not much can be automated.  You can use an earlier
   announcement as a template, but edit it for content!
 
-- Once the announcement is up on Discourse, send an equivalent to the
-  following mailing lists:
-
-  * python-list@python.org
-  * python-announce@python.org
-
 - Also post the announcement to the
   `Python Insider blog <https://blog.python.org>`_.
   To add a new entry, go to
@@ -726,9 +675,7 @@ permissions.
   - Update the `issue tracker`_ for the new branch:
     add the new version to the versions list.
 
-  - Update the `devguide
-    <https://github.com/python/devguide/blob/main/include/release-cycle.json>`__
-    to reflect the new branches and versions.
+  - Update python-releases.toml_ to reflect the new branches and versions.
 
   - Create a PR to update the supported releases table on the
     `downloads page <https://www.python.org/downloads/>`__ (see
@@ -812,10 +759,10 @@ else does them.  Some of those tasks include:
 
   * https://www.python.org/downloads/release/python-336/
 
-- In the `developer's guide
-  <https://github.com/python/devguide/blob/main/include/release-cycle.json>`__,
-  set the branch status to end-of-life
-  and update or remove references to the branch elsewhere in the devguide.
+- In python-releases.toml_, set the branch status to end-of-life.
+
+- Update or remove references to the branch in the `developer's guide
+  <https://github.com/python/devguide/>`__.
 
 - Retire the release from the `issue tracker`_. Tasks include:
 
@@ -833,8 +780,6 @@ else does them.  Some of those tasks include:
 
   * `discuss.python.org`_
 
-  * mailing lists (python-dev, python-list, python-announcements)
-
   * `Python Insider blog <https://blog.python.org>`_
 
 - Enjoy your retirement and bask in the glow of a job well done!
@@ -884,6 +829,7 @@ This document has been placed in the public domain.
 .. _deferred-blocker: https://github.com/python/cpython/labels/deferred-blocker
 .. _discuss.python.org: https://discuss.python.org
 .. _issue tracker: https://github.com/python/cpython/issues
+.. _python-releases.toml: https://github.com/python/peps/blob/HEAD/release_management/python-releases.toml
 .. _python/cpython: https://github.com/python/cpython
 .. _python/peps: https://github.com/python/peps
 .. _python/release-tools: https://github.com/python/release-tools