From 0dda87f962b2209be1734f4fe6bb1ba9f6c0e66b Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Tue, 23 Oct 2018 16:51:54 +0200 Subject: third_party: install yapf with pip --- tools/format.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tools/format.py') diff --git a/tools/format.py b/tools/format.py index 5956432dc..a1217a49d 100755 --- a/tools/format.py +++ b/tools/format.py @@ -3,7 +3,8 @@ from glob import glob import os import sys -from third_party import third_party_path, fix_symlinks, google_env, clang_format_path +from third_party import fix_symlinks, google_env, python_env +from third_party import clang_format_path, third_party_path from util import root_path, run, find_exts, platform fix_symlinks() @@ -27,10 +28,10 @@ for fn in ["BUILD.gn", ".gn"] + find_exts("build_extra", ".gn", ".gni"): # 'third_party/v8/tools/clang', which contains many .py files. # * These third party python files shouldn't be formatted. # * The tools directory has no subdirectories, so `glob()` is sufficient. - -run([sys.executable, "third_party/yapf/yapf", "-i"] + glob("tools/*.py") + - find_exts("build_extra", ".py"), - merge_env={"PYTHONPATH": "third_party/yapf"}) +# TODO(ry) Install yapf in third_party. +run([sys.executable, "third_party/python_packages/bin/yapf", "-i"] + + glob("tools/*.py") + find_exts("build_extra", ".py"), + env=python_env()) # yapf: disable run(["node", prettier, "--write"] + -- cgit v1.2.3