github2gerrit 0.1.7__tar.gz → 0.1.8__tar.gz

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 0.1.7
+Version: 0.1.8
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Author-email: Matthew Watkins <mwatkins@linuxfoundation.org>
 License-Expression: Apache-2.0

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/src/github2gerrit/cli.py

@@ -3,10 +3,13 @@
 
 from __future__ import annotations
 
+import io
 import json
 import logging
 import os
+import shutil
 import tempfile
+import zipfile
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor
 from concurrent.futures import as_completed
@@ -17,6 +20,8 @@ from typing import Protocol
 from typing import TypeVar
 from typing import cast
 from urllib.parse import urlparse
+from urllib.request import Request
+from urllib.request import urlopen
 
 import click
 import typer
@@ -290,14 +295,11 @@ def main(
     """
     Tool to convert GitHub pull requests into Gerrit changes
 
-    - Providing a URL to a pull request: converts that pull request
-      into a Gerrit change
+    - Providing a URL to a pull request: converts that pull request into a Gerrit change
 
-    - Providing a URL to a GitHub repository converts all open pull
-      requests into Gerrit changes
+    - Providing a URL to a GitHub repository converts all open pull requests into Gerrit changes
 
-    - No arguments for CI/CD environment; reads parameters from
-      environment variables
+    - No arguments for CI/CD environment; reads parameters from environment variables
     """
     # Override boolean parameters with properly parsed environment variables
     # This ensures that string "false" from GitHub Actions is handled correctly
@@ -746,13 +748,6 @@ def _prepare_local_checkout(workspace: Path, gh: GitHubContext, data: Inputs) ->
 
 def _fallback_to_api_archive(workspace: Path, gh: GitHubContext, data: Inputs, pr_num_str: str) -> None:
     """Fallback to GitHub API archive download for private repos."""
-    import io
-    import json
-    import shutil
-    import zipfile
-    from urllib.request import Request
-    from urllib.request import urlopen
-
     log.info("Attempting API archive fallback for PR #%s", pr_num_str)
 
     # Get GitHub token for authenticated requests

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/src/github2gerrit/core.py

@@ -30,7 +30,10 @@ import logging
 import os
 import re
 import shlex
+import shutil
+import socket
 import stat
+import tempfile
 import urllib.parse
 import urllib.request
 from collections.abc import Iterable
@@ -786,8 +789,6 @@ class Orchestrator:
 
     def _strategy_open_fchmod(self, key_path: Path, key_content: str) -> None:
         """Strategy: open with os.open and specific flags, then fchmod."""
-        import os
-        import stat
 
         flags = os.O_WRONLY | os.O_CREAT | os.O_EXCL
         mode = stat.S_IRUSR | stat.S_IWUSR  # 0o600
@@ -801,7 +802,6 @@ class Orchestrator:
 
     def _strategy_umask_open(self, key_path: Path, key_content: str) -> None:
         """Strategy: set umask, create file, restore umask."""
-        import os
 
         original_umask = os.umask(0o077)  # Only owner can read/write
         try:
@@ -813,8 +813,6 @@ class Orchestrator:
 
     def _strategy_stat_constants(self, key_path: Path, key_content: str) -> None:
         """Strategy: use stat constants for permission setting."""
-        import os
-        import stat
 
         with open(key_path, "w", encoding="utf-8") as f:
             f.write(key_content)
@@ -826,13 +824,9 @@ class Orchestrator:
 
     def _create_key_in_memory_fs(self, key_path: Path, key_content: str) -> bool:
         """Fallback: try to create key in memory filesystem."""
-        import shutil
-        import tempfile
-
         try:
             # Try to create in memory filesystem if available
             # Use secure temporary directories
-            import tempfile
 
             temp_dir = tempfile.gettempdir()
             memory_dirs = [temp_dir]
@@ -2343,7 +2337,6 @@ class Orchestrator:
         - Verify GitHub token by fetching repository and PR metadata
         - Do NOT perform any write operations
         """
-        import socket
 
         log.info("Dry-run: starting preflight checks")
         if os.getenv("G2G_DRYRUN_DISABLE_NETWORK", "").strip().lower() in (

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/src/github2gerrit/duplicate_detection.py

@@ -289,8 +289,6 @@ class DuplicateDetector:
         Returns:
             Hex-encoded SHA256 hash string (first 16 characters for readability)
         """
-        import hashlib
-
         # Build hash input from stable, unique PR identifiers
         # Use server_url + repository + pr_number for global uniqueness
         hash_input = f"{gh.server_url}/{gh.repository}/pull/{gh.pr_number}"

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/src/github2gerrit/external_api.py

@@ -29,12 +29,14 @@ import functools
 import logging
 import random
 import socket
+import subprocess
 import time
 import urllib.error
 from collections.abc import Callable
 from dataclasses import dataclass
 from dataclasses import field
 from enum import Enum
+from pathlib import Path
 from typing import Any
 from typing import NoReturn
 from typing import TypeVar
@@ -441,9 +443,6 @@ def curl_download(
     Raises:
         RuntimeError: If curl command fails after retries
     """
-    import subprocess
-    from pathlib import Path
-
     if policy is None:
         policy = RetryPolicy(max_attempts=3, timeout=timeout)
 

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/src/github2gerrit/gitutils.py

@@ -11,8 +11,10 @@ from __future__ import annotations
 
 import logging
 import os
+import re
 import shlex
 import subprocess
+import tempfile
 import time
 from collections.abc import Callable
 from collections.abc import Iterable
@@ -481,9 +483,7 @@ def git_commit_amend(
     # Write message to a temp file to avoid shell-escaping issues
     tmp_path: Path | None = None
     if message is not None:
-        import tempfile as _tempfile
-
-        with _tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as _tf:
+        with tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as _tf:
             _tf.write(message)
             _tf.flush()
             tmp_path = Path(_tf.name)
@@ -493,9 +493,6 @@ def git_commit_amend(
     # Determine whether to add -s; only suppress if message already has a sign-off for current committer
     effective_signoff = bool(signoff)
     try:
-        import os
-        import re
-
         # Resolve committer email (prefer repo-local; fallback to global/env)
         committer_email = os.getenv("GIT_COMMITTER_EMAIL", "").strip()
         if not committer_email:
@@ -586,9 +583,7 @@ def git_commit_new(
     # Write message to a temp file to avoid shell-escaping issues
     tmp_path: Path | None = None
     if message is not None:
-        import tempfile as _tempfile
-
-        with _tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as _tf:
+        with tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as _tf:
             _tf.write(message)
             _tf.flush()
             tmp_path = Path(_tf.name)
@@ -598,9 +593,6 @@ def git_commit_new(
     # Determine whether to add -s; only suppress if message already has a sign-off for current committer
     effective_signoff = bool(signoff)
     try:
-        import os
-        import re
-
         # Resolve committer email (prefer repo-local; fallback to global/env)
         committer_email = os.getenv("GIT_COMMITTER_EMAIL", "").strip()
         if not committer_email:

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/src/github2gerrit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 0.1.7
+Version: 0.1.8
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Author-email: Matthew Watkins <mwatkins@linuxfoundation.org>
 License-Expression: Apache-2.0

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/tests/test_duplicate_detection.py

@@ -3,6 +3,7 @@
 
 """Tests for duplicate change detection."""
 
+import json
 from datetime import UTC
 from datetime import datetime
 from datetime import timedelta
@@ -373,8 +374,6 @@ project=test/project.git
         target_pr.get_files.return_value = []
 
         # Mock Gerrit REST API response with matching subject
-        import json
-
         gerrit_response = [
             {
                 "_number": 12345,
@@ -420,8 +419,6 @@ project=test/project.git
         target_pr.get_files.return_value = []
 
         # Mock Gerrit REST API response with matching subject
-        import json
-
         gerrit_response = [
             {
                 "_number": 12345,

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/tests/test_external_api_framework.py

@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 
+import logging
 import urllib.error
 from io import StringIO
 from pathlib import Path
@@ -209,8 +210,6 @@ def test_curl_download_failure(monkeypatch: pytest.MonkeyPatch, tmp_path: Path)
 
 def test_log_api_metrics_summary(monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture) -> None:
     """Test API metrics summary logging."""
-    import logging
-
     # Set up some metrics
     reset_api_metrics()
 

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/tests/test_gerrit_rest_client.py

@@ -7,6 +7,7 @@ import contextlib
 import io
 import os
 import stat
+import urllib.error
 from collections.abc import Callable
 from email.message import Message
 from pathlib import Path
@@ -93,8 +94,6 @@ def test_gerrit_rest_retries_on_http_503_then_succeeds(
     monkeypatch.setattr("github2gerrit.gerrit_rest._PygerritRestApi", None, raising=True)
     monkeypatch.setattr("time.sleep", lambda s: None, raising=False)
 
-    import urllib.error
-
     # Prepare sequence: 503 error twice, then 200 OK
     attempts: dict[str, int] = {"n": 0}
 
@@ -144,8 +143,6 @@ def test_gerrit_rest_retries_on_urlerror_timeout_then_fails(
     monkeypatch.setattr("github2gerrit.gerrit_rest._PygerritRestApi", None, raising=True)
     monkeypatch.setattr("time.sleep", lambda s: None, raising=False)
 
-    import urllib.error
-
     attempts: dict[str, int] = {"n": 0}
 
     def _fake_urlopen(req: Any, timeout: float | None = None) -> _DummyResp:

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/tests/test_gitutils_helpers.py

@@ -8,6 +8,7 @@ from pathlib import Path
 
 import pytest
 
+import github2gerrit.gitutils as gitutils
 from github2gerrit.gitutils import CommandError
 from github2gerrit.gitutils import CommandResult
 from github2gerrit.gitutils import git
@@ -203,8 +204,6 @@ def test_git_last_commit_trailers_parsing_edge_cases(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     # Patch git_show to return a crafted commit message body with various trailer forms.
-    import github2gerrit.gitutils as gitutils
-
     body = (
         "Subject line\n\n"
         "Body content with Key: Value in the middle\n"

{github2gerrit-0.1.7 → github2gerrit-0.1.8}/tests/test_url_parser.py

@@ -68,5 +68,5 @@ from github2gerrit.cli import _parse_github_target
         ("https://github.com", (None, None, None)),
     ],
 )
-def test_parse_github_target(url: str, expected: tuple[object, object, object]) -> None:
+def test_parse_github_target(url: str, expected: tuple[str | None, str | None, int | None]) -> None:
     assert _parse_github_target(url) == expected