Refactor handling of [tool.python-package-folder] section in SubfolderBuildConfig

This commit enhances the logic for managing the [tool.python-package-folder] section in the configuration. It ensures that the section is correctly inserted or updated without creating duplicates. Additionally, new tests are added to verify the absence of duplicate sections and the presence of exclude-patterns, improving the robustness of the build configuration.

Author: alelom

src/python_package_folder/subfolder_build.py

@@ -694,44 +694,55 @@ def _modify_pyproject_string(
             # Usually after [dependency-groups] or at the end
             insert_index = len(result)
             tool_section_exists = False
+            tool_section_start = -1
+            tool_section_end = -1
+            
+            # First, search specifically for [tool.python-package-folder]
             for i, line in enumerate(result):
                 if line.strip() == "[tool.python-package-folder]":
                     tool_section_exists = True
-                    insert_index = i
-                    break
-                elif line.strip().startswith("[tool.") and i > 0:
-                    # Insert before other tool sections
-                    insert_index = i
+                    tool_section_start = i
+                    # Find end of section (next [section] or end of file)
+                    for j in range(i + 1, len(result)):
+                        if result[j].strip().startswith("["):
+                            tool_section_end = j
+                            break
+                    if tool_section_end == -1:
+                        tool_section_end = len(result)
                     break
+            
+            # If not found, find a good insertion point before other [tool.*] sections
+            if not tool_section_exists:
+                for i, line in enumerate(result):
+                    if line.strip().startswith("[tool.") and i > 0:
+                        # Insert before other tool sections
+                        insert_index = i
+                        break
 
             # Format exclude patterns
             patterns_str = ", ".join(f'"{p}"' for p in exclude_patterns)
-            exclude_lines = [
-                "",
-                "[tool.python-package-folder]",
-                f'exclude-patterns = [{patterns_str}]',
-            ]
 
             if tool_section_exists:
-                # Replace or update existing section
-                end_index = insert_index + 1
-                while end_index < len(result) and not result[end_index].strip().startswith("["):
-                    end_index += 1
-                # Check if exclude-patterns already exists
-                has_exclude_patterns = any(
-                    "exclude-patterns" in result[i] for i in range(insert_index, end_index)
-                )
-                if has_exclude_patterns:
-                    # Update existing exclude-patterns line
-                    for i in range(insert_index, end_index):
-                        if "exclude-patterns" in result[i]:
-                            result[i] = f'exclude-patterns = [{patterns_str}]'
-                            break
-                else:
-                    # Add exclude-patterns to existing section
-                    result.insert(end_index - 1, f'exclude-patterns = [{patterns_str}]')
+                # Update existing section
+                # Check if exclude-patterns already exists in the section
+                has_exclude_patterns = False
+                for i in range(tool_section_start + 1, tool_section_end):
+                    if "exclude-patterns" in result[i]:
+                        has_exclude_patterns = True
+                        # Update the existing line
+                        result[i] = f'exclude-patterns = [{patterns_str}]'
+                        break
+                
+                if not has_exclude_patterns:
+                    # Add exclude-patterns to existing section (before the next section)
+                    result.insert(tool_section_end, f'exclude-patterns = [{patterns_str}]')
             else:
                 # Insert new section
+                exclude_lines = [
+                    "",
+                    "[tool.python-package-folder]",
+                    f'exclude-patterns = [{patterns_str}]',
+                ]
                 result[insert_index:insert_index] = exclude_lines
 
         return "\n".join(result)

tests/test_exclude_patterns.py

@@ -211,4 +211,60 @@ def test_exclude_patterns_no_subfolder_toml(self, test_project_with_exclude_patt
         assert ".*_test.*" in content
         assert "sandbox" in content
 
+        # Verify there's only ONE [tool.python-package-folder] section (no duplicates)
+        sections = [line for line in content.split("\n") if line.strip() == "[tool.python-package-folder]"]
+        assert len(sections) == 1, f"Found {len(sections)} duplicate [tool.python-package-folder] sections"
+
+        config.restore()
+
+    def test_exclude_patterns_no_duplicate_section(self, tmp_path: Path) -> None:
+        """Test that exclude patterns don't create duplicate sections when original already has it."""
+        project_root = tmp_path / "test_project"
+        project_root.mkdir()
+
+        # Create pyproject.toml with existing [tool.python-package-folder] section
+        pyproject_content = """[project]
+name = "test-package"
+version = "0.1.0"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/test_package"]
+
+[tool.python-package-folder]
+exclude-patterns = ["_SS", ".*_test.*"]
+
+[tool.pylint.'TYPECHECK']
+generated-members = ["networkx.*"]
+"""
+        (project_root / "pyproject.toml").write_text(pyproject_content)
+
+        # Create source directory
+        src_dir = project_root / "src" / "test_package"
+        src_dir.mkdir(parents=True)
+        (src_dir / "__init__.py").write_text("")
+
+        config = SubfolderBuildConfig(
+            project_root=project_root,
+            src_dir=src_dir,
+            package_name="test-package",
+            version="1.0.0",
+        )
+
+        # Create temporary pyproject.toml
+        temp_pyproject = config.create_temp_pyproject()
+        assert temp_pyproject is not None
+
+        # Check that there's only ONE [tool.python-package-folder] section
+        content = temp_pyproject.read_text()
+        sections = [line for line in content.split("\n") if line.strip() == "[tool.python-package-folder]"]
+        assert len(sections) == 1, f"Found {len(sections)} duplicate [tool.python-package-folder] sections: {sections}"
+
+        # Verify exclude-patterns is present
+        assert "exclude-patterns" in content
+        assert "_SS" in content
+
         config.restore()