Skip to content
Merged
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
11 changes: 5 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ Please be aware that our workflow does deviate slightly from the typical GitHub
project. Details on how to properly submit a pull request are covered in
[Lifecycle of a Pull Request](https://devguide.python.org/pullrequest/).
We utilize various bots and status checks to help with this, so do follow the
comments they leave and their "Details" links, respectively. The key points of
our workflow that are not covered by a bot or status check are:
comments they leave and their "Details" links, respectively.

- All discussions that are not directly related to the code in the pull request
should happen on the [issue tracker](https://devguide.python.org/tracker/)
- Upon your first non-trivial pull request (which includes documentation changes),
feel free to add yourself to [`Misc/ACKS`](https://github.com/python/cpython/blob/main/Misc/ACKS)
The final key part of our workflow is that all discussions that are not
directly related to the code in the pull request should happen on the
[issue tracker](https://devguide.python.org/tracker/), generally in the
pull request's parent issue.


## Setting Expectations
Expand Down
2 changes: 1 addition & 1 deletion getting-started/git-boot-camp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ When a pull request submitter has enabled the `Allow edits from maintainers`_
option, Python Core Developers may decide to make any remaining edits needed
prior to merging themselves, rather than asking the submitter to do them. This
can be particularly appropriate when the remaining changes are bookkeeping
items like updating ``Misc/ACKS``.
items like updating a news entry.

.. _Allow edits from maintainers: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork

Expand Down
6 changes: 2 additions & 4 deletions getting-started/pull-request-lifecycle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,8 @@ it is warranted.
Crediting
=========

Non-trivial contributions are credited in the ``Misc/ACKS`` file (and, most
often, in a contribution's news entry as well). You may be
asked to make these edits on the behalf of the core team member who
accepts your pull request.
Non-trivial contributions are often credited in What's New in Python
and a contributions's news entry as well.

.. _issue tracker: https://github.com/python/cpython/issues
.. _Core Development Discourse category: https://discuss.python.org/c/core-dev/23
Expand Down
1 change: 0 additions & 1 deletion triage/triaging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ you can help by making sure the pull request:
* includes proper tests
* includes proper documentation changes
* includes a :ref:`NEWS entry <news-entry>` (if needed)
* includes the author in ``Misc/ACKS``, either already or the pull request adds them
* doesn't have conflicts with the ``main`` branch
* :ref:`doesn't have failing CI checks <keeping-ci-green>`

Expand Down
Loading