Skip to content

Commit 855bc88

Browse files
authored
Merge pull request #3618 from python-poetry/new-cleo
Migrate to the new version of Cleo
2 parents a104970 + a8d02ef commit 855bc88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+753
-731
lines changed

.flake8

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[flake8]
22
max-line-length = 88
33
ignore = E501, E203, W503
4-
per-file-ignores = __init__.py:F401
4+
per-file-ignores =
5+
__init__.py:F401
6+
tests/console/commands/debug/test_resolve.py:W291
57
exclude =
68
.git
79
__pycache__

.pre-commit-config.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 19.10b0
3+
rev: 20.8b1
44
hooks:
55
- id: black
66

77
- repo: https://gitlab.com/pycqa/flake8
8-
rev: 3.8.3
8+
rev: 3.8.4
99
hooks:
1010
- id: flake8
1111

1212
- repo: https://github.com/timothycrosley/isort
13-
rev: 5.4.2
13+
rev: 5.7.0
1414
hooks:
1515
- id: isort
1616
additional_dependencies: [toml]
1717
exclude: ^.*/?setup\.py$
1818

1919
- repo: https://github.com/pre-commit/pre-commit-hooks
20-
rev: v3.2.0
20+
rev: v3.4.0
2121
hooks:
2222
- id: trailing-whitespace
23-
exclude: ^tests/.*/fixtures/.*
23+
exclude: |
24+
(?x)(
25+
^tests/.*/fixtures/.*
26+
| ^tests/console/commands/debug/test_resolve.py
27+
)
2428
- id: end-of-file-fixer
2529
exclude: ^tests/.*/fixtures/.*
2630
- id: debug-statements

poetry.lock

+7-35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

poetry/__main__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33

44
if __name__ == "__main__":
5-
from .console import main
5+
from .console.application import main
66

77
sys.exit(main())

poetry/console/__init__.py

-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +0,0 @@
1-
from .application import Application
2-
3-
4-
def main(): # type: () -> int
5-
return Application().run()

0 commit comments

Comments
 (0)