[2.7] Update `make patchcheck` for blurb and NEWS.d (GH-2381) (GH-6576)
(cherry picked from commit 1ba9469)
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index b69d540..093ef31 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -221,10 +221,11 @@
return os.path.join('Misc', 'ACKS') in file_paths
-@status("Misc/NEWS updated", modal=True)
+@status("Misc/NEWS.d updated with `blurb`", modal=True)
def reported_news(file_paths):
- """Check if Misc/NEWS has been changed."""
- return os.path.join('Misc', 'NEWS') in file_paths
+ """Check if Misc/NEWS.d has been changed."""
+ return any(p.startswith(os.path.join('Misc', 'NEWS.d', 'next'))
+ for p in file_paths)
def main():
@@ -234,8 +235,7 @@
c_files = [fn for fn in file_paths if fn.endswith(('.c', '.h'))]
doc_files = [fn for fn in file_paths if fn.startswith('Doc') and
fn.endswith(('.rst', '.inc'))]
- misc_files = {os.path.join('Misc', 'ACKS'), os.path.join('Misc', 'NEWS')}\
- & set(file_paths)
+ misc_files = {p for p in file_paths if p.startswith('Misc')}
# PEP 8 whitespace rules enforcement.
normalize_whitespace(python_files)
# C rules enforcement.