From: Tereza Tomcova Date: Fri, 18 Nov 2016 20:50:53 +0000 (+0100) Subject: Fixed linting on Windows X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5498a314939abcc5cf6ae42410edfe8cf672d92a;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git Fixed linting on Windows --- diff --git a/package.json b/package.json index e533a3e..5114f53 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "devDependencies": { "asar": "^0.11.0", "browserify": "^13.1.0", + "cross-conf-env": "^1.0.6", "electabul": "~0.0.4", "electron-docs-linter": "^1.16.0", "request": "*", @@ -37,7 +38,7 @@ "lint-cpp": "python ./script/cpplint.py", "lint-py": "python ./script/pylint.py", "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": "cross-conf-env electron-docs-linter docs/api --version=$npm_package_version --outfile=out/electron-api.json", "preinstall": "node -e 'process.exit(0)'", "release": "./script/upload.py -p", "repl": "python ./script/start.py --interactive", diff --git a/script/pylint.py b/script/pylint.py index 4aba391..a4cb7fd 100755 --- a/script/pylint.py +++ b/script/pylint.py @@ -14,8 +14,9 @@ def main(): pylint = os.path.join(SOURCE_ROOT, 'vendor', 'depot_tools', 'pylint.py') settings = ['--rcfile=vendor/depot_tools/pylintrc'] pys = glob.glob('script/*.py') - subprocess.check_call([sys.executable, pylint] + settings + pys, - env=dict(PYTHONPATH='script')) + env = os.environ.copy() + env['PYTHONPATH'] = 'script' + subprocess.check_call([sys.executable, pylint] + settings + pys, env=env) if __name__ == '__main__':