Fix style being used with yapf 0.30.0

This commit is contained in:
Jean-Michel Picod
2020-04-24 12:38:10 +02:00
parent f471fc4b5e
commit 5ea58bc018
2 changed files with 3 additions and 3 deletions

View File

@@ -39,8 +39,8 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip setuptools wheel 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 - name: Test code formatting with yapf
run: | run: |
echo ::add-matcher::./.github/python_matcher.json echo ::add-matcher::./.github/python_matcher.json
yapf --style=chromium --recursive --exclude third_party --diff . yapf --style=yapf --recursive --exclude third_party --diff .

View File

@@ -15,7 +15,7 @@
// Try to make VSCode formating as close as possible to the Google style. // Try to make VSCode formating as close as possible to the Google style.
"python.formatting.provider": "yapf", "python.formatting.provider": "yapf",
"python.formatting.yapfArgs": [ "python.formatting.yapfArgs": [
"--style=chromium" "--style=yapf"
], ],
"python.linting.enabled": true, "python.linting.enabled": true,
"python.linting.lintOnSave": true, "python.linting.lintOnSave": true,