Drop python 3.8 and fix code

Author: penguinolog

.github/workflows/pythonpackage.yml

@@ -104,7 +104,7 @@ jobs:
       max-parallel: 6
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     name: "Script based python ${{ matrix.python-version }} on ${{ matrix.os }}"
     steps:

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer
     - id: trailing-whitespace
     - id: mixed-line-ending
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
     - id: isort
       name: isort (python)
@@ -20,7 +20,7 @@ repos:
       types: [pyi]
 
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 25.1.0
     hooks:
     - id: black
       # It is recommended to specify the latest version of Python
@@ -30,7 +30,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.4.6
+    rev: v0.11.8
     hooks:
     - id: ruff
       args: [ --fix, --exit-non-zero-on-fix ]

classifiers.txt

@@ -4,10 +4,10 @@ Topic :: Software Development :: Libraries :: Python Modules
 License :: OSI Approved :: Apache Software License
 Programming Language :: Python :: 3
 Programming Language :: Python :: 3 :: Only
-Programming Language :: Python :: 3.8
 Programming Language :: Python :: 3.9
 Programming Language :: Python :: 3.10
 Programming Language :: Python :: 3.11
 Programming Language :: Python :: 3.12
+Programming Language :: Python :: 3.19
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: Python :: Implementation :: PyPy

exec_helpers/__init__.py

@@ -20,7 +20,7 @@
 import typing
 import warnings
 
-try:  # noqa: FURB107,SIM105,RUF100
+try:  # noqa:SIM105,RUF100
     from ._version import version as __version__  # noqa: F401
 except ImportError:
     pass

exec_helpers/_helpers.py

@@ -94,5 +94,5 @@ def chroot_command(command: str, chroot_path: str | None = None, chroot_exe: str
     if chroot_path and chroot_path != "/":
         chroot_dst: str = shlex.quote(chroot_path.strip())
         quoted_command = shlex.quote(command)
-        return f'{chroot_exe} {chroot_dst} sh -c {shlex.quote(f"eval {quoted_command}")}'
+        return f"{chroot_exe} {chroot_dst} sh -c {shlex.quote(f'eval {quoted_command}')}"
     return command

exec_helpers/_ssh_base.py

@@ -19,6 +19,7 @@
 from __future__ import annotations
 
 import concurrent.futures
+import contextlib
 import copy
 import datetime
 import getpass
@@ -135,7 +136,7 @@ def stdout(self) -> paramiko.channel.ChannelFile | None:
         return super().stdout
 
 
-class _SSHExecuteContext(api.ExecuteContext, typing.ContextManager[SshExecuteAsyncResult]):
+class _SSHExecuteContext(api.ExecuteContext, contextlib.AbstractContextManager[SshExecuteAsyncResult]):
     """SSH Execute context."""
 
     __slots__ = (
@@ -358,7 +359,7 @@ def __exit__(
             self.__chan = None
 
 
-class _SudoContext(typing.ContextManager[None]):
+class _SudoContext(contextlib.AbstractContextManager[None]):
     """Context manager for call commands with sudo.
 
     :param ssh: Connection instance.
@@ -389,7 +390,7 @@ def __exit__(
         self.__ssh.sudo_mode = self.__sudo_status
 
 
-class _KeepAliveContext(typing.ContextManager[None]):
+class _KeepAliveContext(contextlib.AbstractContextManager[None]):
     """Context manager for keepalive management.
 
     :param ssh: Connection instance.
@@ -869,7 +870,8 @@ def __del__(self) -> None:
         try:
             self.__ssh.close()
         except BaseException as e:  # pragma: no cover  # NOSONAR
-            self.logger.debug(f"Exception in {self!s} destructor call: {e}")
+            with contextlib.suppress(AttributeError):
+                self.logger.debug(f"Exception in {self!s} destructor call: {e}")
         self.__sftp = None
 
     def __exit__(
@@ -995,12 +997,12 @@ def _prepare_command(self, cmd: str, chroot_path: str | None = None, chroot_exe:
             return super()._prepare_command(cmd=cmd, chroot_path=chroot_path, chroot_exe=chroot_exe)
         quoted_command: str = shlex.quote(cmd)
         if chroot_path is self._chroot_path is None:
-            return f'sudo -S sh -c {shlex.quote(f"eval {quoted_command}")}'
+            return f"sudo -S sh -c {shlex.quote(f'eval {quoted_command}')}"
         if chroot_path is not None:
             target_path: str = shlex.quote(chroot_path)
         else:
             target_path = shlex.quote(self._chroot_path)  # type: ignore[arg-type]
-        return f'{chroot_exe} {target_path} sudo sh -c {shlex.quote(f"eval {quoted_command}")}'
+        return f"{chroot_exe} {target_path} sudo sh -c {shlex.quote(f'eval {quoted_command}')}"
 
     def _exec_command(  # type: ignore[override]
         self,

exec_helpers/_ssh_helpers.py

@@ -5,17 +5,17 @@
 import functools
 import pathlib
 import typing
+from collections import UserDict
+from collections.abc import Collection
 
 import paramiko
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Collection
-
     # noinspection PyPackageRequirements
     import logwrap
 
-SSHConfigDictLikeT = typing.Dict[str, typing.Union[str, int, bool, typing.Collection[str]]]
-SSHConfigsDictT = typing.Dict[str, SSHConfigDictLikeT]
+SSHConfigDictLikeT = dict[str, typing.Union[str, int, bool, Collection[str]]]
+SSHConfigsDictT = dict[str, SSHConfigDictLikeT]
 
 
 # Parse default SSHConfig if available
@@ -379,7 +379,7 @@ def controlmaster(self) -> bool | None:
         return self.__controlmaster
 
 
-class HostsSSHConfigs(typing.Dict[str, SSHConfig]):
+class HostsSSHConfigs(UserDict[str, SSHConfig]):
     """Specific dictionary for managing SSHConfig records.
 
     Instead of creating a new record by request, just generate default value and return if not exists.

exec_helpers/api.py

@@ -21,10 +21,14 @@
 from __future__ import annotations
 
 import abc
+import contextlib
 import logging
 import pathlib
+import re
 import threading
 import typing
+from collections.abc import Callable
+from collections.abc import Iterable
 
 from exec_helpers import constants
 from exec_helpers import exceptions
@@ -55,13 +59,13 @@
     "OptionalTimeoutT",
 )
 
-CommandT = typing.Union[str, typing.Iterable[str]]
-LogMaskReT = typing.Union[str, typing.Pattern[str], None]
+CommandT = typing.Union[str, Iterable[str]]
+LogMaskReT = typing.Union[str, re.Pattern[str], None]
 ErrorInfoT = typing.Optional[str]
 ChRootPathSetT = typing.Optional[typing.Union[str, pathlib.Path]]
-ExpectedExitCodesT = typing.Iterable[ExitCodeT]
+ExpectedExitCodesT = Iterable[ExitCodeT]
 OptionalTimeoutT = typing.Union[int, float, None]
-CalledProcessErrorSubClassT = typing.Type[exceptions.CalledProcessError]
+CalledProcessErrorSubClassT = type[exceptions.CalledProcessError]
 
 
 class ExecuteAsyncResult(typing.NamedTuple):
@@ -74,7 +78,7 @@ class ExecuteAsyncResult(typing.NamedTuple):
     started: datetime.datetime
 
 
-class ExecuteContext(typing.ContextManager[ExecuteAsyncResult], abc.ABC):
+class ExecuteContext(contextlib.AbstractContextManager[ExecuteAsyncResult], abc.ABC):
     """Execute context manager."""
 
     __slots__ = (
@@ -165,7 +169,7 @@ def open_stderr(self) -> bool:
 
 
 # noinspection PyProtectedMember
-class _ChRootContext(typing.ContextManager[None]):
+class _ChRootContext(contextlib.AbstractContextManager[None]):
     """Context manager for call commands with chroot.
 
     :param conn: Connection instance.
@@ -219,8 +223,8 @@ def __exit__(
 
 
 class ExecHelper(
-    typing.Callable[..., exec_result.ExecResult],  # type: ignore[misc]
-    typing.ContextManager["ExecHelper"],
+    Callable[..., exec_result.ExecResult],  # type: ignore[misc]
+    contextlib.AbstractContextManager["ExecHelper"],
     abc.ABC,
 ):
     """ExecHelper global API.

exec_helpers/async_api/api.py

@@ -21,9 +21,12 @@
 
 import abc
 import asyncio
+import contextlib
 import logging
 import pathlib
 import typing
+from collections.abc import Awaitable
+from collections.abc import Callable
 
 from exec_helpers import api
 from exec_helpers import constants
@@ -62,7 +65,7 @@
 )
 
 
-class ExecuteContext(typing.AsyncContextManager[api.ExecuteAsyncResult], abc.ABC):
+class ExecuteContext(contextlib.AbstractAsyncContextManager[api.ExecuteAsyncResult], abc.ABC):
     """Execute context manager."""
 
     __slots__ = (
@@ -153,7 +156,7 @@ def open_stderr(self) -> bool:
 
 
 # noinspection PyProtectedMember
-class _ChRootContext(typing.AsyncContextManager[None]):
+class _ChRootContext(contextlib.AbstractAsyncContextManager[None]):
     """Async extension for chroot.
 
     :param conn: Connection instance.
@@ -203,8 +206,8 @@ async def __aexit__(
 
 
 class ExecHelper(
-    typing.Callable[..., typing.Awaitable["ExecHelper"]],  # type: ignore[misc]
-    typing.AsyncContextManager["ExecHelper"],
+    Callable[..., Awaitable["ExecHelper"]],  # type: ignore[misc]
+    contextlib.AbstractAsyncContextManager["ExecHelper"],
     abc.ABC,
 ):
     """Subprocess helper with timeouts and lock-free FIFO.

exec_helpers/async_api/subprocess.py

@@ -106,7 +106,9 @@ def stdout(self) -> AsyncIterable[bytes] | None:  # type: ignore[override]
         return super().stdout  # type: ignore[return-value]
 
 
-class _SubprocessExecuteContext(api.ExecuteContext, typing.AsyncContextManager[SubprocessExecuteAsyncResult]):
+class _SubprocessExecuteContext(
+    api.ExecuteContext, contextlib.AbstractAsyncContextManager[SubprocessExecuteAsyncResult]
+):
     """Subprocess Execute context."""
 
     __slots__ = ("__cwd", "__env", "__process")
@@ -390,7 +392,7 @@ def open_execute_context(
         if env_patch is not None:
             # make mutable copy
             env = dict(copy.deepcopy(os.environ) if env is None else copy.deepcopy(env))  # type: ignore[arg-type]
-            env.update(env_patch)  # type: ignore[arg-type]
+            env.update(env_patch)
         return _SubprocessExecuteContext(
             command=f"{self._prepare_command(cmd=command, chroot_path=chroot_path, chroot_exe=chroot_exe)}\n",
             stdin=None if stdin is None else self._string_bytes_bytearray_as_bytes(stdin),

exec_helpers/exceptions.py

@@ -274,7 +274,7 @@ def __init__(
 class ParallelCallExceptionsError(ParallelCallProcessError):
     """Exception raised during parallel call as result of exceptions."""
 
-    __slots__ = ("cmd", "exceptions")
+    __slots__ = ("exceptions",)
 
     def __init__(
         self,

exec_helpers/exec_result.py

@@ -802,8 +802,8 @@ def __str__(self) -> str:
         if self.started:
             started = f"\tstarted={self.started.strftime('%Y-%m-%d %H:%M:%S')},\n"
             if self.timestamp:
-                _spent = (self.timestamp - self.started).seconds
-                spent = f"\tspent={_spent // (60 * 60):02d}:{_spent // 60:02d}:{_spent % 60:02d},\n"
+                spent_ = (self.timestamp - self.started).seconds
+                spent = f"\tspent={spent_ // (60 * 60):02d}:{spent_ // 60:02d}:{spent_ % 60:02d},\n"
             else:
                 spent = ""
         else:

exec_helpers/ssh_auth.py

@@ -21,6 +21,7 @@
 import copy
 import logging
 import typing
+from collections import UserDict
 
 import paramiko
 
@@ -74,7 +75,7 @@ def __init__(
         self.__username: str | None = username
         self.__password: str | None = password
 
-        self.__keys: list[None | paramiko.PKey] = []
+        self.__keys: list[paramiko.PKey | None] = []
 
         if key is not None:
             # noinspection PyTypeChecker
@@ -298,22 +299,22 @@ def __repr__(self) -> str:
         :rtype: str
         """
         if self.__keys[self.__key_index] is None:
-            _key: str | None = None
+            key: str | None = None
         else:
-            _key = f"<private for pub: {self.public_key}>"
-        _keys: list[str | None] = []
+            key = f"<private for pub: {self.public_key}>"
+        keys: list[str | None] = []
         for idx, k in enumerate(self.__keys):
             if idx == self.__key_index:
                 continue
             # noinspection PyTypeChecker
-            _keys.append(f"<private for pub: {self.__get_public_key(key=k)}>" if k is not None else None)
+            keys.append(f"<private for pub: {self.__get_public_key(key=k)}>" if k is not None else None)
 
         return (
             f"{self.__class__.__name__}("
             f"username={self.username!r}, "
             f"password=<*masked*>, "
-            f"key={_key}, "
-            f"keys={_keys}, "
+            f"key={key}, "
+            f"keys={keys}, "
             f"key_filename={self.key_filename!r}, "
             f"passphrase=<*masked*>,"
             f")"
@@ -328,7 +329,7 @@ def __str__(self) -> str:
         return f"{self.__class__.__name__} for {self.username}"
 
 
-class SSHAuthMapping(typing.Dict[str, SSHAuth]):
+class SSHAuthMapping(UserDict[str, SSHAuth]):
     """Specific dictionary for ssh hostname - auth mapping.
 
     Keys are always string and saved/collected lowercase.