Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ jobs:
name: Linting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0
- run: exit 0
63 changes: 36 additions & 27 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,41 +1,50 @@
ci:
autofix_prs: false

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-merge-conflict
- id: check-case-conflict
- id: check-toml
- id: check-json
- id: pretty-format-json
args: [--autofix, --no-ensure-ascii, --no-sort-keys]
- id: check-ast
- id: debug-statements

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
hooks:
- id: python-check-blanket-type-ignore
- id: python-check-mock-methods

- repo: https://github.com/pycqa/isort
rev: 5.10.1
hooks:
- id: isort
types: [python] # FIXME: pyi support that doesn't conflict with black

- repo: https://github.com/psf/black
rev: 20.8b1
rev: 21.10b0
Comment thread
abn marked this conversation as resolved.
hooks:
- id: black

- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
hooks:
- id: flake8
additional_dependencies: [flake8-bugbear]
additional_dependencies:
- flake8-bugbear

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.910
rev: v0.910-1
hooks:
- id: mypy
pass_filenames: false
additional_dependencies:
- types-dataclasses
- types-requests
args:
- poetry

- repo: https://github.com/timothycrosley/isort
rev: 5.7.0
hooks:
- id: isort
additional_dependencies: [toml]
exclude: ^.*/?setup\.py$

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
hooks:
- id: trailing-whitespace
Comment thread
neersighted marked this conversation as resolved.
exclude: |
(?x)(
^tests/.*/fixtures/.*
| ^tests/console/commands/debug/test_resolve.py
)
- id: end-of-file-fixer
exclude: ^tests/.*/fixtures/.*
- id: debug-statements
49 changes: 0 additions & 49 deletions mypy.ini

This file was deleted.

4 changes: 2 additions & 2 deletions poetry/config/source.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import dataclasses

from typing import Dict
from typing import Union

import dataclasses


@dataclasses.dataclass(order=True, eq=True)
class Source:
Expand Down
3 changes: 1 addition & 2 deletions poetry/console/commands/debug/resolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def handle(self) -> Optional[int]:

return 0

table = self.table([], style="compact")
table = self.table(style="compact")
table.style.set_vertical_border_chars("", " ")
rows = []

Expand All @@ -133,7 +133,6 @@ def handle(self) -> Optional[int]:
row = [
"<c1>{}</c1>".format(pkg.complete_name),
"<b>{}</b>".format(pkg.version),
"",
]

if not pkg.marker.is_any():
Expand Down
Loading