diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-09-07 00:38:51 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2017-09-07 00:38:51 (GMT) |
| commit | e00e1b812c31f093a98fc85281687c78162eb445 (patch) | |
| tree | c2f40163fe78a5d0e21e9a5ea8b1a06a66b6d432 /Tools/scripts | |
| parent | 1fc47b40af3e3e80902100a2baa472b19dd47010 (diff) | |
| download | cpython-e00e1b812c31f093a98fc85281687c78162eb445.zip cpython-e00e1b812c31f093a98fc85281687c78162eb445.tar.gz cpython-e00e1b812c31f093a98fc85281687c78162eb445.tar.bz2 | |
[3.6] Update `make patchcheck` for blurb and NEWS.d (GH-3406)
(cherry picked from commit 1ba9469e9fdff0c52ba19b1e13a9c4b7235fc9eb)
Diffstat (limited to 'Tools/scripts')
| -rwxr-xr-x | Tools/scripts/patchcheck.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index 5a1c94e..1154b81 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -211,10 +211,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): @@ -260,8 +261,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. |