From 5ea58bc0183207f4632d9a2403d8720f9982a0ca Mon Sep 17 00:00:00 2001
From: Jean-Michel Picod <jmichel@google.com>
Date: Fri, 24 Apr 2020 12:38:10 +0200
Subject: [PATCH] Fix style being used with yapf 0.30.0
---
.github/workflows/python.yml | 4 ++--
.vscode/settings.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index f6051a3..86f78da 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -39,8 +39,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
- pip install yapf tockloader
+ pip install 'yapf>=0.30.0' tockloader
- name: Test code formatting with yapf
run: |
echo ::add-matcher::./.github/python_matcher.json
- yapf --style=chromium --recursive --exclude third_party --diff .
+ yapf --style=yapf --recursive --exclude third_party --diff .
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1666683..138097a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,7 +15,7 @@
// Try to make VSCode formating as close as possible to the Google style.
"python.formatting.provider": "yapf",
"python.formatting.yapfArgs": [
- "--style=chromium"
+ "--style=yapf"
],
"python.linting.enabled": true,
"python.linting.lintOnSave": true,
--
GitLab