speedtest-ssh 2.10.1__tar.gz → 2.11.0__tar.gz

{speedtest_ssh-2.10.1/speedtest_ssh.egg-info → speedtest_ssh-2.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: speedtest_ssh
-Version: 2.10.1
+Version: 2.11.0
 Summary: A tool meant to check inter-device speeds via ssh
 License: GPL
 Project-URL: Homepage, https://github.com/zwimer/speedtest_ssh

{speedtest_ssh-2.10.1 → speedtest_ssh-2.11.0}/pyproject.toml

@@ -55,9 +55,10 @@ line-length = 120
 target-version = ["py312"]
 
 [tool.ruff]
-ignore = ["E731"]
 line-length = 120
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint]
+ignore = ["E731", "I001"]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "F403"]
 
 [tool.bandit]

speedtest_ssh-2.11.0/speedtest_ssh/_version.py

@@ -0,0 +1 @@
+__version__: str = "2.11.0"

{speedtest_ssh-2.10.1 → speedtest_ssh-2.11.0}/speedtest_ssh/data_transfer.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 from subprocess import CalledProcessError, PIPE
 from logging import getLogger, DEBUG, INFO
-from typing import TYPE_CHECKING
-from datetime import datetime
+from typing import TYPE_CHECKING, Self
+from datetime import UTC, datetime
 from pathlib import Path
 import random
 import string
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
     from paramiko import SFTPClient
 
 
-__all__ = ("DataTransfer", "SFTP", "Rsync")
+__all__ = ("SFTP", "DataTransfer", "Rsync")
 
 
 _dict = string.ascii_uppercase + string.ascii_lowercase + string.digits
@@ -61,14 +61,14 @@ class DataTransfer:
         :param config: The Config object the DataTransfer instance should use
         """
         self._l = getLogger(self._LOG)
-        self._remote_f: str = f"/tmp/speedtest-ssh_{datetime.now()}_{_rand_str(8)}.tmp"
+        self._remote_f: str = f"/tmp/speedtest-ssh_{datetime.now(tz=UTC)}_{_rand_str(8)}.tmp"
         self._remote_f = self._remote_f.replace(":", "-").replace(" ", "_")
         # We promise that _remote_f components match: ^[a-zA-Z\d_.-]+$ (old rsync args suck)
         self._l.debug("Parsing ssh config and loading keys...")
         self._sftp_cm = sftp_wrapper(config)
         self._sftp: SFTPClient  # Defined in __enter__
 
-    def __enter__(self) -> DataTransfer:
+    def __enter__(self) -> Self:
         self._l.debug("Chosen remote file name: %s", self._remote_f)
         self._sftp = self._sftp_cm.__enter__()
         return self

{speedtest_ssh-2.10.1 → speedtest_ssh-2.11.0}/speedtest_ssh/ping.py

@@ -4,7 +4,6 @@ from sys import platform
 
 from .util import find_exe, tee_cmd
 
-
 __all__ = ("PingFailed", "ping")
 
 

speedtest_ssh-2.11.0/speedtest_ssh/py.typed

@@ -0,0 +1 @@
+

{speedtest_ssh-2.10.1 → speedtest_ssh-2.11.0}/speedtest_ssh/speedtest_ssh.py

@@ -14,7 +14,6 @@ from .data_transfer import DataTransfer, SFTP, Rsync
 from .ping import ping as ping_test
 from ._version import __version__
 
-
 base_size = 2 * (1024**2)
 _password_env_name = "SPEEDTEST_SSH_PASSWORD"  # nosec B105
 _LOG_VERBOSITY: dict[int, int] = {0: WARNING, 1: INFO, 2: DEBUG}
@@ -72,21 +71,23 @@ def speedtest_ssh(seconds: int, ping: bool, mode: str, conf: Config) -> None:
     log = getLogger(_LOG)
     ping_delay: float | None = ping_test(conf.host) if ping else None
     print("Connecting...")
-    with (Rsync if mode == "rsync" else SFTP)(conf) as remote:
-        with NTF(prefix="speedtest_ssh.", dir="/tmp", delete_on_close=False) as ntf:
-            ntf.close()
-            temp = Path(ntf.name)
-            log.debug("Created temporary file: %s", temp)
-            print("Testing...")
-            nano_sec: int = 0
-            size: int = base_size
-            remaining: int = int(1e9) * seconds
-            while int(1.5 * nano_sec) < remaining - 1:  # Try to get close to seconds
-                size *= 2 ** (0 if not nano_sec else max(1, int(math.log(remaining / nano_sec, 2))))
-                # ^ Faster than just *=2
-                up_t, down_t = _iteration(temp, remote, size)
-                nano_sec = up_t + down_t
-                remaining -= nano_sec
+    with (
+        (Rsync if mode == "rsync" else SFTP)(conf) as remote,
+        NTF(prefix="speedtest_ssh.", dir="/tmp", delete_on_close=False) as ntf,
+    ):
+        ntf.close()
+        temp = Path(ntf.name)
+        log.debug("Created temporary file: %s", temp)
+        print("Testing...")
+        nano_sec: int = 0
+        size: int = base_size
+        remaining: int = int(1e9) * seconds
+        while int(1.5 * nano_sec) < remaining - 1:  # Try to get close to seconds
+            size *= 2 ** (0 if not nano_sec else max(1, int(math.log2(remaining / nano_sec))))
+            # ^ Faster than just *=2
+            up_t, down_t = _iteration(temp, remote, size)
+            nano_sec = up_t + down_t
+            remaining -= nano_sec
     log.debug(f"\n{'*'*30} Final Results {'*'*30}")
     _print_results(ping_delay, up_t, down_t, size)
 

{speedtest_ssh-2.10.1 → speedtest_ssh-2.11.0}/speedtest_ssh/util.py

@@ -5,7 +5,6 @@ import subprocess
 import shlex
 import os
 
-
 __all__ = ("find_exe", "run_cmd")
 
 
@@ -43,7 +42,7 @@ def run_cmd(cmd: Path, *args: str | Path, **kwargs) -> subprocess.CompletedProce
     :return: Completed process
     """
     _log_cmd(cmd, args)
-    return subprocess.run((cmd, *args), **kwargs)  # nosec B603
+    return subprocess.run((cmd, *args), **kwargs)  # nosec B603  # noqa: PLW1510
 
 
 def tee_cmd(cmd: Path, *args: str | Path, level: int, **kwargs) -> tuple[subprocess.Popen, str]:

{speedtest_ssh-2.10.1 → speedtest_ssh-2.11.0/speedtest_ssh.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: speedtest_ssh
-Version: 2.10.1
+Version: 2.11.0
 Summary: A tool meant to check inter-device speeds via ssh
 License: GPL
 Project-URL: Homepage, https://github.com/zwimer/speedtest_ssh

speedtest_ssh-2.10.1/speedtest_ssh/_version.py

@@ -1 +0,0 @@
-__version__: str = "2.10.1"

speedtest_ssh-2.10.1/speedtest_ssh/py.typed

@@ -1 +0,0 @@
-PARTIAL