Skip to content

Prefer 'core team' in core-team/ #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
3 changes: 1 addition & 2 deletions contrib/core-team/experts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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-team/experts.rst
3 changes: 1 addition & 2 deletions contrib/core-team/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
Core team
=========

[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.]
[This is mostly re-organized from the :ref:`core-team` section of the devguide]

.. toctree::
:maxdepth: 5
Expand Down
3 changes: 1 addition & 2 deletions contrib/core-team/join-team.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
|purpose|


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

.. include:: ../../core-team/join-team.rst
3 changes: 1 addition & 2 deletions contrib/core-team/motivations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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-team/motivations.rst
3 changes: 1 addition & 2 deletions contrib/core-team/responsibilities.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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-team/responsibilities.rst
3 changes: 1 addition & 2 deletions contrib/core-team/team-log.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
|purpose|


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

.. include:: ../../core-team/team-log.rst
14 changes: 7 additions & 7 deletions core-team/committing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Accepting pull requests

.. highlight:: none

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

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

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

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

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

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

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

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

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

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

.. _cherry_picker.py: https://github.com/python/cherry-picker
Expand Down
10 changes: 5 additions & 5 deletions core-team/join-team.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ What it takes

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

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


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

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

Expand Down
7 changes: 4 additions & 3 deletions core-team/memorialization.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.. _memorialize-core-developer:
.. _memorialize-core-team-member:

===============
Memorialization
Expand All @@ -7,7 +8,7 @@ Memorialization
Rationale
=========

When a core developer passes away, memorializing accounts helps create
When a core team member passes away, memorializing accounts helps create
a space for remembering the contributor and protects against attempted
logins and fraudulent activity.

Expand All @@ -16,9 +17,9 @@ The process

The memorialization process is performed by a member of the PSF staff
with administrative access to current and historical systems where
core developers have access.
the core team has access.

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

Expand Down
50 changes: 25 additions & 25 deletions core-team/motivations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
Motivations and affiliations
============================

CPython core developers participate in the core development process for a
variety of reasons. Being accepted as a core developer indicates that
CPython core team members participate in the core development process for a
variety of reasons. Being accepted as a core team member indicates that
an individual is interested in acquiring those responsibilities, has the
ability to collaborate effectively with existing core developers, and has had
ability to collaborate effectively with existing core team members, and has had
the time available to demonstrate both that interest and that ability.

This page allows core developers that choose to do so to provide more
This page allows core team members that choose to do so to provide more
information to the rest of the Python community regarding their personal
situation (such as their general location and professional affiliations), as
well as any personal motivations that they consider particularly relevant.

Core developers that wish to provide this additional information add a new
Core team members that wish to provide this additional information add a new
entry to the :ref:`published-motivations` section below. Guidelines relating
to content and layout are included as comments in the source code for this page.

Core developers that are available for training, consulting, contract, or
Core team members who are available for training, consulting, contract, or
full-time work, or are seeking crowdfunding support for their community
contributions, may also choose to provide that information here (including
linking out to commercial sites with the relevant details).
Expand All @@ -32,7 +32,7 @@ For more information on the origins and purpose of this page, see
Published entries
=================

The following core developers have chosen to provide additional details
The following core team members have chosen to provide additional details
regarding their professional affiliations and (optionally) other reasons for
participating in the CPython core development process:

Expand All @@ -43,7 +43,7 @@ participating in the CPython core development process:

Topic headings should be in the form of "Name (Country)" or
"Name (Continent)" to help give some indication as to the geographic
distribution of core developers.
distribution of core team members.

NOTE: The rest of these guidelines are highly provisional - we can evolve
them as people add entries, and we decide on the style we like. The
Expand Down Expand Up @@ -112,7 +112,7 @@ participating in the CPython core development process:
for Boeing Defence Australia. She now primarily uses it as the lead project
maintainer for the open source ``venvstacks`` Python deployment utility.

As a core developer, she is primarily interested in helping to ensure Python's
As a core team member, she is primarily interested in helping to ensure Python's
continued suitability for educational, testing and data analysis use cases,
as well as in encouraging good architectural practices when assembling Python
applications and test harnesses from open source components.
Expand All @@ -132,7 +132,7 @@ participating in the CPython core development process:
devices, and now works for Microsoft on anything that makes Python more
accessible to developers on any platform.

As a core developer, his focus is on maintaining the already excellent
As a core team member, his focus is on maintaining the already excellent
Windows support and improving Python's ability to be embedded in other
applications.

Expand Down Expand Up @@ -194,7 +194,7 @@ participating in the CPython core development process:

Antoine started working with Python in 2005 in order to implement a
decentralized virtual world protocol. He started contributing to CPython
in 2007 and became a core developer in 2008. His motivations have been
in 2007 and became a core team member in 2008. His motivations have been
driven both by the abstract desire to make Python better for the whole
world, and by the concrete roadblocks he was hitting in professional
settings. Topics of choice have included interpreter optimizations,
Expand Down Expand Up @@ -279,12 +279,12 @@ Goals of this page

The `issue metrics`_ automatically collected by the CPython issue tracker
strongly suggest that the current core development process is bottlenecked on
core developer time. This is most clearly indicated in the first metrics graph,
core team time. This is most clearly indicated in the first metrics graph,
which shows both the number of open issues and the number of pull requests awaiting
review growing steadily over time, despite CPython being one of the most
active open source projects in the world. This bottleneck then impacts not only
resolving open issues and accepting submitted pull requests, but also the process of
identifying, nominating and mentoring new core developers.
identifying, nominating and mentoring new core team members.

The core commit statistics monitored by sites like `OpenHub`_ provide a good
record as to *who* is currently handling the bulk of the review and maintenance
Expand All @@ -293,34 +293,34 @@ people's ability to spend time on reviewing proposed changes, or mentoring new
contributors.

This page aims to provide at least some of that missing data by encouraging
core developers to highlight professional affiliations in the following two
core team members to highlight professional affiliations in the following two
cases (even if not currently paid for time spent participating in the core
development process):

* developers working for vendors that distribute a commercially supported
* members working for vendors that distribute a commercially supported
Python runtime
* developers working for Sponsor Members of the Python Software Foundation
* members working for Sponsor Members of the Python Software Foundation

These are cases where documenting our affiliations helps to improve the
overall transparency of the core development process, as well as making it
easier for staff at these organisations to locate colleagues that can help
them to participate in and contribute effectively to supporting the core
development process.

Core developers working for organisations with a vested interest in the
Core team members working for organisations with a vested interest in the
sustainability of the CPython core development process are also encouraged to
seek opportunities to spend work time on mentoring potential new core
developers, whether through the general `core mentorship program`_, through
mentoring colleagues, or through more targeted efforts like Outreachy's paid
`internships`_ and Google's `Summer of Code`_.

Core developers that are available for consulting or contract work on behalf of
Core team members who are available for consulting or contract work on behalf of
the Python Software Foundation or other organisations are also encouraged
to provide that information here, as this will help the PSF to better
facilitate funding of core development work by organisations that don't
directly employ any core developers themselves.
directly employ any core team members themselves.

Finally, some core developers seeking to increase the time they have available
Finally, some core team members seeking to increase the time they have available
to contribute to CPython may wish to pursue crowdfunding efforts that allow
their contributions to be funded directly by the community, rather than relying
on institutional sponsors allowing them to spend some or all of their work
Expand All @@ -336,15 +336,15 @@ time contributing to CPython development.
Limitations on scope
====================

* Specific technical areas of interest for core developers should be captured in
* Specific technical areas of interest for core team members should be captured in
the :ref:`Experts Index <experts>`.

* This specific listing is limited to CPython core developers (since it's
focused on the specific constraint that is core developer time), but it
* This specific listing is limited to CPython core team members (since it's
focused on the specific constraint that is core team member time), but it
would be possible to create a more expansive listing on the Python wiki that
also covers issue triagers, and folks seeking to become core developers.
also covers issue triagers, and folks seeking to join the core team.

* Changes to the software and documentation maintained by core developers,
* Changes to the software and documentation maintained by the core team,
together with related design discussions, all take place in public venues, and
hence are inherently subject to full public review. Accordingly, core
developers are NOT required to publish their motivations and affiliations if
Expand Down
Loading
Loading