Merge branch 'main' into patch-4

Author: StanFromIreland

Makefile

@@ -58,6 +58,7 @@ venv:
 .PHONY: ensure-venv
 ensure-venv:
 	@if [ ! -d $(VENVDIR) ] ; then \
+		set -e; \
 		echo "Creating venv in $(VENVDIR)"; \
 		if $(UV) --version >/dev/null 2>&1; then \
 			$(UV) venv --python=$(PYTHON) $(VENVDIR); \

README.rst

@@ -17,7 +17,7 @@ The CPython Developer's Guide
 
 
 This guide covers how to contribute to CPython. It is known by the
-nickname of "the devguide" by the Python core developers.
+nickname of "the devguide" by the Python core team.
 
 The official home of this guide is https://devguide.python.org.
 

conf.py

@@ -1,3 +1,5 @@
+import json
+
 extensions = [
     'notfound.extension',
     'sphinx.ext.extlinks',
@@ -109,12 +111,21 @@
     # Advanced Tools was renamed Development Tools in gh-1149
     "advanced-tools/clang.rst": "development-tools/clang.rst",
     "advanced-tools/gdb.rst": "development-tools/gdb.rst",
-    # Core Developers
-    "coredev.rst": "core-developers/become-core-developer.rst",
-    "committing.rst": "core-developers/committing.rst",
-    "developers.rst": "core-developers/developer-log.rst",
-    "experts.rst": "core-developers/experts.rst",
-    "motivations.rst": "core-developers/motivations.rst",
+    # Core team
+    "coredev.rst": "core-team/join-team.rst",
+    "committing.rst": "core-team/committing.rst",
+    "developers.rst": "core-team/team-log.rst",
+    "experts.rst": "core-team/experts.rst",
+    "motivations.rst": "core-team/motivations.rst",
+    # core-developers/ -> core-team/
+    "core-developers/become-core-developer.rst": "core-team/join-team.rst",
+    "core-developers/committing.rst": "core-team/committing.rst",
+    "core-developers/developer-log.rst": "core-team/team-log.rst",
+    "core-developers/experts.rst": "core-team/experts.rst",
+    "core-developers/index.rst": "core-team/index.rst",
+    "core-developers/memorialization.rst": "core-team/memorialization.rst",
+    "core-developers/motivations.rst": "core-team/motivations.rst",
+    "core-developers/responsibilities.rst": "core-team/responsibilities.rst",
     # Developer Workflow
     "c-api.rst": "developer-workflow/c-api.rst",
     "communication.rst": "developer-workflow/communication-channels.rst",
@@ -165,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.
@@ -183,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

contrib/core-team/committing.rst

@@ -8,4 +8,4 @@
 [This is the existing core developers :ref:`committing` page from the devguide.  We'll
 adjust "core developer" to "core team" where appropriate.]
 
-.. include:: ../../core-developers/committing.rst
+.. include:: ../../core-team/committing.rst

contrib/core-team/developer-log.rst

@@ -5,7 +5,6 @@
    |purpose|
 
 
-[This is the existing core developers :ref:`experts` page from the devguide.  We'll
-adjust "core developer" to "core team" where appropriate.]
+[This is the existing core team :ref:`experts` page from the devguide.]
 
-.. include:: ../../core-developers/experts.rst
+.. include:: ../../core-team/experts.rst

contrib/core-team/experts.rst

@@ -5,21 +5,20 @@
    |purpose|
 
 
-.. _c_coreteam:
+.. _c_core-team:
 
 =========
 Core team
 =========
 
-[This is mostly re-organized from the :ref:`core-dev` section of the devguide,
-but with "core developer" language changed to "core team" where possible.]
+[This is mostly re-organized from the :ref:`core-team` section of the devguide]
 
 .. toctree::
    :maxdepth: 5
 
    responsibilities
    committing
    experts
-   developer-log
+   team-log
    motivations
    join-team

contrib/core-team/index.rst

@@ -5,12 +5,6 @@
    |purpose|
 
 
-[This is the existing core developers :ref:`become-core-developer` page from the devguide with the title changed.  We'll
-adjust "core developer" to "core team" where appropriate.]
+[This is the existing core team :ref:`join-core-team` page from the devguide.]
 
-=========================
-How to join the core team
-=========================
-
-.. include:: ../../core-developers/become-core-developer.rst
-   :start-line: 7
+.. include:: ../../core-team/join-team.rst

contrib/core-team/join-team.rst

@@ -5,7 +5,6 @@
    |purpose|
 
 
-[This is the existing core developers :ref:`motivations` page from the devguide.  We'll
-adjust "core developer" to "core team" where appropriate.]
+[This is the existing core team :ref:`motivations` page from the devguide.]
 
-.. include:: ../../core-developers/motivations.rst
+.. include:: ../../core-team/motivations.rst

contrib/core-team/motivations.rst

@@ -5,7 +5,6 @@
    |purpose|
 
 
-[This is the existing core developers :ref:`responsibilities` page from the devguide.  We'll
-adjust "core developer" to "core team" where appropriate.]
+[This is the existing core team :ref:`responsibilities` page from the devguide.]
 
-.. include:: ../../core-developers/responsibilities.rst
+.. include:: ../../core-team/responsibilities.rst