Merge pull request #8016 from the-ress/windows-lint

Fixed linting on Windows
This commit is contained in:
Kevin Sawicki 2016-11-23 09:09:39 -08:00 committed by GitHub
commit 9a7209d58e
2 changed files with 5 additions and 4 deletions

View file

@ -5,7 +5,7 @@
"asar": "^0.11.0", "asar": "^0.11.0",
"browserify": "^13.1.0", "browserify": "^13.1.0",
"electabul": "~0.0.4", "electabul": "~0.0.4",
"electron-docs-linter": "^1.16.0", "electron-docs-linter": "^1.16.1",
"request": "*", "request": "*",
"standard": "^8.4.0", "standard": "^8.4.0",
"standard-markdown": "^2.1.1" "standard-markdown": "^2.1.1"
@ -37,7 +37,7 @@
"lint-cpp": "python ./script/cpplint.py", "lint-cpp": "python ./script/cpplint.py",
"lint-py": "python ./script/pylint.py", "lint-py": "python ./script/pylint.py",
"lint-api-docs-js": "standard-markdown docs && standard-markdown docs-translations", "lint-api-docs-js": "standard-markdown docs && standard-markdown docs-translations",
"lint-api-docs": "electron-docs-linter docs/api --version=$npm_package_version --outfile=out/electron-api.json", "lint-api-docs": "electron-docs-linter --outfile=out/electron-api.json",
"preinstall": "node -e 'process.exit(0)'", "preinstall": "node -e 'process.exit(0)'",
"release": "./script/upload.py -p", "release": "./script/upload.py -p",
"repl": "python ./script/start.py --interactive", "repl": "python ./script/start.py --interactive",

View file

@ -14,8 +14,9 @@ def main():
pylint = os.path.join(SOURCE_ROOT, 'vendor', 'depot_tools', 'pylint.py') pylint = os.path.join(SOURCE_ROOT, 'vendor', 'depot_tools', 'pylint.py')
settings = ['--rcfile=vendor/depot_tools/pylintrc'] settings = ['--rcfile=vendor/depot_tools/pylintrc']
pys = glob.glob('script/*.py') pys = glob.glob('script/*.py')
subprocess.check_call([sys.executable, pylint] + settings + pys, env = os.environ.copy()
env=dict(PYTHONPATH='script')) env['PYTHONPATH'] = 'script'
subprocess.check_call([sys.executable, pylint] + settings + pys, env=env)
if __name__ == '__main__': if __name__ == '__main__':