tox: lint setup.py and yapf tests/

Sarcasm · Sarcasm · commit 1fdff54205b0 · 2017-04-27T14:43:21.000+02:00
diff --git a/contrib/yapf-recursive-diff b/contrib/yapf-recursive-diff
@@ -6,10 +6,10 @@
 
 set -o errexit
 
-echo "Running: yapf --exclude=tests/regression/headerdb --diff --recursive" "$@"
+echo "Running: yapf --diff --recursive" "$@"
 
 temp=$(mktemp --tmpdir yapf-diff.XXXXXX)
-yapf --exclude=tests/regression/headerdb --diff --recursive "$@" | tee "$temp"
+yapf --diff --recursive "$@" | tee "$temp"
 
 if [[ -s "$temp" ]]; then
     exit 1
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
-        "Programming Language :: Python :: Implementation :: PyPy"
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
     keywords=['Clang', 'compilation-database', 'compdb'],
     packages=find_packages(include=['compdb', 'compdb.*']),
@@ -55,5 +55,4 @@
         ],
     },
     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
-    install_requires=dependencies,
-)
+    install_requires=dependencies)
diff --git a/tox.ini b/tox.ini
@@ -15,8 +15,8 @@ commands = python setup.py check -m -r -s
 
 [testenv:lint]
 commands =
-    {toxinidir}/contrib/yapf-recursive-diff compdb
-    flake8 --exclude=tests/regression/headerdb compdb tests
+    {toxinidir}/contrib/yapf-recursive-diff --exclude 'tests/regression/headerdb/*' compdb tests setup.py
+    flake8 --exclude=tests/regression/headerdb compdb tests setup.py
 
 [flake8]
 exclude = .tox,*.egg
