python-package-folder 7.0.0__py3-none-any.whl → 8.0.0__py3-none-any.whl

python_package_folder/manager.py

@@ -933,6 +933,9 @@ class BuildManager:
         ambiguous: list[ImportInfo] = []
 
         for file_path in python_files:
+            # Skip files that don't exist (might be in temp directory that wasn't fully created)
+            if not file_path.exists():
+                continue
             imports = analyzer.extract_imports(file_path)
             for imp in imports:
                 analyzer.classify_import(imp, self.src_dir)
@@ -1142,6 +1145,26 @@ class BuildManager:
             else:
                 print("No external dependencies found\n")
 
+            # Verify temporary package directory exists if using subfolder build
+            if self.subfolder_config and self.subfolder_config._temp_package_dir:
+                temp_dir = self.subfolder_config._temp_package_dir
+                if not temp_dir.exists():
+                    raise RuntimeError(
+                        f"Temporary package directory does not exist: {temp_dir}. "
+                        "This should have been created during prepare_build()."
+                    )
+                # Verify it contains Python files
+                py_files = list(temp_dir.glob("*.py"))
+                if not py_files:
+                    raise RuntimeError(
+                        f"Temporary package directory exists but contains no Python files: {temp_dir}"
+                    )
+                # Verify __init__.py exists
+                if not (temp_dir / "__init__.py").exists():
+                    raise RuntimeError(
+                        f"Temporary package directory missing __init__.py: {temp_dir}"
+                    )
+
             print("Running build...")
             # Build command should run from project root to find pyproject.toml
             import os
@@ -1152,6 +1175,36 @@ class BuildManager:
                 build_command()
             finally:
                 os.chdir(original_cwd)
+            
+            # Verify wheel contents after build (for subfolder builds)
+            if self.subfolder_config and self.subfolder_config.package_name:
+                import_name = self.subfolder_config.package_name.replace("-", "_")
+                dist_dir = self.project_root / "dist"
+                if dist_dir.exists():
+                    wheel_files = list(dist_dir.glob("*.whl"))
+                    if wheel_files:
+                        import zipfile
+                        wheel_file = wheel_files[0]
+                        try:
+                            with zipfile.ZipFile(wheel_file, "r") as wheel:
+                                file_names = wheel.namelist()
+                                package_files = [f for f in file_names if f.startswith(f"{import_name}/")]
+                                if not package_files:
+                                    print(
+                                        f"\nWARNING: Built wheel does not contain package directory '{import_name}/'. "
+                                        f"Only found: {[f for f in file_names if '.dist-info' not in f][:10]}",
+                                        file=sys.stderr,
+                                    )
+                                else:
+                                    print(
+                                        f"\nVerified wheel contains package directory '{import_name}/' "
+                                        f"with {len(package_files)} files"
+                                    )
+                        except Exception as e:
+                            print(
+                                f"\nWARNING: Could not verify wheel contents: {e}",
+                                file=sys.stderr,
+                            )
 
         finally:
             print("\nCleaning up copied files...")

python_package_folder/subfolder_build.py

@@ -280,9 +280,19 @@ class SubfolderBuildConfig:
                 in_sdist_section = False
                 result.append(line)
             elif in_sdist_section:
-                # Track if only-include already exists
+                # Replace only-include path if it exists
                 if re.match(r"^\s*only-include\s*=", line):
                     only_include_set = True
+                    # Replace with correct path
+                    only_include_paths = [correct_packages_path]
+                    only_include_paths.append("pyproject.toml")
+                    only_include_paths.append("README.md")
+                    only_include_paths.append("README.rst")
+                    only_include_paths.append("README.txt")
+                    only_include_paths.append("README")
+                    only_include_str = ", ".join(f'"{p}"' for p in only_include_paths)
+                    result.append(f"only-include = [{only_include_str}]")
+                    continue
                 result.append(line)
             elif in_hatch_build_section:
                 result.append(line)
@@ -327,19 +337,27 @@ class SubfolderBuildConfig:
 
         # Use only-include for source distributions to ensure only the subfolder is included
         # This prevents including files from the project root
-        if correct_packages_path and not only_include_set:
-            result.append("")
-            result.append("[tool.hatch.build.targets.sdist]")
-            # Include only the subfolder directory and necessary files
-            only_include_paths = [correct_packages_path]
-            # Also include pyproject.toml and README if they exist
-            only_include_paths.append("pyproject.toml")
-            only_include_paths.append("README.md")
-            only_include_paths.append("README.rst")
-            only_include_paths.append("README.txt")
-            only_include_paths.append("README")
-            only_include_str = ", ".join(f'"{p}"' for p in only_include_paths)
-            result.append(f"only-include = [{only_include_str}]")
+        # Only add sdist section if it doesn't already exist and only-include wasn't set
+        if correct_packages_path:
+            # Check if sdist section already exists in result
+            sdist_section_exists = any(
+                line.strip().startswith("[tool.hatch.build.targets.sdist]")
+                for line in result
+            )
+            # Only add section and only-include if they don't already exist
+            if not sdist_section_exists and not only_include_set:
+                result.append("")
+                result.append("[tool.hatch.build.targets.sdist]")
+                # Include only the subfolder directory and necessary files
+                only_include_paths = [correct_packages_path]
+                # Also include pyproject.toml and README if they exist
+                only_include_paths.append("pyproject.toml")
+                only_include_paths.append("README.md")
+                only_include_paths.append("README.rst")
+                only_include_paths.append("README.txt")
+                only_include_paths.append("README")
+                only_include_str = ", ".join(f'"{p}"' for p in only_include_paths)
+                result.append(f"only-include = [{only_include_str}]")
 
         return "\n".join(result)
 
@@ -407,6 +425,14 @@ class SubfolderBuildConfig:
                 # This will copy the __init__.py we just created (if any)
                 self._create_temp_package_directory()
                 
+                # Verify temporary package directory was created
+                if not self._temp_package_dir or not self._temp_package_dir.exists():
+                    print(
+                        f"Warning: Temporary package directory was not created. "
+                        f"Falling back to using src_dir: {self.src_dir}",
+                        file=sys.stderr,
+                    )
+                
                 # 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
                 # Use the subfolder's pyproject.toml
@@ -421,6 +447,8 @@ class SubfolderBuildConfig:
                 temp_pyproject_path = self.project_root / "pyproject.toml.temp"
 
                 # Adjust packages path to be relative to project root
+                # This must be called AFTER _create_temp_package_directory() so _get_package_structure() 
+                # can find the temporary directory
                 adjusted_content = self._adjust_subfolder_pyproject_packages_path(subfolder_content)
                 
                 # Read exclude patterns from root pyproject.toml and inject them (if it exists)

{python_package_folder-7.0.0.dist-info → python_package_folder-8.0.0.dist-info}/METADATA

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

@@ -2,17 +2,17 @@ python_package_folder/__init__.py,sha256=DQt-uldOEKfh0MUqCvKdeNKOnpuOvpb7blYvXMy
 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=erX8uPu3KA593wsSH9o15O8MNc6mwIZgGGqUJf7Z5i0,59423
+python_package_folder/manager.py,sha256=XcFVFe8O96SJfck4sY4a75j3WrdYP7km6Lh2JkQC6JY,62407
 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
-python_package_folder/subfolder_build.py,sha256=tkZuaKFNgSTptOVu6v2sjxPfgShUmpMkapZSSyZ4UTk,59465
+python_package_folder/subfolder_build.py,sha256=KKrvcngx8-IXo-Cl7PUaX8XPEy3WIynIwlRgJOMz0Zo,61121
 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-7.0.0.dist-info/METADATA,sha256=mGdHt_HrzSDGj-tBuvwG2axyjGUxoAIZhTLrgPCBPZQ,7838
-python_package_folder-7.0.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_package_folder-7.0.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
-python_package_folder-7.0.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
-python_package_folder-7.0.0.dist-info/RECORD,,
+python_package_folder-8.0.0.dist-info/METADATA,sha256=6icCAnYKRqZLbCdrPdi1Bj8cwzRRGax4YzaY12PSiP0,7838
+python_package_folder-8.0.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_package_folder-8.0.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
+python_package_folder-8.0.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
+python_package_folder-8.0.0.dist-info/RECORD,,