diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index f6051a3e9fda0f7ddfa9208c89d51fa5b9309886..86f78da1c713ecbcace49e84046e7ba915936784 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 16666833b87006eea09cefb03bbb9a602a18b45e..138097a22a8cc2816c4ce20f07e79766ea0be980 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,