From fee75c111ed9ea3c9070564bd579475bed9e7907 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sat, 28 Jun 2025 23:58:27 +0300 Subject: [PATCH 1/6] Move core-developers/ to core-team/ --- conf.py | 18 ++++++++++++------ contrib/core-team/committing.rst | 2 +- contrib/core-team/developer-log.rst | 2 +- contrib/core-team/experts.rst | 2 +- contrib/core-team/join-team.rst | 2 +- contrib/core-team/motivations.rst | 2 +- contrib/core-team/responsibilities.rst | 2 +- .../become-core-developer.rst | 0 {core-developers => core-team}/committing.rst | 0 .../developer-log.rst | 0 {core-developers => core-team}/developers.csv | 0 {core-developers => core-team}/experts.rst | 0 {core-developers => core-team}/index.rst | 0 .../memorialization.rst | 4 ++-- {core-developers => core-team}/motivations.rst | 0 .../responsibilities.rst | 0 index.rst | 2 +- 17 files changed, 21 insertions(+), 15 deletions(-) rename {core-developers => core-team}/become-core-developer.rst (100%) rename {core-developers => core-team}/committing.rst (100%) rename {core-developers => core-team}/developer-log.rst (100%) rename {core-developers => core-team}/developers.csv (100%) rename {core-developers => core-team}/experts.rst (100%) rename {core-developers => core-team}/index.rst (100%) rename {core-developers => core-team}/memorialization.rst (97%) rename {core-developers => core-team}/motivations.rst (100%) rename {core-developers => core-team}/responsibilities.rst (100%) diff --git a/conf.py b/conf.py index bedd99c42..7d92369e2 100644 --- a/conf.py +++ b/conf.py @@ -109,12 +109,18 @@ # 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/become-core-developer.rst", + "committing.rst": "core-team/committing.rst", + "developers.rst": "core-team/developer-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/become-core-developer.rst", + "core-developers/committing.rst": "core-team/committing.rst", + "core-developers/developer-log.rst": "core-team/developer-log.rst", + "core-developers/experts.rst": "core-team/experts.rst", + "core-developers/motivations.rst": "core-team/motivations.rst", # Developer Workflow "c-api.rst": "developer-workflow/c-api.rst", "communication.rst": "developer-workflow/communication-channels.rst", diff --git a/contrib/core-team/committing.rst b/contrib/core-team/committing.rst index 59cf7c1af..5b639cd5a 100644 --- a/contrib/core-team/committing.rst +++ b/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 diff --git a/contrib/core-team/developer-log.rst b/contrib/core-team/developer-log.rst index 473cd3c6c..9c2182742 100644 --- a/contrib/core-team/developer-log.rst +++ b/contrib/core-team/developer-log.rst @@ -8,4 +8,4 @@ [This is the existing core developers :ref:`developer-log` page from the devguide. We'll adjust "core developer" to "core team" where appropriate.] -.. include:: ../../core-developers/developer-log.rst +.. include:: ../../core-team/developer-log.rst diff --git a/contrib/core-team/experts.rst b/contrib/core-team/experts.rst index 7f2a103cd..73a9431c0 100644 --- a/contrib/core-team/experts.rst +++ b/contrib/core-team/experts.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 diff --git a/contrib/core-team/join-team.rst b/contrib/core-team/join-team.rst index 0c893ae08..6beacb4ac 100644 --- a/contrib/core-team/join-team.rst +++ b/contrib/core-team/join-team.rst @@ -12,5 +12,5 @@ adjust "core developer" to "core team" where appropriate.] How to join the core team ========================= -.. include:: ../../core-developers/become-core-developer.rst +.. include:: ../../core-team/become-core-developer.rst :start-line: 7 diff --git a/contrib/core-team/motivations.rst b/contrib/core-team/motivations.rst index c9e0281b6..8fc6f94db 100644 --- a/contrib/core-team/motivations.rst +++ b/contrib/core-team/motivations.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 diff --git a/contrib/core-team/responsibilities.rst b/contrib/core-team/responsibilities.rst index a3de32956..973385a15 100644 --- a/contrib/core-team/responsibilities.rst +++ b/contrib/core-team/responsibilities.rst @@ -8,4 +8,4 @@ [This is the existing core developers :ref:`responsibilities` page from the devguide. We'll adjust "core developer" to "core team" where appropriate.] -.. include:: ../../core-developers/responsibilities.rst +.. include:: ../../core-team/responsibilities.rst diff --git a/core-developers/become-core-developer.rst b/core-team/become-core-developer.rst similarity index 100% rename from core-developers/become-core-developer.rst rename to core-team/become-core-developer.rst diff --git a/core-developers/committing.rst b/core-team/committing.rst similarity index 100% rename from core-developers/committing.rst rename to core-team/committing.rst diff --git a/core-developers/developer-log.rst b/core-team/developer-log.rst similarity index 100% rename from core-developers/developer-log.rst rename to core-team/developer-log.rst diff --git a/core-developers/developers.csv b/core-team/developers.csv similarity index 100% rename from core-developers/developers.csv rename to core-team/developers.csv diff --git a/core-developers/experts.rst b/core-team/experts.rst similarity index 100% rename from core-developers/experts.rst rename to core-team/experts.rst diff --git a/core-developers/index.rst b/core-team/index.rst similarity index 100% rename from core-developers/index.rst rename to core-team/index.rst diff --git a/core-developers/memorialization.rst b/core-team/memorialization.rst similarity index 97% rename from core-developers/memorialization.rst rename to core-team/memorialization.rst index b1e51cea2..a7b7eeb9f 100644 --- a/core-developers/memorialization.rst +++ b/core-team/memorialization.rst @@ -115,8 +115,8 @@ python.org admin devguide.python.org ------------------- -* The user is marked as deceased in `developers.csv `_; -* The user is removed from the `Experts Index `_. +* The user is marked as deceased in `developers.csv `_; +* The user is removed from the `experts index `_. bugs.python.org --------------- diff --git a/core-developers/motivations.rst b/core-team/motivations.rst similarity index 100% rename from core-developers/motivations.rst rename to core-team/motivations.rst diff --git a/core-developers/responsibilities.rst b/core-team/responsibilities.rst similarity index 100% rename from core-developers/responsibilities.rst rename to core-team/responsibilities.rst diff --git a/index.rst b/index.rst index b70461dc0..47712997f 100644 --- a/index.rst +++ b/index.rst @@ -314,7 +314,7 @@ Full table of contents documentation/index testing/index development-tools/index - core-developers/index + core-team/index internals/index versions contrib/index From 807ab4daa16c57c6cc40b051e53ac1ead2390a31 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 29 Jun 2025 00:05:33 +0300 Subject: [PATCH 2/6] Rename 'Core developers' section to 'Core team' --- contrib/core-team/index.rst | 4 ++-- contrib/index.rst | 2 +- core-team/index.rst | 7 ++++--- index.rst | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/contrib/core-team/index.rst b/contrib/core-team/index.rst index a89d08aff..5b68fb0c1 100644 --- a/contrib/core-team/index.rst +++ b/contrib/core-team/index.rst @@ -5,13 +5,13 @@ |purpose| -.. _c_coreteam: +.. _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:: diff --git a/contrib/index.rst b/contrib/index.rst index b93d36504..0b5a3edc6 100644 --- a/contrib/index.rst +++ b/contrib/index.rst @@ -95,7 +95,7 @@ major section at the top of each column.]* * :ref:`gh-faq` * :ref:`triage-team` -Core team members will find guidance in the :ref:`c_coreteam` section. +Core team members will find guidance in the :ref:`c_core-team` section. Contents ======== diff --git a/core-team/index.rst b/core-team/index.rst index 2e6db104f..6d14441fd 100644 --- a/core-team/index.rst +++ b/core-team/index.rst @@ -1,8 +1,9 @@ .. _core-dev: +.. _core-team: -=============== -Core developers -=============== +========= +Core team +========= .. toctree:: :maxdepth: 5 diff --git a/index.rst b/index.rst index 47712997f..4f62668ac 100644 --- a/index.rst +++ b/index.rst @@ -169,7 +169,7 @@ Core developers and contributors alike will find the following guides useful: Guide for contributing to Python: ======================== =================== ======================= ======================= -Contributors Documentarians Triagers Core Developers +Contributors Documentarians Triagers Core team ======================== =================== ======================= ======================= :ref:`setup` :ref:`docquality` :ref:`tracker` :ref:`responsibilities` :ref:`help` :ref:`documenting` :ref:`triaging` :ref:`developers` From 2c2a45d372d22962e90dce440723d1399326828d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 29 Jun 2025 00:15:38 +0300 Subject: [PATCH 3/6] Rename 'How to become a core developer' page to 'How to join the core team' --- conf.py | 4 ++-- contrib/core-team/join-team.rst | 9 ++------- core-team/index.rst | 2 +- core-team/{become-core-developer.rst => join-team.rst} | 7 ++++--- 4 files changed, 9 insertions(+), 13 deletions(-) rename core-team/{become-core-developer.rst => join-team.rst} (97%) diff --git a/conf.py b/conf.py index 7d92369e2..ecf5e7a7e 100644 --- a/conf.py +++ b/conf.py @@ -110,13 +110,13 @@ "advanced-tools/clang.rst": "development-tools/clang.rst", "advanced-tools/gdb.rst": "development-tools/gdb.rst", # Core team - "coredev.rst": "core-team/become-core-developer.rst", + "coredev.rst": "core-team/join-team.rst", "committing.rst": "core-team/committing.rst", "developers.rst": "core-team/developer-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/become-core-developer.rst", + "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/developer-log.rst", "core-developers/experts.rst": "core-team/experts.rst", diff --git a/contrib/core-team/join-team.rst b/contrib/core-team/join-team.rst index 6beacb4ac..70557589d 100644 --- a/contrib/core-team/join-team.rst +++ b/contrib/core-team/join-team.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-team/become-core-developer.rst - :start-line: 7 +.. include:: ../../core-team/join-team.rst diff --git a/core-team/index.rst b/core-team/index.rst index 6d14441fd..38ce98c77 100644 --- a/core-team/index.rst +++ b/core-team/index.rst @@ -13,5 +13,5 @@ Core team experts developer-log motivations - become-core-developer + join-team memorialization diff --git a/core-team/become-core-developer.rst b/core-team/join-team.rst similarity index 97% rename from core-team/become-core-developer.rst rename to core-team/join-team.rst index 70b7e25af..5735f72a1 100644 --- a/core-team/become-core-developer.rst +++ b/core-team/join-team.rst @@ -1,9 +1,10 @@ .. _become-core-developer: .. _coredev: +.. _join-core-team: -============================== -How to become a core developer -============================== +========================= +How to join the core team +========================= What it takes ============= From f2ae231d02677be78d73f7947a1c631e0fde472a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 29 Jun 2025 15:56:38 +0300 Subject: [PATCH 4/6] Add more redirects --- conf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf.py b/conf.py index ecf5e7a7e..21bab1d45 100644 --- a/conf.py +++ b/conf.py @@ -120,7 +120,10 @@ "core-developers/committing.rst": "core-team/committing.rst", "core-developers/developer-log.rst": "core-team/developer-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", From e67a410a4d5984bb24ef5dffd2ec6c6e9ab0ceb5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 29 Jun 2025 16:27:50 +0300 Subject: [PATCH 5/6] Rename 'Developer log' to 'Team log' --- conf.py | 4 ++-- contrib/core-team/developer-log.rst | 11 ----------- contrib/core-team/index.rst | 2 +- contrib/core-team/team-log.rst | 11 +++++++++++ core-team/index.rst | 2 +- core-team/{developer-log.rst => team-log.rst} | 7 ++++--- 6 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 contrib/core-team/developer-log.rst create mode 100644 contrib/core-team/team-log.rst rename core-team/{developer-log.rst => team-log.rst} (88%) diff --git a/conf.py b/conf.py index 21bab1d45..f6ac76e02 100644 --- a/conf.py +++ b/conf.py @@ -112,13 +112,13 @@ # Core team "coredev.rst": "core-team/join-team.rst", "committing.rst": "core-team/committing.rst", - "developers.rst": "core-team/developer-log.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/developer-log.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", diff --git a/contrib/core-team/developer-log.rst b/contrib/core-team/developer-log.rst deleted file mode 100644 index 9c2182742..000000000 --- a/contrib/core-team/developer-log.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. important:: - - |draft| - - |purpose| - - -[This is the existing core developers :ref:`developer-log` page from the devguide. We'll -adjust "core developer" to "core team" where appropriate.] - -.. include:: ../../core-team/developer-log.rst diff --git a/contrib/core-team/index.rst b/contrib/core-team/index.rst index 5b68fb0c1..d51a8a4e8 100644 --- a/contrib/core-team/index.rst +++ b/contrib/core-team/index.rst @@ -20,6 +20,6 @@ but with "core developer" language changed to "core team" where possible.] responsibilities committing experts - developer-log + team-log motivations join-team diff --git a/contrib/core-team/team-log.rst b/contrib/core-team/team-log.rst new file mode 100644 index 000000000..d6b480d25 --- /dev/null +++ b/contrib/core-team/team-log.rst @@ -0,0 +1,11 @@ +.. important:: + + |draft| + + |purpose| + + +[This is the existing core team :ref:`team-log` page from the devguide. We'll +adjust "core developer" to "core team" where appropriate.] + +.. include:: ../../core-team/team-log.rst diff --git a/core-team/index.rst b/core-team/index.rst index 38ce98c77..f8dafe05e 100644 --- a/core-team/index.rst +++ b/core-team/index.rst @@ -11,7 +11,7 @@ Core team responsibilities committing experts - developer-log + team-log motivations join-team memorialization diff --git a/core-team/developer-log.rst b/core-team/team-log.rst similarity index 88% rename from core-team/developer-log.rst rename to core-team/team-log.rst index 665ef0700..e4c2ca140 100644 --- a/core-team/developer-log.rst +++ b/core-team/team-log.rst @@ -1,10 +1,11 @@ .. _developer-log: .. _developers: +.. _team-log: -Developer log -============= +Team log +======== -This page lists the historical members of the Python development team. (The +This page lists the historical members of the Python core team. (The master list is kept in a private repository due to containing sensitive contact information.) From 429f153a248074cab2dca93bfec4d4a03f30133e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 29 Jun 2025 16:28:12 +0300 Subject: [PATCH 6/6] Rename developers.csv to core-team.csv --- core-team/{developers.csv => core-team.csv} | 0 core-team/memorialization.rst | 2 +- core-team/team-log.rst | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename core-team/{developers.csv => core-team.csv} (100%) diff --git a/core-team/developers.csv b/core-team/core-team.csv similarity index 100% rename from core-team/developers.csv rename to core-team/core-team.csv diff --git a/core-team/memorialization.rst b/core-team/memorialization.rst index a7b7eeb9f..2bcf24ae1 100644 --- a/core-team/memorialization.rst +++ b/core-team/memorialization.rst @@ -115,7 +115,7 @@ python.org admin devguide.python.org ------------------- -* The user is marked as deceased in `developers.csv `_; +* The user is marked as deceased in `core-team.csv `_; * The user is removed from the `experts index `_. bugs.python.org diff --git a/core-team/team-log.rst b/core-team/team-log.rst index e4c2ca140..77639ebf1 100644 --- a/core-team/team-log.rst +++ b/core-team/team-log.rst @@ -11,7 +11,7 @@ information.) .. csv-table:: :header: "Name", "GitHub username", "Joined", "Left", "Notes" - :file: developers.csv + :file: core-team.csv :encoding: "utf-8" Procedure for granting or dropping access