Merge pull request #7 from castedo/pr/package_allowed_signers

move allowed_signers from compat into package

.github/workflows/docs.yml

@@ -3,7 +3,6 @@ name: Docs
 on:
   push:
     branches: [main]
-  pull_request:
 
 # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
 # and committing generated baseprint snapshot to autobaseprint branch

compat/ssh_keygen.py

@@ -6,8 +6,7 @@
 from typing import BinaryIO
 
 from sshsig import InvalidSignature, check_signature, verify
-
-from .allowed_signers import load_for_git_allowed_signers_file
+from sshsig.allowed_signers import load_for_git_allowed_signers_file
 
 
 def cli_subcmd_check_novalidate(

compat/allowed_signers.py → sshsig/allowed_signers.py

@@ -1,14 +1,16 @@
 # (c) 2024 E. Castedo Ellerman <[email protected]>
 # Released under the MIT License (https://spdx.org/licenses/MIT)
 
+"""Parsing of the ssh-keygen allowed signers format."""
+
 from __future__ import annotations
 
 from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING, TextIO
 
-from sshsig import PublicKey
+from .ssh_public_key import PublicKey
 
 
 if TYPE_CHECKING:
@@ -171,7 +173,9 @@ def load_for_git_allowed_signers_file(file: TextIO | Path) -> Iterable[PublicKey
     return for_git_allowed_keys(load_allowed_signers_file(file))
 
 
-def save_for_git_allowed_signers_file(src: set[PublicKey], out: Path | TextIO) -> None:
+def save_for_git_allowed_signers_file(
+    src: Iterable[PublicKey], out: Path | TextIO
+) -> None:
     """Save keys for git to "allowed signers" format per ssh-keygen."""
 
     if isinstance(out, Path):

tests/test_allowed_signers.py

@@ -7,8 +7,7 @@
 from unittest import TestCase
 
 from sshsig import PublicKey
-
-from compat.allowed_signers import AllowedSigner, load_allowed_signers_file
+from sshsig.allowed_signers import AllowedSigner, load_allowed_signers_file
 
 
 TESTDATA_DIR = Path(__file__).parent.parent / "testdata"

tests/test_sshsig.py

@@ -6,9 +6,9 @@
 from unittest import TestCase
 
 from sshsig import sshsig
+from sshsig.allowed_signers import load_for_git_allowed_signers_file
 
 from compat import ssh_keygen
-from compat.allowed_signers import load_for_git_allowed_signers_file
 
 
 TESTDATA_DIR = Path(__file__).parent.parent / "testdata"