Skip to content

Commit 8090ffc

Browse files
Remove references to Misc/ACKS in the devguide (#1702)
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
1 parent bf44e3d commit 8090ffc

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

.github/CONTRIBUTING.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ Please be aware that our workflow does deviate slightly from the typical GitHub
1818
project. Details on how to properly submit a pull request are covered in
1919
[Lifecycle of a Pull Request](https://devguide.python.org/pullrequest/).
2020
We utilize various bots and status checks to help with this, so do follow the
21-
comments they leave and their "Details" links, respectively. The key points of
22-
our workflow that are not covered by a bot or status check are:
21+
comments they leave and their "Details" links, respectively.
2322

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

2928

3029
## Setting Expectations

getting-started/git-boot-camp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ When a pull request submitter has enabled the `Allow edits from maintainers`_
611611
option, Python Core Developers may decide to make any remaining edits needed
612612
prior to merging themselves, rather than asking the submitter to do them. This
613613
can be particularly appropriate when the remaining changes are bookkeeping
614-
items like updating ``Misc/ACKS``.
614+
items like updating a news entry.
615615

616616
.. _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
617617

getting-started/pull-request-lifecycle.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -629,10 +629,8 @@ it is warranted.
629629
Crediting
630630
=========
631631

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

637635
.. _issue tracker: https://github.com/python/cpython/issues
638636
.. _Core Development Discourse category: https://discuss.python.org/c/core-dev/23

triage/triaging.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ you can help by making sure the pull request:
9292
* includes proper tests
9393
* includes proper documentation changes
9494
* includes a :ref:`NEWS entry <news-entry>` (if needed)
95-
* includes the author in ``Misc/ACKS``, either already or the pull request adds them
9695
* doesn't have conflicts with the ``main`` branch
9796
* :ref:`doesn't have failing CI checks <keeping-ci-green>`
9897

0 commit comments

Comments
 (0)