0

Stop isolating depot_tools' //pylint file in blink_python_unittests

And roll depot_tools to pick up crrev.com/c/3780302, which deletes
that file. Callers should now use the pylint-$VER files specifically.
(See commit msg of crrev.com/c/3780302 for why that's preferred.)
So this also changes blink's pylint support lib to invoke pylint-1.5
rather than plain pylint. Plain pylint was previously pointing to
1.5 anyway, so this does not affect the version of pylint used.

Bug: 1350633, 1351132
Change-Id: I6065999e7f9a87f7e90d9f935ecfc0f2cb906495
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3811086
Reviewed-by: Erik Staab <estaab@chromium.org>
Reviewed-by: Weizhong Xia <weizhong@google.com>
Auto-Submit: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1032731}
This commit is contained in:
Ben Pastene
2022-08-08 21:20:11 +00:00
committed by Chromium LUCI CQ
parent 990aa56b65
commit 7674418cc6
3 changed files with 2 additions and 3 deletions
BUILD.gnDEPS
third_party/blink/tools/blinkpy/style/checkers

@ -1598,7 +1598,6 @@ if (!is_ios) {
"//third_party/catapult/devil/",
"//third_party/catapult/dependency_manager/",
"//third_party/catapult/third_party/typ/",
"//third_party/depot_tools/pylint",
"//third_party/depot_tools/pylint-1.5",
"//third_party/depot_tools/pylint_main.py",
"//third_party/depot_tools/pylintrc",

2
DEPS

@ -1184,7 +1184,7 @@ deps = {
},
'src/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '2cd48234f1fdef2e61a06a7a43479fe8407baaf0',
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '647cfe6bf10efa3e171bed867a455347567007c7',
'src/third_party/devtools-frontend/src':
Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),

@ -64,7 +64,7 @@ class PythonChecker(object):
])
return executive.run_command([
sys.executable,
finder.path_from_depot_tools_base('pylint'),
finder.path_from_depot_tools_base('pylint-1.5'),
'--output-format=parseable',
'--rcfile=' + finder.path_from_blink_tools('blinkpy', 'pylintrc'),
path,