pull-request-fixer 0.1.1__tar.gz → 0.1.2__tar.gz

{pull_request_fixer-0.1.1 → pull_request_fixer-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pull-request-fixer
-Version: 0.1.1
+Version: 0.1.2
 Summary: Pull request formatter and fixer with GitHub integration
 Project-URL: Homepage, https://github.com/lfit/pull-request-fixer
 Project-URL: Repository, https://github.com/lfit/pull-request-fixer.git
@@ -19,23 +19,25 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Text Processing :: Markup :: Markdown
-Requires-Python: <3.14,>=3.10
-Requires-Dist: aiolimiter>=1.2.0
-Requires-Dist: httpx[http2]>=0.28.0
-Requires-Dist: pydantic>=2.10.3
-Requires-Dist: rich>=13.9.4
-Requires-Dist: tenacity>=9.0.0
-Requires-Dist: typer>=0.15.0
+Requires-Python: >=3.10
+Requires-Dist: aiolimiter>=1.2.1
+Requires-Dist: dependamerge>=0.1.19
+Requires-Dist: httpx[http2]>=0.28.1
+Requires-Dist: pydantic>=2.12.5
+Requires-Dist: rich>=14.2.0
+Requires-Dist: tenacity>=9.1.2
+Requires-Dist: typer>=0.20.0
 Provides-Extra: dev
-Requires-Dist: mypy>=1.13.0; extra == 'dev'
-Requires-Dist: pre-commit>=4.0.1; extra == 'dev'
-Requires-Dist: pytest-asyncio>=0.25.0; extra == 'dev'
-Requires-Dist: pytest-cov>=6.0.0; extra == 'dev'
-Requires-Dist: pytest-mock>=3.14.0; extra == 'dev'
-Requires-Dist: pytest>=8.3.4; extra == 'dev'
-Requires-Dist: ruff>=0.8.4; extra == 'dev'
+Requires-Dist: mypy>=1.19.0; extra == 'dev'
+Requires-Dist: pre-commit>=4.5.0; extra == 'dev'
+Requires-Dist: pytest-asyncio>=1.3.0; extra == 'dev'
+Requires-Dist: pytest-cov>=7.0.0; extra == 'dev'
+Requires-Dist: pytest-mock>=3.15.1; extra == 'dev'
+Requires-Dist: pytest>=9.0.2; extra == 'dev'
+Requires-Dist: ruff>=0.14.8; extra == 'dev'
 Description-Content-Type: text/markdown
 
 <!--
@@ -313,7 +315,7 @@ pull-request-fixer myorg --fix-title --blocked-only
 ```
 <!-- write-good-enable -->
 
-**Fix files in multiple PRs:**
+**Fix files across PRs:**
 
 <!-- write-good-disable -->
 ```bash
@@ -355,6 +357,7 @@ comment.
 ## Options
 
 <!-- markdownlint-disable MD013 -->
+<!-- write-good-disable -->
 
 | Flag               | Short | Default         | Description                                           |
 | ------------------ | ----- | --------------- | ----------------------------------------------------- |
@@ -379,6 +382,7 @@ comment.
 | `--log-level`      |       | `INFO`          | Set logging level                                     |
 | `--version`        |       |                 | Show version and exit                                 |
 
+<!-- write-good-enable -->
 <!-- markdownlint-enable MD013 -->
 
 ## How It Works
@@ -521,15 +525,13 @@ pull-request-fixer https://github.com/lfreleng-actions/make-action/pull/40 \
 
 Output:
 
-<!-- write-good-disable -->
 ```text
 🔍 Processing PR: https://github.com/lfreleng-actions/make-action/pull/40
 🔧 Will fix: files
-🏃 Dry run mode: changes will not be applied
+🏃 Dry run mode: the tool will not apply changes
 
 📝 Fixing files in PR...
 ```
-<!-- write-good-enable -->
 
 ✅ Would fix 1 file
 📂 action.yaml

{pull_request_fixer-0.1.1 → pull_request_fixer-0.1.2}/README.md

@@ -273,7 +273,7 @@ pull-request-fixer myorg --fix-title --blocked-only
 ```
 <!-- write-good-enable -->
 
-**Fix files in multiple PRs:**
+**Fix files across PRs:**
 
 <!-- write-good-disable -->
 ```bash
@@ -315,6 +315,7 @@ comment.
 ## Options
 
 <!-- markdownlint-disable MD013 -->
+<!-- write-good-disable -->
 
 | Flag               | Short | Default         | Description                                           |
 | ------------------ | ----- | --------------- | ----------------------------------------------------- |
@@ -339,6 +340,7 @@ comment.
 | `--log-level`      |       | `INFO`          | Set logging level                                     |
 | `--version`        |       |                 | Show version and exit                                 |
 
+<!-- write-good-enable -->
 <!-- markdownlint-enable MD013 -->
 
 ## How It Works
@@ -481,15 +483,13 @@ pull-request-fixer https://github.com/lfreleng-actions/make-action/pull/40 \
 
 Output:
 
-<!-- write-good-disable -->
 ```text
 🔍 Processing PR: https://github.com/lfreleng-actions/make-action/pull/40
 🔧 Will fix: files
-🏃 Dry run mode: changes will not be applied
+🏃 Dry run mode: the tool will not apply changes
 
 📝 Fixing files in PR...
 ```
-<!-- write-good-enable -->
 
 ✅ Would fix 1 file
 📂 action.yaml

{pull_request_fixer-0.1.1 → pull_request_fixer-0.1.2}/pyproject.toml

@@ -10,7 +10,7 @@ name = "pull-request-fixer"
 dynamic = ["version"]
 description = "Pull request formatter and fixer with GitHub integration"
 readme = "README.md"
-requires-python = ">=3.10,<3.14"
+requires-python = ">=3.10"
 license = {text = "Apache-2.0"}
 authors = [
     {name = "The Linux Foundation", email = "releng@linuxfoundation.org"},
@@ -27,27 +27,29 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Quality Assurance",
     "Topic :: Text Processing :: Markup :: Markdown",
 ]
 dependencies = [
-    "typer>=0.15.0",
-    "rich>=13.9.4",
-    "httpx[http2]>=0.28.0",
-    "pydantic>=2.10.3",
-    "aiolimiter>=1.2.0",
-    "tenacity>=9.0.0",
+    "typer>=0.20.0",
+    "rich>=14.2.0",
+    "httpx[http2]>=0.28.1",
+    "pydantic>=2.12.5",
+    "aiolimiter>=1.2.1",
+    "tenacity>=9.1.2",
+    "dependamerge>=0.1.19",
 ]
 
 [project.optional-dependencies]
 dev = [
-    "pytest>=8.3.4",
-    "pytest-cov>=6.0.0",
-    "pytest-asyncio>=0.25.0",
-    "pytest-mock>=3.14.0",
-    "mypy>=1.13.0",
-    "ruff>=0.8.4",
-    "pre-commit>=4.0.1",
+    "pytest>=9.0.2",
+    "pytest-cov>=7.0.0",
+    "pytest-asyncio>=1.3.0",
+    "pytest-mock>=3.15.1",
+    "mypy>=1.19.0",
+    "ruff>=0.14.8",
+    "pre-commit>=4.5.0",
 ]
 
 [project.urls]
@@ -60,6 +62,7 @@ pull-request-fixer = "pull_request_fixer.cli:cli"
 
 [tool.hatch.version]
 source = "vcs"
+fallback-version = "0.0.0"
 
 [tool.hatch.build.hooks.vcs]
 version-file = "src/pull_request_fixer/_version.py"
@@ -71,7 +74,7 @@ packages = ["src/pull_request_fixer"]
 include = ["src", "README.md", "LICENSE*", "pyproject.toml", ".pre-commit-hooks.yaml"]
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py312"
 line-length = 80
 exclude = [
     "src/pull_request_fixer/_version.py",
@@ -114,8 +117,81 @@ indent-style = "space"
 skip-magic-trailing-comma = false
 line-ending = "auto"
 
+[tool.basedpyright]
+pythonVersion = "3.12"
+pythonPlatform = "All"
+typeCheckingMode = "standard"
+include = ["src", "tests", "scripts", "test_blocked_pr_logic.py", "test_integration.py"]
+exclude = [
+    "src/pull_request_fixer/_version.py",
+    ".venv",
+    "build",
+    "dist",
+]
+
+# --- Errors we want to catch and fix ---
+reportMissingTypeArgument = "warning"
+reportOptionalMemberAccess = "warning"
+reportCallIssue = "warning"
+reportAssignmentType = "warning"
+reportReturnType = "warning"
+reportGeneralTypeIssues = "warning"
+reportUninitializedInstanceVariable = "warning"
+
+# --- Intentional patterns we suppress ---
+# Third-party imports cannot be resolved in pre-commit.ci sandbox
+reportMissingImports = false
+# Typer uses Option() calls in parameter defaults by design
+reportCallInDefaultInitializer = false
+# Typer parameters are consumed by the framework, not the function body
+reportUnusedParameter = false
+# Test files legitimately access private members for testing
+reportPrivateUsage = false
+# Test files and CLI create values that are intentionally unused
+reportUnusedCallResult = false
+# Many third-party and dynamic types produce Any
+reportAny = false
+reportExplicitAny = false
+reportUnknownParameterType = false
+reportUnknownMemberType = false
+reportUnknownVariableType = false
+reportUnknownLambdaType = false
+reportUnknownArgumentType = false
+# Missing type annotations are tracked separately (mypy)
+reportMissingParameterType = false
+# String concatenation in GraphQL queries and Rich output is intentional
+reportImplicitStringConcatenation = false
+# Class attributes in tests don't need annotations
+reportUnannotatedClassAttribute = false
+# Unused imports are handled by ruff (F401)
+reportUnusedImport = false
+# Unused functions are typically CLI helpers or test utilities
+reportUnusedFunction = false
+# Unused variables are handled by ruff (F841)
+reportUnusedVariable = false
+# Deprecated typing imports in auto-generated files
+reportDeprecated = false
+# Override decorators are not required
+reportImplicitOverride = false
+# isinstance checks used for runtime safety
+reportUnnecessaryIsInstance = false
+# Comparison checks used for runtime safety
+reportUnnecessaryComparison = false
+# Unreachable code used for defensive programming
+reportUnreachable = false
+# Missing type stubs for third-party packages
+reportMissingTypeStubs = false
+# Constant redefinition patterns (e.g. try/except fallback classes)
+reportConstantRedefinition = false
+# Attribute access issues in tests (mock objects)
+reportAttributeAccessIssue = false
+# Operator issues in tests (mock assertions)
+reportOperatorIssue = false
+# Index issues in tests (mock return values)
+reportIndexIssue = false
+
 [tool.mypy]
-python_version = "3.10"
+python_version = "3.12"
 strict = true
 warn_return_any = true
 warn_unused_configs = true

pull_request_fixer-0.1.2/src/pull_request_fixer/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.1.2'
+__version_tuple__ = version_tuple = (0, 1, 2)
+
+__commit_id__ = commit_id = None

pull_request_fixer-0.1.2/src/pull_request_fixer/blocked_pr_scanner.py

@@ -0,0 +1,216 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2025 The Linux Foundation
+
+"""
+Blocked PR scanner using dependamerge's GitHubService.
+
+This module wraps dependamerge's PR scanning functionality to provide
+consistent blocked PR detection across both tools.
+"""
+
+import asyncio
+from collections.abc import AsyncIterator
+import logging
+from typing import Any
+
+from dependamerge.github_service import GitHubService
+from dependamerge.models import UnmergeablePR
+
+from .progress_tracker import ProgressTracker
+
+
+class BlockedPRScanner:
+    """Scanner for blocked/unmergeable pull requests using dependamerge logic."""
+
+    def __init__(
+        self,
+        token: str,
+        progress_tracker: ProgressTracker | None = None,
+        max_repo_tasks: int = 10,
+    ):
+        """Initialize the blocked PR scanner.
+
+        Args:
+            token: GitHub authentication token
+            progress_tracker: Optional progress tracker for UI updates
+            max_repo_tasks: Maximum number of repositories to process concurrently
+        """
+        self.token = token
+        self.progress_tracker = progress_tracker
+        self.max_repo_tasks = max_repo_tasks
+        self.logger = logging.getLogger(__name__)
+
+        # Initialize the dependamerge GitHubService
+        self.service = GitHubService(
+            token=token,
+            progress_tracker=progress_tracker,
+            max_repo_tasks=max_repo_tasks,
+        )
+
+    async def close(self) -> None:
+        """Close the underlying HTTP client."""
+        await self.service.close()
+
+    async def scan_organization_for_blocked_prs(
+        self,
+        organization: str,
+        include_drafts: bool = False,
+    ) -> AsyncIterator[tuple[str, str, dict[str, Any], UnmergeablePR]]:
+        """Scan an organization for blocked/unmergeable pull requests.
+
+        This method uses dependamerge's GitHubService to analyze PRs and only
+        yields those that are truly blocked (have merge conflicts, failing checks,
+        behind base, etc.). This ensures consistency with dependamerge's reporting.
+
+        Args:
+            organization: Organization name to scan
+            include_drafts: Whether to include draft PRs (default False)
+
+        Yields:
+            Tuples of (owner, repo_name, pr_data, unmergeable_pr) where:
+            - owner: Repository owner
+            - repo_name: Repository name
+            - pr_data: Raw PR data dict from GraphQL
+            - unmergeable_pr: UnmergeablePR model with blocking reasons
+        """
+        self.logger.debug(
+            f"Starting blocked PR scan of organization: {organization}"
+        )
+
+        # Start progress tracker if available
+        if self.progress_tracker:
+            self.progress_tracker.start()
+
+        try:
+            # Use dependamerge's scan_organization which already:
+            # 1. Counts repositories
+            # 2. Paginates through PRs
+            # 3. Analyzes blocking conditions
+            # 4. Tracks progress correctly
+            scan_result = await self.service.scan_organization(
+                organization, include_drafts=include_drafts
+            )
+        finally:
+            # Stop progress tracker before yielding results
+            if self.progress_tracker:
+                self.progress_tracker.stop()
+
+        # Display summary
+        if self.progress_tracker:
+            from rich.console import Console
+
+            console = Console()
+            console.print(
+                f"\n✅ Scan completed\n"
+                f"📊 Found {len(scan_result.unmergeable_prs)} blocked PRs "
+                f"out of {scan_result.total_prs} total PRs across {scan_result.scanned_repositories} repositories\n"
+            )
+        else:
+            self.logger.info(
+                f"Scan complete: found {len(scan_result.unmergeable_prs)} blocked PRs "
+                f"out of {scan_result.total_prs} total PRs across {scan_result.scanned_repositories} repositories"
+            )
+
+        # Now we need to fetch the full PR data for each unmergeable PR
+        # to provide it in the same format as the old scanner
+        for unmergeable_pr in scan_result.unmergeable_prs:
+            # Split repository name
+            parts = unmergeable_pr.repository.split("/", 1)
+            if len(parts) != 2:
+                self.logger.warning(
+                    f"Invalid repository format: {unmergeable_pr.repository}"
+                )
+                continue
+
+            owner, repo_name = parts
+
+            # Create a minimal pr_data dict that matches what the old scanner returned
+            # This is primarily for compatibility with existing code
+            pr_data = {
+                "number": unmergeable_pr.pr_number,
+                "title": unmergeable_pr.title,
+                "author": {"login": unmergeable_pr.author},
+                "url": unmergeable_pr.url,
+                "createdAt": unmergeable_pr.created_at,
+                "updatedAt": unmergeable_pr.updated_at,
+                # Include blocking information for backward compatibility
+                "_unmergeable_reasons": [
+                    {
+                        "type": reason.type,
+                        "description": reason.description,
+                        "details": reason.details,
+                    }
+                    for reason in unmergeable_pr.reasons
+                ],
+            }
+
+            yield owner, repo_name, pr_data, unmergeable_pr
+
+    async def scan_organization_all_prs(
+        self,
+        organization: str,
+        include_drafts: bool = False,
+    ) -> AsyncIterator[tuple[str, str, dict[str, Any], bool]]:
+        """Scan an organization for ALL pull requests, marking which are blocked.
+
+        This is useful when you want to process all PRs but need to know which
+        ones are blocked.
+
+        Args:
+            organization: Organization name to scan
+            include_drafts: Whether to include draft PRs
+
+        Yields:
+            Tuples of (owner, repo_name, pr_data, is_blocked) where:
+            - owner: Repository owner
+            - repo_name: Repository name
+            - pr_data: Raw PR data dict from GraphQL
+            - is_blocked: Boolean indicating if PR is blocked
+        """
+        # For this use case, we need to fetch ALL PRs, not just blocked ones
+        # This requires using the lower-level iteration methods
+        # For now, we'll note this is a TODO and focus on the blocked-only case
+        raise NotImplementedError(
+            "Scanning all PRs (not just blocked) is not yet implemented. "
+            "Use scan_organization_for_blocked_prs() for blocked-only scanning."
+        )
+
+    def is_pr_blocked(self, pr: dict[str, Any]) -> tuple[bool, list[str]]:
+        """Check if a PR is blocked from merging (synchronous wrapper).
+
+        This method provides backward compatibility with the old scanner interface.
+        It uses the same logic as dependamerge's _analyze_pr_node.
+
+        Args:
+            pr: PR data from GraphQL
+
+        Returns:
+            Tuple of (is_blocked, list of blocking reasons as strings)
+        """
+        # Use asyncio to call the async version
+        return asyncio.run(self._is_pr_blocked_async(pr))
+
+    async def _is_pr_blocked_async(
+        self, pr: dict[str, Any]
+    ) -> tuple[bool, list[str]]:
+        """Async version of is_pr_blocked.
+
+        Args:
+            pr: PR data from GraphQL
+
+        Returns:
+            Tuple of (is_blocked, list of blocking reasons as strings)
+        """
+        # Use dependamerge's _analyze_pr_node to check if PR is blocked
+        result = await self.service._analyze_pr_node(
+            repo_full_name="temp/repo",  # Not used for just checking blocked status
+            pr=pr,
+            include_drafts=False,
+        )
+
+        if result is None:
+            return False, []
+
+        # Extract reason descriptions
+        reasons = [reason.description for reason in result.reasons]
+        return True, reasons