dycw-utilities 0.166.19__tar.gz → 0.166.21__tar.gz

{dycw_utilities-0.166.19 → dycw_utilities-0.166.21}/PKG-INFO

@@ -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 → dycw_utilities-0.166.21}/pyproject.toml

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

{dycw_utilities-0.166.19 → dycw_utilities-0.166.21}/src/tests/test_pydantic_settings_sops.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, ClassVar
 from tests.conftest import SKIPIF_CI
 from utilities.iterables import one
 from utilities.os import temp_environ
-from utilities.pydantic_settings import load_settings
+from utilities.pydantic_settings import PathLikeOrWithSection, load_settings
 from utilities.pydantic_settings_sops import SopsBaseSettings
 from utilities.re import extract_group
 
@@ -16,8 +16,6 @@ if TYPE_CHECKING:
     from collections.abc import Sequence
     from pathlib import Path
 
-    from utilities.types import PathLike
-
 
 class TestSOPSBaseSettings:
     @SKIPIF_CI
@@ -40,7 +38,7 @@ class TestSOPSBaseSettings:
             _ = check_call(["sops", "encrypt", str(unencrypted_file)], stdout=file)
 
         class Settings(SopsBaseSettings):
-            secret_files: ClassVar[Sequence[PathLike]] = [encrypted_file]
+            secret_files: ClassVar[Sequence[PathLikeOrWithSection]] = [encrypted_file]
             x: int
             y: int
 

{dycw_utilities-0.166.19 → dycw_utilities-0.166.21}/src/tests/test_pytest.py

@@ -9,7 +9,12 @@ from pytest import fixture, mark, param, raises
 
 from utilities.iterables import one
 from utilities.os import temp_environ
-from utilities.pytest import NodeIdToPathError, node_id_path, throttle
+from utilities.pytest import (
+    _NodeIdToPathNotGetTailError,
+    _NodeIdToPathNotPythonFileError,
+    node_id_path,
+    throttle,
+)
 
 if TYPE_CHECKING:
     from _pytest.legacypath import Testdir
@@ -51,26 +56,46 @@ class TestNodeIdPath:
         "node_id",
         [
             param("src/tests/module/test_funcs.py::TestClass::test_main"),
+            param("tests/module/test_funcs.py::TestClass::test_main"),
             param(
                 "python/package/src/tests/module/test_funcs.py::TestClass::test_main"
             ),
         ],
     )
     def test_root(self, *, node_id: str) -> None:
-        result = node_id_path(node_id, root="src/tests")
+        result = node_id_path(node_id, root="tests")
         expected = Path("module.test_funcs/TestClass__test_main")
         assert result == expected
 
-    def test_suffix(self) -> None:
-        node_id = "src/tests/module/test_funcs.py::TestClass::test_main"
-        result = node_id_path(node_id, root="src/tests", suffix=".csv")
+    @mark.parametrize(
+        "node_id",
+        [
+            param("src/tests/module/test_funcs.py::TestClass::test_main"),
+            param("tests/module/test_funcs.py::TestClass::test_main"),
+        ],
+    )
+    def test_suffix(self, *, node_id: str) -> None:
+        result = node_id_path(node_id, root="tests", suffix=".csv")
         expected = Path("module.test_funcs/TestClass__test_main.csv")
         assert result == expected
 
-    def test_error_file_suffix(self) -> None:
-        with raises(NodeIdToPathError, match="Node ID must be a Python file; got .*"):
+    def test_error_not_python_file(self) -> None:
+        with raises(
+            _NodeIdToPathNotPythonFileError,
+            match="Node ID must be a Python file; got .*",
+        ):
             _ = node_id_path("src/tests/module/test_funcs.csv::TestClass::test_main")
 
+    def test_error_get_tail_error(self) -> None:
+        with raises(
+            _NodeIdToPathNotGetTailError,
+            match=r"Unable to get the tail of 'tests.+module.+test_funcs' with root 'src.+tests'",
+        ):
+            _ = node_id_path(
+                "tests/module/test_funcs.py::TestClass::test_main",
+                root=Path("src", "tests"),
+            )
+
 
 class TestPytestOptions:
     def test_unknown_mark(self, *, testdir: Testdir) -> None:

{dycw_utilities-0.166.19 → dycw_utilities-0.166.21}/src/utilities/__init__.py

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

{dycw_utilities-0.166.19 → dycw_utilities-0.166.21}/src/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

{dycw_utilities-0.166.19 → dycw_utilities-0.166.21}/src/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}"
+        )
+
+
 ##
 
 

{dycw_utilities-0.166.19 → dycw_utilities-0.166.21}/src/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)