dycw-utilities 0.175.22__py3-none-any.whl → 0.175.24__py3-none-any.whl

{dycw_utilities-0.175.22.dist-info → dycw_utilities-0.175.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dycw-utilities
-Version: 0.175.22
+Version: 0.175.24
 Summary: Miscellaneous Python utilities
 Author: Derek Wan
 Author-email: Derek Wan <d.wan@icloud.com>

{dycw_utilities-0.175.22.dist-info → dycw_utilities-0.175.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=sU42IQNdRzdYqP75DUwM7K3Ehuq6BiyoV70DPstqNi4,61
+utilities/__init__.py,sha256=5B4185Je5N1a7pdW809Ek1j0ijDB3zrA5o4fo5XSiuw,61
 utilities/altair.py,sha256=TLfRFbG9HwG7SLXoJ-v0r-t49ZaGgTQZD82cpjVi4vs,9085
 utilities/asyncio.py,sha256=aJySVxBY0gqsIYnoNmH7-1r8djKuf4vSsU69VCD08t8,16772
 utilities/atomicwrites.py,sha256=tPo6r-Rypd9u99u66B9z86YBPpnLrlHtwox_8Z7T34Y,5790
@@ -80,7 +80,7 @@ utilities/sqlalchemy.py,sha256=HQYpd7LFxdTF5WYVWYtCJeEBI71EJm7ytvCGyAH9B-U,37163
 utilities/sqlalchemy_polars.py,sha256=JCGhB37raSR7fqeWV5dTsciRTMVzIdVT9YSqKT0piT0,13370
 utilities/statsmodels.py,sha256=koyiBHvpMcSiBfh99wFUfSggLNx7cuAw3rwyfAhoKpQ,3410
 utilities/string.py,sha256=shmBK87zZwzGyixuNuXCiUbqzfeZ9xlrFwz6JTaRvDk,582
-utilities/subprocess.py,sha256=p8bzzSc9m-E-Vz8p3mulKi2Jo60Mp0qoiou0Kjd5ZjI,45823
+utilities/subprocess.py,sha256=YmFlOyuwsEK_OHH47vbG603_2BgY_pB18IrmCUjA-BE,45980
 utilities/tempfile.py,sha256=a3_M1QyxGZql_VcGkBOQBeWbbkItjgkfIpVyzU1UAic,3843
 utilities/testbook.py,sha256=j1KmaVbrX9VrbeMgtPh5gk55myAsn3dyRUn7jGbPbRk,1294
 utilities/text.py,sha256=7SvwcSR2l_5cOrm1samGnR4C-ZI6qyFLHLzSpO1zeHQ,13958
@@ -97,7 +97,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=F4ek0-OBWxHYrZdmoZt76N2RnNyKY5KrEHt7rqO4AQE,60183
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=tdIScrTB2-B-LH0ukb1HUXKooLknOfJNwHk10MuMYvA,3619
-dycw_utilities-0.175.22.dist-info/WHEEL,sha256=RRVLqVugUmFOqBedBFAmA4bsgFcROUBiSUKlERi0Hcg,79
-dycw_utilities-0.175.22.dist-info/entry_points.txt,sha256=cOGtKeJI0KXLSV7MJ8Dhc2G8jPgDcBDm53MVNJU4ycI,136
-dycw_utilities-0.175.22.dist-info/METADATA,sha256=gFB3Hnr93Qj949yWxcBj1ULGuI6tV_4eM1-L5ptCwm8,1443
-dycw_utilities-0.175.22.dist-info/RECORD,,
+dycw_utilities-0.175.24.dist-info/WHEEL,sha256=RRVLqVugUmFOqBedBFAmA4bsgFcROUBiSUKlERi0Hcg,79
+dycw_utilities-0.175.24.dist-info/entry_points.txt,sha256=cOGtKeJI0KXLSV7MJ8Dhc2G8jPgDcBDm53MVNJU4ycI,136
+dycw_utilities-0.175.24.dist-info/METADATA,sha256=TsMRFyemwh01F5d7kNpuH0fW59FQnbp7yHMGQcPoSD0,1443
+dycw_utilities-0.175.24.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.175.22"
+__version__ = "0.175.24"

utilities/subprocess.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from io import StringIO
 from itertools import repeat
 from pathlib import Path
-from re import search
+from re import MULTILINE, search
 from shlex import join
 from shutil import copyfile, copytree, move, rmtree
 from string import Template
@@ -1169,8 +1169,9 @@ def _ssh_retry_skip(return_code: int, stdout: str, stderr: str, /) -> bool:
 
 def _ssh_is_strict_checking_error(text: str, /) -> bool:
     match = search(
-        "No ED25519 host key is known for .* and you have requested strict checking",
+        "(Host key for .* has changed|No ED25519 host key is known for .*) and you have requested strict checking",
         text,
+        flags=MULTILINE,
     )
     return match is not None
 
@@ -1246,13 +1247,19 @@ def ssh_await(
 
 
 def ssh_keyscan(
-    hostname: str, /, *, path: PathLike = KNOWN_HOSTS, port: int | None = None
+    hostname: str,
+    /,
+    *,
+    path: PathLike = KNOWN_HOSTS,
+    retry: Retry | None = None,
+    port: int | None = None,
 ) -> None:
     """Add a known host."""
-    ssh_keygen_remove(hostname, path=path)  # skipif-ci
-    mkdir(path, parent=True)  # skipif-ci
-    with Path(path).open(mode="a") as fh:  # skipif-ci
-        _ = fh.write(run(*ssh_keyscan_cmd(hostname, port=port), return_=True))
+    ssh_keygen_remove(hostname, path=path, retry=retry)  # skipif-ci
+    result = run(  # skipif-ci
+        *ssh_keyscan_cmd(hostname, port=port), return_=True, retry=retry
+    )
+    tee(path, result, append=True)  # skipif-ci
 
 
 def ssh_keyscan_cmd(hostname: str, /, *, port: int | None = None) -> list[str]:
@@ -1266,11 +1273,13 @@ def ssh_keyscan_cmd(hostname: str, /, *, port: int | None = None) -> list[str]:
 ##
 
 
-def ssh_keygen_remove(hostname: str, /, *, path: PathLike = KNOWN_HOSTS) -> None:
+def ssh_keygen_remove(
+    hostname: str, /, *, path: PathLike = KNOWN_HOSTS, retry: Retry | None = None
+) -> None:
     """Remove a known host."""
     path = Path(path)
     if path.exists():
-        run(*ssh_keygen_remove_cmd(hostname, path=path))
+        run(*ssh_keygen_remove_cmd(hostname, path=path), retry=retry)
 
 
 def ssh_keygen_remove_cmd(