From 6f04f76a5d83c4dad1579695043318e6469e582d Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Wed, 11 Sep 2019 13:49:08 +0200 Subject: [PATCH] Fix clang invocation - remove .clang-format and hardcode the style --- .clang-format | 1 - scripts/format.sh | 2 +- scripts/test.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 .clang-format diff --git a/.clang-format b/.clang-format deleted file mode 100644 index aeb51544a..000000000 --- a/.clang-format +++ /dev/null @@ -1 +0,0 @@ -Language: Proto diff --git a/scripts/format.sh b/scripts/format.sh index d5f21e653..a4f85ac7e 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -9,4 +9,4 @@ cd $DIR/../ isort --indent=4 -rc setup.py conftest.py xain black --exclude "xain/grpc/.*_pb2.*" setup.py conftest.py xain -clang-format -i -style=Google protobuf/xain/grpc/*.proto +clang-format -style="{Language: Proto, BasedOnStyle: Google}" -i protobuf/xain/grpc/*.proto diff --git a/scripts/test.sh b/scripts/test.sh index 6508ccd74..95e3c5114 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -11,7 +11,7 @@ isort --check-only --indent=4 -rc setup.py conftest.py xain && echo "===> isort black --check --exclude "xain/grpc/.*_pb2.*" setup.py conftest.py xain && echo "===> black says: well done <===" && # check format of proto files -clang-format -style=Google protobuf/xain/grpc/*.proto | diff protobuf/xain/grpc/*.proto - && echo "===> clang-format says: well done <===" && +clang-format -style="{Language: Proto, BasedOnStyle: Google}" protobuf/xain/grpc/*.proto | diff protobuf/xain/grpc/*.proto - && echo "===> clang-format says: well done <===" && # lint pylint --rcfile=pylint.ini xain && echo "===> pylint says: well done <===" &&