dycw-utilities 0.147.0__tar.gz → 0.147.2__tar.gz

{dycw_utilities-0.147.0 → dycw_utilities-0.147.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.147.0
+Version: 0.147.2
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.147.0 → dycw_utilities-0.147.2}/pyproject.toml

@@ -102,7 +102,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.147.0"
+version = "0.147.2"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -135,7 +135,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.147.0"
+current_version = "0.147.2"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.147.0 → dycw_utilities-0.147.2}/src/tests/test_traceback.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING
 
 from hypothesis import given
 from hypothesis.strategies import sampled_from
-from pytest import CaptureFixture, raises
+from pytest import CaptureFixture, mark, param, raises
 
 from utilities.iterables import one
 from utilities.traceback import (
@@ -17,10 +17,14 @@ from utilities.traceback import (
     format_exception_stack,
     make_except_hook,
 )
+from utilities.tzlocal import LOCAL_TIME_ZONE_NAME
+from utilities.whenever import get_now
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
 
+    from utilities.types import MaybeCallableZonedDateTime
+
 
 class TestFormatExceptionStack:
     @classmethod
@@ -41,15 +45,18 @@ class TestFormatExceptionStack:
             result = format_exception_stack(error).splitlines()
             self._assert_lines(result)
 
-    def test_header(self) -> None:
+    @mark.parametrize("start", [param(get_now), param(None)])
+    def test_header(self, *, start: MaybeCallableZonedDateTime) -> None:
         try:
             _ = self.func(1, 2, 3, 4, c=5, d=6, e=7)
         except AssertionError as error:
-            result = format_exception_stack(error, header=True).splitlines()
+            result = format_exception_stack(
+                error, header=True, start=start
+            ).splitlines()
             patterns = [
-                r"^Date/time  \| .+$",
-                r"^Started    \| .+$",
-                r"^Duration   \| .+$",
+                rf"^Date/time  \| \d{{8}}T\d{{6}}\[{LOCAL_TIME_ZONE_NAME}\]$",
+                rf"^Started    \| (\d{{8}}T\d{{6}}\[{LOCAL_TIME_ZONE_NAME}\]|)$",
+                r"^Duration   \| (-?PT\d+\.\d+S|)$",
                 r"^User       \| .+$",
                 r"^Host       \| .+$",
                 r"^Process ID \| \d+$",

{dycw_utilities-0.147.0 → dycw_utilities-0.147.2}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.147.0"
+__version__ = "0.147.2"

{dycw_utilities-0.147.0 → dycw_utilities-0.147.2}/src/utilities/pottery.py

@@ -175,7 +175,9 @@ async def _get_first_available_lock(
     )
     async with timeout_td(timeout, error=error):  # skipif-ci-and-not-linux
         while True:
-            if (result := await _get_first_available_lock_if_any(locks)) is not None:
+            if (
+                (result := await _get_first_available_lock_if_any(locks)) is not None
+            ) and (await result.locked() > 0.0):
                 return result
             await sleep_td(sleep)
 

{dycw_utilities-0.147.0 → dycw_utilities-0.147.2}/src/utilities/slack_sdk.py

@@ -66,7 +66,7 @@ class SendToSlackError(Exception):
     def __str__(self) -> str:
         code = self.response.status_code  # pragma: no cover
         phrase = HTTPStatus(code).phrase  # pragma: no cover
-        return f"Error sending to Slack:\n\n{self.text}\n\n{code}: {phrase}"  # pragma: no cover
+        return f"Error sending to Slack; got error code {code} ({phrase})"  # pragma: no cover
 
 
 __all__ = ["SendToSlackError", "send_to_slack", "send_to_slack_async"]

{dycw_utilities-0.147.0 → dycw_utilities-0.147.2}/src/utilities/traceback.py

@@ -6,6 +6,7 @@ from dataclasses import dataclass
 from functools import partial
 from getpass import getuser
 from itertools import repeat
+from logging import exception
 from os import getpid
 from pathlib import Path
 from socket import gethostname
@@ -26,6 +27,7 @@ from utilities.reprlib import (
     RICH_MAX_WIDTH,
     yield_mapping_repr,
 )
+from utilities.tzlocal import LOCAL_TIME_ZONE_NAME
 from utilities.version import get_version
 from utilities.whenever import (
     format_compact,
@@ -98,7 +100,10 @@ def _yield_header_lines(
     now = get_now_local()
     start_use = to_zoned_date_time(date_time=start)
     yield f"Date/time  | {format_compact(now)}"
-    start_str = "" if start_use is None else format_compact(start_use)
+    if start_use is None:
+        start_str = ""
+    else:
+        start_str = format_compact(start_use.to_tz(LOCAL_TIME_ZONE_NAME))
     yield f"Started    | {start_str}"
     delta = None if start_use is None else (now - start_use)
     delta_str = "" if delta is None else delta.format_common_iso()
@@ -277,9 +282,14 @@ def _make_except_hook_inner(
         with writer(path, overwrite=True) as temp:
             _ = temp.write_text(full)
     if slack_url is not None:  # pragma: no cover
-        from utilities.slack_sdk import send_to_slack
+        from utilities.slack_sdk import SendToSlackError, send_to_slack
+
+        try:
+            send_to_slack(slack_url, f"```{slim}```")
+        except SendToSlackError as error:
+            msg = str(error)
+            exception(msg)  # noqa: LOG015
 
-        send_to_slack(slack_url, f"```{slim}```")
     if to_bool(bool_=pudb):  # pragma: no cover
         from pudb import post_mortem