diff options
author | Jeremy Bettis <jbettis@google.com> | 2023-02-03 13:33:43 -0700 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-03 22:37:08 +0000 |
commit | bb1bf345d928a602916bed6eefef4a317a577849 (patch) | |
tree | 35fc57378a9472c84a9450284090d7cb3d37f970 /firmware_builder.py | |
parent | 989f9d24a097a8da7de10c5f765f3718597ac73c (diff) | |
download | chrome-ec-bb1bf345d928a602916bed6eefef4a317a577849.tar.gz |
ec: Use chromite isort config
Remove the .isort.cfg from platform/ec and use the one from chromite
instead. This should be compatible with cros format.
BRANCH=None
BUG=b:267757300
TEST=Ran firmware_builder.py
Change-Id: Ice4955b6995bd1f9380e97f58e89efb7c1e8aeb1
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4221928
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'firmware_builder.py')
-rwxr-xr-x | firmware_builder.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/firmware_builder.py b/firmware_builder.py index dfe1161c59..2fcccd6476 100755 --- a/firmware_builder.py +++ b/firmware_builder.py @@ -17,11 +17,12 @@ import shutil import subprocess import sys -from chromite.api.gen_sdk.chromite.api import firmware_pb2 - # pylint: disable=import-error from google.protobuf import json_format +from chromite.api.gen_sdk.chromite.api import firmware_pb2 + + DEFAULT_BUNDLE_DIRECTORY = "/tmp/artifact_bundles" DEFAULT_BUNDLE_METADATA_FILE = "/tmp/artifact_bundle_metadata" @@ -61,15 +62,17 @@ def build(opts): message. """ metric_list = firmware_pb2.FwBuildMetricList() + ec_dir = pathlib.Path(__file__).parent # Run formatting checks on all python files. subprocess.run( ["black", "--check", "."], cwd=os.path.dirname(__file__), check=True ) + chromite_dir = ec_dir.resolve().parent.parent.parent / "chromite" subprocess.run( [ "isort", - "--settings-file=.isort.cfg", + f"--settings-file={chromite_dir / '.isort.cfg'}", "--check", "--gitignore", "--dont-follow-links", @@ -88,7 +91,6 @@ def build(opts): file.write(json_format.MessageToJson(metric_list)) return - ec_dir = pathlib.Path(__file__).parent subprocess.run([ec_dir / "util" / "check_clang_format.py"], check=True) cmd = ["make", "clobber"] |