Merge branch 'main' into copilot/create-benchmark-mocking-uv

nathanjmcdougall · web-flow · commit 4b68fa875b36 · 2026-04-07T23:00:56.000+12:00
diff --git a/tests/usethis/_integrations/project/test_layout.py b/tests/usethis/_integrations/project/test_layout.py
@@ -37,3 +37,14 @@ def test_src_file_not_dir(self, tmp_path: Path):
 
         # Assert
         assert result == "."
+
+    def test_setup_py_present(self, tmp_path: Path):
+        # Arrange
+        (tmp_path / "setup.py").touch()
+
+        # Act
+        with change_cwd(tmp_path):
+            result = get_source_dir_str()
+
+        # Assert
+        assert result == "."
diff --git a/tests/usethis/_tool/impl/base/test_import_linter.py b/tests/usethis/_tool/impl/base/test_import_linter.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+from typing import cast
 
 import pytest
 
@@ -174,6 +175,34 @@ def test_empty_src_directory(self, tmp_path: Path):
             assert config_spec is not None
             assert len(config_spec.config_items) > 0
 
+        def test_flat_layout_with_setup_py(self, tmp_path: Path):
+            # Arrange: flat layout (no src/) with setup.py present
+            (tmp_path / "pyproject.toml").write_text('[project]\nname = "myflatpkg"')
+            (tmp_path / "setup.py").touch()
+            (tmp_path / "myflatpkg").mkdir()
+            (tmp_path / "myflatpkg" / "__init__.py").touch()
+            (tmp_path / "myflatpkg" / "a.py").touch()
+            (tmp_path / "myflatpkg" / "b.py").write_text("import myflatpkg.a\n")
+            (tmp_path / "myflatpkg" / "c.py").write_text(
+                "import myflatpkg.a\nimport myflatpkg.b\n"
+            )
+
+            # Act
+            with change_cwd(tmp_path), files_manager():
+                config_spec = ImportLinterTool().config_spec()
+
+            # Assert: setup.py should not appear as a contract; myflatpkg should
+            contracts_item = next(
+                item
+                for item in config_spec.config_items
+                if item.description == "Listed Contracts"
+            )
+            pyproject_entry = contracts_item.root[Path("pyproject.toml")]
+            contracts = cast("list[dict[str, object]]", pyproject_entry.get_value())
+            contract_names = [c["name"] for c in contracts]
+            assert "setup" not in contract_names
+            assert "myflatpkg" in contract_names
+
 
 class TestIsINPRule:
     def test_inp_rule(self):
