From c04d18d639f48ee22e4346f706e6bbcb7bbce1ba Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Wed, 20 Jan 2016 10:52:37 -0800 Subject: [PATCH] Addressing review comments. - Removing accidentally including bigquery module from IGNORED_MODULES in verify_include_modules - Adding Sphinx as a lint dependency (it couldn't be imported) - Fixing Python 2 style print statements in run_pylint --- scripts/run_pylint.py | 12 ++++++------ scripts/verify_included_modules.py | 1 - tox.ini | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py index 16ee908a98d04..59b254f7763d6 100644 --- a/scripts/run_pylint.py +++ b/scripts/run_pylint.py @@ -154,12 +154,12 @@ def get_files_for_linting(allow_limited=True): if diff_base is not None and allow_limited: result = subprocess.check_output(['git', 'diff', '--name-only', diff_base]) - print 'Using files changed relative to %s:' % (diff_base,) - print '-' * 60 - print result.rstrip('\n') # Don't print trailing newlines. - print '-' * 60 + print('Using files changed relative to %s:' % (diff_base,)) + print('-' * 60) + print(result.rstrip('\n')) # Don't print trailing newlines. + print('-' * 60) else: - print 'Diff base not specified, listing all files in repository.' + print('Diff base not specified, listing all files in repository.') result = subprocess.check_output(['git', 'ls-files']) return result.rstrip('\n').split('\n'), diff_base @@ -217,7 +217,7 @@ def lint_fileset(filenames, rcfile, description): print(error_message, file=sys.stderr) sys.exit(status_code) else: - print 'Skipping %s, no files to lint.' % (description,) + print('Skipping %s, no files to lint.' % (description,)) def main(): diff --git a/scripts/verify_included_modules.py b/scripts/verify_included_modules.py index 897206a5ff226..52752901f81e2 100644 --- a/scripts/verify_included_modules.py +++ b/scripts/verify_included_modules.py @@ -30,7 +30,6 @@ OBJECT_INVENTORY_RELPATH = os.path.join('_build', 'html', 'objects.inv') IGNORED_PREFIXES = ('test_', '_') IGNORED_MODULES = frozenset([ - 'gcloud.bigquery.query', 'gcloud.bigtable.client', 'gcloud.bigtable.cluster', 'gcloud.bigtable.column_family', diff --git a/tox.ini b/tox.ini index 76f3f7a4c0a9e..8c8ec161284cf 100644 --- a/tox.ini +++ b/tox.ini @@ -77,6 +77,7 @@ deps = pylint unittest2 psutil + Sphinx passenv = {[testenv:system-tests]passenv} [testenv:system-tests]