Ensure Import Linter is added via use_ci_bitbucket

nathanjmcdougall · nathanjmcdougall · commit 5d8a139ae136 · 2025-10-13T17:22:25.000+13:00
diff --git a/src/usethis/_core/ci.py b/src/usethis/_core/ci.py
@@ -7,6 +7,7 @@
 )
 from usethis._tool.impl.codespell import CodespellTool
 from usethis._tool.impl.deptry import DeptryTool
+from usethis._tool.impl.import_linter import ImportLinterTool
 from usethis._tool.impl.pre_commit import PreCommitTool
 from usethis._tool.impl.pyproject_fmt import PyprojectFmtTool
 from usethis._tool.impl.pytest import PytestTool
@@ -23,13 +24,15 @@ def use_ci_bitbucket(*, remove: bool = False, how: bool = False) -> None:
         use_pytest = PytestTool().is_used()
         use_ruff = RuffTool().is_used()
         use_deptry = DeptryTool().is_used()
+        use_import_linter = ImportLinterTool().is_used()
         use_pyproject_fmt = PyprojectFmtTool().is_used()
         use_codespell = CodespellTool().is_used()
         use_any_tool = (
             use_pre_commit
             or use_pytest
             or use_ruff
             or use_deptry
+            or use_import_linter
             or use_pyproject_fmt
             or use_codespell
         )
@@ -39,11 +42,12 @@ def use_ci_bitbucket(*, remove: bool = False, how: bool = False) -> None:
         if use_pre_commit:
             PreCommitTool().update_bitbucket_steps()
         else:
-            # This order should match the canonical order in the function which add
+            # This order should match the canonical order in the function which adds
             # steps
             PyprojectFmtTool().update_bitbucket_steps()
             RuffTool().update_bitbucket_steps()
             DeptryTool().update_bitbucket_steps()
+            ImportLinterTool().update_bitbucket_steps()
             CodespellTool().update_bitbucket_steps()
 
         PytestTool().update_bitbucket_steps()
diff --git a/src/usethis/_integrations/ci/bitbucket/steps.py b/src/usethis/_integrations/ci/bitbucket/steps.py
@@ -166,6 +166,7 @@ def _add_step_in_default_via_doc(
         "Run Ruff",
         "Run Ruff Formatter",
         "Run deptry",
+        "Run Import Linter",
         "Run Codespell",
         *[f"Test on 3.{maj_version}" for maj_version in maj_versions],
     ]
diff --git a/tests/usethis/_core/test_core_tool.py b/tests/usethis/_core/test_core_tool.py
@@ -53,6 +53,29 @@ def test_subset_hook_names(self, tmp_path: Path):
                     assert hook_name in _HOOK_ORDER
 
 
+class TestAllBitbucketCompatibleSteps:
+    def test_names_regression(self, tmp_path: Path):
+        # See https://github.com/usethis-python/usethis-python/issues/981
+        with change_cwd(tmp_path), files_manager():
+            names = set()
+            for tool in ALL_TOOLS:
+                steps = tool.get_bitbucket_steps()
+                if steps:
+                    names.add(tool.name)
+
+        # Until https://github.com/usethis-python/usethis-python/issues/981 is resolved,
+        # if this test changes, make sure to update `use_ci_bitbucket`.
+        assert names == {
+            "Codespell",
+            "deptry",
+            "Import Linter",
+            "pre-commit",
+            "pyproject-fmt",
+            "pytest",
+            "Ruff",
+        }
+
+
 class TestCodespell:
     class TestAdd:
         @pytest.mark.usefixtures("_vary_network_conn")

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ def _add_step_in_default_via_doc(`
`166`	`166`	`"Run Ruff",`
`167`	`167`	`"Run Ruff Formatter",`
`168`	`168`	`"Run deptry",`
	`169`	`+ "Run Import Linter",`
`169`	`170`	`"Run Codespell",`
`170`	`171`	`*[f"Test on 3.{maj_version}" for maj_version in maj_versions],`
`171`	`172`	`]`