Merge pull request googleapis#1348 from dhermes/updating-lint-tox-rule

dhermes · dhermes · commit 22642cddc61b · 2016-01-07T14:49:43.000-08:00
Updating lint tox rule
diff --git a/.gitignore b/.gitignore
@@ -48,7 +48,7 @@ coverage.xml
 system_tests/local_test_setup
 
 # Make sure a generated file isn't accidentally committed.
-pylintrc_reduced
+scripts/pylintrc_reduced
 
 # Directories used for creating generated PB2 files
 generated_python/
diff --git a/scripts/pep8_on_repo.py b/scripts/pep8_on_repo.py
@@ -0,0 +1,39 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Custom script to run pep8 on gcloud codebase.
+
+This runs pep8 as a script via subprocess but only runs it on the
+.py files that are checked in to the repository.
+"""
+
+
+import os
+import subprocess
+
+
+def main():
+    """Run pep8 on all Python files in the repository."""
+    git_root = subprocess.check_output(
+        ['git', 'rev-parse', '--show-toplevel']).strip()
+    os.chdir(git_root)
+    python_files = subprocess.check_output(['git', 'ls-files', '*py'])
+    python_files = python_files.strip().split()
+
+    pep8_command = ['pep8'] + python_files
+    subprocess.call(pep8_command)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/pep8_on_repo.sh b/scripts/pep8_on_repo.sh
diff --git a/scripts/pylintrc_default b/scripts/pylintrc_default
diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py
@@ -36,8 +36,9 @@
     'docs/conf.py',
     'setup.py',
 ]
-PRODUCTION_RC = 'pylintrc_default'
-TEST_RC = 'pylintrc_reduced'
+SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
+PRODUCTION_RC = os.path.join(SCRIPTS_DIR, 'pylintrc_default')
+TEST_RC = os.path.join(SCRIPTS_DIR, 'pylintrc_reduced')
 TEST_DISABLED_MESSAGES = [
     'attribute-defined-outside-init',
     'exec-used',
diff --git a/tox.ini b/tox.ini
@@ -68,8 +68,8 @@ verbose = 1
 basepython =
     python2.7
 commands =
-    {toxinidir}/scripts/pep8_on_repo.sh
-    python run_pylint.py
+    python {toxinidir}/scripts/pep8_on_repo.py
+    python {toxinidir}/scripts/run_pylint.py
 deps =
     pep8
     pylint
