python-package-folder 3.0.1__tar.gz → 3.1.0__tar.gz

{python_package_folder-3.0.1 → python_package_folder-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 3.0.1
+Version: 3.1.0
 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-3.0.1 → python_package_folder-3.1.0}/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">68%</text>
-    <text x="81" y="14">68%</text>
+    <text x="81" y="15" fill="#010101" fill-opacity=".3">69%</text>
+    <text x="81" y="14">69%</text>
   </g>
 </svg>

{python_package_folder-3.0.1 → python_package_folder-3.1.0}/src/python_package_folder/manager.py

@@ -339,6 +339,13 @@ class BuildManager:
                 shutil.copy2(source, target)
                 self.copied_files.append(target)
                 print(f"Copied external file: {source} -> {target}")
+                # If copying a Python file, ensure parent directory has __init__.py
+                # This helps type checkers resolve imports correctly
+                if source.suffix == ".py" and target.parent != self.src_dir:
+                    init_file = target.parent / "__init__.py"
+                    if not init_file.exists():
+                        init_file.write_text("", encoding="utf-8")
+                        self.copied_files.append(init_file)
             elif source.is_dir():
                 if target.exists():
                     shutil.rmtree(target)
@@ -354,6 +361,8 @@ class BuildManager:
         Copy a directory tree, excluding certain patterns.
 
         Excludes directories matching patterns like _SS, __SS, _sandbox, etc.
+        Ensures __init__.py files exist in directories containing Python files
+        so that type checkers can resolve imports correctly.
 
         Args:
             src: Source directory
@@ -385,6 +394,9 @@ class BuildManager:
         # Create destination directory
         dst.mkdir(parents=True, exist_ok=True)
 
+        has_python_files = False
+        copied_python_files = []
+
         # Copy files and subdirectories, excluding patterns
         for item in src.iterdir():
             if should_exclude(item):
@@ -395,8 +407,39 @@ class BuildManager:
 
             if src_item.is_file():
                 shutil.copy2(src_item, dst_item)
+                if src_item.suffix == ".py":
+                    has_python_files = True
+                    copied_python_files.append(dst_item)
             elif src_item.is_dir():
                 self._copytree_excluding(src_item, dst_item)
+                # Check if the subdirectory has Python files
+                if any(dst_item.rglob("*.py")):
+                    has_python_files = True
+
+        # Ensure __init__.py exists in directories containing Python files
+        # This is needed for type checkers to resolve imports correctly
+        # Also ensure all parent directories in the path have __init__.py
+        if has_python_files:
+            init_file = dst / "__init__.py"
+            if not init_file.exists():
+                # Create an empty __init__.py file
+                init_file.write_text("", encoding="utf-8")
+                self.copied_files.append(init_file)
+
+            # Ensure all parent directories up to src_dir also have __init__.py
+            # This helps type checkers resolve nested imports like:
+            # from empty_drawing_detection.models.Information_extraction._shared_ie.ie_enums import ...
+            current = dst
+            while current != self.src_dir and current.is_relative_to(self.src_dir):
+                parent_init = current.parent / "__init__.py"
+                if (
+                    parent_init.parent != self.src_dir
+                    and not parent_init.exists()
+                    and any(current.parent.rglob("*.py"))
+                ):
+                    parent_init.write_text("", encoding="utf-8")
+                    self.copied_files.append(parent_init)
+                current = current.parent
 
     def _get_package_name_from_import(self, module_name: str) -> str | None:
         """

{python_package_folder-3.0.1 → python_package_folder-3.1.0}/src/python_package_folder/subfolder_build.py

@@ -140,7 +140,9 @@ class SubfolderBuildConfig:
         lines = content.split("\n")
         result = []
         in_hatch_build = False
+        in_hatch_build_section = False
         packages_set = False
+        paths_exclude_set = False
 
         for line in lines:
             # Detect hatch build section
@@ -148,6 +150,10 @@ class SubfolderBuildConfig:
                 in_hatch_build = True
                 result.append(line)
                 continue
+            elif line.strip().startswith("[tool.hatch.build]"):
+                in_hatch_build_section = True
+                result.append(line)
+                continue
             elif line.strip().startswith("[") and in_hatch_build:
                 # End of hatch build section, add packages if not set
                 if not packages_set and correct_packages_path:
@@ -155,6 +161,15 @@ class SubfolderBuildConfig:
                     result.append(f"packages = [{packages_str}]")
                 in_hatch_build = False
                 result.append(line)
+            elif line.strip().startswith("[") and in_hatch_build_section:
+                # End of hatch build section
+                in_hatch_build_section = False
+                result.append(line)
+            elif in_hatch_build_section:
+                # Track if paths-exclude already exists
+                if re.match(r"^\s*paths-exclude\s*=", line):
+                    paths_exclude_set = True
+                result.append(line)
             elif in_hatch_build:
                 # Modify packages path if found
                 if re.match(r"^\s*packages\s*=", line):
@@ -194,6 +209,43 @@ class SubfolderBuildConfig:
                 packages_str = f'"{correct_packages_path}"'
                 result.append(f"packages = [{packages_str}]")
 
+        # Add file exclusion patterns to prevent including non-package files
+        # Only add if paths-exclude wasn't already set (we merged it above)
+        if not paths_exclude_set:
+            result.append("")
+            result.append("[tool.hatch.build]")
+            result.append("paths-exclude = [")
+            result.append('    ".cursor/**",')
+            result.append('    ".github/**",')
+            result.append('    ".vscode/**",')
+            result.append('    ".idea/**",')
+            result.append('    "data/**",')
+            result.append('    "docs/**",')
+            result.append('    "references/**",')
+            result.append('    "reports/**",')
+            result.append('    "scripts/**",')
+            result.append('    "tests/**",')
+            result.append('    "test/**",')
+            result.append('    "dist/**",')
+            result.append('    "build/**",')
+            result.append('    "*.egg-info/**",')
+            result.append('    "__pycache__/**",')
+            result.append('    ".pytest_cache/**",')
+            result.append('    ".mypy_cache/**",')
+            result.append('    ".venv/**",')
+            result.append('    "venv/**",')
+            result.append('    ".git/**",')
+            result.append('    ".gitignore",')
+            result.append('    ".gitattributes",')
+            result.append('    "Dockerfile",')
+            result.append('    ".dockerignore",')
+            result.append('    ".pylintrc",')
+            result.append('    "pyrightconfig.json",')
+            result.append('    "git-filter-repo",')
+            result.append('    "pyproject.toml.original",')
+            result.append('    "README.md.backup",')
+            result.append("]")
+
         return "\n".join(result)
 
     def create_temp_pyproject(self) -> Path | None:
@@ -532,6 +584,42 @@ class SubfolderBuildConfig:
             packages_str = ", ".join(f'"{p}"' for p in package_dirs)
             result.append(f"packages = [{packages_str}]")
 
+        # Add file exclusion patterns to prevent including non-package files
+        # This ensures only the subfolder code is included, not project root files
+        result.append("")
+        result.append("[tool.hatch.build]")
+        result.append("paths-exclude = [")
+        result.append('    ".cursor/**",')
+        result.append('    ".github/**",')
+        result.append('    ".vscode/**",')
+        result.append('    ".idea/**",')
+        result.append('    "data/**",')
+        result.append('    "docs/**",')
+        result.append('    "references/**",')
+        result.append('    "reports/**",')
+        result.append('    "scripts/**",')
+        result.append('    "tests/**",')
+        result.append('    "test/**",')
+        result.append('    "dist/**",')
+        result.append('    "build/**",')
+        result.append('    "*.egg-info/**",')
+        result.append('    "__pycache__/**",')
+        result.append('    ".pytest_cache/**",')
+        result.append('    ".mypy_cache/**",')
+        result.append('    ".venv/**",')
+        result.append('    "venv/**",')
+        result.append('    ".git/**",')
+        result.append('    ".gitignore",')
+        result.append('    ".gitattributes",')
+        result.append('    "Dockerfile",')
+        result.append('    ".dockerignore",')
+        result.append('    ".pylintrc",')
+        result.append('    "pyrightconfig.json",')
+        result.append('    "git-filter-repo",')
+        result.append('    "pyproject.toml.original",')
+        result.append('    "README.md.backup",')
+        result.append("]")
+
         # Add dependency group if specified
         if dependency_group:
             # Find where to insert dependency-groups section

{python_package_folder-3.0.1 → python_package_folder-3.1.0}/tests/test_subfolder_build.py

@@ -675,6 +675,118 @@ class TestSubfolderBuildTemporaryPyprojectCreation:
         # Cleanup
         config.restore()
 
+    def test_file_exclusion_patterns_added(self, test_project_with_pyproject: Path) -> None:
+        """Test that file exclusion patterns are added to temporary pyproject.toml."""
+        project_root = test_project_with_pyproject
+        subfolder = project_root / "subfolder"
+
+        # Create various non-package files and directories that should be excluded
+        (project_root / ".cursor").mkdir()
+        (project_root / ".github").mkdir()
+        (project_root / ".vscode").mkdir()
+        (project_root / "data").mkdir()
+        (project_root / "docs").mkdir()
+        (project_root / "references").mkdir()
+        (project_root / "reports").mkdir()
+        (project_root / "scripts").mkdir()
+        (project_root / "tests").mkdir()
+        (project_root / "Dockerfile").write_text("# Dockerfile")
+        (project_root / ".gitignore").write_text("*.pyc")
+
+        # Ensure no pyproject.toml in subfolder
+        subfolder_pyproject = subfolder / "pyproject.toml"
+        if subfolder_pyproject.exists():
+            subfolder_pyproject.unlink()
+
+        config = SubfolderBuildConfig(
+            project_root=project_root,
+            src_dir=subfolder,
+            version="1.0.0",
+            package_name="test-package",
+        )
+
+        pyproject_path = config.create_temp_pyproject()
+
+        assert pyproject_path is not None
+        assert pyproject_path.exists()
+        content = pyproject_path.read_text()
+
+        # Verify [tool.hatch.build] section exists
+        assert "[tool.hatch.build]" in content
+
+        # Verify paths-exclude is present
+        assert "paths-exclude = [" in content
+
+        # Verify common exclusion patterns are included
+        assert '".cursor/**"' in content
+        assert '".github/**"' in content
+        assert '".vscode/**"' in content
+        assert '"data/**"' in content
+        assert '"docs/**"' in content
+        assert '"references/**"' in content
+        assert '"reports/**"' in content
+        assert '"scripts/**"' in content
+        assert '"tests/**"' in content
+        assert '"dist/**"' in content
+        assert '"build/**"' in content
+        assert '"*.egg-info/**"' in content
+        assert '"__pycache__/**"' in content
+        assert '".pytest_cache/**"' in content
+        assert '".git/**"' in content
+        assert '"Dockerfile"' in content
+        assert '".gitignore"' in content
+
+        # Cleanup
+        config.restore()
+
+    def test_file_exclusion_patterns_with_subfolder_pyproject(
+        self, test_project_with_pyproject: Path
+    ) -> None:
+        """Test that file exclusion patterns are added when subfolder has its own pyproject.toml."""
+        project_root = test_project_with_pyproject
+        subfolder = project_root / "subfolder"
+
+        # Create various non-package files that should be excluded
+        (project_root / ".cursor").mkdir()
+        (project_root / "data").mkdir()
+        (project_root / "docs").mkdir()
+
+        # Create pyproject.toml in subfolder
+        subfolder_pyproject_content = """[project]
+name = "subfolder-package"
+version = "1.0.0"
+description = "Subfolder package"
+"""
+        (subfolder / "pyproject.toml").write_text(subfolder_pyproject_content)
+
+        config = SubfolderBuildConfig(
+            project_root=project_root,
+            src_dir=subfolder,
+            version="2.0.0",  # Should be ignored since subfolder has its own
+        )
+
+        pyproject_path = config.create_temp_pyproject()
+
+        assert pyproject_path is not None
+        assert pyproject_path.exists()
+        content = pyproject_path.read_text()
+
+        # Verify [tool.hatch.build] section exists
+        assert "[tool.hatch.build]" in content
+
+        # Verify paths-exclude is present
+        assert "paths-exclude = [" in content
+
+        # Verify common exclusion patterns are included
+        assert '".cursor/**"' in content
+        assert '"data/**"' in content
+        assert '"docs/**"' in content
+        assert '"dist/**"' in content
+        assert '"build/**"' in content
+
+        # Cleanup
+        config.restore()
+
     def test_third_party_dependencies_added(self, test_project_with_pyproject: Path) -> None:
         """Test that third-party dependencies are added to temporary pyproject.toml."""
         project_root = test_project_with_pyproject