github2gerrit 1.0.4__tar.gz → 1.0.6__tar.gz

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/.pre-commit-config.yaml

@@ -59,7 +59,7 @@ repos:
         types: [yaml]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 45ef068da5f21267bb2a7ec4a623092959f09ce5  # frozen: v0.14.14
+    rev: fa93bc3224c614a0e9786d3e2d3d48edcca246eb  # frozen: v0.15.1
     hooks:
       - id: ruff
         files: ^(src|scripts|tests)/.+\.py$
@@ -110,7 +110,7 @@ repos:
   # Replaces: https://github.com/rhysd/actionlint
   # Permits actionlint to run both locally and with precommit.ci/GitHub
   - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
-    rev: 85c37735ea69e5baf0681530e57e63deee0ce733  # frozen: v1.7.10.24
+    rev: 694e2c0dfb4253d51f3c6c54b8f9fec0a16764dc  # frozen: v1.7.11.24
     hooks:
       - id: actionlint
 
@@ -121,7 +121,7 @@ repos:
       - id: codespell
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: ccf21790019848af3eb4464be2a9d5efed6358f3  # frozen: 0.36.1
+    rev: ec368acd16deee9c560c105ab6d27db4ee19a5ec  # frozen: 0.36.2
     hooks:
       - id: check-github-actions
       - id: check-github-workflows

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 1.0.4
+Version: 1.0.6
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Project-URL: Homepage, https://github.com/lfreleng-actions/github2gerrit-action
 Project-URL: Repository, https://github.com/lfreleng-actions/github2gerrit-action
@@ -22,6 +22,7 @@ Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Version Control
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
+Requires-Dist: cryptography>=46.0.5
 Requires-Dist: git-review>=2.5.0
 Requires-Dist: pygerrit2>=2.0.15
 Requires-Dist: pygithub>=2.8.1
@@ -991,7 +992,7 @@ Common issues and solutions:
 The comprehensive [Inputs](#inputs) table above documents all environment variables.
 Key variables for CLI usage include:
 
-- `G2G_LOG_LEVEL`: Set to `DEBUG` for verbose output (default: `INFO`)
+- `G2G_LOG_LEVEL`: Set to `DEBUG` for verbose output (default: `WARNING`)
 - `G2G_VERBOSE`: Set to `true` to enable debug logging (same as `--verbose` flag)
 - `GERRIT_SSH_PRIVKEY_G2G`: SSH private key content
 - `GERRIT_KNOWN_HOSTS`: SSH known hosts entries
@@ -1204,7 +1205,7 @@ The following environment variables control internal behavior but are not action
 
 | Environment Variable         | Description                                    | Default                                    |
 | ---------------------------- | ---------------------------------------------- | ------------------------------------------ |
-| `G2G_LOG_LEVEL`              | Logging level (DEBUG, INFO, WARNING, ERROR)    | `"INFO"`                                   |
+| `G2G_LOG_LEVEL`              | Logging level (DEBUG, INFO, WARNING, ERROR)    | `"WARNING"`                                |
 | `G2G_ENABLE_DERIVATION`      | Enable auto-derivation of Gerrit parameters    | `"true"`                                   |
 | `G2G_CONFIG_PATH`            | Path to organization configuration file        | `~/.config/github2gerrit/config.ini`       |
 | `G2G_AUTO_SAVE_CONFIG`       | Auto-save derived parameters to config         | `"false"` (GitHub Actions), `"true"` (CLI) |

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/README.md

@@ -946,7 +946,7 @@ Common issues and solutions:
 The comprehensive [Inputs](#inputs) table above documents all environment variables.
 Key variables for CLI usage include:
 
-- `G2G_LOG_LEVEL`: Set to `DEBUG` for verbose output (default: `INFO`)
+- `G2G_LOG_LEVEL`: Set to `DEBUG` for verbose output (default: `WARNING`)
 - `G2G_VERBOSE`: Set to `true` to enable debug logging (same as `--verbose` flag)
 - `GERRIT_SSH_PRIVKEY_G2G`: SSH private key content
 - `GERRIT_KNOWN_HOSTS`: SSH known hosts entries
@@ -1159,7 +1159,7 @@ The following environment variables control internal behavior but are not action
 
 | Environment Variable         | Description                                    | Default                                    |
 | ---------------------------- | ---------------------------------------------- | ------------------------------------------ |
-| `G2G_LOG_LEVEL`              | Logging level (DEBUG, INFO, WARNING, ERROR)    | `"INFO"`                                   |
+| `G2G_LOG_LEVEL`              | Logging level (DEBUG, INFO, WARNING, ERROR)    | `"WARNING"`                                |
 | `G2G_ENABLE_DERIVATION`      | Enable auto-derivation of Gerrit parameters    | `"true"`                                   |
 | `G2G_CONFIG_PATH`            | Path to organization configuration file        | `~/.config/github2gerrit/config.ini`       |
 | `G2G_AUTO_SAVE_CONFIG`       | Auto-save derived parameters to config         | `"false"` (GitHub Actions), `"true"` (CLI) |

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/action.yaml

@@ -164,7 +164,7 @@ runs:
 
     - name: "Setup uv"
       # yamllint disable-line rule:line-length
-      uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41  # v7.2.1
+      uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b  # v7.3.0
       with:
         enable-cache: false
 

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/pyproject.toml

@@ -50,6 +50,9 @@ dependencies = [
 
   # Security: Fix CVE-2026-21441 (decompression-bomb vulnerability)
   "urllib3>=2.6.3",
+
+  # Security: Fix CVE-2026-26007 (SECT curve subgroup attack)
+  "cryptography>=46.0.5",
 ]
 
 [project.urls]

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/src/github2gerrit/cli.py

@@ -283,7 +283,9 @@ def _extract_and_display_pr_info(
             pr_info["Files Changed"] = "unknown"
 
         # Display the PR information
-        display_pr_info(pr_info, "Pull Request Details", progress_tracker)
+        display_pr_info(
+            pr_info, "Pull Request Details", progress_tracker=progress_tracker
+        )
 
     except GitHub2GerritError:
         # Let our structured errors propagate
@@ -1099,8 +1101,8 @@ def main(
 
 
 def _setup_logging() -> logging.Logger:
-    level_name = os.getenv("G2G_LOG_LEVEL", "INFO").upper()
-    level = getattr(logging, level_name, logging.INFO)
+    level_name = os.getenv("G2G_LOG_LEVEL", "WARNING").upper()
+    level = getattr(logging, level_name, logging.WARNING)
     fmt = (
         "%(asctime)s %(levelname)-8s %(name)s %(filename)s:%(lineno)d | "
         "%(message)s"
@@ -1111,8 +1113,8 @@ def _setup_logging() -> logging.Logger:
 
 def _reconfigure_logging() -> None:
     """Reconfigure logging level based on current environment variables."""
-    level_name = os.getenv("G2G_LOG_LEVEL", "INFO").upper()
-    level = getattr(logging, level_name, logging.INFO)
+    level_name = os.getenv("G2G_LOG_LEVEL", "WARNING").upper()
+    level = getattr(logging, level_name, logging.WARNING)
     logging.getLogger().setLevel(level)
     for handler in logging.getLogger().handlers:
         handler.setLevel(level)

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/src/github2gerrit/core.py

@@ -2547,9 +2547,10 @@ class Orchestrator:
     def _ensure_workspace_prepared(self, branch: str) -> None:
         """Ensure workspace is prepared with latest remote state.
 
-        Performs a single git fetch to avoid redundant SSH operations.
-        This consolidates multiple fetch operations that were causing
-        excessive SSH agent prompts.
+        Performs a git fetch to get the latest branch state. Does NOT
+        proactively unshallow to avoid performance impact on large repos.
+        If checkout later fails due to missing commits in shallow clone,
+        _checkout_with_unshallow_fallback() will handle it reactively.
 
         Args:
             branch: The branch to fetch from origin
@@ -2575,6 +2576,276 @@ class Orchestrator:
             # Don't mark as prepared if fetch failed
             raise
 
+    def _is_shallow_clone(self) -> bool:
+        """Check if the current workspace is a shallow clone.
+
+        Returns:
+            True if the repository is a shallow clone, False otherwise.
+        """
+        shallow_file = self.workspace / ".git" / "shallow"
+        if shallow_file.exists():
+            return True
+        # Also check via git command for edge cases (e.g., worktrees)
+        try:
+            result = run_cmd(
+                ["git", "rev-parse", "--is-shallow-repository"],
+                cwd=self.workspace,
+                check=False,
+            )
+            return result.stdout.strip().lower() == "true"
+        except Exception:
+            return False
+
+    def _unshallow_repository(self) -> bool:
+        """Unshallow the repository to get full history.
+
+        Returns:
+            True if unshallowing succeeded or repo is already full,
+            False if unshallowing failed.
+        """
+        if not self._is_shallow_clone():
+            log.debug("Repository is not shallow, no unshallow needed")
+            return True
+
+        log.info("Unshallowing repository to fetch full history...")
+        try:
+            run_cmd(
+                ["git", "fetch", "--unshallow", "origin"],
+                cwd=self.workspace,
+                env=self._ssh_env(),
+            )
+        except CommandError as exc:
+            log.warning("Failed to unshallow repository: %s", exc)
+            return False
+        else:
+            log.debug("Repository unshallowed successfully")
+            return True
+
+    def _deepen_repository(self, depth: int = 100) -> bool:
+        """Deepen the repository history by fetching more commits.
+
+        This is a lighter alternative to full unshallow, fetching only
+        the specified number of additional commits.
+
+        Args:
+            depth: Number of additional commits to fetch (default: 100)
+
+        Returns:
+            True if deepening succeeded, False otherwise.
+        """
+        if not self._is_shallow_clone():
+            log.debug("Repository is not shallow, no deepening needed")
+            return True
+
+        log.debug("Deepening repository by %d commits...", depth)
+        try:
+            run_cmd(
+                ["git", "fetch", f"--deepen={depth}", "origin"],
+                cwd=self.workspace,
+                env=self._ssh_env(),
+            )
+        except CommandError as exc:
+            log.debug("Failed to deepen repository: %s", exc)
+            return False
+        else:
+            log.debug("Repository deepened by %d commits", depth)
+            return True
+
+    def _checkout_with_unshallow_fallback(
+        self,
+        branch_name: str,
+        start_point: str,
+        create_branch: bool = True,
+    ) -> None:
+        """Checkout a branch with graduated deepening fallback.
+
+        If the initial checkout fails because the start_point SHA is not
+        available (common in shallow clones), this method will:
+        1. First try to deepen the repository (fetch 100 more commits)
+        2. If that fails, fully unshallow the repository
+        3. Retry the checkout after each attempt
+
+        This graduated approach minimizes performance impact for most cases
+        while still handling edge cases where full history is needed.
+
+        Args:
+            branch_name: Name of the branch to checkout or create
+            start_point: The SHA or ref to start the branch from
+            create_branch: If True, create a new branch (-b flag)
+
+        Raises:
+            CommandError: If checkout fails even after unshallowing
+        """
+        cmd = ["git", "checkout"]
+        if create_branch:
+            cmd.extend(["-b", branch_name, start_point])
+        else:
+            cmd.append(branch_name)
+
+        checkout_exc: CommandError | None = None
+        try:
+            run_cmd(cmd, cwd=self.workspace)
+        except CommandError as exc:
+            checkout_exc = exc
+
+        if checkout_exc is None:
+            return  # Success on first attempt
+
+        # Analyze the failure
+        error_msg = str(checkout_exc).lower()
+        # Check if failure is due to missing commit (shallow clone issue)
+        is_missing_commit = (
+            "not a commit" in error_msg
+            or "cannot be created from" in error_msg
+            or "bad revision" in error_msg
+            or "unknown revision" in error_msg
+            or "invalid reference" in error_msg
+        )
+
+        if not is_missing_commit:
+            # Not a shallow clone issue, re-raise immediately
+            raise checkout_exc
+
+        log.warning(
+            "Checkout failed, SHA %s not available in shallow clone. "
+            "Attempting graduated deepening...",
+            start_point,
+        )
+
+        # Step 1: Try deepening first (cheaper than full unshallow)
+        if self._deepen_repository(depth=100):
+            log.debug("Retrying checkout after deepening...")
+            try:
+                run_cmd(cmd, cwd=self.workspace)
+            except CommandError as deepen_exc:
+                log.debug(
+                    "Checkout still failed after deepening: %s", deepen_exc
+                )
+            else:
+                log.info("Checkout succeeded after deepening repository")
+                return
+
+        # Step 2: Full unshallow as last resort
+        log.info("Deepening insufficient, performing full unshallow...")
+        if not self._unshallow_repository():
+            log.error(
+                "Failed to unshallow repository. Cannot checkout SHA: %s",
+                start_point,
+            )
+            raise checkout_exc
+
+        # Retry the checkout after full unshallow
+        log.debug("Retrying checkout after full unshallow...")
+        run_cmd(cmd, cwd=self.workspace)
+        log.info("Checkout succeeded after full unshallow")
+
+    def _merge_squash_with_unshallow_fallback(self, head_sha: str) -> None:
+        """Perform git merge --squash with graduated deepening fallback.
+
+        If the initial merge fails because the shallow clone lacks a common
+        ancestor between the base and head (causing "refusing to merge
+        unrelated histories"), this method will:
+        1. First try to deepen the repository (fetch 100 more commits)
+        2. If that fails, fully unshallow the repository
+        3. Retry the merge after each attempt
+
+        This mirrors the graduated approach used by
+        ``_checkout_with_unshallow_fallback`` but for merge operations,
+        which are equally susceptible to shallow clone limitations.
+
+        Args:
+            head_sha: The SHA to merge (PR head commit)
+
+        Raises:
+            CommandError: If merge fails even after unshallowing, or if
+                the failure is not related to shallow clone history
+        """
+        merge_cmd = ["git", "merge", "--squash", head_sha]
+
+        merge_exc: CommandError | None = None
+        try:
+            run_cmd(merge_cmd, cwd=self.workspace)
+        except CommandError as exc:
+            merge_exc = exc
+
+        if merge_exc is None:
+            return  # Success on first attempt
+
+        # Check if the failure is due to unrelated histories in a shallow clone
+        error_str = str(merge_exc).lower()
+        stderr_str = (merge_exc.stderr or "").lower()
+        combined = f"{error_str} {stderr_str}"
+
+        is_unrelated_histories = (
+            "refusing to merge unrelated histories" in combined
+            or "unrelated histories" in combined
+            or "no common ancestor" in combined
+        )
+
+        if not is_unrelated_histories or not self._is_shallow_clone():
+            # Not a shallow clone issue — let the caller handle the error
+            raise merge_exc
+
+        log.warning(
+            "Merge --squash failed due to unrelated histories in shallow "
+            "clone. Attempting graduated deepening to recover..."
+        )
+
+        # Step 1: Try deepening first (cheaper than full unshallow)
+        if self._deepen_repository(depth=100):
+            log.debug("Retrying merge --squash after deepening...")
+            # Reset the failed merge state before retrying
+            run_cmd(
+                ["git", "merge", "--abort"],
+                cwd=self.workspace,
+                check=False,
+            )
+            try:
+                run_cmd(merge_cmd, cwd=self.workspace)
+            except CommandError as deepen_exc:
+                log.debug(
+                    "Merge --squash still failed after deepening: %s",
+                    deepen_exc,
+                )
+                # Re-check whether this is still a shallow-history problem;
+                # if the error has changed (e.g. real merge conflict), an
+                # expensive full unshallow cannot help — propagate immediately.
+                deepen_combined = (
+                    f"{deepen_exc} {deepen_exc.stderr or ''}".lower()
+                )
+                deepen_is_unrelated = (
+                    "refusing to merge unrelated histories" in deepen_combined
+                    or "unrelated histories" in deepen_combined
+                    or "no common ancestor" in deepen_combined
+                )
+                if not deepen_is_unrelated:
+                    raise
+            else:
+                log.info("Merge --squash succeeded after deepening repository")
+                return
+
+        # Step 2: Full unshallow as last resort
+        log.info(
+            "Deepening insufficient, performing full unshallow for merge..."
+        )
+        # Reset the failed merge state before retrying
+        run_cmd(
+            ["git", "merge", "--abort"],
+            cwd=self.workspace,
+            check=False,
+        )
+        if not self._unshallow_repository():
+            log.error(
+                "Failed to unshallow repository. Cannot merge SHA: %s",
+                head_sha,
+            )
+            raise merge_exc
+
+        # Retry the merge after full unshallow
+        log.debug("Retrying merge --squash after full unshallow...")
+        run_cmd(merge_cmd, cwd=self.workspace)
+        log.info("Merge --squash succeeded after full unshallow")
+
     def _cleanup_ssh(self) -> None:
         """Clean up temporary SSH files created by this tool.
 
@@ -2787,8 +3058,10 @@ class Orchestrator:
         ).stdout.strip()
         tmp_branch = f"g2g_tmp_{gh.pr_number or 'pr'!s}_{os.getpid()}"
         os.environ["G2G_TMP_BRANCH"] = tmp_branch
-        run_cmd(
-            ["git", "checkout", "-b", tmp_branch, base_sha], cwd=self.workspace
+        self._checkout_with_unshallow_fallback(
+            branch_name=tmp_branch,
+            start_point=base_sha,
+            create_branch=True,
         )
         change_ids: list[str] = []
         for idx, csha in enumerate(commit_list):
@@ -2937,9 +3210,20 @@ class Orchestrator:
 
         except Exception as debug_exc:
             log.warning("Failed to analyze merge situation: %s", debug_exc)
+            # Proactively deepen if merge-base fails in a shallow clone,
+            # as this strongly indicates the shallow history is insufficient
+            # for the upcoming merge --squash operation.
+            if self._is_shallow_clone():
+                log.info(
+                    "merge-base failed in shallow clone — proactively "
+                    "deepening repository to improve merge success chances"
+                )
+                self._deepen_repository(depth=100)
 
-        run_cmd(
-            ["git", "checkout", "-b", tmp_branch, base_sha], cwd=self.workspace
+        self._checkout_with_unshallow_fallback(
+            branch_name=tmp_branch,
+            start_point=base_sha,
+            create_branch=True,
         )
 
         # Show git status before attempting merge
@@ -2966,7 +3250,7 @@ class Orchestrator:
 
         log.debug("About to run: git merge --squash %s", head_sha)
         try:
-            run_cmd(["git", "merge", "--squash", head_sha], cwd=self.workspace)
+            self._merge_squash_with_unshallow_fallback(head_sha)
         except CommandError as merge_exc:
             # Enhanced error handling for git merge failures
             error_details = self._analyze_merge_failure(

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/src/github2gerrit/gerrit_pr_closer.py

@@ -1492,6 +1492,16 @@ def cleanup_closed_github_prs(
                 )
                 continue
 
+    except GerritRestError as exc:
+        # Wrap in GitHub2GerritError to ensure SSL/connection errors
+        # fail the workflow
+        log.exception("Failed to perform Gerrit cleanup for closed GitHub PRs")
+        raise GitHub2GerritError(
+            ExitCode.GERRIT_CONNECTION_ERROR,
+            message="❌ Gerrit REST API error during cleanup",
+            details=str(exc),
+            original_exception=exc,
+        ) from exc
     except Exception:
         log.exception("Failed to perform Gerrit cleanup for closed GitHub PRs")
         return 0

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/src/github2gerrit/gitutils.py

@@ -51,8 +51,8 @@ _LOGGER_NAME = "github2gerrit.git"
 log = logging.getLogger(_LOGGER_NAME)
 if not log.handlers:
     # Provide a minimal default if the app has not configured logging.
-    level_name = os.getenv("G2G_LOG_LEVEL", "INFO").upper()
-    level = getattr(logging, level_name, logging.INFO)
+    level_name = os.getenv("G2G_LOG_LEVEL", "WARNING").upper()
+    level = getattr(logging, level_name, logging.WARNING)
     fmt = (
         "%(asctime)s %(levelname)-8s %(name)s %(filename)s:%(lineno)d | "
         "%(message)s"

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/src/github2gerrit/pr_content_filter.py

@@ -44,27 +44,6 @@ _MULTIPLE_NEWLINES_PATTERN = re.compile(r"\n{3,}")
 _EMOJI_PATTERN = re.compile(r":[a-z_]+:")  # GitHub emoji codes like :sparkles:
 
 
-@dataclass
-class FilterConfig:
-    """Configuration for PR content filtering."""
-
-    # Global options
-    enabled: bool = True
-    remove_emoji_codes: bool = True
-    deduplicate_title_in_body: bool = True
-
-    # Author-specific filtering
-    author_rules: dict[str, str] = field(default_factory=dict)
-
-    # Rule-specific configurations
-    dependabot_config: DependabotConfig = field(
-        default_factory=lambda: DependabotConfig()
-    )
-    precommit_config: PrecommitConfig = field(
-        default_factory=lambda: PrecommitConfig()
-    )
-
-
 @dataclass
 class DependabotConfig:
     """Configuration for Dependabot PR filtering."""
@@ -85,6 +64,25 @@ class PrecommitConfig:
     # Future: add pre-commit.ci specific options
 
 
+@dataclass
+class FilterConfig:
+    """Configuration for PR content filtering."""
+
+    # Global options
+    enabled: bool = True
+    remove_emoji_codes: bool = True
+    deduplicate_title_in_body: bool = True
+
+    # Author-specific filtering
+    author_rules: dict[str, str] = field(default_factory=dict)
+
+    # Rule-specific configurations
+    dependabot_config: DependabotConfig = field(
+        default_factory=DependabotConfig
+    )
+    precommit_config: PrecommitConfig = field(default_factory=PrecommitConfig)
+
+
 class FilterRule(ABC):
     """Abstract base class for PR content filtering rules."""
 

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/src/github2gerrit/utils.py

@@ -63,9 +63,17 @@ def is_verbose_mode() -> bool:
     """Check if verbose mode is enabled via environment variable.
 
     Returns:
-        True if G2G_VERBOSE environment variable is set to a truthy value
+        True if G2G_VERBOSE environment variable is set to a truthy value,
+        or if GitHub Actions debug mode is enabled (RUNNER_DEBUG=1 or
+        ACTIONS_STEP_DEBUG=true)
     """
-    return os.getenv("G2G_VERBOSE", "").lower() in ("true", "1", "yes")
+    if os.getenv("G2G_VERBOSE", "").lower() in ("true", "1", "yes"):
+        return True
+    # GitHub Actions sets RUNNER_DEBUG=1 when re-running with debug logging
+    if os.getenv("RUNNER_DEBUG", "") == "1":
+        return True
+    # GitHub Actions also sets ACTIONS_STEP_DEBUG=true for step-level debugging
+    return os.getenv("ACTIONS_STEP_DEBUG", "").lower() == "true"
 
 
 def log_exception_conditionally(

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/tests/test_change_id_deduplication.py

@@ -275,7 +275,7 @@ Change-Id: {reused_change_id}
     monkeypatch.setattr("github2gerrit.core.run_cmd", mock_run_cmd)
 
     # Mock GitHub API for Change-ID reuse
-    monkeypatch.setattr("github2gerrit.core.build_client", lambda: object())
+    monkeypatch.setattr("github2gerrit.core.build_client", object)
     monkeypatch.setattr(
         "github2gerrit.core.get_repo_from_env", lambda _: object()
     )

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/tests/test_cli_outputs_file.py

@@ -232,7 +232,7 @@ def test_multi_pr_url_mode_writes_aggregated_outputs(
         def __init__(self, number: int) -> None:
             self.number = number
 
-    monkeypatch.setattr(cli_mod, "build_client", lambda: object())
+    monkeypatch.setattr(cli_mod, "build_client", object)
     monkeypatch.setattr(cli_mod, "get_repo_from_env", lambda _client: object())
     monkeypatch.setattr(
         cli_mod,

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/tests/test_cli_url_and_dryrun.py

@@ -168,7 +168,7 @@ def test_repo_url_dry_run_invokes_for_each_open_pr(
     monkeypatch.setattr(cli_mod, "Orchestrator", _DummyOrchestrator)
 
     # Patch PyGithub wrapper functions used by CLI bulk path
-    monkeypatch.setattr(cli_mod, "build_client", lambda: object())
+    monkeypatch.setattr(cli_mod, "build_client", object)
     monkeypatch.setattr(cli_mod, "get_repo_from_env", lambda _client: object())
     monkeypatch.setattr(
         cli_mod, "iter_open_pulls", lambda _repo: iter(dummy_prs)
@@ -212,7 +212,7 @@ def test_url_mode_sets_environment_for_config_resolution(
     monkeypatch.setattr(cli_mod, "Orchestrator", _DummyOrchestrator)
 
     # Minimal patches for bulk flow
-    monkeypatch.setattr(cli_mod, "build_client", lambda: object())
+    monkeypatch.setattr(cli_mod, "build_client", object)
     monkeypatch.setattr(cli_mod, "get_repo_from_env", lambda _client: object())
     monkeypatch.setattr(
         cli_mod,

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/tests/test_core_close_pr_policy.py

@@ -102,9 +102,7 @@ def test_close_pr_invoked_for_pull_request_target_event(
             self.closed_state: str | None = None
 
     # Patch the GitHub helper functions used by the close path
-    monkeypatch.setattr(
-        "github2gerrit.core.build_client", lambda: DummyClient()
-    )
+    monkeypatch.setattr("github2gerrit.core.build_client", DummyClient)
     monkeypatch.setattr(
         "github2gerrit.core.get_repo_from_env", lambda _c: DummyRepo()
     )

{github2gerrit-1.0.4 → github2gerrit-1.0.6}/tests/test_core_prepare_commits.py

@@ -237,7 +237,7 @@ def test_prepare_squashed_commit_reuses_change_id_from_comments(
     monkeypatch.setattr("github2gerrit.core.run_cmd", fake_run_cmd)
 
     # GitHub API helpers used to fetch PR comments
-    monkeypatch.setattr("github2gerrit.core.build_client", lambda: object())
+    monkeypatch.setattr("github2gerrit.core.build_client", object)
     monkeypatch.setattr(
         "github2gerrit.core.get_repo_from_env", lambda _c: object()
     )