Skip to content

Commit 08a3197

Browse files
authored
Prefer 'core team' in core-team/ (#1614)
* Prefer 'core team' in core-team/ * Update contrib/core-team/
1 parent 9069a98 commit 08a3197

File tree

12 files changed

+62
-67
lines changed

12 files changed

+62
-67
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The CPython Developer's Guide
1717

1818

1919
This guide covers how to contribute to CPython. It is known by the
20-
nickname of "the devguide" by the Python core developers.
20+
nickname of "the devguide" by the Python core team.
2121

2222
The official home of this guide is https://devguide.python.org.
2323

contrib/core-team/experts.rst

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

77

8-
[This is the existing core developers :ref:`experts` page from the devguide. We'll
9-
adjust "core developer" to "core team" where appropriate.]
8+
[This is the existing core team :ref:`experts` page from the devguide.]
109

1110
.. include:: ../../core-team/experts.rst

contrib/core-team/index.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
Core team
1212
=========
1313

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

1716
.. toctree::
1817
:maxdepth: 5

contrib/core-team/join-team.rst

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

77

8-
[This is the existing core developers :ref:`join-core-team` page from the devguide. We'll
9-
adjust "core developer" to "core team" where appropriate.]
8+
[This is the existing core team :ref:`join-core-team` page from the devguide.]
109

1110
.. include:: ../../core-team/join-team.rst

contrib/core-team/motivations.rst

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

77

8-
[This is the existing core developers :ref:`motivations` page from the devguide. We'll
9-
adjust "core developer" to "core team" where appropriate.]
8+
[This is the existing core team :ref:`motivations` page from the devguide.]
109

1110
.. include:: ../../core-team/motivations.rst

contrib/core-team/responsibilities.rst

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

77

8-
[This is the existing core developers :ref:`responsibilities` page from the devguide. We'll
9-
adjust "core developer" to "core team" where appropriate.]
8+
[This is the existing core team :ref:`responsibilities` page from the devguide.]
109

1110
.. include:: ../../core-team/responsibilities.rst

contrib/core-team/team-log.rst

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

77

8-
[This is the existing core team :ref:`team-log` page from the devguide. We'll
9-
adjust "core developer" to "core team" where appropriate.]
8+
[This is the existing core team :ref:`team-log` page from the devguide.]
109

1110
.. include:: ../../core-team/team-log.rst

core-team/committing.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Accepting pull requests
55

66
.. highlight:: none
77

8-
This page is a step-by-step guide for core developers who need to assess,
8+
This page is a step-by-step guide for the core team to assess,
99
merge, and possibly backport a pull request on the main repository.
1010

1111
Assessing a pull request
@@ -54,7 +54,7 @@ to enter the public source tree. Ask yourself the following questions:
5454
developer can apply the label ``needs backport to X.Y`` to the pull
5555
request. Once the backport pull request has been created, remove the
5656
``needs backport to X.Y`` label from the original pull request. (Only
57-
core developers and members of the :ref:`Python Triage Team <triage-team>`
57+
the core team and members of the :ref:`Python Triage Team <triage-team>`
5858
can apply labels to GitHub pull requests).
5959

6060
* **Does the pull request pass a check indicating that the submitter has signed the CLA?**
@@ -152,7 +152,7 @@ How to write a NEWS entry
152152

153153
All ``NEWS`` entries end up being part of the changelog.
154154
The changelog contains *a lot* of entries,
155-
and its intended audience is mainly users, not core devs and contributors.
155+
and its intended audience is mainly users, not the core team and contributors.
156156
Take this into consideration when wording your ``NEWS`` entry.
157157
Describe the user-visible effects of your change succinctly and accurately;
158158
avoid long technical elaborations, digressions, and do not expect or require
@@ -179,7 +179,7 @@ Working with Git_
179179
.. seealso::
180180
:ref:`gitbootcamp`
181181

182-
As a core developer, you have the ability to push changes to the official
182+
As a core team member, you have the ability to push changes to the official
183183
Python repositories, so you need to be careful with your workflow:
184184

185185
* **You should not push new branches to the main repository.** You can
@@ -224,12 +224,12 @@ Backporting changes to an older version
224224
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
225225

226226
If it is determined that a pull request needs to be backported into one or
227-
more of the maintenance branches, then a core developer can apply the label
227+
more of the maintenance branches, then a core team member can apply the label
228228
``needs backport to X.Y`` to the pull request.
229229

230230
After the pull request has been merged, miss-islington (bot) will first try to
231231
do the backport automatically. If miss-islington is unable to do it,
232-
then the pull request author or the core developer who merged it should look into
232+
then the pull request author or the core team member who merged it should look into
233233
backporting it themselves, using the backport generated by cherry_picker.py_
234234
as a starting point.
235235

@@ -252,7 +252,7 @@ Note that cherry_picker.py_ adds the branch prefix automatically.
252252

253253
Once the backport pull request has been created, remove the
254254
``needs backport to X.Y`` label from the original pull request. (Only
255-
core developers and members of the :ref:`Python Triage Team <triage-team>`
255+
members of the core team and :ref:`Python Triage Team <triage-team>`
256256
can apply labels to GitHub pull requests).
257257

258258
.. _cherry_picker.py: https://github.com/python/cherry-picker

core-team/join-team.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ What it takes
1111

1212
When you have consistently made contributions which meet quality standards
1313
without requiring extensive rewrites prior to being committed,
14-
you may qualify for commit privileges and become a core developer of Python.
15-
You must also work well with other core developers (and people in general)
14+
you may qualify for commit privileges and join the core team of Python.
15+
You must also work well with other core team members (and people in general)
1616
as you become an ambassador for the Python project.
1717

18-
Typically a core developer will offer you the chance to gain commit privilege.
18+
Typically a core team member will offer you the chance to gain commit privilege.
1919
The person making the offer will become your mentor and watch your commits for
2020
a while to make sure you understand the development process. If other core
2121
developers agree that you should gain commit privileges you are then extended
22-
an official offer. How core developers come to that agreement are outlined in
22+
an official offer. How core team members come to that agreement are outlined in
2323
:pep:`13`.
2424

2525

@@ -29,7 +29,7 @@ Gaining commit privileges
2929
After a candidate has demonstrated consistent contributions, commit privileges
3030
are granted through these steps:
3131

32-
#. A core developer (submitter, usually the mentor) starts a poll
32+
#. A core team member (submitter, usually the mentor) starts a poll
3333
(see the :ref:`template <coredev-template>` below) in
3434
the `Committers category`_ on the `Python Discourse`_.
3535

core-team/memorialization.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.. _memorialize-core-developer:
2+
.. _memorialize-core-team-member:
23

34
===============
45
Memorialization
@@ -7,7 +8,7 @@ Memorialization
78
Rationale
89
=========
910

10-
When a core developer passes away, memorializing accounts helps create
11+
When a core team member passes away, memorializing accounts helps create
1112
a space for remembering the contributor and protects against attempted
1213
logins and fraudulent activity.
1314

@@ -16,9 +17,9 @@ The process
1617

1718
The memorialization process is performed by a member of the PSF staff
1819
with administrative access to current and historical systems where
19-
core developers have access.
20+
the core team has access.
2021

21-
After the status of the core developer in question is confirmed,
22+
After the status of the core team member in question is confirmed,
2223
access to the systems listed below is revoked and some changes are
2324
made to how the user displays to others.
2425

0 commit comments

Comments
 (0)