Skip to content

Drop the fallback to linting everything. #2036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 1 commit into from
Jul 30, 2016
Merged

Drop the fallback to linting everything. #2036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions scripts/run_pylint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,11 @@ def get_python_files(all_files=None):
:param all_files: Optional list of files to be linted.

:rtype: tuple
:returns: A tuple containing two lists and a boolean. The first list
contains all production files, the next all test files and
the boolean indicates if a restricted fileset was used.
:returns: A tuple containing two lists. The first list
contains all production files, the next all test files.
"""
using_restricted = False
if all_files is None:
all_files, diff_base = get_files_for_linting()
using_restricted = diff_base is not None

library_files = []
non_library_files = []
Expand All @@ -212,7 +209,7 @@ def get_python_files(all_files=None):
else:
non_library_files.append(filename)

return library_files, non_library_files, using_restricted
return library_files, non_library_files, diff_base


def lint_fileset(filenames, rcfile, description):
Expand Down Expand Up @@ -244,21 +241,11 @@ def main():
"""Script entry point. Lints both sets of files."""
make_test_rc(PRODUCTION_RC, TEST_RC_ADDITIONS,
TEST_RC_REPLACEMENTS, TEST_RC)
library_files, non_library_files, using_restricted = get_python_files()
try:
lint_fileset(library_files, PRODUCTION_RC, 'library code')
lint_fileset(non_library_files, TEST_RC, 'test code')
except SystemExit:
if not using_restricted:
raise

message = 'Restricted lint failed, expanding to full fileset.'
print(message, file=sys.stderr)
all_files, _ = get_files_for_linting(allow_limited=False)
library_files, non_library_files, _ = get_python_files(
all_files=all_files)
lint_fileset(library_files, PRODUCTION_RC, 'library code')
lint_fileset(non_library_files, TEST_RC, 'test code')
library_files, non_library_files, diff_base = get_python_files()
if diff_base:
print('Checking only files which differ from base.')
lint_fileset(library_files, PRODUCTION_RC, 'library code')
lint_fileset(non_library_files, TEST_RC, 'test code')


if __name__ == '__main__':
Expand Down