Merge remote-tracking branch 'upstream/main' into core-team

Author: hugovk

conf.py

@@ -1,3 +1,5 @@
+import json
+
 extensions = [
     'notfound.extension',
     'sphinx.ext.extlinks',
@@ -174,8 +176,17 @@
 # sphinx-notfound-page
 notfound_urls_prefix = "/"
 
+# Dynamically expose the Python version associated with the "main" branch.
+# Exactly one entry in ``release-cycle.json`` should have ``"branch": "main"``.
+with open("include/release-cycle.json", encoding="UTF-8") as _f:
+    _cycle = json.load(_f)
+
+_main_version = next(
+    version for version, data in _cycle.items() if data.get("branch") == "main"
+)
+
 # prolog and epilogs
-rst_prolog = """
+rst_prolog = f"""
 .. |draft| replace::
     This is part of a **Draft** of the Python Contributor's Guide.
     Text in square brackets are notes about content to fill in.
@@ -192,6 +203,8 @@
 
 .. _Refactoring the DevGuide: https://discuss.python.org/t/refactoring-the-devguide-into-a-contribution-guide/63409
 
+.. |main_version| replace:: {_main_version}
+
 """
 
 # sphinx.ext.extlinks

core-team/experts.rst

@@ -56,7 +56,7 @@ __future__
 __main__              gvanrossum, ncoghlan
 _thread
 abc
-argparse              serhiy-storchaka*, savannahostrowski*
+argparse              savannahostrowski*, serhiy-storchaka*
 array
 ast                   benjaminp, pablogsal, isidentical, JelleZijlstra, eclips4
 asyncio               1st1, asvetlov, gvanrossum, graingert, kumaraditya303, willingc
@@ -103,15 +103,15 @@ encodings             malemburg
 ensurepip             ncoghlan, dstufft, pradyunsg, pfmoore
 enum                  eliben*, warsaw, ethanfurman*
 errno                 Yhg1s
-faulthandler          vstinner, gpshead
+faulthandler          vstinner, gpshead, ZeroIntensity*
 fcntl                 Yhg1s
 filecmp
 fileinput
 fnmatch               serhiy-storchaka*
 fractions
 ftplib                giampaolo*
 functools             rhettinger*
-gc                    pitrou, pablogsal
+gc                    pitrou, pablogsal, nascheme
 getopt                serhiy-storchaka*
 getpath               FFY00
 getpass
@@ -241,7 +241,7 @@ uuid
 venv                  vsajip, FFY00
 warnings
 wave
-weakref               freddrake
+weakref               freddrake, nascheme
 webbrowser
 winreg                stutzbach^
 winsound
@@ -343,22 +343,22 @@ io                  benjaminp, stutzbach^, gpshead
 JIT                 brandtbucher*, savannahostrowski*
 locale              malemburg
 mathematics         malemburg, stutzbach^, rhettinger, serhiy-storchaka
-memory management   tim-one, malemburg, Yhg1s
+memory management   tim-one, malemburg, Yhg1s, nascheme
 memoryview
 networking          giampaolo, gpshead
 object model        benjaminp, Yhg1s
 packaging           tarekziade, malemburg, alexis^, merwok, dstufft, pfmoore
 pattern matching    brandtbucher*
 PEG parser          gvanrossum, pablogsal, lysnikolaou
 performance         vstinner, serhiy-storchaka*, 1st1, rhettinger, markshannon,
-                    brandtbucher, carljm, Fidget-Spinner, AlexWaygood*
+                    brandtbucher, carljm, Fidget-Spinner, AlexWaygood*, nascheme
 pip                 ncoghlan, dstufft, pfmoore, Marcus.Smith^, pradyunsg
 release management  tarekziade, malemburg, benjaminp, warsaw,
                     gvanrossum, anthonybaxter^, merwok, ned-deily,
                     birkenfeld, JulienPalard, hugovk
-runtime lifecycle   ericsnowcurrently, kumaraditya303, zooba
+runtime lifecycle   ericsnowcurrently, kumaraditya303, zooba, ZeroIntensity, nascheme
 str.format          ericvsmith*
-subinterpreters     ericsnowcurrently, kumaraditya303
+subinterpreters     ericsnowcurrently, kumaraditya303, ZeroIntensity*
 symbol table        JelleZijlstra, carljm
 testing             ezio-melotti
 test coverage

getting-started/setup-building.rst

@@ -1188,19 +1188,52 @@ select the option ``Open in VS Code``. You will still be working on the remote
 codespace instance, thus using the remote instance's compute power. The compute
 power may be a much higher spec than your local machine which can be helpful.
 
+.. _devcontainer-directly:
 
-Building the container locally
-------------------------------
+Using the dev container directly
+================================
 
 If you want more control over the environment, or to work offline,
-you can build the container locally.
+you can use the same container used in
+:ref:`GitHub Codespaces <using-codespaces>` directly.
 This is meant for users who have (or want to get) some experience
 with containers.
-The following instructions are a starting point for
-your own customizations.
-They assume a Unix-like environment, and Docker or Podman installed.
+These instructions assume a Unix-like environment with
+`Docker <https://www.docker.com/>`__ or `Podman <https://podman.io/>`__
+installed.
 
-In a clone of the `cpython-devcontainers repo <https://github.com/python/cpython-devcontainers>`_,
+.. _devcontainer-image:
+
+Using the pre-built container image
+-----------------------------------
+
+`Dev container images <https://github.com/python/cpython-devcontainers/pkgs/container/devcontainer>`__
+are available from the
+`GitHub Container Registry (GHCR) account for the Python org <https://github.com/orgs/python/packages>`__.
+
+To run the container and launch a Bash shell, run one of the following commands
+in a clone of the CPython repository.
+
+.. code-block:: bash
+
+   docker run -it --rm --volume $PWD:/workspace --workdir /workspace ghcr.io/python/devcontainer:latest
+
+.. code-block:: bash
+
+   podman run -it --rm --volume $PWD:/workspace:Z --workdir /workspace ghcr.io/python/devcontainer:latest
+
+Note that the container has read/write access to the working directory.
+You may want to use a separate clone of CPython, or run ``make clean``
+to remove caches and build output generated for your host OS.
+
+.. _building-the-container-locally
+.. _devcontainer-build:
+
+Building yourself
+-----------------
+
+If you prefer, you can build the container image yourself. In a clone of the
+`cpython-devcontainers repo <https://github.com/python/cpython-devcontainers>`_,
 build the container and name it ``cpython-dev``:
 
 .. code-block:: bash
@@ -1213,8 +1246,8 @@ The same command will update any existing ``cpython-dev`` container.
 Run it again from time to time -- especially if the container stops
 working for you.
 
-To run the container, run one of the following commands in a clone of the
-CPython repository.
+To run the container and launch a Bash shell, run one of the following commands
+in a clone of the CPython repository.
 
 .. code-block:: bash
 
@@ -1224,12 +1257,10 @@ CPython repository.
 
    podman run -it --rm --volume $PWD:/workspace:Z --workdir /workspace cpython-dev
 
-Note that the container has read/write access to the working directory.
-You may want to use a separate clone of CPython, or run ``make clean``
-to remove caches and build output generated for your host OS.
+The same caveats outlined above when running from a container image from GHCR
+also apply here.
 
 .. c_codespaces_end
 
 
-
 .. include:: ../links.rst

versions.rst

@@ -5,7 +5,7 @@
 Status of Python versions
 =========================
 
-The ``main`` branch is currently the future Python 3.14, and is the only
+The ``main`` branch is currently the future Python |main_version|, and is the only
 branch that accepts new features.  The latest release for each Python
 version can be found on the `download page <https://www.python.org/downloads/>`_.