Skip to content

Commit 0fe9ca7

Browse files
StanFromIrelandhugovkpicnixz
authored
Move NEWS entries to pull-request-lifecycle (#1506)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
1 parent b736a43 commit 0fe9ca7

File tree

2 files changed

+103
-98
lines changed

2 files changed

+103
-98
lines changed

core-team/committing.rst

Lines changed: 4 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -73,104 +73,10 @@ to enter the public source tree. Ask yourself the following questions:
7373
significant improvements, or backwards-incompatible changes), then an
7474
entry in the ``What's New in Python`` document (in ``Doc/whatsnew/``) should
7575
be added as well. Changes that affect only documentation generally do not
76-
require a ``NEWS`` entry. (See the following section for more information.)
77-
78-
.. _news-entry:
79-
.. _what-s-new-and-news-entries:
80-
81-
Updating NEWS and What's New in Python
82-
--------------------------------------
83-
84-
Changes that require NEWS entries
85-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
86-
87-
Most changes made to the codebase deserve an entry in :cpy-file:`Misc/NEWS.d`,
88-
except for the following:
89-
90-
* documentation changes
91-
* test changes
92-
* strictly internal changes with no user-visible effects
93-
* changes that already have a ``NEWS`` entry
94-
* reverts that have not yet been included in any formal release
95-
(including alpha and beta releases)
96-
97-
For the last two, note the following:
98-
99-
#. **If a change is reverted prior to release**, then the corresponding
100-
entry is simply removed. Otherwise, a new entry must be added noting
101-
that the change has been reverted (for example, when a feature is released in
102-
an alpha and then cut prior to the first beta).
103-
104-
#. **If a change is a fix (or other adjustment) to an earlier unreleased
105-
change and the original** ``NEWS`` **entry remains valid**, then no additional
106-
entry is needed.
107-
108-
Changes that require "What's New in Python" entries
109-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
110-
111-
If a change is particularly interesting for end users (for example, new features,
112-
significant improvements, or backwards-incompatible changes), add an entry in
113-
the "What's New in Python" document (in :cpy-file:`Doc/whatsnew/`)
114-
in addition to the ``NEWS`` entry.
115-
116-
In most cases, it is sufficient to reuse the wording from the ``NEWS`` entry
117-
in the "What's New in Python" entry.
118-
119-
.. note::
120-
121-
A change that needs an entry in "What's New in Python",
122-
is very likely not suitable for inclusion in a maintenance release.
123-
124-
How to add a NEWS entry
125-
^^^^^^^^^^^^^^^^^^^^^^^
126-
127-
``NEWS`` entries go into the ``Misc/NEWS.d`` directory as individual files. The
128-
``NEWS`` entry can be created by using `blurb-it <https://blurb-it.herokuapp.com/>`__,
129-
or the :pypi:`blurb` tool and its ``blurb add`` command.
130-
131-
If you are unable to use the tool, then you can create the ``NEWS`` entry file
132-
manually. The ``Misc/NEWS.d`` directory contains a sub-directory named
133-
``next``, which contains various sub-directories representing classifications
134-
for what was affected (for example, ``Misc/NEWS.d/next/Library`` for changes relating
135-
to the standard library). The file name itself should be in the format
136-
``<datetime>.gh-issue-<issue-number>.<nonce>.rst``:
137-
138-
* ``<datetime>`` is today's date joined with a hyphen (``-``) to your current
139-
local time, in the ``YYYY-MM-DD-hh-mm-ss`` format (for example, ``2017-05-27-16-46-23``).
140-
* ``<issue-number>`` is the issue number the change is for (for example, ``12345``
141-
for ``gh-issue-12345``).
142-
* ``<nonce>`` is a unique string to guarantee that the file name is
143-
unique across branches (for example, ``Yl4gI2``). It is typically six characters
144-
long, but it can be any length of letters and numbers. Its uniqueness
145-
can be satisfied by typing random characters on your keyboard.
146-
147-
As a result, a file name can look something like
148-
``Misc/NEWS.d/next/Library/2017-05-27-16-46-23.gh-issue-12345.Yl4gI2.rst``.
149-
150-
How to write a NEWS entry
151-
^^^^^^^^^^^^^^^^^^^^^^^^^
152-
153-
All ``NEWS`` entries end up being part of the changelog.
154-
The changelog contains *a lot* of entries,
155-
and its intended audience is mainly users, not the core team and contributors.
156-
Take this into consideration when wording your ``NEWS`` entry.
157-
Describe the user-visible effects of your change succinctly and accurately;
158-
avoid long technical elaborations, digressions, and do not expect or require
159-
the reader to have read the actual diff for the change.
160-
161-
The contents of a ``NEWS`` file should be valid reStructuredText. An 80 character
162-
column width should be used. There is no indentation or leading marker in the
163-
file (for example, ``-``). There is also no need to start the entry with the issue
164-
number since it is part of the file name. You can use
165-
:ref:`inline markups <rest-inline-markup>` too. Here is an example of a ``NEWS``
166-
entry::
167-
168-
Fix warning message when :func:`os.chdir` fails inside
169-
:func:`test.support.temp_cwd`. Contributed by Chris Jerdonek.
170-
171-
The inline Sphinx roles like ``:func:`` can be used help readers
172-
find more information. You can build HTML and verify that the
173-
link target is appropriate by using :ref:`make html <building-using-make>`.
76+
require a ``NEWS`` entry.
77+
78+
.. seealso::
79+
:ref:`what-s-new-and-news-entries`
17480

17581

17682
Working with Git_

getting-started/pull-request-lifecycle.rst

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,105 @@ should do to help ensure that your pull request is accepted.
240240

241241
#. Proper :ref:`documentation <documenting>` additions/changes should be included.
242242

243+
.. _news-entry:
244+
.. _what-s-new-and-news-entries:
245+
246+
Updating NEWS and What's New in Python
247+
======================================
248+
249+
Changes that require NEWS entries
250+
---------------------------------
251+
252+
Most changes made to the codebase deserve an entry in :cpy-file:`Misc/NEWS.d`,
253+
except for the following:
254+
255+
* documentation changes
256+
* test changes
257+
* strictly internal changes with no user-visible effects
258+
* changes that already have a ``NEWS`` entry
259+
* reverts that have not yet been included in any formal release
260+
(including alpha and beta releases)
261+
262+
For the last two, note the following:
263+
264+
#. **If a change is reverted prior to release**, then the corresponding
265+
entry is simply removed. Otherwise, a new entry must be added noting
266+
that the change has been reverted (for example, when a feature is released in
267+
an alpha and then cut prior to the first beta).
268+
269+
#. **If a change is a fix (or other adjustment) to an earlier unreleased
270+
change and the original** ``NEWS`` **entry remains valid**, then no additional
271+
entry is needed.
272+
273+
Changes that require "What's New in Python" entries
274+
---------------------------------------------------
275+
276+
If a change is particularly interesting for end users (for example, new features,
277+
significant improvements, or backwards-incompatible changes), add an entry in
278+
the "What's New in Python" document (in :cpy-file:`Doc/whatsnew/`, the 3.X.rst
279+
file where X is the current Python version) in addition to the ``NEWS`` entry.
280+
281+
In most cases, it is sufficient to reuse the wording from the ``NEWS`` entry
282+
in the "What's New in Python" entry.
283+
284+
.. note::
285+
286+
A change that needs an entry in "What's New in Python"
287+
is very likely not suitable for inclusion in a maintenance release.
288+
289+
How to add a NEWS entry
290+
-----------------------
291+
292+
``NEWS`` entries go into the ``Misc/NEWS.d`` directory as individual files. The
293+
``NEWS`` entry can be created by using `blurb-it <https://blurb-it.herokuapp.com/>`_,
294+
or the :pypi:`blurb` tool and its ``blurb add`` command.
295+
296+
If you are unable to use the tool, then you can create the ``NEWS`` entry file
297+
manually. The ``Misc/NEWS.d`` directory contains a sub-directory named
298+
``next``, which contains various sub-directories representing classifications
299+
for what was affected (for example, ``Misc/NEWS.d/next/Library`` for changes relating
300+
to the standard library). The file name itself should be in the format
301+
``<datetime>.gh-issue-<issue-number>.<nonce>.rst``:
302+
303+
* ``<datetime>`` is today's date joined with a hyphen (``-``) to your current
304+
local time, in the ``YYYY-MM-DD-hh-mm-ss`` format (for example, ``2017-05-27-16-46-23``).
305+
* ``<issue-number>`` is the issue number the change is for (for example, ``12345``
306+
for ``gh-issue-12345``).
307+
* ``<nonce>`` is a unique string to guarantee that the file name is
308+
unique across branches (for example, ``Yl4gI2``). It is typically six characters
309+
long, but it can be any length of letters and numbers. Its uniqueness
310+
can be satisfied by typing random characters on your keyboard.
311+
312+
As a result, a file name can look something like
313+
``Misc/NEWS.d/next/Library/2017-05-27-16-46-23.gh-issue-12345.Yl4gI2.rst``.
314+
315+
How to write a NEWS entry
316+
-------------------------
317+
318+
All ``NEWS`` entries end up being part of the changelog.
319+
The changelog contains *a lot* of entries,
320+
and its intended audience is mainly users, not core devs and contributors.
321+
Take this into consideration when wording your ``NEWS`` entry.
322+
Describe the user-visible effects of your change succinctly and accurately;
323+
avoid long technical elaborations, digressions, and do not expect or require
324+
the reader to have read the actual diff for the change.
325+
326+
The contents of a ``NEWS`` file should be valid reStructuredText. An 80 character
327+
column width should be used. There is no indentation or leading marker in the
328+
file (for example, ``-``). There is also no need to start the entry with the issue
329+
number since it is part of the file name. You can use
330+
:ref:`inline markups <rest-inline-markup>` too. Here is an example of a ``NEWS``
331+
entry:
332+
333+
.. code-block:: rst
334+
335+
Fix warning message when :func:`os.chdir` fails inside
336+
:func:`test.support.temp_cwd`. Contributed by Chris Jerdonek.
337+
338+
The inline Sphinx roles like :rst:role:`:func: <py:func>` can be used help readers
339+
find more information. You can build HTML and verify that the
340+
link target is appropriate by using :ref:`make html <building-using-make>`.
341+
243342

244343
Copyrights
245344
==========

0 commit comments

Comments
 (0)