python-package-folder 1.4.1__py3-none-any.whl → 2.0.4__py3-none-any.whl

python_package_folder/manager.py

@@ -268,6 +268,19 @@ class BuildManager:
         for dep in external_deps:
             self._copy_dependency(dep)
 
+        # For subfolder builds, extract third-party dependencies and add to pyproject.toml
+        if self._is_subfolder_build() and self.subfolder_config:
+            # Re-analyze all Python files (including copied dependencies) to find third-party imports
+            all_python_files = analyzer.find_all_python_files(self.src_dir)
+            third_party_deps = self._extract_third_party_dependencies(all_python_files, analyzer)
+            if third_party_deps:
+                print(
+                    f"Found {len(third_party_deps)} third-party dependencies: {', '.join(third_party_deps)}"
+                )
+                self.subfolder_config.add_third_party_dependencies(third_party_deps)
+            else:
+                print("No third-party dependencies found in subfolder code")
+
         # Report ambiguous imports
         self._report_ambiguous_imports(python_files)
 
@@ -381,6 +394,145 @@ class BuildManager:
             elif src_item.is_dir():
                 self._copytree_excluding(src_item, dst_item)
 
+    def _get_package_name_from_import(self, module_name: str) -> str | None:
+        """
+        Get the actual PyPI package name from an import module name.
+
+        This handles cases where the import name differs from the package name
+        (e.g., 'import fitz' from 'pymupdf' package).
+
+        Args:
+            module_name: The module name from the import statement
+
+        Returns:
+            The actual package name, or None if not found
+        """
+        root_module = module_name.split(".")[0]
+        try:
+            # Try Python 3.10+ first (has packages_distributions)
+            import importlib.metadata as importlib_metadata
+
+            # Use packages_distributions() if available (Python 3.10+)
+            if hasattr(importlib_metadata, "packages_distributions"):
+                packages_map = importlib_metadata.packages_distributions()
+                # packages_map is a dict mapping module names to list of distribution names
+                if root_module in packages_map:
+                    # Return the first distribution name (usually there's only one)
+                    dist_names = packages_map[root_module]
+                    if dist_names:
+                        return dist_names[0]
+
+            # Fallback: search all distributions
+            for dist in importlib_metadata.distributions():
+                try:
+                    # Check if this distribution provides the module
+                    # by looking at its files
+                    files = dist.files or []
+                    for file in files:
+                        file_str = str(file)
+                        # Check if file is the module itself or in a package directory
+                        if (
+                            file.suffix == ".py"
+                            and (file.stem == root_module or file.stem == "__init__")
+                        ) or (
+                            "/" in file_str
+                            and (
+                                file_str.startswith(f"{root_module}/")
+                                or file_str.startswith(f"{root_module.replace('_', '-')}/")
+                            )
+                        ):
+                            return dist.metadata["Name"]
+                except Exception:
+                    continue
+
+        except ImportError:
+            try:
+                # Fallback for older Python versions
+                import importlib_metadata
+
+                # Search all distributions
+                for dist in importlib_metadata.distributions():
+                    try:
+                        files = dist.files or []
+                        for file in files:
+                            file_str = str(file)
+                            if (
+                                file.suffix == ".py"
+                                and (file.stem == root_module or file.stem == "__init__")
+                            ) or (
+                                "/" in file_str
+                                and (
+                                    file_str.startswith(f"{root_module}/")
+                                    or file_str.startswith(f"{root_module.replace('_', '-')}/")
+                                )
+                            ):
+                                return dist.metadata["Name"]
+                    except Exception:
+                        continue
+            except ImportError:
+                pass
+        except Exception:
+            pass
+
+        return None
+
+    def _extract_third_party_dependencies(
+        self, python_files: list[Path], analyzer: ImportAnalyzer
+    ) -> list[str]:
+        """
+        Extract third-party package dependencies from Python files.
+
+        Analyzes all Python files to find imports classified as "third_party"
+        and returns a list of unique package names. Handles cases where the
+        import name differs from the package name (e.g., 'fitz' -> 'pymupdf').
+
+        Args:
+            python_files: List of Python file paths to analyze
+            analyzer: ImportAnalyzer instance to use for classification
+
+        Returns:
+            List of unique third-party package names (e.g., ["pypdf", "requests", "pymupdf"])
+        """
+        third_party_packages: set[str] = set()
+
+        for file_path in python_files:
+            imports = analyzer.extract_imports(file_path)
+            for imp in imports:
+                analyzer.classify_import(imp, self.src_dir)
+
+                # Extract the root package name (first part of module name)
+                root_module = imp.module_name.split(".")[0]
+
+                # Skip if it's a standard library module
+                stdlib_modules = analyzer.get_stdlib_modules()
+                if root_module in stdlib_modules:
+                    continue
+
+                # If classified as third_party, try to get actual package name
+                if imp.classification == "third_party":
+                    # Try to get the actual package name from metadata
+                    actual_package = self._get_package_name_from_import(imp.module_name)
+                    if actual_package:
+                        third_party_packages.add(actual_package)
+                    else:
+                        # Fallback to using the import name
+                        third_party_packages.add(root_module)
+                # If it's ambiguous or unresolved, and not stdlib/local/external,
+                # it's likely a third-party package that needs to be declared
+                elif imp.classification == "ambiguous" or imp.classification is None:
+                    # Check if it's not a local or external module
+                    if not imp.resolved_path:
+                        # Try to get the actual package name from metadata
+                        # (might work if package is installed but module path is unusual)
+                        actual_package = self._get_package_name_from_import(imp.module_name)
+                        if actual_package:
+                            third_party_packages.add(actual_package)
+                        else:
+                            # Fallback: use import name (will be normalized later)
+                            third_party_packages.add(root_module)
+
+        return sorted(list(third_party_packages))
+
     def _report_ambiguous_imports(self, python_files: list[Path]) -> None:
         """
         Report any ambiguous imports that couldn't be resolved.

python_package_folder/subfolder_build.py

@@ -254,6 +254,9 @@ class SubfolderBuildConfig:
             # If original pyproject.toml exists, temporarily move it
             if original_pyproject.exists():
                 backup_path = self.project_root / "pyproject.toml.original"
+                # Remove backup if it already exists (from previous failed test or run)
+                if backup_path.exists():
+                    backup_path.unlink()
                 original_pyproject.rename(backup_path)
                 self.original_pyproject_backup = backup_path
 
@@ -292,6 +295,9 @@ class SubfolderBuildConfig:
 
         # Temporarily move original to backup location
         backup_path = self.project_root / "pyproject.toml.original"
+        # Remove backup if it already exists (from previous failed test or run)
+        if backup_path.exists():
+            backup_path.unlink()
         original_pyproject.rename(backup_path)
         self.original_pyproject_backup = backup_path
 
@@ -559,6 +565,139 @@ class SubfolderBuildConfig:
 
         return "\n".join(result)
 
+    def add_third_party_dependencies(self, dependencies: list[str]) -> None:
+        """
+        Add third-party dependencies to the temporary pyproject.toml.
+
+        This method updates the pyproject.toml file that was created for the subfolder
+        build by adding the specified dependencies to the [project.dependencies] section.
+
+        Args:
+            dependencies: List of third-party package names to add (e.g., ["pypdf", "requests"])
+        """
+        if not self.temp_pyproject or not self.temp_pyproject.exists():
+            print(
+                f"Warning: Cannot add third-party dependencies - pyproject.toml not found at {self.temp_pyproject}",
+                file=sys.stderr,
+            )
+            return
+
+        if not dependencies:
+            return
+
+        print(f"Adding third-party dependencies to pyproject.toml: {', '.join(dependencies)}")
+        content = self.temp_pyproject.read_text(encoding="utf-8")
+        updated_content = self._add_dependencies_to_pyproject(content, dependencies)
+        self.temp_pyproject.write_text(updated_content, encoding="utf-8")
+
+    def _normalize_package_name(self, package_name: str) -> str:
+        """
+        Normalize package name for PyPI.
+
+        Converts underscores to hyphens, as PyPI package names typically use hyphens
+        while Python import names use underscores (e.g., 'better_enum' -> 'better-enum').
+
+        Args:
+            package_name: Package name from import statement
+
+        Returns:
+            Normalized package name for PyPI
+        """
+        # Convert underscores to hyphens for PyPI package names
+        # This handles the common case where import names use underscores
+        # but PyPI package names use hyphens
+        return package_name.replace("_", "-")
+
+    def _add_dependencies_to_pyproject(self, content: str, dependencies: list[str]) -> str:
+        """
+        Add dependencies to pyproject.toml content.
+
+        Adds the specified dependencies to the [project] section's dependencies list.
+        If dependencies already exist, merges them. If no dependencies section exists,
+        creates one. Package names are normalized (underscores -> hyphens) to match
+        PyPI naming conventions.
+
+        Args:
+            content: Current pyproject.toml content
+            dependencies: List of dependency names to add (will be normalized)
+
+        Returns:
+            Updated pyproject.toml content with dependencies added
+        """
+        if not dependencies:
+            return content
+
+        # Normalize package names (convert underscores to hyphens for PyPI)
+        normalized_deps = [self._normalize_package_name(dep) for dep in dependencies]
+
+        lines = content.split("\n")
+        result = []
+        in_project = False
+        in_dependencies = False
+        dependencies_added = False
+        existing_deps: set[str] = set()
+
+        # First pass: find existing dependencies
+        for line in lines:
+            if line.strip().startswith("[project]"):
+                in_project = True
+            elif line.strip().startswith("[") and in_project:
+                in_project = False
+            elif in_project and re.match(r"^\s*dependencies\s*=\s*\[", line):
+                in_dependencies = True
+            elif in_dependencies:
+                # Extract existing dependency names
+                dep_match = re.search(r'["\']([^"\']+)["\']', line)
+                if dep_match:
+                    existing_deps.add(dep_match.group(1))
+                if line.strip().endswith("]"):
+                    in_dependencies = False
+
+        # Merge with new dependencies (normalized)
+        all_deps = sorted(existing_deps | set(normalized_deps))
+
+        # Second pass: build result with dependencies
+        in_project = False
+        in_dependencies = False
+        for line in lines:
+            if line.strip().startswith("[project]"):
+                in_project = True
+                result.append(line)
+            elif line.strip().startswith("[") and in_project:
+                # End of [project] section, add dependencies if not already present
+                if not dependencies_added:
+                    result.append("dependencies = [")
+                    for dep in all_deps:
+                        result.append(f'    "{dep}",')
+                    result.append("]")
+                    result.append("")
+                in_project = False
+                result.append(line)
+            elif in_project and re.match(r"^\s*dependencies\s*=\s*\[", line):
+                # Replace existing dependencies section
+                result.append("dependencies = [")
+                for dep in all_deps:
+                    result.append(f'    "{dep}",')
+                result.append("]")
+                dependencies_added = True
+                in_dependencies = True
+            elif in_dependencies:
+                # Skip lines in existing dependencies section (already replaced)
+                if line.strip().endswith("]"):
+                    in_dependencies = False
+            else:
+                result.append(line)
+
+        # If [project] section exists but no dependencies were added, add them
+        if in_project and not dependencies_added:
+            result.append("dependencies = [")
+            for dep in all_deps:
+                result.append(f'    "{dep}",')
+            result.append("]")
+            result.append("")
+
+        return "\n".join(result)
+
     def _handle_readme(self) -> None:
         """
         Handle README file for subfolder builds.

{python_package_folder-1.4.1.dist-info → python_package_folder-2.0.4.dist-info}/METADATA

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

@@ -2,16 +2,16 @@ python_package_folder/__init__.py,sha256=DQt-uldOEKfh0MUqCvKdeNKOnpuOvpb7blYvXMy
 python_package_folder/__main__.py,sha256=a-__-VLhYw-J7S7CsHdhtEvQr3RiAZxiYDvKhKTgMX4,291
 python_package_folder/analyzer.py,sha256=w7hc2oyOoPK7tvlwcJDXnB3eiJsuGZc4BkOpTfZP7Vo,12257
 python_package_folder/finder.py,sha256=_LvJ9xBVKv41UK5sbwbNyKmuYjAOqUbzvZhK7NCYQF8,9130
-python_package_folder/manager.py,sha256=cQRBLdru8bSovenR5hXFRKmjrBdTmjl0owJdqbXyHjg,30989
+python_package_folder/manager.py,sha256=C3atdBMZqZTFnDMuKSTtb7q2gL90AHo7Wu7u3l8nLLI,38085
 python_package_folder/publisher.py,sha256=TSjdOvxvnWLbJCnduTK_xZBRfvsrq9kpEH-sfebeWkU,13507
 python_package_folder/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_package_folder/python_package_folder.py,sha256=RPsqRcIy_LjzzTHdp4qdtFJ4-4xhtR_0YLIC0RlUxFo,8841
-python_package_folder/subfolder_build.py,sha256=JRctqCaaax76sI7qvjRxR3M9Otz27_tUVYKCCN-Gjyw,29535
+python_package_folder/subfolder_build.py,sha256=LMiJ4Ck6PW1x3hmiSK-9fDH4Q6RrHqot4drx4lise3E,35310
 python_package_folder/types.py,sha256=3yeSRR5p_3PDKEAaehW_RJ7NwJHexOIeA08bGaT1iSY,2368
 python_package_folder/utils.py,sha256=lIkWsFKeAYAJ9TDUM99T4pUBHJVbUvCdUgkWQN-LUho,3111
 python_package_folder/version.py,sha256=kIDP6S9trEfs9gj7lBYGxrWm4RPssRla24UtlO9Jkh4,9111
-python_package_folder-1.4.1.dist-info/METADATA,sha256=E6egWuU3bFmFJeM8s74ra7If-P69qNeGNS6Qnz8YRyc,33282
-python_package_folder-1.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_package_folder-1.4.1.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
-python_package_folder-1.4.1.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
-python_package_folder-1.4.1.dist-info/RECORD,,
+python_package_folder-2.0.4.dist-info/METADATA,sha256=4PIl6MNJWiM4Laz4Rs36zLr5O9T34BnqN9RjWDmR_VQ,33282
+python_package_folder-2.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_package_folder-2.0.4.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
+python_package_folder-2.0.4.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
+python_package_folder-2.0.4.dist-info/RECORD,,