Skip to content

Commit 4641ed8

Browse files
authored
Merge pull request #2042 from PyCQA/bugfix/packaging-pypoetry
Fix packaging pypoetry
2 parents 501855c + b4b41e8 commit 4641ed8

File tree

4 files changed

+36
-16
lines changed

4 files changed

+36
-16
lines changed

setup.cfg renamed to .flake8

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
[tool:pytest]
2-
testpaths = tests
3-
4-
51
[flake8]
62
max-line-length = 100
73
# Ignore non PEP 8 compliant rules as suggested by black

poetry.lock

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

pyproject.toml

+15-6
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ classifiers = [
3232
"Topic :: Utilities",
3333
]
3434
urls = { Changelog = "https://github.com/pycqa/isort/blob/main/CHANGELOG.md" }
35-
packages = [
36-
{ include = "isort" },
37-
]
3835
include = [
3936
{ path = "tests", format = "sdist" },
4037
{ path = "ACKNOWLEDGEMENTS.md" },
@@ -89,13 +86,25 @@ smmap2 = "^3.0.1"
8986
gitdb2 = "^4.0.2"
9087
libcst = "^0.3.18"
9188
mypy-extensions = "^0.4.3"
92-
toml = "^0.10.2"
89+
pre-commit = ">=2.13.0"
9390
pytest-benchmark = "^3.4.1"
91+
toml = "^0.10.2"
9492
types-pkg-resources = "^0.1.2"
95-
pre-commit = "^2.13.0"
9693
types-colorama = "^0.4.2"
9794
types-toml = "^0.1.3"
98-
vulture = "^1.0"
95+
vulture = ">=1.0"
96+
97+
[tool.coverage.paths]
98+
source = ["src", "*/site-packages"]
99+
tests = ["tests", "*/tests"]
100+
101+
[tool.coverage.run]
102+
branch = true
103+
source = ["git_portfolio", "tests"]
104+
105+
[tool.coverage.report]
106+
show_missing = true
107+
fail_under = 100
99108

100109
[tool.poetry.scripts]
101110
isort = "isort.main:main"

tests/integration/test_projects_using_isort.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,19 @@ def test_websockets(tmpdir):
7474

7575
def test_airflow(tmpdir):
7676
git_clone("https://github.com/apache/airflow.git", tmpdir)
77-
run_isort([str(tmpdir), "--skip-glob", "*.pyi", "--skip", "tests"])
77+
run_isort(
78+
[
79+
str(tmpdir),
80+
"--skip-glob",
81+
"*.pyi",
82+
"--skip",
83+
"tests",
84+
"--skip",
85+
"docker_tests",
86+
"--skip",
87+
"docs",
88+
]
89+
)
7890

7991

8092
def test_typeshed(tmpdir):

0 commit comments

Comments
 (0)