python-package-folder 5.1.0__tar.gz → 5.1.1__tar.gz

{python_package_folder-5.1.0 → python_package_folder-5.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 5.1.0
+Version: 5.1.1
 Summary: Python package to automatically package and build a folder, fetching all relevant dependencies.
 Project-URL: Repository, https://github.com/alelom/python-package-folder
 Author-email: Alessio Lombardi <work@alelom.com>

{python_package_folder-5.1.0 → python_package_folder-5.1.1}/coverage.svg

@@ -14,7 +14,7 @@
   <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
     <text x="31.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
     <text x="31.5" y="14">coverage</text>
-    <text x="81" y="15" fill="#010101" fill-opacity=".3">65%</text>
-    <text x="81" y="14">65%</text>
+    <text x="81" y="15" fill="#010101" fill-opacity=".3">63%</text>
+    <text x="81" y="14">63%</text>
   </g>
 </svg>

{python_package_folder-5.1.0 → python_package_folder-5.1.1}/pyproject.toml

@@ -43,7 +43,7 @@ dependencies = [
 
 # ---- Dev dependencies ----
 
-version = "5.1.0"
+version = "5.1.1"
 [dependency-groups]
 dev = [
     "pytest>=8.3.5",

{python_package_folder-5.1.0 → python_package_folder-5.1.1}/src/python_package_folder/subfolder_build.py

@@ -205,13 +205,80 @@ class SubfolderBuildConfig:
         has_build_system = any(line.strip().startswith("[build-system]") for line in result)
         if not has_build_system:
             # Insert build-system at the very beginning of the file
+            # Include python-package-folder in requires so the build hook is available
             build_system_lines = [
                 "[build-system]",
-                'requires = ["hatchling"]',
+                'requires = ["hatchling", "python-package-folder"]',
                 'build-backend = "hatchling.build"',
                 "",
             ]
             result = build_system_lines + result
+        else:
+            # Ensure python-package-folder is in requires for build hook availability
+            in_build_system = False
+            for i, line in enumerate(result):
+                if line.strip().startswith("[build-system]"):
+                    in_build_system = True
+                elif in_build_system and line.strip().startswith("requires"):
+                    # Check if python-package-folder is already in requires
+                    if "python-package-folder" not in line:
+                        # Add python-package-folder to requires
+                        if "]" in line:
+                            # Single-line requires
+                            result[i] = line.rstrip().rstrip("]") + ', "python-package-folder"]'
+                        else:
+                            # Multi-line requires, find the closing bracket
+                            for j in range(i + 1, len(result)):
+                                if "]" in result[j]:
+                                    # Insert before closing
+                                    # Determine indentation from the previous line (last item in list)
+                                    if j > i + 1:
+                                        # Look at the previous line to get indentation
+                                        prev_line = result[j - 1]
+                                        # Extract leading whitespace from previous line
+                                        indent = len(prev_line) - len(prev_line.lstrip())
+                                        indent_str = " " * indent
+                                    else:
+                                        # Fallback: use standard 4-space indent
+                                        indent_str = "    "
+                                    result.insert(j, f'{indent_str}"python-package-folder",')
+                                    break
+                    break
+                elif in_build_system and line.strip().startswith("[") and not line.strip().startswith("[build-system"):
+                    # End of build-system section
+                    break
+
+        # Register the build hook to enable exclude patterns
+        build_hook_registered = any(
+            "[tool.hatch.build.hooks.custom]" in line for line in result
+        )
+        if not build_hook_registered:
+            # Add build hook registration after [tool.hatch.build.targets.wheel] section
+            hook_insert_index = len(result)
+            for i, line in enumerate(result):
+                if line.strip().startswith("[tool.hatch.build.targets.wheel]"):
+                    # Find the end of this section
+                    for j in range(i + 1, len(result)):
+                        if result[j].strip().startswith("[") and not result[j].strip().startswith(
+                            "[tool.hatch.build.targets"
+                        ):
+                            hook_insert_index = j
+                            break
+                    if hook_insert_index == len(result):
+                        # Insert after packages line if section continues
+                        for j in range(i + 1, len(result)):
+                            if result[j].strip().startswith("["):
+                                hook_insert_index = j
+                                break
+                    break
+
+            # Insert build hook registration
+            hook_lines = [
+                "",
+                "[tool.hatch.build.hooks.custom]",
+                'path = "python_package_folder._hatch_build:CustomBuildHook"',
+            ]
+            result[hook_insert_index:hook_insert_index] = hook_lines
 
         # Ensure hatch build section exists if packages path is needed
         if not packages_set and correct_packages_path:
@@ -570,13 +637,54 @@ class SubfolderBuildConfig:
         has_build_system = any(line.strip().startswith("[build-system]") for line in result)
         if not has_build_system:
             # Insert build-system at the very beginning of the file
+            # Include python-package-folder in requires so the build hook is available
             build_system_lines = [
                 "[build-system]",
-                'requires = ["hatchling"]',
+                'requires = ["hatchling", "python-package-folder"]',
                 'build-backend = "hatchling.build"',
                 "",
             ]
             result = build_system_lines + result
+        else:
+            # Ensure python-package-folder is in requires for build hook availability
+            in_build_system = False
+            requires_modified = False
+            for i, line in enumerate(result):
+                if line.strip().startswith("[build-system]"):
+                    in_build_system = True
+                elif in_build_system and line.strip().startswith("requires"):
+                    # Check if python-package-folder is already in requires
+                    if "python-package-folder" not in line:
+                        # Add python-package-folder to requires
+                        if "]" in line:
+                            # Single-line requires (may have closing bracket on same line)
+                            if line.strip().endswith("]"):
+                                result[i] = line.rstrip().rstrip("]") + ', "python-package-folder"]'
+                            else:
+                                # Closing bracket might be on same line but not at end
+                                result[i] = line.rstrip().rstrip("]") + ', "python-package-folder"]'
+                        else:
+                            # Multi-line requires, find the closing bracket
+                            for j in range(i + 1, len(result)):
+                                if "]" in result[j]:
+                                    # Insert before closing
+                                    # Determine indentation from the previous line (last item in list)
+                                    if j > i + 1:
+                                        # Look at the previous line to get indentation
+                                        prev_line = result[j - 1]
+                                        # Extract leading whitespace from previous line
+                                        indent = len(prev_line) - len(prev_line.lstrip())
+                                        indent_str = " " * indent
+                                    else:
+                                        # Fallback: use standard 4-space indent
+                                        indent_str = "    "
+                                    result.insert(j, f'{indent_str}"python-package-folder",')
+                                    break
+                        requires_modified = True
+                    break
+                elif in_build_system and line.strip().startswith("[") and not line.strip().startswith("[build-system"):
+                    # End of build-system section
+                    break
 
         # Ensure packages is always set for subfolder builds
         if not packages_set and package_dirs:
@@ -587,6 +695,50 @@ class SubfolderBuildConfig:
             packages_str = ", ".join(f'"{p}"' for p in package_dirs)
             result.append(f"packages = [{packages_str}]")
 
+        # Register the build hook to enable exclude patterns
+        # Always register the build hook if exclude patterns are present, or if we want to support them
+        # Check if build hook is already registered
+        build_hook_registered = any(
+            "[tool.hatch.build.hooks.custom]" in line for line in result
+        )
+
+        if not build_hook_registered:
+            # Add build hook registration after [tool.hatch.build.targets.wheel] section
+            hook_insert_index = len(result)
+            wheel_section_found = False
+            for i, line in enumerate(result):
+                if line.strip().startswith("[tool.hatch.build.targets.wheel]"):
+                    wheel_section_found = True
+                    # Find the end of this section
+                    for j in range(i + 1, len(result)):
+                        if result[j].strip().startswith("[") and not result[j].strip().startswith(
+                            "[tool.hatch.build.targets"
+                        ):
+                            hook_insert_index = j
+                            break
+                    if hook_insert_index == len(result):
+                        # Insert after packages line if section continues
+                        for j in range(i + 1, len(result)):
+                            if result[j].strip().startswith("["):
+                                hook_insert_index = j
+                                break
+                    break
+
+            # If wheel section not found, insert before sdist section or at end
+            if not wheel_section_found:
+                for i, line in enumerate(result):
+                    if line.strip().startswith("[tool.hatch.build.targets.sdist]"):
+                        hook_insert_index = i
+                        break
+
+            # Insert build hook registration
+            hook_lines = [
+                "",
+                "[tool.hatch.build.hooks.custom]",
+                'path = "python_package_folder._hatch_build:CustomBuildHook"',
+            ]
+            result[hook_insert_index:hook_insert_index] = hook_lines
+
         # Use only-include for source distributions to ensure only the subfolder is included
         # This prevents including files from the project root
         if package_dirs:
@@ -1011,4 +1163,4 @@ class SubfolderBuildConfig:
 
     def __exit__(self, exc_type, exc_val, exc_tb) -> None:  # noqa: ARG002
         """Context manager exit - always restore."""
-        self.restore()
+        self.restore()

{python_package_folder-5.1.0 → python_package_folder-5.1.1}/tests/test_subfolder_build.py

@@ -661,7 +661,7 @@ class TestSubfolderBuildTemporaryPyprojectCreation:
 
         # Verify build-system section is added (required for hatchling)
         assert "[build-system]" in content
-        assert 'requires = ["hatchling"]' in content
+        assert 'requires = ["hatchling", "python-package-folder"]' in content
         assert 'build-backend = "hatchling.build"' in content
         assert "[tool.hatch.version]" not in content
         assert "[tool.uv-dynamic-versioning]" not in content
@@ -894,7 +894,7 @@ description = "Subfolder package"
 
             # Verify build-system section uses hatchling, not setuptools
             assert "[build-system]" in content
-            assert 'requires = ["hatchling"]' in content
+            assert 'requires = ["hatchling", "python-package-folder"]' in content
             assert 'build-backend = "hatchling.build"' in content
             assert "setuptools" not in content or 'build-backend = "setuptools' not in content
 
@@ -929,7 +929,7 @@ description = "Subfolder package"
 
         # Verify build-system section is added
         assert "[build-system]" in content
-        assert 'requires = ["hatchling"]' in content
+        assert 'requires = ["hatchling", "python-package-folder"]' in content
         assert 'build-backend = "hatchling.build"' in content
 
         config.restore()