dycw-utilities 0.166.19__py3-none-any.whl → 0.166.21__py3-none-any.whl

{dycw_utilities-0.166.19.dist-info → dycw_utilities-0.166.21.dist-info}/METADATA

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

{dycw_utilities-0.166.19.dist-info → dycw_utilities-0.166.21.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=k8myIMc86meItIQjAhmQS8ML5HKIpWmNGFvwEy-C31M,61
+utilities/__init__.py,sha256=X2YbMqUPwpJb6zXgoy6sq5FDjCkXba4dKqbURe75W3w,61
 utilities/aeventkit.py,sha256=ddoleSwW9zdc2tjX5Ge0pMKtYwV_JMxhHYOxnWX2AGM,12609
 utilities/altair.py,sha256=nHdpWt8ZwdUwRQN970MvHd5bRWokNqzHcZQEdSHKRuE,9033
 utilities/asyncio.py,sha256=PUedzQ5deqlSECQ33sam9cRzI9TnygHz3FdOqWJWPTM,15288
@@ -54,9 +54,9 @@ utilities/pqdm.py,sha256=idv2seRVP2f6NeSfpeEnT5A-tQezaHZKDyeu16g2-0E,3091
 utilities/psutil.py,sha256=KUlu4lrUw9Zg1V7ZGetpWpGb9DB8l_SSDWGbANFNCPU,2104
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utilities/pydantic_settings.py,sha256=bFr9UDrVhdqTl7O_TPutCLdsQ5rUp--nO76-_F8z0bs,5102
-utilities/pydantic_settings_sops.py,sha256=lQc0ltEbQvxXoV0GgHZRYsXJh3VZFbk7x6o_lqFmvoU,1913
+utilities/pydantic_settings_sops.py,sha256=m2uB9wDw1PU2CiSL7KwxulDXT0STjOZTu3Ctc2q7jc0,1943
 utilities/pyinstrument.py,sha256=hnXaL-4HE7wWBI5JKaPfYTpsrXe68YiuZKahHV0VJn8,841
-utilities/pytest.py,sha256=Pu8jmeNQq659uQmZsmFj6lb0sHMDsNN3fcd6M21J-ww,7723
+utilities/pytest.py,sha256=pl4j9-GReiYQMZkAFOGxsHIO_DcTHbJ_VaiLPFrw57g,8370
 utilities/pytest_regressions.py,sha256=ocjHTtfOeiGfQAKIei8pKNd61sxN9dawrJJ9gPt2wzA,4097
 utilities/random.py,sha256=hZlH4gnAtoaofWswuJYjcygejrY8db4CzP-z_adO2Mo,4165
 utilities/re.py,sha256=S4h-DLL6ScMPqjboZ_uQ1BVTJajrqV06r_81D--_HCE,4573
@@ -90,9 +90,9 @@ utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=tdIScrTB2-B-LH0ukb1HUXKooLknOfJNwHk10MuMYvA,3619
 utilities/pytest_plugins/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 utilities/pytest_plugins/pytest_randomly.py,sha256=B1qYVlExGOxTywq2r1SMi5o7btHLk2PNdY_b1p98dkE,409
-utilities/pytest_plugins/pytest_regressions.py,sha256=9v8kAXDM2ycIXJBimoiF4EgrwbUvxTycFWJiGR_GHhM,1466
-dycw_utilities-0.166.19.dist-info/METADATA,sha256=TUp3VLjdjotA6WA4T1UwBqRzudU6iYlKU-5FV0359AQ,1702
-dycw_utilities-0.166.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.166.19.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
-dycw_utilities-0.166.19.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.166.19.dist-info/RECORD,,
+utilities/pytest_plugins/pytest_regressions.py,sha256=mnHYBfdprz50UGVkVzV1bZERZN5CFfoF8YbokGxdFwU,1639
+dycw_utilities-0.166.21.dist-info/METADATA,sha256=QaOBA9ZPw7DqBXar1Vm0SZ4xiZoAMnLI9yKI4e84jTU,1702
+dycw_utilities-0.166.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.166.21.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
+dycw_utilities-0.166.21.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.166.21.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.166.19"
+__version__ = "0.166.21"

utilities/pydantic_settings_sops.py

@@ -7,6 +7,7 @@ from pydantic_settings_sops import SOPSConfigSettingsSource
 
 from utilities.pydantic_settings import (
     CustomBaseSettings,
+    PathLikeOrWithSection,
     _ensure_section,
     _get_section,
 )
@@ -17,14 +18,14 @@ if TYPE_CHECKING:
     from pydantic_settings import BaseSettings, PydanticBaseSettingsSource
     from pydantic_settings.sources import PathType
 
-    from utilities.types import MaybeSequenceStr, PathLike
+    from utilities.types import MaybeSequenceStr
 
 
 class SopsBaseSettings(CustomBaseSettings):
     """Base settings for loading secrets using `sops/age`."""
 
     # paths
-    secret_files: ClassVar[Sequence[PathLike]] = ()
+    secret_files: ClassVar[Sequence[PathLikeOrWithSection]] = []
 
     @classmethod
     @override

utilities/pytest.py

@@ -13,7 +13,13 @@ from utilities.atomicwrites import writer
 from utilities.functools import cache
 from utilities.hashlib import md5_hash
 from utilities.os import get_env_var
-from utilities.pathlib import ensure_suffix, get_root, get_tail, module_path
+from utilities.pathlib import (
+    _GetTailEmptyError,
+    ensure_suffix,
+    get_root,
+    get_tail,
+    module_path,
+)
 from utilities.platform import (
     IS_LINUX,
     IS_MAC,
@@ -118,10 +124,15 @@ def node_id_path(
     path_file, *parts = node_id.split("::")
     path_file = Path(path_file)
     if path_file.suffix != ".py":
-        raise NodeIdToPathError(node_id=node_id)
+        raise _NodeIdToPathNotPythonFileError(node_id=node_id)
     path = path_file.with_suffix("")
     if root is not None:
-        path = get_tail(path, root)
+        try:
+            path = get_tail(path, root)
+        except _GetTailEmptyError as error:
+            raise _NodeIdToPathNotGetTailError(
+                node_id=node_id, path=error.path, root=error.root
+            ) from None
     path = Path(module_path(path), "__".join(parts))
     if suffix is not None:
         path = ensure_suffix(path, suffix)
@@ -132,11 +143,26 @@ def node_id_path(
 class NodeIdToPathError(Exception):
     node_id: str
 
+
+@dataclass(kw_only=True, slots=True)
+class _NodeIdToPathNotPythonFileError(NodeIdToPathError):
     @override
     def __str__(self) -> str:
         return f"Node ID must be a Python file; got {self.node_id!r}"
 
 
+@dataclass(kw_only=True, slots=True)
+class _NodeIdToPathNotGetTailError(NodeIdToPathError):
+    path: PathLike
+    root: PathLike
+
+    @override
+    def __str__(self) -> str:
+        return (
+            f"Unable to get the tail of {str(self.path)!r} with root {str(self.root)!r}"
+        )
+
+
 ##
 
 

utilities/pytest_plugins/pytest_regressions.py

@@ -41,11 +41,15 @@ else:
 
 def _get_path(request: FixtureRequest, /) -> Path:
     from utilities.pathlib import get_root
-    from utilities.pytest import node_id_path
+    from utilities.pytest import _NodeIdToPathNotGetTailError, node_id_path
 
     path = Path(cast("Any", request).fspath)
     root = Path("src", "tests")
-    tail = node_id_path(request.node.nodeid, root=root)
+    try:
+        tail = node_id_path(request.node.nodeid, root=root)
+    except _NodeIdToPathNotGetTailError:
+        root = Path("tests")
+        tail = node_id_path(request.node.nodeid, root=root)
     return get_root(path).joinpath(root, "regressions", tail)