mirror of
https://github.com/python/cpython.git
synced 2025-07-09 20:35:26 +00:00
Check the whitespace of pull requests on Travis (GH-2367)
This commit is contained in:
parent
13e96cc596
commit
70cb1875bb
2 changed files with 37 additions and 2 deletions
|
@ -1,4 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
"""Check proposed changes for common issues."""
|
||||
import re
|
||||
import sys
|
||||
import shutil
|
||||
|
@ -135,7 +136,7 @@ def report_modified_files(file_paths):
|
|||
return "\n".join(lines)
|
||||
|
||||
|
||||
@status("Fixing whitespace", info=report_modified_files)
|
||||
@status("Fixing Python file whitespace", info=report_modified_files)
|
||||
def normalize_whitespace(file_paths):
|
||||
"""Make sure that the whitespace for .py files have been normalized."""
|
||||
reindent.makebackup = False # No need to create backups.
|
||||
|
@ -212,6 +213,27 @@ def regenerated_pyconfig_h_in(file_paths):
|
|||
else:
|
||||
return "not needed"
|
||||
|
||||
def travis(pull_request):
|
||||
if pull_request == 'false':
|
||||
print('Not a pull request; skipping')
|
||||
return
|
||||
base_branch = get_base_branch()
|
||||
file_paths = changed_files(base_branch)
|
||||
python_files = [fn for fn in file_paths if fn.endswith('.py')]
|
||||
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'))]
|
||||
fixed = []
|
||||
fixed.extend(normalize_whitespace(python_files))
|
||||
fixed.extend(normalize_c_whitespace(c_files))
|
||||
fixed.extend(normalize_docs_whitespace(doc_files))
|
||||
if not fixed:
|
||||
print('No whitespace issues found')
|
||||
else:
|
||||
print(f'Please fix the {len(fixed)} file(s) with whitespace issues')
|
||||
print('(on UNIX you can run `make patchcheck` to make the fixes)')
|
||||
sys.exit(1)
|
||||
|
||||
def main():
|
||||
base_branch = get_base_branch()
|
||||
file_paths = changed_files(base_branch)
|
||||
|
@ -246,4 +268,12 @@ def main():
|
|||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
import argparse
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--travis',
|
||||
help='Perform pass/fail checks')
|
||||
args = parser.parse_args()
|
||||
if args.travis:
|
||||
travis(args.travis)
|
||||
else:
|
||||
main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue