Skip to content

Commit 598577b

Browse files
hoodmanehoodmane
committed
Fix conflict
2 parents 74bef72 + 2fad851 commit 598577b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1152
-500
lines changed

‎Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ SPHINXBUILD = $(VENVDIR)/bin/sphinx-build
1010
# there are duplicate labels. These cause warnings, which prevent the
1111
# build from finishing. Turn off --fail-on-warning so we can see the
1212
# finished results.
13-
#SPHINXOPTS = --fail-on-warning --keep-going
14-
SPHINXOPTS = --keep-going
13+
#SPHINXOPTS = --fail-on-warning
14+
SPHINXOPTS =
1515
BUILDDIR = _build
1616
BUILDER = html
1717
JOBS = auto
@@ -58,6 +58,7 @@ venv:
5858
.PHONY: ensure-venv
5959
ensure-venv:
6060
@if [ ! -d $(VENVDIR) ] ; then \
61+
set -e; \
6162
echo "Creating venv in $(VENVDIR)"; \
6263
if $(UV) --version >/dev/null 2>&1; then \
6364
$(UV) venv --python=$(PYTHON) $(VENVDIR); \

‎_static/devguide_overrides.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
}
5656

5757
.release-cycle-chart .release-cycle-blob-label.release-cycle-status-end-of-life,
58+
.release-cycle-chart .release-cycle-blob-label.release-cycle-status-prerelease,
5859
.release-cycle-chart .release-cycle-blob-label.release-cycle-status-feature {
5960
/* and FG when it's not in a blob */
6061
fill: var(--color-foreground-primary);

‎conf.py

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import json
2+
13
extensions = [
24
'notfound.extension',
35
'sphinx.ext.extlinks',
@@ -84,18 +86,10 @@
8486
r'\/.*',
8587
]
8688

87-
# Check the link itself, but ignore anchors that are added by JS
88-
# https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-linkcheck_anchors_ignore_for_url
89-
linkcheck_anchors_ignore_for_url = [
90-
# GitHub
91-
r'https://github.com/.*',
92-
]
93-
9489
linkcheck_ignore = [
95-
# The voters repo is private and appears as a 404
96-
'https://github.com/python/voters',
97-
# The python-core team link is private, redirects to login
98-
'https://github.com/orgs/python/teams/python-core',
90+
# Checks fail due to rate limits
91+
r'https://github.com/.*',
92+
r'https://www.gnu.org/software/autoconf/',
9993
# The Discourse groups are private unless you are logged in
10094
'https://discuss.python.org/groups/staff',
10195
'https://discuss.python.org/groups/moderators',
@@ -117,12 +111,21 @@
117111
# Advanced Tools was renamed Development Tools in gh-1149
118112
"advanced-tools/clang.rst": "development-tools/clang.rst",
119113
"advanced-tools/gdb.rst": "development-tools/gdb.rst",
120-
# Core Developers
121-
"coredev.rst": "core-developers/become-core-developer.rst",
122-
"committing.rst": "core-developers/committing.rst",
123-
"developers.rst": "core-developers/developer-log.rst",
124-
"experts.rst": "core-developers/experts.rst",
125-
"motivations.rst": "core-developers/motivations.rst",
114+
# Core team
115+
"coredev.rst": "core-team/join-team.rst",
116+
"committing.rst": "core-team/committing.rst",
117+
"developers.rst": "core-team/team-log.rst",
118+
"experts.rst": "core-team/experts.rst",
119+
"motivations.rst": "core-team/motivations.rst",
120+
# core-developers/ -> core-team/
121+
"core-developers/become-core-developer.rst": "core-team/join-team.rst",
122+
"core-developers/committing.rst": "core-team/committing.rst",
123+
"core-developers/developer-log.rst": "core-team/team-log.rst",
124+
"core-developers/experts.rst": "core-team/experts.rst",
125+
"core-developers/index.rst": "core-team/index.rst",
126+
"core-developers/memorialization.rst": "core-team/memorialization.rst",
127+
"core-developers/motivations.rst": "core-team/motivations.rst",
128+
"core-developers/responsibilities.rst": "core-team/responsibilities.rst",
126129
# Developer Workflow
127130
"c-api.rst": "developer-workflow/c-api.rst",
128131
"communication.rst": "developer-workflow/communication-channels.rst",
@@ -135,6 +138,10 @@
135138
# Documentation
136139
"docquality.rst": "documentation/help-documenting.rst",
137140
"documenting.rst": "documentation/start-documenting.rst",
141+
# Translating
142+
"documentation/translating.rst": "documentation/translations/translating.rst",
143+
"translating.rst": "documentation/translations/translating.rst",
144+
"coordinating.rst": "documentation/translations/coordinating.rst",
138145
# Getting Started
139146
"fixingissues.rst": "getting-started/fixing-issues.rst",
140147
"help.rst": "getting-started/getting-help.rst",
@@ -169,8 +176,17 @@
169176
# sphinx-notfound-page
170177
notfound_urls_prefix = "/"
171178

179+
# Dynamically expose the Python version associated with the "main" branch.
180+
# Exactly one entry in ``release-cycle.json`` should have ``"branch": "main"``.
181+
with open("include/release-cycle.json", encoding="UTF-8") as _f:
182+
_cycle = json.load(_f)
183+
184+
_main_version = next(
185+
version for version, data in _cycle.items() if data.get("branch") == "main"
186+
)
187+
172188
# prolog and epilogs
173-
rst_prolog = """
189+
rst_prolog = f"""
174190
.. |draft| replace::
175191
This is part of a **Draft** of the Python Contributor's Guide.
176192
Text in square brackets are notes about content to fill in.
@@ -187,6 +203,8 @@
187203
188204
.. _Refactoring the DevGuide: https://discuss.python.org/t/refactoring-the-devguide-into-a-contribution-guide/63409
189205
206+
.. |main_version| replace:: {_main_version}
207+
190208
"""
191209

192210
# sphinx.ext.extlinks

‎contrib/contrib-plan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ To help, you can:
4343

4444
.. _Write an issue: https://github.com/python/devguide/issues
4545
.. _Make a pull request: https://github.com/python/devguide/pulls
46-
.. _Python Docs Discord: https://discord.gg/NeGgyhUZ
46+
.. _Python Docs Discord: https://discord.gg/qcfPbnM2zH
4747
.. _Docs Editorial Board: https://python.github.io/editorial-board/

‎contrib/core-team/committing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`committing` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../core-developers/committing.rst
11+
.. include:: ../../core-team/committing.rst

‎contrib/core-team/developer-log.rst

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎contrib/core-team/experts.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`experts` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../core-developers/experts.rst
11+
.. include:: ../../core-team/experts.rst

‎contrib/core-team/index.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
|purpose|
66

77

8+
.. _c_core-team:
9+
810
=========
911
Core team
1012
=========
1113

12-
[This is mostly re-organized from the :ref:`core-dev` section of the devguide,
14+
[This is mostly re-organized from the :ref:`core-team` section of the devguide,
1315
but with "core developer" language changed to "core team" where possible.]
1416

1517
.. toctree::
@@ -18,6 +20,6 @@ but with "core developer" language changed to "core team" where possible.]
1820
responsibilities
1921
committing
2022
experts
21-
developer-log
23+
team-log
2224
motivations
2325
join-team

‎contrib/core-team/join-team.rst

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55
|purpose|
66

77

8-
[This is the existing core developers :ref:`become-core-developer` page from the devguide with the title changed. We'll
8+
[This is the existing core developers :ref:`join-core-team` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
=========================
12-
How to join the core team
13-
=========================
14-
15-
.. include:: ../../core-developers/become-core-developer.rst
16-
:start-line: 7
11+
.. include:: ../../core-team/join-team.rst

‎contrib/core-team/motivations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`motivations` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../core-developers/motivations.rst
11+
.. include:: ../../core-team/motivations.rst

0 commit comments

Comments
 (0)