diff --git a/setup.cfg b/.flake8 similarity index 90% rename from setup.cfg rename to .flake8 index d3a6c814f..a5e26e2c3 100644 --- a/setup.cfg +++ b/.flake8 @@ -1,7 +1,3 @@ -[tool:pytest] -testpaths = tests - - [flake8] max-line-length = 100 # Ignore non PEP 8 compliant rules as suggested by black diff --git a/poetry.lock b/poetry.lock index c73d49fe7..bea417408 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2123,16 +2123,19 @@ typing = ["mypy", "mypy-extensions", "mypytools", "typed-ast"] [[package]] name = "vulture" -version = "1.6" +version = "2.6" description = "Find dead code" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.6" files = [ - {file = "vulture-1.6-py2.py3-none-any.whl", hash = "sha256:79ecb77e5d61a2375e2b94dea2fd859cd77a067e55e99b8238b64196adfcdc0f"}, - {file = "vulture-1.6.tar.gz", hash = "sha256:7b94784ededbf8e2913b5142dc875d8f26de7c903b37cd2d8f478f79275f7ce9"}, + {file = "vulture-2.6-py2.py3-none-any.whl", hash = "sha256:e792e903ccc063ec4873a8979dcf11b51ea3d65a2d3b31c113d47be48f0cdcae"}, + {file = "vulture-2.6.tar.gz", hash = "sha256:2515fa848181001dc8a73aba6a01a1a17406f5d372f24ec7f7191866f9f4997e"}, ] +[package.dependencies] +toml = "*" + [[package]] name = "watchdog" version = "2.2.0" @@ -2241,4 +2244,4 @@ requirements-deprecated-finder = ["pipreqs", "pip-api"] [metadata] lock-version = "2.0" python-versions = ">=3.7.0" -content-hash = "59583a6aee842a5b281abe4a593ee9ea71ba177f732b7e12cd717a8250462cb9" +content-hash = "c085fe60809f5ebf88aa1a630a14a8ff660da17400a8b753645dfb5d8ae864c7" diff --git a/pyproject.toml b/pyproject.toml index a868291e1..6709fb6c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,9 +32,6 @@ classifiers = [ "Topic :: Utilities", ] urls = { Changelog = "https://github.com/pycqa/isort/blob/main/CHANGELOG.md" } -packages = [ - { include = "isort" }, -] include = [ { path = "tests", format = "sdist" }, { path = "ACKNOWLEDGEMENTS.md" }, @@ -89,13 +86,25 @@ smmap2 = "^3.0.1" gitdb2 = "^4.0.2" libcst = "^0.3.18" mypy-extensions = "^0.4.3" -toml = "^0.10.2" +pre-commit = ">=2.13.0" pytest-benchmark = "^3.4.1" +toml = "^0.10.2" types-pkg-resources = "^0.1.2" -pre-commit = "^2.13.0" types-colorama = "^0.4.2" types-toml = "^0.1.3" -vulture = "^1.0" +vulture = ">=1.0" + +[tool.coverage.paths] +source = ["src", "*/site-packages"] +tests = ["tests", "*/tests"] + +[tool.coverage.run] +branch = true +source = ["git_portfolio", "tests"] + +[tool.coverage.report] +show_missing = true +fail_under = 100 [tool.poetry.scripts] isort = "isort.main:main" diff --git a/tests/integration/test_projects_using_isort.py b/tests/integration/test_projects_using_isort.py index f0756a62d..0626c211b 100644 --- a/tests/integration/test_projects_using_isort.py +++ b/tests/integration/test_projects_using_isort.py @@ -74,7 +74,19 @@ def test_websockets(tmpdir): def test_airflow(tmpdir): git_clone("https://github.com/apache/airflow.git", tmpdir) - run_isort([str(tmpdir), "--skip-glob", "*.pyi", "--skip", "tests"]) + run_isort( + [ + str(tmpdir), + "--skip-glob", + "*.pyi", + "--skip", + "tests", + "--skip", + "docker_tests", + "--skip", + "docs", + ] + ) def test_typeshed(tmpdir):