From aeb9c4cb393468ea4e1b387993a3af51781ab28e Mon Sep 17 00:00:00 2001 From: Semyon Moroz Date: Tue, 5 Aug 2025 11:38:21 +0000 Subject: [PATCH] [paramiko] Update to 4.0.* (#14527) Closes: #14524 --- stubs/paramiko/METADATA.toml | 2 +- stubs/paramiko/paramiko/__init__.pyi | 53 ++++------------------------ stubs/paramiko/paramiko/_version.pyi | 2 -- stubs/paramiko/paramiko/dsskey.pyi | 35 ------------------ stubs/paramiko/paramiko/ssh_gss.pyi | 2 -- 5 files changed, 7 insertions(+), 87 deletions(-) delete mode 100644 stubs/paramiko/paramiko/_version.pyi delete mode 100644 stubs/paramiko/paramiko/dsskey.pyi diff --git a/stubs/paramiko/METADATA.toml b/stubs/paramiko/METADATA.toml index 045d214a6..1531573c8 100644 --- a/stubs/paramiko/METADATA.toml +++ b/stubs/paramiko/METADATA.toml @@ -1,4 +1,4 @@ -version = "3.5.*" +version = "4.0.*" upstream_repository = "https://github.com/paramiko/paramiko" # Requires a version of cryptography where cryptography.hazmat.primitives.ciphers.Cipher is generic requires = ["cryptography>=37.0.0"] diff --git a/stubs/paramiko/paramiko/__init__.pyi b/stubs/paramiko/paramiko/__init__.pyi index b6538e0c3..648141acf 100644 --- a/stubs/paramiko/paramiko/__init__.pyi +++ b/stubs/paramiko/paramiko/__init__.pyi @@ -1,3 +1,5 @@ +from typing import Final + from paramiko import util as util from paramiko.agent import Agent as Agent, AgentKey as AgentKey from paramiko.channel import Channel as Channel, ChannelFile as ChannelFile @@ -10,7 +12,6 @@ from paramiko.client import ( ) from paramiko.common import io_sleep as io_sleep from paramiko.config import SSHConfig as SSHConfig, SSHConfigDict as SSHConfigDict -from paramiko.dsskey import DSSKey as DSSKey from paramiko.ecdsakey import ECDSAKey as ECDSAKey from paramiko.ed25519key import Ed25519Key as Ed25519Key from paramiko.file import BufferedFile as BufferedFile @@ -40,49 +41,7 @@ from paramiko.ssh_exception import ( ) from paramiko.transport import SecurityOptions as SecurityOptions, Transport as Transport -__author__: str -__license__: str -__all__ = [ - "Agent", - "AgentKey", - "AuthenticationException", - "AutoAddPolicy", - "BadAuthenticationType", - "BadHostKeyException", - "BufferedFile", - "Channel", - "ChannelException", - "ConfigParseError", - "CouldNotCanonicalize", - "DSSKey", - "ECDSAKey", - "Ed25519Key", - "HostKeys", - "Message", - "MissingHostKeyPolicy", - "PKey", - "PasswordRequiredException", - "ProxyCommand", - "ProxyCommandFailure", - "RSAKey", - "RejectPolicy", - "SFTP", - "SFTPAttributes", - "SFTPClient", - "SFTPError", - "SFTPFile", - "SFTPHandle", - "SFTPServer", - "SFTPServerInterface", - "SSHClient", - "SSHConfig", - "SSHConfigDict", - "SSHException", - "SecurityOptions", - "ServerInterface", - "SubsystemHandler", - "Transport", - "WarningPolicy", - "io_sleep", - "util", -] +__version__: Final[str] +__author__: Final[str] +__license__: Final[str] +key_classes: list[type[PKey]] diff --git a/stubs/paramiko/paramiko/_version.pyi b/stubs/paramiko/paramiko/_version.pyi deleted file mode 100644 index 8faa8a2d7..000000000 --- a/stubs/paramiko/paramiko/_version.pyi +++ /dev/null @@ -1,2 +0,0 @@ -__version_info__: tuple[int, int, int] -__version__: str diff --git a/stubs/paramiko/paramiko/dsskey.pyi b/stubs/paramiko/paramiko/dsskey.pyi deleted file mode 100644 index 59b419275..000000000 --- a/stubs/paramiko/paramiko/dsskey.pyi +++ /dev/null @@ -1,35 +0,0 @@ -from _typeshed import FileDescriptorOrPath, ReadableBuffer -from collections.abc import Callable -from typing import IO - -from paramiko.message import Message -from paramiko.pkey import PKey - -class DSSKey(PKey): - p: int | None - q: int | None - g: int | None - y: int | None - x: int | None - public_blob: None - size: int - def __init__( - self, - msg: Message | None = None, - data: ReadableBuffer | None = None, - filename: FileDescriptorOrPath | None = None, - password: str | None = None, - vals: tuple[int, int, int, int] | None = None, - file_obj: IO[str] | None = None, - ) -> None: ... - def asbytes(self) -> bytes: ... - def __hash__(self) -> int: ... - def get_name(self) -> str: ... - def get_bits(self) -> int: ... - def can_sign(self) -> bool: ... - def sign_ssh_data(self, data: bytes, algorithm: str | None = None) -> Message: ... - def verify_ssh_sig(self, data: bytes, msg: Message) -> bool: ... - def write_private_key_file(self, filename: FileDescriptorOrPath, password: str | None = None) -> None: ... - def write_private_key(self, file_obj: IO[str], password: str | None = None) -> None: ... - @staticmethod - def generate(bits: int = 1024, progress_func: Callable[..., object] | None = None) -> DSSKey: ... diff --git a/stubs/paramiko/paramiko/ssh_gss.pyi b/stubs/paramiko/paramiko/ssh_gss.pyi index 89f234681..49d6ca88d 100644 --- a/stubs/paramiko/paramiko/ssh_gss.pyi +++ b/stubs/paramiko/paramiko/ssh_gss.pyi @@ -25,8 +25,6 @@ class _SSH_GSSAPI_OLD(_SSH_GSSAuth): def credentials_delegated(self) -> bool: ... def save_client_creds(self, client_token: str) -> None: ... -_SSH_GSSAPI = _SSH_GSSAPI_OLD - class _SSH_GSSAPI_NEW(_SSH_GSSAuth): def __init__(self, auth_method: str, gss_deleg_creds: bool) -> None: ... def ssh_init_sec_context(