From f100262577f85b23ee6cbb531773805c0f7d238c Mon Sep 17 00:00:00 2001 From: Stan Ulbrych Date: Tue, 25 Nov 2025 07:30:20 +0000 Subject: [PATCH 1/3] Remove Misc/ACKS mentions --- getting-started/git-boot-camp.rst | 2 +- getting-started/pull-request-lifecycle.rst | 4 +--- triage/triaging.rst | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 87177840cb..7085bf78de 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -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. .. _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 diff --git a/getting-started/pull-request-lifecycle.rst b/getting-started/pull-request-lifecycle.rst index c401187593..3fb9c088f7 100644 --- a/getting-started/pull-request-lifecycle.rst +++ b/getting-started/pull-request-lifecycle.rst @@ -630,9 +630,7 @@ 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. +often, in a contribution'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 diff --git a/triage/triaging.rst b/triage/triaging.rst index c560d8c1d5..207c59082f 100644 --- a/triage/triaging.rst +++ b/triage/triaging.rst @@ -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 ` (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 ` From d06c0527a23cfb226b3ec89c9b536b0ed9f4edda Mon Sep 17 00:00:00 2001 From: Stan Ulbrych Date: Tue, 25 Nov 2025 16:43:46 +0000 Subject: [PATCH 2/3] Apply some Finnish wisdom --- .github/CONTRIBUTING.md | 11 ++++------- getting-started/pull-request-lifecycle.rst | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0287153194..1953ce907e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,13 +18,10 @@ 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: - -- 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) +comments they leave and their "Details" links, respectively. A key point of +our workflow that is not covered by a bot or status check 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/). ## Setting Expectations diff --git a/getting-started/pull-request-lifecycle.rst b/getting-started/pull-request-lifecycle.rst index 3fb9c088f7..46975b7f73 100644 --- a/getting-started/pull-request-lifecycle.rst +++ b/getting-started/pull-request-lifecycle.rst @@ -629,8 +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). +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 From 4fba85b002264d6e60fda275c35b6f69b24f22d3 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Date: Tue, 25 Nov 2025 18:39:50 +0000 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- .github/CONTRIBUTING.md | 10 ++++++---- getting-started/git-boot-camp.rst | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1953ce907e..c4a7d25457 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,10 +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. A key point of -our workflow that is not covered by a bot or status check 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/). +comments they leave and their "Details" links, respectively. + +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 diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 7085bf78de..2ecaa62f0e 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -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. +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