summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <pitrou@free.fr>2017-06-25 01:21:49 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2017-06-25 01:21:49 (GMT)
commit1ba9469e9fdff0c52ba19b1e13a9c4b7235fc9eb (patch)
treee6ba5dd67eb162f2ed0de91dfba184fb1fac6109
parent70cb1875bb5343e31d7268f4b2d231a5fecdf989 (diff)
downloadcpython-1ba9469e9fdff0c52ba19b1e13a9c4b7235fc9eb.zip
cpython-1ba9469e9fdff0c52ba19b1e13a9c4b7235fc9eb.tar.gz
cpython-1ba9469e9fdff0c52ba19b1e13a9c4b7235fc9eb.tar.bz2
Update `make patchcheck` for blurb and NEWS.d (#2381)
-rwxr-xr-xTools/scripts/patchcheck.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index 436b277..2204ba0 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -192,10 +192,11 @@ def credit_given(file_paths):
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)
@status("configure regenerated", modal=True, info=str)
def regenerated_configure(file_paths):
@@ -241,8 +242,7 @@ def main():
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.