Skip to content

Commit e8fcc8e

Browse files
authored
Merge pull request #3078 from abravalheri/fix-changelog
Consolidate lingering news fragments named 'docs'
2 parents 780cae2 + e2a6325 commit e8fcc8e

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

CHANGES.rst

+12
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@ Changes
3030
* #3057: Don't include optional ``Home-page`` in metadata if no ``url`` is specified. -- by :user:`cdce8p`
3131
* #3062: Merge with pypa/distutils@b53a824ec3 including improved support for lib directories on non-x64 Windows builds.
3232

33+
Documentation changes
34+
^^^^^^^^^^^^^^^^^^^^^
35+
* #2897: Added documentation about wrapping ``setuptools.build_meta`` in a in-tree
36+
custom backend. This is a :pep:`517`-compliant way of dynamically specifying
37+
build dependencies (e.g. when platform, OS and other markers are not enough).
38+
-- by :user:`abravalheri`
39+
* #3034: Replaced occurrences of the defunct distutils-sig mailing list with pointers
40+
to GitHub Discussions.
41+
-- by :user:`ashemedai`
42+
* #3056: The documentation has stopped suggesting to add ``wheel`` to
43+
:pep:`517` requirements -- by :user:`webknjaz`
44+
3345
Misc
3446
^^^^
3547
* #3054: Used Py3 syntax ``super().__init__()`` -- by :user:`imba-tjd`

changelog.d/2897.docs.rst

-4
This file was deleted.

changelog.d/3034.docs.rst

-4
This file was deleted.

changelog.d/3056.docs.rst

-2
This file was deleted.

tools/finalize.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,18 @@ def check_changes():
7979
"""
8080
allowed = 'deprecation', 'breaking', 'change', 'doc', 'misc'
8181
except_ = 'README.rst', '.gitignore'
82-
assert all(
83-
any(key in file.name for key in allowed)
82+
news_fragments = (
83+
file
8484
for file in pathlib.Path('changelog.d').iterdir()
8585
if file.name not in except_
8686
)
87+
unrecognized = [
88+
str(file)
89+
for file in news_fragments
90+
if not any(f".{key}" in file.suffixes for key in allowed)
91+
]
92+
if unrecognized:
93+
raise ValueError(f"Some news fragments have invalid names: {unrecognized}")
8794

8895

8996
if __name__ == '__main__':

0 commit comments

Comments
 (0)