python-package-folder 5.3.0__py3-none-any.whl → 6.0.0__py3-none-any.whl

python_package_folder/analyzer.py

@@ -330,56 +330,33 @@ class ImportAnalyzer:
 
             # Check all subdirectories in parent (not just common ones)
             # This handles cases like src/data/spreadsheet_creation/spreadsheet_formatting_dataclasses.py
-            if parent.is_dir():
+            # Use recursive search to find modules in nested directories
+            if parent.is_dir() and parent.is_relative_to(self.project_root):
+                # Recursively search for the module file in subdirectories
+                # Limit search to project_root and its subdirectories to avoid searching too broadly
+                module_basename = module_name.split(".")[-1]
                 try:
-                    for subdir in parent.iterdir():
-                        if not subdir.is_dir():
+                    # Search recursively for the module file
+                    for potential_file in parent.rglob(f"{module_basename}.py"):
+                        # Only search within project_root to avoid going too far
+                        if not potential_file.is_relative_to(self.project_root):
                             continue
-                        # Skip common excluded patterns
-                        if subdir.name.startswith("_SS") or subdir.name.startswith("__SS"):
-                            continue
-                        # Check if module file exists directly in subdirectory
-                        potential_subdir_file = subdir / f"{module_name.split('.')[-1]}.py"
-                        if potential_subdir_file.exists():
-                            return potential_subdir_file
-                        # Check if module directory exists in subdirectory
-                        potential_subdir_module = subdir / module_name.replace(".", "/")
-                        if (
-                            potential_subdir_module.is_dir()
-                            and (potential_subdir_module / "__init__.py").exists()
+                        # Skip excluded patterns
+                        if any(
+                            part.startswith("_SS")
+                            or part.startswith("__SS")
+                            or part.startswith("_sandbox")
+                            or part.startswith("__sandbox")
+                            for part in potential_file.parts
                         ):
-                            return potential_subdir_module / "__init__.py"
-                        if potential_subdir_module.with_suffix(".py").is_file():
-                            return potential_subdir_module.with_suffix(".py")
-                        # Check nested subdirectories (e.g., data/spreadsheet_creation)
-                        # Recursively check subdirectories up to 2 levels deep
-                        try:
-                            for nested_subdir in subdir.iterdir():
-                                if not nested_subdir.is_dir():
-                                    continue
-                                # Check if module file exists in nested subdirectory
-                                potential_nested_file = (
-                                    nested_subdir / f"{module_name.split('.')[-1]}.py"
-                                )
-                                if potential_nested_file.exists():
-                                    return potential_nested_file
-                                # Check if module directory exists in nested subdirectory
-                                potential_nested_module = nested_subdir / module_name.replace(
-                                    ".", "/"
-                                )
-                                if (
-                                    potential_nested_module.is_dir()
-                                    and (potential_nested_module / "__init__.py").exists()
-                                ):
-                                    return potential_nested_module / "__init__.py"
-                                if potential_nested_module.with_suffix(".py").is_file():
-                                    return potential_nested_module.with_suffix(".py")
-                        except (OSError, PermissionError):
-                            # Skip nested directories we can't read
                             continue
+                        # Skip if it's in the src_dir (we're looking for external dependencies)
+                        if potential_file.is_relative_to(src_dir):
+                            continue
+                        return potential_file
                 except (OSError, PermissionError):
-                    # Skip directories we can't read
-                    continue
+                    # Skip if we can't read the directory
+                    pass
 
             # Check common subdirectories in parent (e.g., _shared, shared, common)
             # This handles cases like src/_shared/better_enum.py

python_package_folder/manager.py

@@ -239,10 +239,19 @@ class BuildManager:
                 )
 
             if not package_name:
-                # Derive package name from subfolder
-                package_name = (
+                # Derive package name from subfolder: {root_project_name}-{subfolder_name}
+                root_project_name = self._get_project_name()
+                subfolder_name = (
                     self.src_dir.name.replace("_", "-").replace(" ", "-").lower().strip("-")
                 )
+                
+                if root_project_name:
+                    # Normalize root project name (replace underscores/hyphens consistently)
+                    root_name_normalized = root_project_name.replace("_", "-").lower()
+                    package_name = f"{root_name_normalized}-{subfolder_name}"
+                else:
+                    # Fallback to just subfolder name if root project name not found
+                    package_name = subfolder_name
 
             print(
                 f"Detected subfolder build. Setting up package '{package_name}' version '{version}'..."
@@ -259,10 +268,30 @@ class BuildManager:
             # This is acceptable for tests or dependency-only operations
             if temp_pyproject is None:
                 self.subfolder_config = None
+            else:
+                # If temporary package directory was created, use it for all operations
+                # This ensures dependencies are copied to the correct location and
+                # imports are fixed in the files that will actually be packaged
+                if (
+                    self.subfolder_config
+                    and self.subfolder_config._temp_package_dir
+                    and self.subfolder_config._temp_package_dir.exists()
+                ):
+                    # 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
+                    self.finder = ExternalDependencyFinder(
+                        self.project_root,
+                        self.src_dir,
+                        exclude_patterns=self.exclude_patterns,
+                    )
+                    print(
+                        f"Using temporary package directory for build: {self.src_dir}"
+                    )
 
         analyzer = ImportAnalyzer(self.project_root)
 
-        # Find all Python files in src/
+        # Find all Python files in src/ (which may now be the temp package directory)
         python_files = analyzer.find_all_python_files(self.src_dir)
 
         # Find external dependencies using the configured finder
@@ -1191,13 +1220,23 @@ class BuildManager:
             captured_package_name = None
             if self._is_subfolder_build():
                 # We need to get the package name before run_build cleans up subfolder_config
-                if not package_name:
-                    # Derive from src_dir name (same logic as in prepare_build)
-                    captured_package_name = (
+                if package_name:
+                    # Use provided package name (from --package-name arg)
+                    captured_package_name = package_name
+                else:
+                    # Derive from root project name + src_dir name (same logic as in prepare_build)
+                    root_project_name = self._get_project_name()
+                    subfolder_name = (
                         self.src_dir.name.replace("_", "-").replace(" ", "-").lower().strip("-")
                     )
-                else:
-                    captured_package_name = package_name
+                    
+                    if root_project_name:
+                        # Normalize root project name (replace underscores/hyphens consistently)
+                        root_name_normalized = root_project_name.replace("_", "-").lower()
+                        captured_package_name = f"{root_name_normalized}-{subfolder_name}"
+                    else:
+                        # Fallback to just subfolder name if root project name not found
+                        captured_package_name = subfolder_name
 
             self.run_build(
                 build_command,
@@ -1223,10 +1262,19 @@ class BuildManager:
                     elif package_name:
                         publish_package_name = package_name
                     else:
-                        # Last resort: derive from src_dir name
-                        publish_package_name = (
+                        # Last resort: derive from root project name + src_dir name
+                        root_project_name = self._get_project_name()
+                        subfolder_name = (
                             self.src_dir.name.replace("_", "-").replace(" ", "-").lower().strip("-")
                         )
+                        
+                        if root_project_name:
+                            # Normalize root project name (replace underscores/hyphens consistently)
+                            root_name_normalized = root_project_name.replace("_", "-").lower()
+                            publish_package_name = f"{root_name_normalized}-{subfolder_name}"
+                        else:
+                            # Fallback to just subfolder name if root project name not found
+                            publish_package_name = subfolder_name
                     
                     # Log the package name being used for publishing
                     import logging

python_package_folder/python_package_folder.py

@@ -30,6 +30,45 @@ logging.basicConfig(
 
 def is_github_actions() -> bool:
     """Check if running in GitHub Actions."""
+
+
+def _get_root_project_name(project_root: Path) -> str | None:
+    """
+    Get the root project name from pyproject.toml.
+    
+    Args:
+        project_root: Root directory of the project
+        
+    Returns:
+        Project name from pyproject.toml, or None if not found
+    """
+    pyproject_path = project_root / "pyproject.toml"
+    if not pyproject_path.exists():
+        return None
+    
+    try:
+        import tomllib
+    except ImportError:
+        try:
+            import tomli as tomllib
+        except ImportError:
+            tomllib = None
+    
+    try:
+        if tomllib:
+            with open(pyproject_path, "rb") as f:
+                data = tomllib.load(f)
+                return data.get("project", {}).get("name")
+        else:
+            # Fallback: simple string parsing
+            content = pyproject_path.read_text(encoding="utf-8")
+            for line in content.split("\n"):
+                if line.strip().startswith("name ="):
+                    return line.split("=", 1)[1].strip().strip('"').strip("'")
+    except Exception:
+        pass
+    
+    return None
     return os.getenv("GITHUB_ACTIONS") == "true"
 
 
@@ -177,6 +216,27 @@ def main() -> int:
 
         # Resolve version via conventional commits if not provided and needed
         resolved_version = args.version
+        
+        # Derive package name for subfolder builds (used for both version resolution and publishing)
+        derived_package_name = None
+        if is_subfolder:
+            if args.package_name:
+                derived_package_name = args.package_name
+            else:
+                # Derive package name: {root_project_name}-{subfolder_name}
+                root_project_name = _get_root_project_name(project_root)
+                subfolder_name = src_dir.name.replace("_", "-").replace(
+                    " ", "-"
+                ).lower().strip("-")
+                
+                if root_project_name:
+                    # Normalize root project name (replace underscores/hyphens consistently)
+                    root_name_normalized = root_project_name.replace("_", "-").lower()
+                    derived_package_name = f"{root_name_normalized}-{subfolder_name}"
+                else:
+                    # Fallback to just subfolder name if root project name not found
+                    derived_package_name = subfolder_name
+        
         if not resolved_version and not args.analyze_only:
             # Version is needed for subfolder builds or when publishing main package
             if is_subfolder or args.publish:
@@ -204,21 +264,18 @@ def main() -> int:
                 if is_subfolder:
                     # Workflow 1: subfolder build
                     # src_dir is guaranteed to be relative to project_root due to is_subfolder check
-                    package_name = args.package_name or src_dir.name.replace("_", "-").replace(
-                        " ", "-"
-                    ).lower().strip("-")
                     subfolder_rel_path = src_dir.relative_to(project_root)
                     
                     # Log the package name being used for version query
                     logger = logging.getLogger(__name__)
                     logger.info(
-                        f"Querying registry for package name: '{package_name}' "
-                        f"(derived from src_dir: '{src_dir.name}', args.package_name: {args.package_name})"
+                        f"Querying registry for package name: '{derived_package_name}' "
+                        f"(derived from src_dir: '{src_dir.name}', root_project: {_get_root_project_name(project_root)}, args.package_name: {args.package_name})"
                     )
                     
                     resolved_version, error_details = resolve_version(
                         project_root,
-                        package_name=package_name,
+                        package_name=derived_package_name,
                         subfolder_path=subfolder_rel_path,
                         repository=repository,
                         repository_url=repository_url,
@@ -279,7 +336,7 @@ def main() -> int:
                 skip_existing=args.skip_existing,
                 version=args.version,
                 restore_versioning=not args.no_restore_versioning,
-                package_name=args.package_name,
+                package_name=derived_package_name if is_subfolder else args.package_name,
                 dependency_group=args.dependency_group,
             )
         else:
@@ -289,9 +346,25 @@ def main() -> int:
                 if is_subfolder:
                     from .subfolder_build import SubfolderBuildConfig
 
-                    package_name = args.package_name or src_dir.name.replace("_", "-").replace(
-                        " ", "-"
-                    ).lower().strip("-")
+                    # Use derived_package_name if available, otherwise derive it again
+                    if derived_package_name is not None:
+                        package_name = derived_package_name
+                    elif args.package_name:
+                        package_name = args.package_name
+                    else:
+                        # Derive package name: {root_project_name}-{subfolder_name}
+                        root_project_name = _get_root_project_name(project_root)
+                        subfolder_name = src_dir.name.replace("_", "-").replace(
+                            " ", "-"
+                        ).lower().strip("-")
+                        
+                        if root_project_name:
+                            # Normalize root project name (replace underscores/hyphens consistently)
+                            root_name_normalized = root_project_name.replace("_", "-").lower()
+                            package_name = f"{root_name_normalized}-{subfolder_name}"
+                        else:
+                            # Fallback to just subfolder name if root project name not found
+                            package_name = subfolder_name
                     subfolder_config = SubfolderBuildConfig(
                         project_root=project_root,
                         src_dir=src_dir,

python_package_folder/subfolder_build.py

@@ -78,16 +78,91 @@ class SubfolderBuildConfig:
         self._used_subfolder_pyproject = False
         self._excluded_files: list[tuple[Path, Path]] = []  # List of (original_path, temp_path) tuples
         self._exclude_temp_dir: Path | None = None
+        self._temp_package_dir: Path | None = None
 
     def _derive_package_name(self) -> str:
-        """Derive package name from source directory name."""
+        """
+        Derive package name from root project name and source directory name.
+        
+        Format: {root_project_name}-{subfolder_name}
+        Falls back to just subfolder_name if root project name not found.
+        """
+        # Get root project name from pyproject.toml
+        root_project_name = None
+        pyproject_path = self.project_root / "pyproject.toml"
+        if pyproject_path.exists():
+            try:
+                if tomllib:
+                    with open(pyproject_path, "rb") as f:
+                        data = tomllib.load(f)
+                        root_project_name = data.get("project", {}).get("name")
+                else:
+                    # Fallback: simple string parsing
+                    content = pyproject_path.read_text(encoding="utf-8")
+                    for line in content.split("\n"):
+                        if line.strip().startswith("name ="):
+                            root_project_name = line.split("=", 1)[1].strip().strip('"').strip("'")
+                            break
+            except Exception:
+                pass
+        
         # Use the directory name, replacing invalid characters
-        name = self.src_dir.name
+        subfolder_name = self.src_dir.name
         # Replace invalid characters with hyphens
-        name = name.replace("_", "-").replace(" ", "-").lower()
+        subfolder_name = subfolder_name.replace("_", "-").replace(" ", "-").lower()
         # Remove any leading/trailing hyphens
-        name = name.strip("-")
-        return name
+        subfolder_name = subfolder_name.strip("-")
+        
+        # Combine with root project name if available
+        if root_project_name:
+            # Normalize root project name (replace underscores/hyphens consistently)
+            root_name_normalized = root_project_name.replace("_", "-").lower()
+            return f"{root_name_normalized}-{subfolder_name}"
+        else:
+            # Fallback to just subfolder name
+            return subfolder_name
+
+    def _create_temp_package_directory(self) -> None:
+        """
+        Create a temporary package directory with the correct import name.
+        
+        This ensures the installed package has the correct directory structure.
+        The package name (with hyphens) is converted to the import name (with underscores).
+        For example: 'ml-drawing-assistant-data' -> 'ml_drawing_assistant_data'
+        
+        The temporary directory is created in the project root and contains a copy
+        of the source directory contents.
+        """
+        if not self.package_name:
+            return
+        
+        # Convert package name (with hyphens) to import name (with underscores)
+        # PyPI package names use hyphens, but Python import names use underscores
+        import_name = self.package_name.replace("-", "_")
+        
+        # Create temporary directory name
+        temp_dir_name = f".temp_package_{import_name}"
+        temp_package_dir = self.project_root / temp_dir_name
+        
+        # Remove if it already exists (from a previous failed build)
+        if temp_package_dir.exists():
+            shutil.rmtree(temp_package_dir)
+        
+        # Copy the entire source directory contents to the temporary directory
+        try:
+            shutil.copytree(self.src_dir, temp_package_dir)
+            self._temp_package_dir = temp_package_dir
+            print(
+                f"Created temporary package directory: {temp_package_dir} "
+                f"(import name: {import_name})"
+            )
+        except Exception as e:
+            print(
+                f"Warning: Could not create temporary package directory: {e}",
+                file=sys.stderr,
+            )
+            # Fall back to using src_dir directly
+            self._temp_package_dir = None
 
     def _get_package_structure(self) -> tuple[str, list[str]]:
         """
@@ -98,21 +173,24 @@ class SubfolderBuildConfig:
             - packages_path: The path to the directory containing packages
             - package_dirs: List of package directories to include
         """
-        # Check if src_dir itself is a package (has __init__.py)
-        has_init = (self.src_dir / "__init__.py").exists()
+        # Use temporary package directory if it exists, otherwise use src_dir
+        package_dir = self._temp_package_dir if self._temp_package_dir and self._temp_package_dir.exists() else self.src_dir
+        
+        # Check if package_dir itself is a package (has __init__.py)
+        has_init = (package_dir / "__init__.py").exists()
 
-        # Check for Python files directly in src_dir
-        py_files = list(self.src_dir.glob("*.py"))
+        # Check for Python files directly in package_dir
+        py_files = list(package_dir.glob("*.py"))
         has_py_files = bool(py_files)
 
-        # Calculate relative path
+        # Calculate relative path from project root
         try:
-            rel_path = self.src_dir.relative_to(self.project_root)
+            rel_path = package_dir.relative_to(self.project_root)
             packages_path = str(rel_path).replace("\\", "/")
         except ValueError:
             packages_path = None
 
-        # If src_dir has Python files but no __init__.py, we need to make it a package
+        # If package_dir has Python files but no __init__.py, we need to make it a package
         # or include it as a module directory
         if has_py_files and not has_init:
             # For flat structures, we include the directory itself
@@ -266,7 +344,8 @@ class SubfolderBuildConfig:
         if not self.version:
             raise ValueError("Version is required for subfolder builds")
 
-        # Ensure src_dir is a package (has __init__.py) for hatchling
+        # Ensure src_dir is a package (has __init__.py) before creating temp directory
+        # This way the __init__.py will be copied to the temp directory
         init_file = self.src_dir / "__init__.py"
         if not init_file.exists():
             # Create a temporary __init__.py to make it a package
@@ -275,6 +354,13 @@ class SubfolderBuildConfig:
         else:
             self._temp_init_created = False
 
+        # Create temporary package directory with correct import name
+        # This will copy the __init__.py we just created (if any)
+        self._create_temp_package_directory()
+        
+        # Determine which directory to use (temp package dir or src_dir)
+        package_dir = self._temp_package_dir if self._temp_package_dir and self._temp_package_dir.exists() else self.src_dir
+
         # Check if pyproject.toml exists in subfolder
         subfolder_pyproject = self.src_dir / "pyproject.toml"
         if subfolder_pyproject.exists():
@@ -1174,6 +1260,18 @@ class SubfolderBuildConfig:
             self.original_pyproject_path = None
             self._used_subfolder_pyproject = False
 
+        # Remove temporary package directory if it exists
+        if self._temp_package_dir and self._temp_package_dir.exists():
+            try:
+                shutil.rmtree(self._temp_package_dir)
+                print(f"Removed temporary package directory: {self._temp_package_dir}")
+            except Exception as e:
+                print(
+                    f"Warning: Could not remove temporary package directory {self._temp_package_dir}: {e}",
+                    file=sys.stderr,
+                )
+            self._temp_package_dir = None
+
     def __enter__(self) -> Self:
         """Context manager entry."""
         return self

{python_package_folder-5.3.0.dist-info → python_package_folder-6.0.0.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
 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=cmTNUDCWBIh3XZ_mShlQVG1P9NN_oe3FUBTirVtYfTQ,16709
+python_package_folder/analyzer.py,sha256=7AfJCN29aY7dSYB5H6t1xnHbT-hCZsLtYN7i27pAgMU,15191
 python_package_folder/finder.py,sha256=RPidZ7LKCFuQ_KgCFIZdHWPXsZIDor3M4C0hKeYW7EI,11799
-python_package_folder/manager.py,sha256=FwEO1N41qqHSipYDtCPCxFZ6XzVDeCbS_AtoZIm1AJs,56408
+python_package_folder/manager.py,sha256=erX8uPu3KA593wsSH9o15O8MNc6mwIZgGGqUJf7Z5i0,59423
 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=lbrQHLpRA-43sSB3pJosUFbmAKsTfR-y7MMP0spZVIQ,13898
-python_package_folder/subfolder_build.py,sha256=SR8bbEk8o-YcCva81kPl-mW5uCe54d1ajFq82pG0-D4,51274
+python_package_folder/python_package_folder.py,sha256=QZ-vdOZ40wF-eGbp39JotDhMwIhhT3Z_sC5obQj3i4s,17024
+python_package_folder/subfolder_build.py,sha256=4H6XDb8nxpjLPKlTixXy-PtX0JbW8jiMZvxn7Hgbqs0,55883
 python_package_folder/types.py,sha256=3yeSRR5p_3PDKEAaehW_RJ7NwJHexOIeA08bGaT1iSY,2368
 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-5.3.0.dist-info/METADATA,sha256=3HtNsy7AXnzAJx8HYBkZH80cENLeEDOFHrsvr147zlQ,7838
-python_package_folder-5.3.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_package_folder-5.3.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
-python_package_folder-5.3.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
-python_package_folder-5.3.0.dist-info/RECORD,,
+python_package_folder-6.0.0.dist-info/METADATA,sha256=UeEwTJf4IxlZpjf-ekl7lX4tyxf-MgqCANxi16aDENc,7838
+python_package_folder-6.0.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_package_folder-6.0.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
+python_package_folder-6.0.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
+python_package_folder-6.0.0.dist-info/RECORD,,