Merge branch 'main' into pep-813-pprint

Author: warsaw

.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

peps/pep-0101.rst

@@ -646,51 +646,6 @@ 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!
@@ -726,9 +681,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 +765,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:
 
@@ -884,6 +837,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

peps/pep-0693.rst

@@ -82,9 +82,13 @@ Source-only security fix releases
 
 Provided irregularly on an as-needed basis until October 2028.
 
+.. release schedule: security
+
 - 3.12.11: Tuesday, 2025-06-03
 - 3.12.12: Thursday, 2025-10-09
 
+.. release schedule: ends
+
 3.12 Lifespan
 -------------
 

peps/pep-0790.rst

@@ -37,10 +37,10 @@ Actual:
 
 - 3.15 development begins: Wednesday, 2025-05-07
 - 3.15.0 alpha 1: Tuesday, 2025-10-14
+- 3.15.0 alpha 2: Wednesday, 2025-11-19
 
 Expected:
 
-- 3.15.0 alpha 2: Tuesday, 2025-11-18
 - 3.15.0 alpha 3: Tuesday, 2025-12-16
 - 3.15.0 alpha 4: Tuesday, 2026-01-13
 - 3.15.0 alpha 5: Tuesday, 2026-02-10