exec-helpers 8.1.2__tar.gz → 8.1.3__tar.gz

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer
@@ -8,7 +8,7 @@ repos:
     - id: mixed-line-ending
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 9.0.0a3
     hooks:
     - id: isort
       name: isort (python)
@@ -20,7 +20,7 @@ repos:
       types: [pyi]
 
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 26.3.1
     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.15.12
     hooks:
     - id: ruff
       args: [ --fix, --exit-non-zero-on-fix ]

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/PKG-INFO

@@ -1,11 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: exec-helpers
-Version: 8.1.2
+Version: 8.1.3
 Summary: Execution helpers for simplified usage of subprocess and ssh.
-Home-page: https://github.com/python-useful-helpers/exec-helpers
-Author-email: Alexey Stepanov <penguinolog@gmail.com>
+Author-email: Aleksei Stepanov <penguinolog@gmail.com>
 Maintainer-email: Aleksei Stepanov <penguinolog@gmail.com>, Antonio Esposito <esposito.cloud@gmail.com>, Dennis Dmitriev <dis-xcom@gmail.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Documentation, https://exec-helpers.readthedocs.io/
 Project-URL: Repository, https://github.com/python-useful-helpers/exec-helpers
 Project-URL: Bug Tracker, https://github.com/python-useful-helpers/exec-helpers/issues
@@ -13,36 +12,35 @@ Keywords: subprocess,ssh
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.8.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: paramiko>=2.4
 Requires-Dist: tenacity>=4.4.0
 Requires-Dist: psutil>=5.0
 Provides-Extra: xml
-Requires-Dist: defusedxml; extra == "xml"
 Provides-Extra: lxml
 Requires-Dist: lxml>=4.6.2; extra == "lxml"
 Provides-Extra: yaml
 Requires-Dist: PyYAML>=3.12; extra == "yaml"
 Provides-Extra: all-formats
-Requires-Dist: defusedxml; extra == "all-formats"
 Requires-Dist: lxml>=4.6.2; extra == "all-formats"
 Requires-Dist: PyYAML>=3.12; extra == "all-formats"
 Provides-Extra: all-formats
-Requires-Dist: defusedxml; extra == "all-formats"
 Requires-Dist: lxml>=4.6.2; extra == "all-formats"
 Requires-Dist: PyYAML>=3.12; extra == "all-formats"
+Dynamic: license-file
 
 exec-helpers
 ============

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/classifiers.txt

@@ -1,13 +1,14 @@
 Development Status :: 5 - Production/Stable
 Intended Audience :: Developers
 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.13
+Programming Language :: Python :: 3.14
+Programming Language :: Python :: 3.15
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: Python :: Implementation :: PyPy

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/exec_helpers/__init__.py

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

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/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-8.1.2 → exec_helpers-8.1.3}/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 @@ class SshExecuteAsyncResult(api.ExecuteAsyncResult):
         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 @@ class _SSHExecuteContext(api.ExecuteContext, typing.ContextManager[SshExecuteAsy
             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 @@ class _SudoContext(typing.ContextManager[None]):
         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 @@ class SSHClientBase(api.ExecHelper):
         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 @@ class SSHClientBase(api.ExecHelper):
             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-8.1.2 → exec_helpers-8.1.3}/exec_helpers/_ssh_helpers.py

@@ -5,17 +5,16 @@ from __future__ import annotations
 import functools
 import pathlib
 import typing
+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 +378,7 @@ class SSHConfig:
         return self.__controlmaster
 
 
-class HostsSSHConfigs(typing.Dict[str, SSHConfig]):
+class HostsSSHConfigs(dict[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-8.1.3/exec_helpers/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '8.1.3'
+__version_tuple__ = version_tuple = (8, 1, 3)
+
+__commit_id__ = commit_id = 'g88b7c628a'

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/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 @@ __all__ = (
     "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 @@ class ExecuteContext(typing.ContextManager[ExecuteAsyncResult], abc.ABC):
 
 
 # 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 @@ class _ChRootContext(typing.ContextManager[None]):
 
 
 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-8.1.2 → exec_helpers-8.1.3}/exec_helpers/async_api/api.py

@@ -21,9 +21,12 @@ from __future__ import annotations
 
 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 @@ __all__ = (
 )
 
 
-class ExecuteContext(typing.AsyncContextManager[api.ExecuteAsyncResult], abc.ABC):
+class ExecuteContext(contextlib.AbstractAsyncContextManager[api.ExecuteAsyncResult], abc.ABC):
     """Execute context manager."""
 
     __slots__ = (
@@ -153,7 +156,7 @@ class ExecuteContext(typing.AsyncContextManager[api.ExecuteAsyncResult], abc.ABC
 
 
 # noinspection PyProtectedMember
-class _ChRootContext(typing.AsyncContextManager[None]):
+class _ChRootContext(contextlib.AbstractAsyncContextManager[None]):
     """Async extension for chroot.
 
     :param conn: Connection instance.
@@ -203,8 +206,8 @@ class _ChRootContext(typing.AsyncContextManager[None]):
 
 
 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-8.1.2 → exec_helpers-8.1.3}/exec_helpers/async_api/subprocess.py

@@ -106,7 +106,9 @@ class SubprocessExecuteAsyncResult(subprocess.SubprocessExecuteAsyncResult):
         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")
@@ -389,8 +391,8 @@ class Subprocess(api.ExecHelper):
         """
         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 = dict(copy.deepcopy(os.environ) if env is None else copy.deepcopy(env))
+            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-8.1.2 → exec_helpers-8.1.3}/exec_helpers/exceptions.py

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

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/exec_helpers/exec_result.py

@@ -25,6 +25,7 @@ import json
 import logging
 import threading
 import typing
+import xml.etree
 
 from exec_helpers import exceptions
 from exec_helpers import proc_enums
@@ -38,11 +39,6 @@ try:
     from ruamel import yaml as ruamel_yaml
 except ImportError:
     ruamel_yaml = None  # type: ignore[assignment]
-try:
-    # noinspection PyPackageRequirements
-    import defusedxml.ElementTree
-except ImportError:
-    defusedxml = None  # pylint: disable=invalid-name
 try:
     # noinspection PyPackageRequirements
     import lxml.etree  # nosec
@@ -50,7 +46,6 @@ except ImportError:
     lxml = None  # pylint: disable=invalid-name
 
 if typing.TYPE_CHECKING:
-    import xml.etree.ElementTree as ET  # nosec  # for typing only
     from collections.abc import Callable
     from collections.abc import Collection
     from collections.abc import Iterable
@@ -673,19 +668,17 @@ class ExecResult:
                     return yaml.safe_load(self.stdout_str)  # pragma: no cover
                 return ruamel_yaml.YAML(typ="safe").load(self.stdout_str)  # nosec  # Safe
 
-    if defusedxml is not None:
-        # noinspection PyUnresolvedReferences
-        @property
-        @_handle_deserialize("xml")
-        def stdout_xml(self) -> ET.Element:
-            """XML from stdout.
+    @property
+    @_handle_deserialize("xml")
+    def stdout_xml(self) -> xml.etree.ElementTree.Element:  # type: ignore[name-defined]
+        """XML from stdout.
 
-            :return: Decoded XML document.
-            :rtype: xml.etree.ElementTree.Element
-            :raises DeserializeValueError: STDOUT cannot be deserialized as XML.
-            """
-            with self.stdout_lock:
-                return defusedxml.ElementTree.fromstring(b"".join(self.stdout))  # type: ignore[no-any-return]
+        :return: Decoded XML document.
+        :rtype: xml.etree.ElementTree.Element
+        :raises DeserializeValueError: STDOUT cannot be deserialized as XML.
+        """
+        with self.stdout_lock:
+            return xml.etree.ElementTree.fromstring(b"".join(self.stdout))  # type: ignore[attr-defined]
 
     if lxml is not None:
 
@@ -724,11 +717,10 @@ class ExecResult:
             "stderr_lines",
             "stdout_json",
             "lock",
+            "stdout_xml",
         ]
         if yaml is not None or ruamel_yaml is not None:
             content.append("stdout_yaml")
-        if defusedxml is not None:
-            content.append("stdout_xml")
         if lxml is not None:
             content.append("stdout_lxml")
         return content
@@ -802,8 +794,8 @@ class ExecResult:
         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-8.1.2 → exec_helpers-8.1.3}/exec_helpers/ssh_auth.py

@@ -21,6 +21,7 @@ from __future__ import annotations
 import copy
 import logging
 import typing
+from collections import UserDict
 
 import paramiko
 
@@ -74,7 +75,7 @@ class SSHAuth:
         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 @@ class SSHAuth:
         :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 @@ class SSHAuth:
         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.

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/exec_helpers/subprocess.py

@@ -19,6 +19,7 @@
 from __future__ import annotations
 
 import concurrent.futures
+import contextlib
 import copy
 import datetime
 import errno
@@ -28,6 +29,7 @@ import pathlib
 import subprocess  # nosec  # Expected usage
 import typing
 import warnings
+from collections.abc import Mapping
 
 from exec_helpers import api
 from exec_helpers import constants
@@ -51,9 +53,7 @@ if typing.TYPE_CHECKING:
 
 __all__ = ("CwdT", "EnvT", "Subprocess", "SubprocessExecuteAsyncResult")
 
-EnvT = typing.Optional[
-    typing.Union[typing.Mapping[bytes, typing.Union[bytes, str]], typing.Mapping[str, typing.Union[bytes, str]]]
-]
+EnvT = typing.Optional[Mapping[str, str]]
 CwdT = typing.Optional[typing.Union[str, bytes, pathlib.Path]]
 
 
@@ -105,7 +105,7 @@ class SubprocessExecuteAsyncResult(api.ExecuteAsyncResult):
         return super().stdout
 
 
-class _SubprocessExecuteContext(api.ExecuteContext, typing.ContextManager[SubprocessExecuteAsyncResult]):
+class _SubprocessExecuteContext(api.ExecuteContext, contextlib.AbstractContextManager[SubprocessExecuteAsyncResult]):
     """Subprocess Execute context."""
 
     __slots__ = ("__cwd", "__env", "__process")
@@ -411,8 +411,8 @@ class Subprocess(api.ExecHelper):
         """
         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 = dict(copy.deepcopy(os.environ) if env is None else copy.deepcopy(env))
+            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-8.1.2 → exec_helpers-8.1.3}/exec_helpers.egg-info/PKG-INFO

@@ -1,11 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: exec-helpers
-Version: 8.1.2
+Version: 8.1.3
 Summary: Execution helpers for simplified usage of subprocess and ssh.
-Home-page: https://github.com/python-useful-helpers/exec-helpers
-Author-email: Alexey Stepanov <penguinolog@gmail.com>
+Author-email: Aleksei Stepanov <penguinolog@gmail.com>
 Maintainer-email: Aleksei Stepanov <penguinolog@gmail.com>, Antonio Esposito <esposito.cloud@gmail.com>, Dennis Dmitriev <dis-xcom@gmail.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Documentation, https://exec-helpers.readthedocs.io/
 Project-URL: Repository, https://github.com/python-useful-helpers/exec-helpers
 Project-URL: Bug Tracker, https://github.com/python-useful-helpers/exec-helpers/issues
@@ -13,36 +12,35 @@ Keywords: subprocess,ssh
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.8.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: paramiko>=2.4
 Requires-Dist: tenacity>=4.4.0
 Requires-Dist: psutil>=5.0
 Provides-Extra: xml
-Requires-Dist: defusedxml; extra == "xml"
 Provides-Extra: lxml
 Requires-Dist: lxml>=4.6.2; extra == "lxml"
 Provides-Extra: yaml
 Requires-Dist: PyYAML>=3.12; extra == "yaml"
 Provides-Extra: all-formats
-Requires-Dist: defusedxml; extra == "all-formats"
 Requires-Dist: lxml>=4.6.2; extra == "all-formats"
 Requires-Dist: PyYAML>=3.12; extra == "all-formats"
 Provides-Extra: all-formats
-Requires-Dist: defusedxml; extra == "all-formats"
 Requires-Dist: lxml>=4.6.2; extra == "all-formats"
 Requires-Dist: PyYAML>=3.12; extra == "all-formats"
+Dynamic: license-file
 
 exec-helpers
 ============

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/exec_helpers.egg-info/SOURCES.txt

@@ -12,7 +12,6 @@ mypy_requirements.txt
 pyproject.toml
 pytest_requirements.txt
 requirements.txt
-setup.py
 exec_helpers/__init__.py
 exec_helpers/__init__.pyi
 exec_helpers/_helpers.py

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/exec_helpers.egg-info/requires.txt

@@ -3,12 +3,10 @@ tenacity>=4.4.0
 psutil>=5.0
 
 [all-formats]
-defusedxml
 lxml>=4.6.2
 PyYAML>=3.12
 
 [all_formats]
-defusedxml
 lxml>=4.6.2
 PyYAML>=3.12
 
@@ -16,7 +14,6 @@ PyYAML>=3.12
 lxml>=4.6.2
 
 [xml]
-defusedxml
 
 [yaml]
 PyYAML>=3.12

{exec_helpers-8.1.2 → exec_helpers-8.1.3}/pyproject.toml

@@ -11,11 +11,11 @@ build-backend="setuptools.build_meta"
 [project]
 name = "exec-helpers"
 description = "Execution helpers for simplified usage of subprocess and ssh."
-requires-python = ">=3.8.0"
+requires-python = ">=3.9.0"
 keywords = ["subprocess", "ssh"]
-license={text="Apache-2.0"}  # Use SPDX classifier
+license="Apache-2.0"  # Use SPDX classifier
 readme = {file = "README.rst", content-type = "text/x-rst"}
-authors=[{name="Alexey Stepanov", email="penguinolog@gmail.com"}]
+authors=[{name="Aleksei Stepanov", email="penguinolog@gmail.com"}]
 maintainers=[
   {name="Aleksei Stepanov", email="penguinolog@gmail.com"},
   {name="Antonio Esposito", email="esposito.cloud@gmail.com"},
@@ -53,11 +53,11 @@ dependencies = {file = ["requirements.txt"]}
 classifiers = {file = ["classifiers.txt"]}
 
 [project.optional-dependencies]
-xml = ["defusedxml"]
+xml = []
 lxml = ["lxml>=4.6.2"]
 yaml = ["PyYAML>=3.12"]
-all_formats = ["defusedxml", "lxml>=4.6.2", "PyYAML>=3.12"]
-all-formats = ["defusedxml", "lxml>=4.6.2", "PyYAML>=3.12"]
+all_formats = ["lxml>=4.6.2", "PyYAML>=3.12"]
+all-formats = ["lxml>=4.6.2", "PyYAML>=3.12"]
 
 [tool.distutils.bdist_wheel]
 universal = 0
@@ -67,7 +67,7 @@ write_to = "exec_helpers/_version.py"
 
 [tool.black]
 line-length = 120
-target-version = ["py38"]
+target-version = ["py39"]
 
 [tool.isort]
 line_length = 120
@@ -104,7 +104,6 @@ pretty = true
 [[tool.mypy.overrides]]
 module = [
   "psutil",
-  "defusedxml.*",
   "lxml.*"
 ]
 ignore_missing_imports = true
@@ -160,7 +159,7 @@ pretty_print = true
 [tool.ruff]
 line-length = 120
 output-format = "full"
-target-version = "py38"
+target-version = "py39"
 
 [tool.ruff.lint]
 extend-select = [
@@ -191,6 +190,7 @@ extend-ignore = [
   "PLR6301",  # "maybe staticmethod"
   "RET504",  # Unnecessary variable assignment before return statement
   "SIM108",  # Use ternary operator,
+  "S314",  # use "defusedxml" which is stale
   "TRY003",  # long messages prepare outside, ...
   "TID252",  # relative imports from parent modules
 ]
@@ -209,7 +209,7 @@ convention = "pep257"
 docstring-code-format = true
 
 [tool.refurb]
-python_version = "3.8"
+python_version = "3.9"
 enable_all = true
 ignore = ["FURB120"]
 
@@ -217,7 +217,7 @@ ignore = ["FURB120"]
 extension-pkg-whitelist = ["lxml.etree"]
 ignore = ["CVS", "_version.py"]
 jobs = 0
-py-version = "3.8"
+py-version = "3.9"
 
 load-plugins = [
   "pylint.extensions.docparams",
@@ -247,6 +247,7 @@ disable = [
   "too-many-locals",
   "too-many-statements",
   "too-many-instance-attributes",
+  "too-many-positional-arguments",
   "too-many-lines",
   "broad-except",
   "logging-fstring-interpolation",

exec_helpers-8.1.2/exec_helpers/_version.py

@@ -1,16 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple, Union
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '8.1.2'
-__version_tuple__ = version_tuple = (8, 1, 2)

exec_helpers-8.1.2/setup.py

@@ -1,40 +0,0 @@
-#    Copyright 2018 - 2023 Aleksei Stepanov aka penguinolog
-
-#    Copyright 2016 Mirantis, Inc.
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Execution helpers for simplified usage of subprocess and ssh."""
-
-from __future__ import annotations
-
-# External Dependencies
-import setuptools
-
-PACKAGE_NAME = "exec_helpers"
-
-setuptools.setup(
-    name=PACKAGE_NAME.replace("_", "-"),
-    url="https://github.com/python-useful-helpers/exec-helpers",
-    python_requires=">=3.8.0",
-    # While setuptools cannot deal with pre-installed incompatible versions,
-    # setting a lower bound is not harmful - it makes error messages cleaner. DO
-    # NOT set an upper bound on setuptools, as that will lead to uninstallable
-    # situations as progressive releases of projects are done.
-    setup_requires=[
-        "setuptools >= 61.0.0",
-        "setuptools_scm[toml]>=6.2",
-        "wheel",
-    ],
-    package_data={PACKAGE_NAME: ["py.typed"]},
-)