python-package-folder 4.0.0__py3-none-any.whl → 4.1.1__py3-none-any.whl

python_package_folder/python_package_folder.py

@@ -10,6 +10,8 @@ It can be invoked via:
 
 from __future__ import annotations
 
+import os
+import shutil
 import subprocess
 import sys
 from pathlib import Path
@@ -23,11 +25,23 @@ from .manager import BuildManager
 from .utils import find_project_root, find_source_directory
 
 
+def is_github_actions() -> bool:
+    """Check if running in GitHub Actions."""
+    return os.getenv("GITHUB_ACTIONS") == "true"
+
+
+def check_node_available() -> bool:
+    """Check if Node.js is available."""
+    return shutil.which("node") is not None
+
+
 def resolve_version_via_semantic_release(
     project_root: Path,
     subfolder_path: Path | None = None,
     package_name: str | None = None,
-) -> str | None:
+    repository: str | None = None,
+    repository_url: str | None = None,
+) -> tuple[str | None, str | None]:
     """
     Resolve the next version using semantic-release via Node.js script.
 
@@ -35,10 +49,38 @@ def resolve_version_via_semantic_release(
         project_root: Root directory of the project
         subfolder_path: Optional path to subfolder (relative to project_root) for Workflow 1
         package_name: Optional package name for subfolder builds
+        repository: Optional target repository ('pypi', 'testpypi', or 'azure')
+        repository_url: Optional repository URL (required for Azure Artifacts)
 
     Returns:
-        Version string if a release is determined, None if no release or error
+        Tuple of (version string if a release is determined, error message if any)
+        Returns (None, None) if no release or no error, (None, error_msg) on error
     """
+    # Note: Node.js availability should be checked before calling this function
+    # This check is a safety fallback
+    if not check_node_available():
+        if is_github_actions():
+            error_msg = """Node.js is not available in this GitHub Actions workflow.
+
+To fix this, add the following steps BEFORE running python-package-folder:
+
+- name: Setup Node.js
+  uses: actions/setup-node@v4
+  with:
+    node-version: '20'
+
+- name: Install semantic-release
+  run: |
+    npm install -g semantic-release semantic-release-commit-filter
+
+Alternatively, provide --version explicitly to skip automatic version resolution."""
+            print(f"Error: {error_msg}", file=sys.stderr)
+            return None, error_msg
+        else:
+            error_msg = "Node.js not found. Cannot resolve version via semantic-release."
+            print(f"Error: {error_msg}", file=sys.stderr)
+            return None, error_msg
+
     # Try to find the script in multiple locations:
     # 1. Project root / scripts (for development or when script is in repo)
     # 2. Package installation directory / scripts (for installed package)
@@ -86,7 +128,9 @@ def resolve_version_via_semantic_release(
                     script_path = fallback_script
 
         if not script_path:
-            return None
+            error_msg = "Could not locate get-next-version.cjs script"
+            print(f"Error: {error_msg}", file=sys.stderr)
+            return None, error_msg
 
         # Build command arguments
         cmd = ["node", str(script_path), str(project_root)]
@@ -98,7 +142,17 @@ def resolve_version_via_semantic_release(
                 else subfolder_path
             )
             cmd.extend([str(rel_path), package_name])
-        # Workflow 2: main package (no additional args needed)
+        elif package_name:
+            # Main package build with package_name (for registry queries)
+            # Pass null for subfolder_path, then package_name
+            cmd.extend(["", package_name])
+        # Workflow 2: main package without package_name (no additional args needed)
+        
+        # Add repository information if provided
+        if repository:
+            cmd.append(repository)
+            if repository_url:
+                cmd.append(repository_url)
 
         result = subprocess.run(
             cmd,
@@ -109,38 +163,53 @@ def resolve_version_via_semantic_release(
         )
 
         if result.returncode != 0:
-            # Log error details for debugging
+            # Collect error details
+            error_details = []
             if result.stderr:
-                print(
-                    f"Warning: semantic-release version resolution failed: {result.stderr}",
-                    file=sys.stderr,
-                )
-            elif result.stdout:
-                print(
-                    f"Warning: semantic-release version resolution failed: {result.stdout}",
-                    file=sys.stderr,
-                )
-            return None
+                error_details.append(f"stderr: {result.stderr}")
+            if result.stdout:
+                error_details.append(f"stdout: {result.stdout}")
+            
+            error_msg = "semantic-release version resolution failed"
+            if error_details:
+                error_msg += f": {'; '.join(error_details)}"
+            
+            print(f"Error: {error_msg}", file=sys.stderr)
+            return None, error_msg
 
         version = result.stdout.strip()
         if version and version != "none":
-            return version
+            return version, None
 
-        return None
+        return None, None
     except FileNotFoundError:
-        # Node.js not found
-        print(
-            "Warning: Node.js not found. Cannot resolve version via semantic-release.",
-            file=sys.stderr,
-        )
-        return None
+        # Node.js not found (shouldn't happen if check_node_available() passed, but handle gracefully)
+        if is_github_actions():
+            error_msg = """Node.js is not available in this GitHub Actions workflow.
+
+To fix this, add the following steps BEFORE running python-package-folder:
+
+- name: Setup Node.js
+  uses: actions/setup-node@v4
+  with:
+    node-version: '20'
+
+- name: Install semantic-release
+  run: |
+    npm install -g semantic-release semantic-release-commit-filter
+
+Alternatively, provide --version explicitly to skip automatic version resolution."""
+            print(f"Error: {error_msg}", file=sys.stderr)
+            return None, error_msg
+        else:
+            error_msg = "Node.js not found. Cannot resolve version via semantic-release."
+            print(f"Error: {error_msg}", file=sys.stderr)
+            return None, error_msg
     except Exception as e:
         # Other errors (e.g., permission issues, script not found)
-        print(
-            f"Warning: Error resolving version via semantic-release: {e}",
-            file=sys.stderr,
-        )
-        return None
+        error_msg = f"Error resolving version via semantic-release: {e}"
+        print(f"Error: {error_msg}", file=sys.stderr)
+        return None, error_msg
     finally:
         # Clean up temporary file if we extracted from zip/pex
         # This must be at function level to ensure cleanup even on early return
@@ -297,6 +366,50 @@ def main() -> int:
             # Version is needed for subfolder builds or when publishing main package
             if is_subfolder or args.publish:
                 print("No --version provided, attempting to resolve via semantic-release...")
+                
+                # Check Node.js availability upfront
+                if not check_node_available():
+                    if is_github_actions():
+                        error_msg = """Node.js is not available in this GitHub Actions workflow.
+
+To fix this, add the following steps BEFORE running python-package-folder:
+
+- name: Setup Node.js
+  uses: actions/setup-node@v4
+  with:
+    node-version: '20'
+
+- name: Install semantic-release
+  run: |
+    npm install -g semantic-release semantic-release-commit-filter
+
+Alternatively, provide --version explicitly to skip automatic version resolution."""
+                        print(f"Error: {error_msg}", file=sys.stderr)
+                    else:
+                        print(
+                            "Error: Node.js is not available. Cannot resolve version via semantic-release.",
+                            file=sys.stderr,
+                        )
+                        print(
+                            "Please install Node.js or provide --version explicitly.",
+                            file=sys.stderr,
+                        )
+                    return 1
+                
+                # Log that Node.js is available (for debugging)
+                node_version = subprocess.run(
+                    ["node", "--version"],
+                    capture_output=True,
+                    text=True,
+                    check=False,
+                )
+                if node_version.returncode == 0:
+                    print(f"Node.js detected: {node_version.stdout.strip()}")
+                
+                # Get repository info if publishing
+                repository = args.publish if args.publish else None
+                repository_url = args.repository_url if args.publish else None
+                
                 if is_subfolder:
                     # Workflow 1: subfolder build
                     # src_dir is guaranteed to be relative to project_root due to is_subfolder check
@@ -304,12 +417,35 @@ def main() -> int:
                         " ", "-"
                     ).lower().strip("-")
                     subfolder_rel_path = src_dir.relative_to(project_root)
-                    resolved_version = resolve_version_via_semantic_release(
-                        project_root, subfolder_rel_path, package_name
+                    resolved_version, error_details = resolve_version_via_semantic_release(
+                        project_root,
+                        subfolder_rel_path,
+                        package_name,
+                        repository=repository,
+                        repository_url=repository_url,
                     )
                 else:
                     # Workflow 2: main package
-                    resolved_version = resolve_version_via_semantic_release(project_root)
+                    # For main package, we need package_name from pyproject.toml for registry queries
+                    package_name_for_registry = None
+                    if repository:
+                        try:
+                            import tomllib
+                            pyproject_path = project_root / "pyproject.toml"
+                            if pyproject_path.exists():
+                                with open(pyproject_path, "rb") as f:
+                                    data = tomllib.load(f)
+                                    package_name_for_registry = data.get("project", {}).get("name")
+                        except Exception:
+                            pass
+                    
+                    resolved_version, error_details = resolve_version_via_semantic_release(
+                        project_root,
+                        subfolder_path=None,
+                        package_name=package_name_for_registry,
+                        repository=repository,
+                        repository_url=repository_url,
+                    )
 
                 if resolved_version:
                     print(f"Resolved version via semantic-release: {resolved_version}")
@@ -319,8 +455,11 @@ def main() -> int:
                         "This could mean:\n"
                         "  - No release is needed (no relevant commits)\n"
                         "  - semantic-release is not installed or configured\n"
-                        "  - Node.js is not available\n\n"
-                        "Please either:\n"
+                    )
+                    if error_details:
+                        error_msg += f"\nDetails: {error_details}\n"
+                    error_msg += (
+                        "\nPlease either:\n"
                         "  - Install semantic-release: npm install -g semantic-release"
                     )
                     if is_subfolder:

{python_package_folder-4.0.0.dist-info → python_package_folder-4.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 4.0.0
+Version: 4.1.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>
@@ -475,15 +475,32 @@ The `--version` option:
 
 When `--version` is not provided, the tool can automatically determine the next version using semantic-release. This requires Node.js, npm, and semantic-release to be installed.
 
+**Version Detection:**
+- **Baseline version**:
+  - **Registry Query (Preferred)**: When publishing to a repository (PyPI, TestPyPI, or Azure Artifacts), the tool queries the target registry for the latest published version and uses it as the baseline for version calculation. This ensures version calculations are based on what's actually published, not just git tags.
+  - **Git Tags (Fallback)**: If the package doesn't exist on the registry yet (first release) or if registry query fails, the tool falls back to using git tags to determine the starting version.
+- **New version to publish**: After determining the baseline version, [`semantic-release`](https://semantic-release.gitbook.io/semantic-release/) analyzes commits since that version to calculate the next version bump (major, minor, or patch) based on [_conventional commit_](https://www.conventionalcommits.org/en/v1.0.0/) messages.
+
 **For subfolder builds (Workflow 1):**
 - Uses per-package tags: `{package-name}-v{version}` (e.g., `my-package-v1.2.3`)
+- Queries the target registry for the latest published version of the subfolder package
 - Filters commits to only those affecting the subfolder path
+- **Commit filtering behavior**: Only commits that modify files within the subfolder path are considered for version calculation. Commits that only target files outside the subfolder are excluded. For example:
+  - `fix: update my_subfolder/foo.py` → **Included** (affects subfolder)
+  - `feat: add feature to other_package/bar.py` → **Excluded** (doesn't affect subfolder)
+  - `fix: update my_subfolder/baz.py and shared/utils.py` → **Included** (affects subfolder, even if it also touches files outside)
 - Requires `semantic-release-commit-filter` plugin
 
 **For main package builds (Workflow 2):**
 - Uses repo-level tags: `v{version}` (e.g., `v1.2.3`)
+- Queries the target registry for the latest published version when publishing
 - Analyzes all commits in the repository
 
+**Registry Support:**
+- **PyPI**: Fully supported via JSON API (`https://pypi.org/pypi/{package-name}/json`)
+- **TestPyPI**: Fully supported via JSON API (`https://test.pypi.org/pypi/{package-name}/json`)
+- **Azure Artifacts**: Basic support with fallback to git tags. Azure Artifacts uses a different API format and may require authentication, so if the query fails, the tool automatically falls back to git tags.
+
 **Setup:**
 ```bash
 # Install semantic-release globally

{python_package_folder-4.0.0.dist-info → python_package_folder-4.1.1.dist-info}/RECORD

@@ -6,13 +6,13 @@ python_package_folder/finder.py,sha256=RPidZ7LKCFuQ_KgCFIZdHWPXsZIDor3M4C0hKeYW7
 python_package_folder/manager.py,sha256=Z9RPg0ZQ7jZhmEXfCzX9OrD_oiA5p2Pnm5Y9tgW3ObQ,55970
 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=yqwAFKjP8eAq5-cTiJJktndji5GYXPz6-uXb7b4ZwfI,15912
+python_package_folder/python_package_folder.py,sha256=HOJQOgDiPhwVta4iudehuy1QLu4mrdjUNV6z0zaSTxs,21820
 python_package_folder/subfolder_build.py,sha256=oH_KKLJIMByUZCl8y3AyohUO6Om0OvsIQ7Xg1fkd3jE,38782
 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-4.0.0.dist-info/METADATA,sha256=nEAxlP6arQTeduyXCqtfR8ZdR5rLAAAEqGaPpoJtNyM,35525
-python_package_folder-4.0.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_package_folder-4.0.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
-python_package_folder-4.0.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
-python_package_folder-4.0.0.dist-info/RECORD,,
+python_package_folder-4.1.1.dist-info/METADATA,sha256=tP7YhDnLYlnSzoDTKIjjpVcuCyIs4dGwtuedDFbajUc,37517
+python_package_folder-4.1.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_package_folder-4.1.1.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
+python_package_folder-4.1.1.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
+python_package_folder-4.1.1.dist-info/RECORD,,