python-package-folder 8.1.0__py3-none-any.whl → 8.2.0__py3-none-any.whl

python_package_folder/finder.py

@@ -29,18 +29,26 @@ class ExternalDependencyFinder:
     """
 
     def __init__(
-        self, project_root: Path, src_dir: Path, exclude_patterns: list[str] | None = None
+        self,
+        project_root: Path,
+        src_dir: Path,
+        exclude_patterns: list[str] | None = None,
+        original_src_dir: Path | None = None,
     ) -> None:
         """
         Initialize the dependency finder.
 
         Args:
             project_root: Root directory of the project
-            src_dir: Source directory to analyze
+            src_dir: Source directory to analyze (may be temp directory for subfolder builds)
             exclude_patterns: Additional patterns to exclude (default: common sandbox patterns)
+            original_src_dir: Original source directory before any changes (e.g., before temp directory creation).
+                Used for relative path checks. If not provided, uses src_dir.
         """
         self.project_root = project_root.resolve()
         self.src_dir = src_dir.resolve()
+        # Store original src_dir for relative path checks (important for subfolder builds)
+        self.original_src_dir = (original_src_dir or src_dir).resolve()
         self.analyzer = ImportAnalyzer(project_root)
         # Patterns for directories/files to exclude (sandbox, skip, etc.)
         default_patterns = [
@@ -90,34 +98,43 @@ class ExternalDependencyFinder:
                     if source_path.is_file():
                         parent_dir = source_path.parent
 
-                        # Only copy parent directory if:
-                        # 1. It's a package (has __init__.py), OR
-                        # 2. Files from it are actually imported (which is the case here)
-                        # But only copy the immediate parent, not entire directory trees
-                        parent_is_package = (parent_dir / "__init__.py").exists()
-                        files_are_imported = True  # Always true when processing an import
-
-                        # Only copy immediate parent directory, not grandparent directories
-                        # This prevents copying entire trees like models/Information_extraction
-                        # when we only need models/Information_extraction/_shared_ie
-                        should_copy_dir = (
-                            not self._should_exclude_path(parent_dir)
-                            and (
-                                parent_is_package or files_are_imported
-                            )  # Package OR files imported
-                            and not parent_dir.is_relative_to(self.src_dir)
-                            and not self.src_dir.is_relative_to(parent_dir)
-                            and parent_dir != self.project_root
-                            and parent_dir != self.project_root.parent
-                        )
-
-                        if should_copy_dir:
-                            # Copy the directory instead of just the file
-                            track_path = parent_dir
-                            source_path = parent_dir
-                        else:
-                            # Copy just the file
+                        # Never copy the src/ directory itself - only copy individual files at its root
+                        # This prevents copying the entire src/ directory (with all subdirectories)
+                        # when only a file like _globals.py is needed
+                        if parent_dir == self.project_root / "src":
+                            # For files at root of src/, only copy the file, not the directory
                             track_path = source_path
+                        else:
+                            # Only copy parent directory if:
+                            # 1. It's a package (has __init__.py), OR
+                            # 2. Files from it are actually imported (which is the case here)
+                            # But only copy the immediate parent, not entire directory trees
+                            parent_is_package = (parent_dir / "__init__.py").exists()
+                            files_are_imported = True  # Always true when processing an import
+
+                            # Only copy immediate parent directory, not grandparent directories
+                            # This prevents copying entire trees like models/Information_extraction
+                            # when we only need models/Information_extraction/_shared_ie
+                            # Use original_src_dir for relative path checks to correctly handle
+                            # subfolder builds where src_dir may point to temp directory
+                            should_copy_dir = (
+                                not self._should_exclude_path(parent_dir)
+                                and (
+                                    parent_is_package or files_are_imported
+                                )  # Package OR files imported
+                                and not parent_dir.is_relative_to(self.src_dir)
+                                and not self.original_src_dir.is_relative_to(parent_dir)
+                                and parent_dir != self.project_root
+                                and parent_dir != self.project_root.parent
+                            )
+
+                            if should_copy_dir:
+                                # Copy the directory instead of just the file
+                                track_path = parent_dir
+                                source_path = parent_dir
+                            else:
+                                # Copy just the file
+                                track_path = source_path
                     elif source_path.is_dir():
                         # Don't copy directories that contain src_dir
                         if self.src_dir.is_relative_to(source_path):

python_package_folder/manager.py

@@ -71,6 +71,8 @@ class BuildManager:
                 src_dir = self.project_root / "src"
 
         self.src_dir = Path(src_dir).resolve()
+        # Store original src_dir before any changes (e.g., when temp directory is created)
+        self.original_src_dir = self.src_dir
 
         # Validate source directory
         if not self.src_dir.exists():
@@ -280,10 +282,12 @@ class BuildManager:
                     # Update src_dir to point to temp package directory
                     self.src_dir = self.subfolder_config._temp_package_dir
                     # Recreate finder with updated src_dir so it calculates target paths correctly
+                    # Pass original_src_dir for relative path checks to prevent copying entire src/ directory
                     self.finder = ExternalDependencyFinder(
                         self.project_root,
                         self.src_dir,
                         exclude_patterns=self.exclude_patterns,
+                        original_src_dir=self.original_src_dir,
                     )
                     print(
                         f"Using temporary package directory for build: {self.src_dir}"

{python_package_folder-8.1.0.dist-info → python_package_folder-8.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 8.1.0
+Version: 8.2.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-8.1.0.dist-info → python_package_folder-8.2.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 python_package_folder/__init__.py,sha256=DQt-uldOEKfh0MUqCvKdeNKOnpuOvpb7blYvXMyO9Wc,719
 python_package_folder/__main__.py,sha256=a-__-VLhYw-J7S7CsHdhtEvQr3RiAZxiYDvKhKTgMX4,291
 python_package_folder/analyzer.py,sha256=8DCc5AaVpYF9qh8NbMJ5igeW5AVYnQqy_XqRtl16ZLc,15981
-python_package_folder/finder.py,sha256=RPidZ7LKCFuQ_KgCFIZdHWPXsZIDor3M4C0hKeYW7EI,11799
-python_package_folder/manager.py,sha256=IIwxXlh4gUwg_ijnxOsDgnVQLYI7LO3rDONKhwI1ubU,63065
+python_package_folder/finder.py,sha256=wChaKPcku_U9LBQD2i6xIEKmUsKQzVUpO6H2cnxqPTE,13089
+python_package_folder/manager.py,sha256=znZMn6BjXy6BlIgBCfPhDyNQMXcrF8pUfkiCDfW9ZXI,63375
 python_package_folder/publisher.py,sha256=fmf3l0zMY9CD49gurxlXyvm9mOP0FzDjmiSt0yDqt1M,18813
 python_package_folder/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_package_folder/python_package_folder.py,sha256=QZ-vdOZ40wF-eGbp39JotDhMwIhhT3Z_sC5obQj3i4s,17024
@@ -11,8 +11,8 @@ python_package_folder/types.py,sha256=3yeSRR5p_3PDKEAaehW_RJ7NwJHexOIeA08bGaT1iS
 python_package_folder/utils.py,sha256=b6Ukcc0fctXdxS5zhGLS86kqn0vz1yOEK7XjCY9fjfY,5621
 python_package_folder/version.py,sha256=kIDP6S9trEfs9gj7lBYGxrWm4RPssRla24UtlO9Jkh4,9111
 python_package_folder/version_calculator.py,sha256=_gcc8IbMjt27UxePcc7RZlFTMCG3AGnRI_-Mp_4qRG0,39568
-python_package_folder-8.1.0.dist-info/METADATA,sha256=HDU2zFsdaprjjLCY2-hSuPASZlNOwN-wkthsxVC9G9o,7838
-python_package_folder-8.1.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_package_folder-8.1.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
-python_package_folder-8.1.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
-python_package_folder-8.1.0.dist-info/RECORD,,
+python_package_folder-8.2.0.dist-info/METADATA,sha256=Up5d-XslEXQZOjv1od0o9qwqzp1VqWekDIIHHxNR-Ro,7838
+python_package_folder-8.2.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_package_folder-8.2.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
+python_package_folder-8.2.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
+python_package_folder-8.2.0.dist-info/RECORD,,