github2gerrit 0.1.4__tar.gz → 0.1.6__tar.gz

{github2gerrit-0.1.4 → github2gerrit-0.1.6}/.editorconfig

@@ -14,10 +14,10 @@ indent_size = 4
 indent_size = 2
 
 [*.markdown]
-max_line_length = 80
+max_line_length = 120
 
 [*.py]
-max_line_legth = 120
+max_line_length = 120
 
 [*.sh]
-max_line_length = 80
+max_line_length = 120

{github2gerrit-0.1.4 → github2gerrit-0.1.6}/.pre-commit-config.yaml

@@ -79,6 +79,7 @@ repos:
     hooks:
       - id: write-good
         files: "\\.(rst|md|markdown|mdown|mkdn)$"
+        exclude: "GERRIT_URL_CENTRALIZATION.md"
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: 745eface02aef23e168a8afb6b5737818efbea95  # frozen: v0.11.0.1
@@ -90,6 +91,7 @@ repos:
     hooks:
       - id: markdownlint
         args: ["--fix"]
+        exclude: "GERRIT_URL_CENTRALIZATION.md"
 
   - repo: https://github.com/fsfe/reuse-tool
     rev: 60dfc6b2ad9e1f3eabfbcf3a0dc202ee89dc5a00 # frozen: v5.0.2

{github2gerrit-0.1.4 → github2gerrit-0.1.6}/.yamllint

@@ -11,3 +11,5 @@ rules:
     # prettier forces 1 space comment separator
     min-spaces-from-content: 1
     level: error
+  line-length:
+    max: 120

{github2gerrit-0.1.4/src/github2gerrit.egg-info → github2gerrit-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 0.1.4
+Version: 0.1.6
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Author-email: Matthew Watkins <mwatkins@linuxfoundation.org>
 License-Expression: Apache-2.0
@@ -34,6 +34,8 @@ Requires-Dist: ruff>=0.6.3; extra == "dev"
 Requires-Dist: black>=24.8.0; extra == "dev"
 Requires-Dist: mypy>=1.11.2; extra == "dev"
 Requires-Dist: pytest-mock>=3.14.0; extra == "dev"
+Requires-Dist: types-requests>=2.31.0; extra == "dev"
+Requires-Dist: types-click>=7.1.8; extra == "dev"
 Dynamic: license-file
 
 <!--
@@ -103,16 +105,25 @@ stabilize coverage reporting for parallel/xdist runs.
 
 ## Duplicate detection
 
-By default, the tool checks for duplicate changes to prevent spam
-submissions from automated tools like Dependabot. It compares PR titles,
-content, and files changed against recent PRs (last 7 days) and will
-exit with an error when it finds duplicates.
+Duplicate detection uses a scoring-based approach. Instead of relying on a hash
+added by this action, the detector compares the first line of the commit message
+(subject/PR title), analyzes the body text and the set of files changed, and
+computes a similarity score. When the score meets or exceeds a configurable
+threshold (default 0.8), the tool treats the change as a duplicate and blocks
+submission. This approach aims to remain robust even when similar changes
+appeared outside this pipeline.
 
 ### Examples of detected duplicates
 
-- Identical Dependabot PRs: "Bump package from 1.0 to 1.1"
-- Sequential dependency updates: "Bump package 1.0→1.1", "Bump package 1.1→1.2"
-- Similar bug fixes with slightly different wording
+- Dependency bumps for the same package across close versions
+  (e.g., "Bump foo from 1.0 to 1.1" vs "Bump foo from 1.1 to 1.2")
+  with overlapping files — high score
+- Pre-commit autoupdates that change .pre-commit-config.yaml and hook versions —
+  high score
+- GitHub Actions version bumps that update .github/workflows/* uses lines —
+  medium to high score
+- Similar bug fixes with the same subject and significant file overlap —
+  strong match
 
 ### Allowing duplicates
 
@@ -288,19 +299,7 @@ jobs:
   submit-to-gerrit:
     runs-on: ubuntu-latest
     steps:
-      - name: Install SSH key and custom SSH config
-        <!-- markdownlint-disable-next-line MD013 -->
-        uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4 # v2.7.0
-        with:
-          key: ${{ secrets.GERRIT_SSH_PRIVKEY_G2G }}
-          name: "id_rsa"
-          known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
-          config: |
-            Host ${{ vars.GERRIT_SERVER }}
-              User ${{ vars.GERRIT_SSH_USER_G2G }}
-              Port ${{ vars.GERRIT_SERVER_PORT }}
-              PubkeyAcceptedKeyTypes +ssh-rsa
-              IdentityFile ~/.ssh/id_rsa
+
 
       - name: Submit PR to Gerrit (with explicit overrides)
         id: g2g
@@ -334,10 +333,10 @@ jobs:
 
 Notes:
 
-- If both this step and the action define SSH configuration, the last
-  configuration applied in the runner wins.
-- For most users, you can rely on the action’s built-in SSH setup. Use this
-  advanced configuration when you need custom SSH behavior or hosts.
+- The action configures SSH internally using the provided inputs (key,
+  known_hosts) and does not use the runner’s SSH agent or ~/.ssh/config.
+- Do not add external steps to install SSH keys or edit SSH config; they’re
+  unnecessary and may conflict with the action.
 
 ## GitHub Enterprise support
 

{github2gerrit-0.1.4 → github2gerrit-0.1.6}/README.md

@@ -65,16 +65,25 @@ stabilize coverage reporting for parallel/xdist runs.
 
 ## Duplicate detection
 
-By default, the tool checks for duplicate changes to prevent spam
-submissions from automated tools like Dependabot. It compares PR titles,
-content, and files changed against recent PRs (last 7 days) and will
-exit with an error when it finds duplicates.
+Duplicate detection uses a scoring-based approach. Instead of relying on a hash
+added by this action, the detector compares the first line of the commit message
+(subject/PR title), analyzes the body text and the set of files changed, and
+computes a similarity score. When the score meets or exceeds a configurable
+threshold (default 0.8), the tool treats the change as a duplicate and blocks
+submission. This approach aims to remain robust even when similar changes
+appeared outside this pipeline.
 
 ### Examples of detected duplicates
 
-- Identical Dependabot PRs: "Bump package from 1.0 to 1.1"
-- Sequential dependency updates: "Bump package 1.0→1.1", "Bump package 1.1→1.2"
-- Similar bug fixes with slightly different wording
+- Dependency bumps for the same package across close versions
+  (e.g., "Bump foo from 1.0 to 1.1" vs "Bump foo from 1.1 to 1.2")
+  with overlapping files — high score
+- Pre-commit autoupdates that change .pre-commit-config.yaml and hook versions —
+  high score
+- GitHub Actions version bumps that update .github/workflows/* uses lines —
+  medium to high score
+- Similar bug fixes with the same subject and significant file overlap —
+  strong match
 
 ### Allowing duplicates
 
@@ -250,19 +259,7 @@ jobs:
   submit-to-gerrit:
     runs-on: ubuntu-latest
     steps:
-      - name: Install SSH key and custom SSH config
-        <!-- markdownlint-disable-next-line MD013 -->
-        uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4 # v2.7.0
-        with:
-          key: ${{ secrets.GERRIT_SSH_PRIVKEY_G2G }}
-          name: "id_rsa"
-          known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
-          config: |
-            Host ${{ vars.GERRIT_SERVER }}
-              User ${{ vars.GERRIT_SSH_USER_G2G }}
-              Port ${{ vars.GERRIT_SERVER_PORT }}
-              PubkeyAcceptedKeyTypes +ssh-rsa
-              IdentityFile ~/.ssh/id_rsa
+
 
       - name: Submit PR to Gerrit (with explicit overrides)
         id: g2g
@@ -296,10 +293,10 @@ jobs:
 
 Notes:
 
-- If both this step and the action define SSH configuration, the last
-  configuration applied in the runner wins.
-- For most users, you can rely on the action’s built-in SSH setup. Use this
-  advanced configuration when you need custom SSH behavior or hosts.
+- The action configures SSH internally using the provided inputs (key,
+  known_hosts) and does not use the runner’s SSH agent or ~/.ssh/config.
+- Do not add external steps to install SSH keys or edit SSH config; they’re
+  unnecessary and may conflict with the action.
 
 ## GitHub Enterprise support
 

{github2gerrit-0.1.4 → github2gerrit-0.1.6}/action.yaml

@@ -31,11 +31,24 @@ inputs:
     description: "SSH private key content used to authenticate to Gerrit"
     required: true
   GERRIT_SSH_USER_G2G:
-    description: "Gerrit SSH username (e.g. automation bot account)"
-    required: true
+    description: >
+      Gerrit SSH username (e.g. automation bot account). In GitHub Actions,
+      automatically derived as [ORGANIZATION].gh2gerrit when not provided if
+      G2G_ENABLE_DERIVATION=true (default: false). For local CLI usage,
+      derivation is enabled by default; set
+      G2G_ENABLE_DERIVATION=false to disable.
+    required: false
+    default: ""
   GERRIT_SSH_USER_G2G_EMAIL:
-    description: "Email address associated to the Gerrit SSH user"
-    required: true
+    description: >
+      Email address associated to the Gerrit SSH user. In GitHub Actions,
+      automatically derived as
+      releng+[ORGANIZATION]-gh2gerrit@linuxfoundation.org when not provided if
+      G2G_ENABLE_DERIVATION=true (default: false). For local CLI usage,
+      derivation is enabled by default; set
+      G2G_ENABLE_DERIVATION=false to disable.
+    required: false
+    default: ""
 
   # Behavior and metadata
   ORGANIZATION:
@@ -67,9 +80,21 @@ inputs:
     required: false
     default: ""
 
+  DUPLICATES:
+    description: >
+      Comma-separated Gerrit statuses to consider for duplicate
+      detection (e.g., open,merged,abandoned)
+    required: false
+    default: "open"
+
   # Optional Gerrit overrides (used when .gitreview is missing)
   GERRIT_SERVER:
-    description: "Gerrit server hostname (optional; use .gitreview if present)"
+    description: >
+      Gerrit server hostname (optional; use .gitreview if present). In GitHub
+      Actions, automatically derived as gerrit.[ORGANIZATION].org when not
+      provided if G2G_ENABLE_DERIVATION=true (default: false). For local CLI
+      usage, derivation is enabled by default; set G2G_ENABLE_DERIVATION=false
+      to disable.
     required: false
     default: ""
   GERRIT_SERVER_PORT:
@@ -191,19 +216,6 @@ runs:
           fi
         fi
 
-    - name: Install SSH key for Gerrit
-      # yamllint disable-line rule:line-length
-      uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4 # v2.7.0
-      with:
-        key: ${{ inputs.GERRIT_SSH_PRIVKEY_G2G }}
-        name: "id_rsa"
-        known_hosts: ${{ inputs.GERRIT_KNOWN_HOSTS }}
-        config: |
-          Host ${{ inputs.GERRIT_SERVER || env.GERRIT_SERVER }}
-            User ${{ inputs.GERRIT_SSH_USER_G2G }}
-            Port ${{ inputs.GERRIT_SERVER_PORT }}
-            PubkeyAcceptedKeyTypes +ssh-rsa
-            IdentityFile ~/.ssh/id_rsa
 
     - name: Run github2gerrit Python CLI
       id: run-cli
@@ -227,6 +239,7 @@ runs:
         DRY_RUN: ${{ inputs.DRY_RUN }}
         ALLOW_DUPLICATES: ${{ inputs.ALLOW_DUPLICATES }}
         ISSUE_ID: ${{ inputs.ISSUE_ID }}
+        DUPLICATES: ${{ inputs.DUPLICATES }}
 
         # Optional Gerrit overrides (when .gitreview is missing)
         GERRIT_SERVER: ${{ inputs.GERRIT_SERVER }}

{github2gerrit-0.1.4 → github2gerrit-0.1.6}/pyproject.toml

@@ -71,10 +71,12 @@ dev = [
 
   # Type checking helpers
   "pytest-mock>=3.14.0",
+  "types-requests>=2.31.0",
+  "types-click>=7.1.8",
 ]
 
 [tool.ruff]
-line-length = 80
+line-length = 120
 target-version = "py311"
 
 [tool.ruff.lint]
@@ -90,7 +92,9 @@ ignore = [
 ]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/*.py" = ["S101", "S105", "PLW0603", "E501", "TRY003"]
+"tests/*.py" = ["S101", "S105", "PLW0603", "TRY003"]
+"sitecustomize.py" = ["S110", "SIM103", "SIM105", "PLW2901"]
+"src/github2gerrit/duplicate_detection.py" = ["S310"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["github2gerrit"]
@@ -121,12 +125,27 @@ exclude = [
   "tests/fixtures/",
 ]
 
+[[tool.mypy.overrides]]
+module = ["pygerrit2", "pygerrit2.*"]
+ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = ["click", "click.*"]
+ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
-module = ["pygerrit2", "pygerrit2.*"]
+module = ["typer", "typer.*"]
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = ["pytest", "pytest.*"]
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = ["tests.*"]
+disallow_untyped_defs = false
+disallow_untyped_calls = false
+
 [tool.coverage.run]
 branch = true
 source = ["src/github2gerrit"]
@@ -153,5 +172,3 @@ testpaths = ["tests"]
 # No extra settings are required here; this stanza reserves the
 # namespace for future use if needed.
 managed = true
-
-

{github2gerrit-0.1.4 → github2gerrit-0.1.6}/sitecustomize.py

@@ -81,7 +81,9 @@ def _iter_cov_candidates(base: Path) -> Iterable[Path]:
         _dbg(f"Failed to iterate {base}: {exc}")
 
 
-def _clean_stale_coverage_files(bases: Iterable[Path], protect: Path | None) -> None:
+def _clean_stale_coverage_files(
+    bases: Iterable[Path], protect: Path | None
+) -> None:
     protected = str(protect.resolve()) if protect else None
     for base in bases:
         try:
@@ -109,7 +111,10 @@ def _ensure_unique_coverage_file() -> Path:
         except Exception:
             # Fall through to create a sane default
             pass
-    unique = Path(tempfile.gettempdir()) / f".coverage.pytest.{os.getpid()}.{uuid.uuid4().hex}"
+    unique = (
+        Path(tempfile.gettempdir())
+        / f".coverage.pytest.{os.getpid()}.{uuid.uuid4().hex}"
+    )
     os.environ["COVERAGE_FILE"] = str(unique)
     return unique