dycw-utilities 0.131.19__tar.gz → 0.131.20__tar.gz

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/PKG-INFO

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

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/pyproject.toml

@@ -94,7 +94,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.131.19"
+version = "0.131.20"
 
 [project.optional-dependencies]
 logging = [
@@ -121,7 +121,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.131.19"
+current_version = "0.131.20"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/src/tests/test_datetime.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
 import datetime as dt
-from re import search
 from typing import TYPE_CHECKING
 
-from hypothesis import assume, given
+from hypothesis import given
 from hypothesis.strategies import DataObject, data, dates, integers, sampled_from
 from pytest import mark, param, raises
 
@@ -17,12 +16,11 @@ from utilities.datetime import (
     _ParseTwoDigitYearInvalidStringError,
     date_to_month,
     ensure_month,
-    maybe_sub_pct_y,
     parse_month,
     parse_two_digit_year,
     serialize_month,
 )
-from utilities.hypothesis import months, text_clean
+from utilities.hypothesis import months
 from utilities.zoneinfo import UTC
 
 if TYPE_CHECKING:
@@ -36,14 +34,6 @@ class TestDateToMonth:
         assert result == date
 
 
-class TestMaybeSubPctY:
-    @given(text=text_clean())
-    def test_main(self, *, text: str) -> None:
-        result = maybe_sub_pct_y(text)
-        _ = assume(not search("%Y", result))
-        assert not search("%Y", result)
-
-
 class TestMonth:
     @mark.parametrize(
         ("month", "n", "expected"),

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/src/tests/test_platform.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+from re import search
 from typing import TYPE_CHECKING, assert_never
 
-from hypothesis import given
+from hypothesis import assume, given
 from hypothesis.strategies import sampled_from, sets
 
-from utilities.hypothesis import text_ascii
+from utilities.hypothesis import text_ascii, text_clean
 from utilities.platform import (
     IS_LINUX,
     IS_MAC,
@@ -17,6 +18,7 @@ from utilities.platform import (
     SYSTEM,
     System,
     get_max_pid,
+    get_strftime,
     get_system,
     maybe_yield_lower_case,
 )
@@ -51,6 +53,14 @@ class TestGetMaxPID:
                 assert_never(never)
 
 
+class TestGetStrftime:
+    @given(text=text_clean())
+    def test_main(self, *, text: str) -> None:
+        result = get_strftime(text)
+        _ = assume(not search("%Y", result))
+        assert not search("%Y", result)
+
+
 class TestGetSystem:
     def test_function(self) -> None:
         assert get_system() in get_args(System)

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.131.19"
+__version__ = "0.131.20"

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/src/utilities/datetime.py

@@ -2,11 +2,10 @@ from __future__ import annotations
 
 import datetime as dt
 from dataclasses import dataclass, replace
-from re import search, sub
+from re import search
 from typing import Any, Self, assert_never, overload, override
 
 from utilities.iterables import OneEmptyError, one
-from utilities.platform import SYSTEM
 from utilities.types import MaybeStr
 from utilities.zoneinfo import UTC
 
@@ -41,22 +40,6 @@ class EnsureMonthError(Exception):
 ##
 
 
-def maybe_sub_pct_y(text: str, /) -> str:
-    """Substitute the `%Y' token with '%4Y' if necessary."""
-    match SYSTEM:
-        case "windows":  # skipif-not-windows
-            return text
-        case "mac":  # skipif-not-macos
-            return text
-        case "linux":  # skipif-not-linux
-            return sub("%Y", "%4Y", text)
-        case _ as never:
-            assert_never(never)
-
-
-##
-
-
 @dataclass(order=True, unsafe_hash=True, slots=True)
 class Month:
     """Represents a month in time."""

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/src/utilities/platform.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from pathlib import Path
 from platform import system
+from re import sub
 from typing import TYPE_CHECKING, Literal, assert_never, override
 
 if TYPE_CHECKING:
@@ -69,6 +70,22 @@ MAX_PID = get_max_pid()
 ##
 
 
+def get_strftime(text: str, /) -> str:
+    """Get a platform-specific format string."""
+    match SYSTEM:
+        case "windows":  # skipif-not-windows
+            return text
+        case "mac":  # skipif-not-macos
+            return text
+        case "linux":  # skipif-not-linux
+            return sub("%Y", "%4Y", text)
+        case _ as never:
+            assert_never(never)
+
+
+##
+
+
 def maybe_yield_lower_case(text: Iterable[str], /) -> Iterator[str]:
     """Yield lower-cased text if the platform is case-insentive."""
     match SYSTEM:
@@ -94,6 +111,7 @@ __all__ = [
     "GetSystemError",
     "System",
     "get_max_pid",
+    "get_strftime",
     "get_system",
     "maybe_yield_lower_case",
 ]

{dycw_utilities-0.131.19 → dycw_utilities-0.131.20}/src/utilities/whenever2.py

@@ -18,8 +18,8 @@ from whenever import (
     ZonedDateTime,
 )
 
-from utilities.datetime import maybe_sub_pct_y
 from utilities.math import sign
+from utilities.platform import get_strftime
 from utilities.sentinel import Sentinel, sentinel
 from utilities.tzlocal import LOCAL_TIME_ZONE, LOCAL_TIME_ZONE_NAME
 from utilities.zoneinfo import UTC, get_time_zone_name
@@ -148,7 +148,7 @@ def datetime_utc(
 def format_compact(datetime: ZonedDateTime, /) -> str:
     """Convert a zoned datetime to the local time zone, then format."""
     py_datetime = datetime.round().to_tz(LOCAL_TIME_ZONE_NAME).to_plain().py_datetime()
-    return py_datetime.strftime(maybe_sub_pct_y("%Y%m%dT%H%M%S"))
+    return py_datetime.strftime(get_strftime("%Y%m%dT%H%M%S"))
 
 
 ##