diff options
| -rw-r--r-- | gclient_config.py | 5 | ||||
| m--------- | third_party | 0 | ||||
| -rwxr-xr-x | tools/format.py | 11 | ||||
| -rw-r--r-- | tools/third_party.py | 8 |
4 files changed, 14 insertions, 10 deletions
diff --git a/gclient_config.py b/gclient_config.py index dc4a75e5b..93d744a3f 100644 --- a/gclient_config.py +++ b/gclient_config.py @@ -37,11 +37,6 @@ solutions = [{ 'cpplint' }, { 'url': - 'https://github.com/google/yapf.git@32afb3004e0967eab351ee83e3d9d55e3a02fd9b', - 'name': - 'yapf' -}, { - 'url': 'https://github.com/google/flatbuffers.git@d840856093fa7b935b0d6378c436bd633d006c8c', 'name': 'flatbuffers' diff --git a/third_party b/third_party -Subproject 0da585d1d855ad720b7e5a5a0d0af380e66216f +Subproject 739aa43d724ecf1b0ecce7dac0b2c1f1ae098bb 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"] + diff --git a/tools/third_party.py b/tools/third_party.py index 0477187c0..2e7de23b4 100644 --- a/tools/third_party.py +++ b/tools/third_party.py @@ -160,6 +160,14 @@ def run_pip(): cwd=third_party_path, merge_env=pip_env) + # Get yapf. + # Install pywin32. + run([ + sys.executable, "-m", "pip", "install", "--upgrade", "--target", + python_packages_path, "yapf" + ], + cwd=third_party_path, + merge_env=pip_env) # Remove the temporary pip installation. rmtree(temp_python_home) |