Fix conflict

Author: hoodmane

Makefile

@@ -10,8 +10,8 @@ SPHINXBUILD  = $(VENVDIR)/bin/sphinx-build
 # there are duplicate labels.  These cause warnings, which prevent the
 # build from finishing.  Turn off --fail-on-warning so we can see the
 # finished results.
-#SPHINXOPTS   = --fail-on-warning --keep-going
-SPHINXOPTS   = --keep-going
+#SPHINXOPTS   = --fail-on-warning
+SPHINXOPTS   =
 BUILDDIR     = _build
 BUILDER      = html
 JOBS         = auto
@@ -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); \

_static/devguide_overrides.css

@@ -55,6 +55,7 @@
 }
 
 .release-cycle-chart .release-cycle-blob-label.release-cycle-status-end-of-life,
+.release-cycle-chart .release-cycle-blob-label.release-cycle-status-prerelease,
 .release-cycle-chart .release-cycle-blob-label.release-cycle-status-feature {
     /* and FG when it's not in a blob */
     fill: var(--color-foreground-primary);

conf.py

@@ -1,3 +1,5 @@
+import json
+
 extensions = [
     'notfound.extension',
     'sphinx.ext.extlinks',
@@ -84,18 +86,10 @@
     r'\/.*',
 ]
 
-# Check the link itself, but ignore anchors that are added by JS
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-linkcheck_anchors_ignore_for_url
-linkcheck_anchors_ignore_for_url = [
-    # GitHub
-    r'https://github.com/.*',
-]
-
 linkcheck_ignore = [
-    # The voters repo is private and appears as a 404
-    'https://github.com/python/voters',
-    # The python-core team link is private, redirects to login
-    'https://github.com/orgs/python/teams/python-core',
+    # Checks fail due to rate limits
+    r'https://github.com/.*',
+    r'https://www.gnu.org/software/autoconf/',
     # The Discourse groups are private unless you are logged in
     'https://discuss.python.org/groups/staff',
     'https://discuss.python.org/groups/moderators',
@@ -117,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",
@@ -135,6 +138,10 @@
     # Documentation
     "docquality.rst": "documentation/help-documenting.rst",
     "documenting.rst": "documentation/start-documenting.rst",
+    # Translating
+    "documentation/translating.rst": "documentation/translations/translating.rst",
+    "translating.rst": "documentation/translations/translating.rst",
+    "coordinating.rst": "documentation/translations/coordinating.rst",
     # Getting Started
     "fixingissues.rst": "getting-started/fixing-issues.rst",
     "help.rst": "getting-started/getting-help.rst",
@@ -169,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.
@@ -187,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/contrib-plan.rst

@@ -43,5 +43,5 @@ To help, you can:
 
 .. _Write an issue: https://github.com/python/devguide/issues
 .. _Make a pull request: https://github.com/python/devguide/pulls
-.. _Python Docs Discord: https://discord.gg/NeGgyhUZ
+.. _Python Docs Discord: https://discord.gg/qcfPbnM2zH
 .. _Docs Editorial Board: https://python.github.io/editorial-board/

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

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

contrib/core-team/experts.rst

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

contrib/core-team/index.rst

@@ -5,12 +5,7 @@
    |purpose|
 
 
-[This is the existing core developers :ref:`become-core-developer` page from the devguide with the title changed.  We'll
+[This is the existing core developers :ref:`join-core-team` page from the devguide.  We'll
 adjust "core developer" to "core team" where appropriate.]
 
-=========================
-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

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