panda-pytest-assertions 0.1.0__tar.gz → 0.2.0__tar.gz

{panda_pytest_assertions-0.1.0 → panda_pytest_assertions-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panda-pytest-assertions
-Version: 0.1.0
+Version: 0.2.0
 Summary: Complex assertions that can be used when writing test with pytest
 Home-page: https://github.com/KRunchPL/panda-pytest-assertions
 License: Apache-2.0

{panda_pytest_assertions-0.1.0 → panda_pytest_assertions-0.2.0}/panda_pytest_assertions/assert_context/__init__.py

@@ -6,10 +6,11 @@ pytest.register_assert_rewrite(__name__ + '._assert_context')
 # isort: on
 
 
-from ._assert_context import assert_context, AssertContext
+from ._assert_context import assert_context, AssertContext, ExceptionMatch
 
 
 __all__ = [
     'assert_context',
     'AssertContext',
+    'ExceptionMatch',
 ]

{panda_pytest_assertions-0.1.0 → panda_pytest_assertions-0.2.0}/panda_pytest_assertions/assert_context/_assert_context.py

@@ -1,6 +1,6 @@
 from collections.abc import Generator
 from contextlib import contextmanager, ExitStack, nullcontext
-from typing import Any, overload
+from typing import Any, NamedTuple, overload
 
 import pytest
 
@@ -32,18 +32,29 @@ class AssertContext:
         assert expected_result == self._result
 
 
+class ExceptionMatch(NamedTuple):
+    #: type of expected exception
+    type_: type[BaseException]
+    #: match parameter passed to pytest.raises
+    match_: str
+
+
 @overload
 @contextmanager
 def assert_context(  # noqa: D418
     *,
-    exception: type[Exception] | _Unset = ...,
+    exception: type[BaseException] | ExceptionMatch | None | _Unset = ...,
     result: Any | _Unset = ...,  # noqa: ANN401
 ) -> Generator[AssertContext, None, None]:
     """
     Context manager that makes sure `with` block behaved according to the arguments.
 
-    If the `exception` parameter is set, the `with` block is expected to raise an exception of provided type.
-    If it is NOT set, the `with` block is expected NOT TO raise any exceptions.
+    If the `exception` parameter is set to exception type, the `with` block is expected to raise an exception
+    of provided type. If the `exception` parameter is set to an instance of `ExceptionMatch` class, the `with`
+    block is expected to raise an exception of type specified in `type_` field and the value that matches the
+    string specified in `match_` field. For exact matching logic see `match` parameter of the `pytest.raises`.
+    If the `exception` parameter is NOT set or is set to `None`, the `with` block is expected NOT TO raise
+    any exceptions.
 
     If the `result` parameter is set, its value is expected to be equal to `with` block result. The `with`
     block result is set with the `set` method of an object yielded by the context manager. The comparison
@@ -51,7 +62,7 @@ def assert_context(  # noqa: D418
     If the `result` parameter is NOT set, the `set` method of yielded object is expected
     not to be called at all.
 
-    :param exception: type of exception, expected to be raised
+    :param exception: specification of exception, expected to be raised
     :param result: value expected to be set with `set` method of yielded object
     """
 
@@ -60,7 +71,7 @@ def assert_context(  # noqa: D418
 @contextmanager
 def assert_context(  # noqa: D418
     *,
-    behaviour: type[Exception] | Any | _Unset = ...,  # noqa: ANN401
+    behaviour: type[BaseException] | ExceptionMatch | Any | _Unset = ...,  # noqa: ANN401
 ) -> Generator[AssertContext, None, None]:
     """
     Context manager that makes sure `with` block behaved according to the arguments.
@@ -68,9 +79,11 @@ def assert_context(  # noqa: D418
     Context manager yields a single object used that provides `set` method used to set the `with`
     block result that is to be asserted.
 
-    If the `behaviour` parameter is set to an exception type, the `with` block is expected
-    to raise an exception of provided type and the `set` method of yielded object is expected
-    not to be called at all.
+    If the `behaviour` parameter is set to exception type, the `with` block is expected to raise an exception
+    of provided type. If the `behaviour` parameter is set to an instance of `ExceptionMatch` class, the `with`
+    block is expected to raise an exception of type specified in `type_` field and the value that matches the
+    string specified in `match_` field. For exact matching logic see `match` parameter of the `pytest.raises`.
+    In both cases the `set` method of yielded object is expected not to be called at all.
 
     If the `behaviour` parameter is set to anything else, its value is expected to be equal to `with`
     block result. The comparison is used with `==` operator, where `result` argument is on the left side and
@@ -86,20 +99,24 @@ def assert_context(  # noqa: D418
 @contextmanager
 def assert_context(
     *,
-    exception: type[Exception] | _Unset = _UNSET,
+    exception: type[BaseException] | ExceptionMatch | None | _Unset = _UNSET,
     result: Any | _Unset = _UNSET,
-    behaviour: type[Exception] | Any | _Unset = _UNSET,
+    behaviour: type[BaseException] | ExceptionMatch | Any | _Unset = _UNSET,
 ) -> Generator[AssertContext, None, None]:
     """
     Context manager that makes sure `with` block behaved according to the arguments.
 
     Pair of parameters `exception` and `result` are exclusive with parameter `behaviour`. If `behaviour`
-    is set to an exception type, it is the same as if `exception` would be set to this value and `result`
-    would not be set. If `behaviour` is set to any other value, its treated as the value of `result` and the
-    `exception` remains unset.
+    is set to an exception type or `ExceptionMatch` instance, it is the same as if `exception` would be set to
+    this value and `result` would not be set. If `behaviour` is set to any other value, its treated as the
+    value of `result` and the `exception` remains unset.
 
-    If the `exception` parameter is set, the `with` block is expected to raise an exception of provided type.
-    If it is NOT set, the `with` block is expected NOT TO raise any exceptions.
+    If the `exception` parameter is set to exception type, the `with` block is expected to raise an exception
+    of provided type. If the `exception` parameter is set to an instance of `ExceptionMatch` class, the `with`
+    block is expected to raise an exception of type specified in `type_` field and the value that matches the
+    string specified in `match_` field. For exact matching logic see `match` parameter of the `pytest.raises`.
+    If the `exception` parameter is NOT set or is set to `None`, the `with` block is expected NOT TO raise
+    any exceptions.
 
     If the `result` parameter is set, its value is expected to be equal to `with` block result. The `with`
     block result is set with the `set` method of an object yielded by the context manager. The comparison
@@ -107,7 +124,7 @@ def assert_context(
     If the `result` parameter is NOT set, the `set` method of yielded object is expected
     not to be called at all.
 
-    :param exception: type of exception, expected to be raised
+    :param exception: specification of exception, expected to be raised
     :param result: value expected to be set with `set` method of yielded object
     :param behaviour: a common name for `exception` and `result` parameters, exclusive to them
     :yield: object used to set the result of a `with` block
@@ -115,12 +132,26 @@ def assert_context(
     if behaviour != _UNSET:
         assert exception == _UNSET
         assert result == _UNSET
-        if isinstance(behaviour, type) and issubclass(behaviour, Exception):
+        if isinstance(behaviour, ExceptionMatch) or (
+            isinstance(behaviour, type) and issubclass(behaviour, BaseException)
+        ):
             exception = behaviour
         else:
             result = behaviour
+    if isinstance(exception, ExceptionMatch):
+        match_ = exception.match_
+        exception = exception.type_
+    else:
+        match_ = None
     context = AssertContext()
-    exception_behaviour = nullcontext() if isinstance(exception, _Unset) else pytest.raises(exception)
+    exception_behaviour = (
+        nullcontext()
+        if isinstance(exception, _Unset | None)
+        else pytest.raises(
+            exception,
+            match=match_,
+        )
+    )
 
     with ExitStack() as behaviours_stack:
         behaviours_stack.enter_context(context.assert_result_equal(result))

{panda_pytest_assertions-0.1.0 → panda_pytest_assertions-0.2.0}/panda_pytest_assertions/assert_object/_converters/expectation_from_yaml.py

@@ -71,7 +71,7 @@ def _(loader: ExpectationYamlLoader, node: yaml.Node) -> Stringified:
             problem_mark=node.start_mark,
         )
     # I was not able to produce yaml that would return something else than a string
-    node_data = cast(str, loader.construct_scalar(node))
+    node_data = loader.construct_scalar(node)
     return Stringified(node_data)
 
 

{panda_pytest_assertions-0.1.0 → panda_pytest_assertions-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "panda-pytest-assertions"
-version = "0.1.0"
+version = "0.2.0"
 description = "Complex assertions that can be used when writing test with pytest"
 authors = ["Cyber Panda <krunchfrompoland@gmail.com>"]
 readme = "README.md"
@@ -19,18 +19,18 @@ pyyaml = "^6.0.1"
 
 [tool.poetry.group.dev.dependencies]
 darglint = "^1.8.1"
-flake8 = "^7.0.0"
-ruff = "^0.4.3"
-mypy = "~1.10.0"
-pytest-cov = "^5.0.0"
+flake8 = "^7.1.1"
+ruff = "^0.7.3"
+mypy = "~1.13.0"
+pytest-cov = "^6.0.0"
 pytest-mock = "^3.14.0"
 munch = "^4.0.0"
 munch-stubs = "^0.1.2"
-types-pyyaml = "^6.0.12.20240311"
+types-pyyaml = "^6.0.12.20240917"
 
 [tool.poetry.group.docs.dependencies]
-mkdocs-material = "^9.5.22"
-mike = "^2.1.1"
+mkdocs-material = "^9.5.44"
+mike = "^2.1.3"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]