8000 Merge remote-tracking branch 'origin/chore/linting' into enum-default… · abn/python-betterproto@28644e3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 28644e3

Browse files
committed
Merge remote-tracking branch 'origin/chore/linting' into enum-default-value
# Conflicts: # .github/workflows/ci.yml
2 parents 781e701 + 60adc3b commit 28644e3

File tree

6 files changed

+1733
-16
lines changed

6 files changed

+1733
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [Ubuntu, MacOS, Windows]
19-
python-version: ['3.6.7', '3.7', '3.8', '3.9', '3.10']
19+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
2020
exclude:
2121
- os: Windows
2222
python-version: 3.6
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Install dependencies
5959
shell: bash
60-
run: poetry install
60+
run: poetry install -E compiler
6161

6262
- name: Generate code from proto files
6363
shell: bash

.github/workflows/code-quality.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,5 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Run Black
18-
uses: lgeiger/black-action@master
19-
with:
20-
args: --check src/ tests/ benchmarks/
21-
22-
- name: Install rST dependcies
23-
run: python -m pip install doc8
24-
- name: Lint documentation for errors
25-
run: python -m doc8 docs --max-line-length 88 --ignore-path-errors "docs/migrating.rst;D001"
26-
# it has a table which is longer than 88 characters long
17+
- uses: actions/setup-python@v2
18+
- uses: pre-commit/action@v2.0.3

.pre-commit-config.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ci:
2+
autofix_prs: false
3+
4+
repos:
5+
- repo: https://github.com/psf/black
6+
rev: 22.1.0
7+
hooks:
8+
- id: black
9+
10+
- repo: https://github.com/PyCQA/doc8
11+
rev: 0.10.1
12+
hooks:
13+
- id: doc8
14+
additional_dependencies:
15+
- toml

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,7 @@ datetime.datetime(2019, 1, 1, 11, 59, 58, 800000, tzinfo=datetime.timezone.utc)
381381

382382
```sh
383383
# Get set up with the virtual env & dependencies
384-
poetry run pip install --upgrade pip
385-
poetry install
384+
poetry install -E compiler
386385

387386
# Activate the poetry environment
388387
poetry shell

0 commit comments

Comments
 (0)
0