python-package-folder 1.3.1__tar.gz → 1.4.1__tar.gz

{python_package_folder-1.3.1 → python_package_folder-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 1.3.1
+Version: 1.4.1
 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.3.1 → python_package_folder-1.4.1}/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">67%</text>
+    <text x="81" y="14">67%</text>
   </g>
 </svg>

{python_package_folder-1.3.1 → python_package_folder-1.4.1}/src/python_package_folder/manager.py

@@ -665,6 +665,18 @@ class BuildManager:
                 version_manager.set_version(version)
 
             # Build the package (prepare_build will handle subfolder config if needed)
+            # Capture package name BEFORE cleanup (which happens in run_build)
+            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 = (
+                        self.src_dir.name.replace("_", "-").replace(" ", "-").lower().strip("-")
+                    )
+                else:
+                    captured_package_name = package_name
+
             self.run_build(
                 build_command,
                 version=version,
@@ -677,15 +689,22 @@ class BuildManager:
                 # Determine package name and version for filtering
                 publish_package_name = None
                 publish_version = version
-                publish_package_name = None
                 is_subfolder_build = self._is_subfolder_build()
 
                 if is_subfolder_build:
-                    # Get package name from subfolder_config if it was created, otherwise use provided
-                    if self.subfolder_config:
+                    # Use captured package name (subfolder_config was cleaned up in run_build)
+                    if captured_package_name:
+                        publish_package_name = captured_package_name
+                    elif self.subfolder_config:
+                        # Fallback: if somehow subfolder_config still exists
                         publish_package_name = self.subfolder_config.package_name
                     elif package_name:
                         publish_package_name = package_name
+                    else:
+                        # Last resort: derive from src_dir name
+                        publish_package_name = (
+                            self.src_dir.name.replace("_", "-").replace(" ", "-").lower().strip("-")
+                        )
                 else:
                     # For regular builds, get package name from pyproject.toml
                     try:
@@ -704,6 +723,18 @@ class BuildManager:
                                 if "project" in data and "name" in data["project"]:
                                     publish_package_name = data["project"]["name"]
 
+                # Ensure we have package name and version for filtering
+                if is_subfolder_build and not publish_package_name:
+                    raise ValueError(
+                        "Could not determine package name for subfolder build. "
+                        "Please specify --package-name explicitly."
+                    )
+                if is_subfolder_build and not publish_version:
+                    raise ValueError(
+                        "Version is required for subfolder builds. "
+                        "Please specify --version explicitly."
+                    )
+
                 publisher = Publisher(
                     repository=repository,
                     dist_dir=self.project_root / "dist",

{python_package_folder-1.3.1 → python_package_folder-1.4.1}/src/python_package_folder/publisher.py

@@ -219,7 +219,21 @@ class Publisher:
 
                 if matches:
                     dist_files.append(f)
+
+            # Debug output to help diagnose filtering issues
+            if dist_files:
+                print(f"Filtering: package='{self.package_name}', version='{self.version}'")
+                print(f"Matched {len(dist_files)} files:")
+                for f in dist_files:
+                    print(f"  - {f.name}")
         else:
+            # If no package name or version provided, warn and upload all files
+            if not self.package_name or not self.version:
+                print(
+                    f"Warning: No package name or version specified for filtering. "
+                    f"Uploading all {len(all_dist_files)} files in dist/ directory.",
+                    file=sys.stderr,
+                )
             dist_files = all_dist_files
 
         if not dist_files: