Skip to content

Commit cfec337

Browse files
authored
Merge pull request #2022 from PyCQA/ci/fix-integration-tests
Fix integration tests
2 parents f5ba583 + 40b7c30 commit cfec337

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

tests/integration/test_projects_using_isort.py

+19-12
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,15 @@ def test_plone(tmpdir):
3636

3737

3838
def test_pandas(tmpdir):
39-
# Need to limit extensions as isort has just made sorting pxd the default, and pandas
40-
# will have not picked it up yet
41-
# TODO: Remove below line as soon as these files are sorted on the mainline pandas project
4239
git_clone("https://github.com/pandas-dev/pandas.git", tmpdir)
43-
limit_extensions = ("--ext", "py", "--ext", "pyi", "--ext", "pyx")
44-
run_isort((str(tmpdir / "pandas"), "--skip", "__init__.py", *limit_extensions))
40+
run_isort((str(tmpdir / "pandas"), "--skip", "__init__.py"))
4541

4642

4743
def test_fastapi(tmpdir):
4844
git_clone("https://github.com/tiangolo/fastapi.git", tmpdir)
4945
run_isort([str(tmpdir / "fastapi")])
5046

5147

52-
def test_zulip(tmpdir):
53-
git_clone("https://github.com/zulip/zulip.git", tmpdir)
54-
run_isort((str(tmpdir), "--skip", "__init__.pyi"))
55-
56-
5748
def test_habitat_lab(tmpdir):
5849
git_clone("https://github.com/facebookresearch/habitat-lab.git", tmpdir)
5950
run_isort([str(tmpdir)])
@@ -83,7 +74,7 @@ def test_websockets(tmpdir):
8374

8475
def test_airflow(tmpdir):
8576
git_clone("https://github.com/apache/airflow.git", tmpdir)
86-
run_isort([str(tmpdir), "--skip-glob", "*/_vendor/*", "--skip", "tests"])
77+
run_isort([str(tmpdir), "--skip-glob", "*.pyi", "--skip", "tests"])
8778

8879

8980
def test_typeshed(tmpdir):
@@ -157,7 +148,23 @@ def test_attrs(tmpdir):
157148

158149
def test_datadog_integrations_core(tmpdir):
159150
git_clone("https://github.com/DataDog/integrations-core.git", tmpdir)
160-
run_isort([str(tmpdir), "--skip", "docs"])
151+
run_isort(
152+
[
153+
str(tmpdir),
154+
"--skip",
155+
"ddev",
156+
"--skip",
157+
"docs",
158+
"--skip-glob",
159+
".*",
160+
"--skip-glob",
161+
"*/datadog_checks/dev/tooling/signing.py",
162+
"--skip-glob",
163+
"*/datadog_checks/dev/tooling/templates/*",
164+
"--skip-glob",
165+
"*/datadog_checks/*/vendor/*",
166+
]
167+
)
161168

162169

163170
def test_pyramid(tmpdir):

0 commit comments

Comments
 (0)