assertpy2 2.3.1__tar.gz → 2.3.2__tar.gz

{assertpy2-2.3.1 → assertpy2-2.3.2}/.github/workflows/ci.yml

@@ -64,3 +64,6 @@ jobs:
 
       - name: Ruff format check
         run: uv run ruff format --check .
+
+      - name: Type check
+        run: uv run ty check assertpy2/

{assertpy2-2.3.1 → assertpy2-2.3.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: assertpy2
-Version: 2.3.1
-Summary: Fluent assertion library for Python with full type safety and soft assertions
+Version: 2.3.2
+Summary: Fluent assertion library for Python with composable matchers, structural matching, and full type safety
 Project-URL: Homepage, https://github.com/Solganis/assertpy2
 Project-URL: Repository, https://github.com/Solganis/assertpy2
 Project-URL: Issues, https://github.com/Solganis/assertpy2/issues
@@ -52,9 +52,9 @@ Description-Content-Type: text/markdown
   <a href="https://pepy.tech/projects/assertpy2"><img src="https://static.pepy.tech/badge/assertpy2/month" alt="Downloads"></a>
   <a href="https://pypi.org/project/assertpy2/"><img src="https://img.shields.io/pypi/pyversions/assertpy2" alt="Python"></a>
   <a href="https://codecov.io/gh/Solganis/assertpy2"><img src="https://codecov.io/gh/Solganis/assertpy2/graph/badge.svg" alt="Coverage"></a>
-  <a href="https://github.com/Solganis/assertpy2/blob/main/LICENSE"><img src="https://img.shields.io/github/license/Solganis/assertpy2" alt="License"></a>
   <a href="https://docs.astral.sh/ruff/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff"></a>
   <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="uv"></a>
+  <a href="https://github.com/astral-sh/ty"><img src="https://img.shields.io/badge/type--checker-ty-blue" alt="ty"></a>
   <a href="https://scorecard.dev/viewer/?uri=github.com/Solganis/assertpy2"><img src="https://api.scorecard.dev/projects/github.com/Solganis/assertpy2/badge" alt="OpenSSF Scorecard"></a>
   <a href="https://www.bestpractices.dev/projects/12990"><img src="https://www.bestpractices.dev/projects/12990/badge" alt="OpenSSF Best Practices"></a>
 </p>

{assertpy2-2.3.1 → assertpy2-2.3.2}/README.md

@@ -17,9 +17,9 @@
   <a href="https://pepy.tech/projects/assertpy2"><img src="https://static.pepy.tech/badge/assertpy2/month" alt="Downloads"></a>
   <a href="https://pypi.org/project/assertpy2/"><img src="https://img.shields.io/pypi/pyversions/assertpy2" alt="Python"></a>
   <a href="https://codecov.io/gh/Solganis/assertpy2"><img src="https://codecov.io/gh/Solganis/assertpy2/graph/badge.svg" alt="Coverage"></a>
-  <a href="https://github.com/Solganis/assertpy2/blob/main/LICENSE"><img src="https://img.shields.io/github/license/Solganis/assertpy2" alt="License"></a>
   <a href="https://docs.astral.sh/ruff/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff"></a>
   <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="uv"></a>
+  <a href="https://github.com/astral-sh/ty"><img src="https://img.shields.io/badge/type--checker-ty-blue" alt="ty"></a>
   <a href="https://scorecard.dev/viewer/?uri=github.com/Solganis/assertpy2"><img src="https://api.scorecard.dev/projects/github.com/Solganis/assertpy2/badge" alt="OpenSSF Scorecard"></a>
   <a href="https://www.bestpractices.dev/projects/12990"><img src="https://www.bestpractices.dev/projects/12990/badge" alt="OpenSSF Best Practices"></a>
 </p>

assertpy2-2.3.2/assertpy2/_mixin_base.py

@@ -0,0 +1,89 @@
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from typing_extensions import Self
+
+    from .errors import DiffResult
+
+
+class _MixinBase:
+    if TYPE_CHECKING:
+        val: Any
+        description: str
+        kind: str | None
+        expected: type[BaseException] | None
+        logger: logging.LoggerAdapter
+        _not_expected: bool
+
+        def error(
+            self,
+            msg: str,
+            *,
+            actual: object = ...,
+            expected: object = ...,
+            diff: DiffResult | None = ...,
+        ) -> Self: ...
+
+        def builder(
+            self,
+            val: object,
+            description: str = ...,
+            kind: str | None = ...,
+            expected: BaseException | None = ...,
+            logger: logging.LoggerAdapter | None = ...,
+        ) -> Self: ...
+
+        # HelpersMixin
+
+        def _fmt_items(self, i: object) -> str: ...
+
+        def _fmt_args_kwargs(self, *some_args: object, **some_kwargs: object) -> str: ...
+
+        def _validate_between_args(self, val_type: type, low: object, high: object) -> None: ...
+
+        def _validate_close_to_args(self, val: object, other: object, tolerance: object) -> None: ...
+
+        def _check_dict_like(
+            self,
+            d: object,
+            check_keys: bool = ...,
+            check_values: bool = ...,
+            check_getitem: bool = ...,
+            name: str = ...,
+            return_as_bool: bool = ...,
+        ) -> bool | None: ...
+
+        def _check_iterable(self, val: object, check_getitem: bool = ..., name: str = ...) -> None: ...
+
+        def _dict_not_equal(
+            self,
+            val: object,
+            other: object,
+            ignore: object = ...,
+            include: object = ...,
+        ) -> bool: ...
+
+        def _dict_err(
+            self,
+            val: object,
+            other: object,
+            ignore: object = ...,
+            include: object = ...,
+        ) -> None: ...
+
+        # NumericMixin class attrs used by HelpersMixin._validate_between_args
+        _NUMERIC_COMPAREABLE: frozenset[type]
+        _NUMERIC_NON_COMPAREABLE: frozenset[type]
+
+        # Cross-mixin methods
+
+        def contains(self, *items: object) -> Self: ...
+
+        def does_not_contain(self, *items: object) -> Self: ...
+
+        def is_equal_to(self, other: object, **kwargs: object) -> Self: ...
+
+        def is_not_equal_to(self, other: object) -> Self: ...

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/assertpy.py

@@ -73,10 +73,10 @@ from .numeric import NumericMixin
 from .snapshot import SnapshotMixin
 from .string import StringMixin
 
-__version__ = "2.3.1"
+__version__ = "2.3.2"
 
 __tracebackhide__ = True  # clean tracebacks via py.test integration
-contextlib.__tracebackhide__ = True  # monkey patch contextlib with clean py.test tracebacks
+contextlib.__tracebackhide__ = True  # ty: ignore[unresolved-attribute]  # pytest monkey-patch
 
 # assertpy files
 ASSERTPY_FILES = [
@@ -475,6 +475,7 @@ class AssertionBuilder(
         self.kind = kind
         self.expected = expected
         self.logger = logger if logger else _default_logger
+        self._not_expected = False
 
     def builder(self, val, description="", kind=None, expected=None, logger=None):
         """Helper to build a new :class:`AssertionBuilder` instance. Use this only if not chaining to ``self``.

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/base.py

@@ -31,6 +31,7 @@ from __future__ import annotations
 import collections.abc
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
 from .errors import DiffEntry, DiffResult
 from .matchers import Matcher, StructureMatcher
 
@@ -40,7 +41,7 @@ if TYPE_CHECKING:
 __tracebackhide__ = True
 
 
-class BaseMixin:
+class BaseMixin(_MixinBase):
     """Base mixin."""
 
     def described_as(self, description) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/behave_matchers.py

@@ -77,7 +77,7 @@ def register_assertpy_types() -> None:
         ImportError: if behave is not installed
     """
     try:
-        from behave import register_type
+        from behave import register_type  # ty: ignore[unresolved-import]  # optional dependency
     except ImportError:
         raise ImportError(
             "behave is required for register_assertpy_types(). Install it with: pip install assertpy2[behave]"

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/collection.py

@@ -31,13 +31,15 @@ from __future__ import annotations
 import collections
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
 __tracebackhide__ = True
 
 
-class CollectionMixin:
+class CollectionMixin(_MixinBase):
     """Collection assertions mixin."""
 
     def is_iterable(self) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/contains.py

@@ -31,6 +31,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
 from .matchers import Matcher
 
 if TYPE_CHECKING:
@@ -39,7 +40,7 @@ if TYPE_CHECKING:
 __tracebackhide__ = True
 
 
-class ContainsMixin:
+class ContainsMixin(_MixinBase):
     """Containment assertions mixin."""
 
     def contains(self, *items) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/date.py

@@ -31,13 +31,15 @@ from __future__ import annotations
 import datetime
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
 __tracebackhide__ = True
 
 
-class DateMixin:
+class DateMixin(_MixinBase):
     """Date and time assertions mixin."""
 
     def is_before(self, other) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/dict.py

@@ -30,13 +30,15 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
 __tracebackhide__ = True
 
 
-class DictMixin:
+class DictMixin(_MixinBase):
     """Dict assertions mixin."""
 
     def contains_key(self, *keys) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/dynamic.py

@@ -30,10 +30,12 @@ from __future__ import annotations
 
 import collections
 
+from ._mixin_base import _MixinBase
+
 __tracebackhide__ = True
 
 
-class DynamicMixin:
+class DynamicMixin(_MixinBase):
     """Dynamic assertions mixin.
 
     When testing attributes of an object (or the contents of a dict), the

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/exception.py

@@ -28,7 +28,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
+
+from ._mixin_base import _MixinBase
 
 if TYPE_CHECKING:
     from typing_extensions import Self
@@ -46,7 +48,7 @@ class _InertBuilder:
         return lambda *args, **kwargs: self
 
 
-class ExceptionMixin:
+class ExceptionMixin(_MixinBase):
     """Expected exception mixin."""
 
     def raises(self, ex) -> Self:
@@ -116,15 +118,16 @@ class ExceptionMixin:
                     f" when called with ({self._fmt_args_kwargs(*some_args, **some_kwargs)}),"
                     f" but raised <{type(e).__name__}>."
                 )
-                return _InertBuilder()
+                return cast("Self", _InertBuilder())
 
         self.error(
             f"Expected <{self.val.__name__}> to raise <{self.expected.__name__}>"
             f" when called with ({self._fmt_args_kwargs(*some_args, **some_kwargs)})."
         )
-        return _InertBuilder()
+        return cast("Self", _InertBuilder())
 
     def _when_called_with_not_expected(self, *some_args, **some_kwargs) -> Self:
+        assert self.expected is not None
         try:
             self.val(*some_args, **some_kwargs)
         except BaseException as e:
@@ -134,7 +137,7 @@ class ExceptionMixin:
                     f" when called with ({self._fmt_args_kwargs(*some_args, **some_kwargs)}),"
                     f" but did raise <{type(e).__name__}>."
                 )
-                return _InertBuilder()
+                return cast("Self", _InertBuilder())
         return self
 
     def does_not_raise(self, ex) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/extracting.py

@@ -31,13 +31,15 @@ from __future__ import annotations
 import collections.abc
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
 __tracebackhide__ = True
 
 
-class ExtractingMixin:
+class ExtractingMixin(_MixinBase):
     """Collection flattening mixin.
 
     It is often necessary to test collections of objects.  Use the ``extracting()`` helper to

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/file.py

@@ -31,6 +31,8 @@ from __future__ import annotations
 import os
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
@@ -72,17 +74,12 @@ def contents_of(file, encoding="utf-8"):
                 raise ValueError(f"val must be file or path, but was type <{type(file).__name__}>") from None
             raise
 
-    if type(contents) is bytes:
-        return contents.decode(encoding, "replace")
-    try:
+    if isinstance(contents, (bytes, bytearray)):
         return contents.decode(encoding, "replace")
-    except AttributeError:
-        pass  # contents is already a str, no decode needed
-    # if all else fails, just return the contents "as is"
     return contents
 
 
-class FileMixin:
+class FileMixin(_MixinBase):
     """File assertions mixin."""
 
     def exists(self) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/helpers.py

@@ -33,10 +33,12 @@ import numbers
 
 from assertpy2.errors import DiffEntry, DiffResult
 
+from ._mixin_base import _MixinBase
+
 __tracebackhide__ = True
 
 
-class HelpersMixin:
+class HelpersMixin(_MixinBase):
     """Helpers mixin.  For internal use only."""
 
     def _fmt_items(self, i):

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/matchers.py

@@ -2,30 +2,30 @@ from __future__ import annotations
 
 import re
 import uuid as _uuid_mod
-from typing import Protocol, runtime_checkable
+from typing import Any, Protocol, runtime_checkable
 
 
 @runtime_checkable
 class Matcher(Protocol):
     """Protocol for composable matcher objects."""
 
-    def matches(self, value: object) -> bool: ...
+    def matches(self, value: Any) -> bool: ...
 
     def describe(self) -> str: ...
 
-    def describe_mismatch(self, value: object) -> str: ...
+    def describe_mismatch(self, value: Any) -> str: ...
 
 
 class BaseMatcher:
     """Abstract base for all matchers with operator support."""
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         raise NotImplementedError
 
     def describe(self) -> str:
         raise NotImplementedError
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         return f"was <{value}>"
 
     def __and__(self, other: Matcher) -> AllOfMatcher:
@@ -54,13 +54,13 @@ class AllOfMatcher(BaseMatcher):
     def __init__(self, *matchers: Matcher):
         self.matchers = matchers
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return all(m.matches(value) for m in self.matchers)
 
     def describe(self) -> str:
         return f"({' and '.join(m.describe() for m in self.matchers)})"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         failed = [m for m in self.matchers if not m.matches(value)]
         return f"<{value}> did not satisfy: {', '.join(m.describe() for m in failed)}"
 
@@ -71,13 +71,13 @@ class AnyOfMatcher(BaseMatcher):
     def __init__(self, *matchers: Matcher):
         self.matchers = matchers
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return any(m.matches(value) for m in self.matchers)
 
     def describe(self) -> str:
         return f"({' or '.join(m.describe() for m in self.matchers)})"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         return f"<{value}> satisfied none of: {', '.join(m.describe() for m in self.matchers)}"
 
 
@@ -87,13 +87,13 @@ class NotMatcher(BaseMatcher):
     def __init__(self, matcher: Matcher):
         self.matcher = matcher
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return not self.matcher.matches(value)
 
     def describe(self) -> str:
         return f"not {self.matcher.describe()}"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         return f"<{value}> unexpectedly matched {self.matcher.describe()}"
 
 
@@ -104,7 +104,7 @@ class EqualToMatcher(BaseMatcher):
     def __init__(self, expected: object):
         self.expected = expected
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value == self.expected
 
     def describe(self) -> str:
@@ -115,7 +115,7 @@ class GreaterThanMatcher(BaseMatcher):
     def __init__(self, boundary: object):
         self.boundary = boundary
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value > self.boundary
 
     def describe(self) -> str:
@@ -126,7 +126,7 @@ class GreaterThanOrEqualToMatcher(BaseMatcher):
     def __init__(self, boundary: object):
         self.boundary = boundary
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value >= self.boundary
 
     def describe(self) -> str:
@@ -137,7 +137,7 @@ class LessThanMatcher(BaseMatcher):
     def __init__(self, boundary: object):
         self.boundary = boundary
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value < self.boundary
 
     def describe(self) -> str:
@@ -148,7 +148,7 @@ class LessThanOrEqualToMatcher(BaseMatcher):
     def __init__(self, boundary: object):
         self.boundary = boundary
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value <= self.boundary
 
     def describe(self) -> str:
@@ -160,7 +160,7 @@ class BetweenMatcher(BaseMatcher):
         self.low = low
         self.high = high
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return self.low <= value <= self.high
 
     def describe(self) -> str:
@@ -172,7 +172,7 @@ class CloseToMatcher(BaseMatcher):
         self.expected = expected
         self.tolerance = tolerance
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return abs(value - self.expected) <= self.tolerance
 
     def describe(self) -> str:
@@ -183,7 +183,7 @@ class CloseToMatcher(BaseMatcher):
 
 
 class IsNoneMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value is None
 
     def describe(self) -> str:
@@ -191,7 +191,7 @@ class IsNoneMatcher(BaseMatcher):
 
 
 class IsNotNoneMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value is not None
 
     def describe(self) -> str:
@@ -202,18 +202,18 @@ class IsInstanceOfMatcher(BaseMatcher):
     def __init__(self, expected_type: type):
         self.expected_type = expected_type
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, self.expected_type)
 
     def describe(self) -> str:
         return f"an instance of <{self.expected_type.__name__}>"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         return f"was <{value}> of type <{type(value).__name__}>"
 
 
 class IsTruthyMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return bool(value)
 
     def describe(self) -> str:
@@ -221,7 +221,7 @@ class IsTruthyMatcher(BaseMatcher):
 
 
 class IsFalsyMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return not bool(value)
 
     def describe(self) -> str:
@@ -235,18 +235,18 @@ class HasLengthMatcher(BaseMatcher):
     def __init__(self, expected_length: int):
         self.expected_length = expected_length
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return len(value) == self.expected_length
 
     def describe(self) -> str:
         return f"a value of length <{self.expected_length}>"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         return f"was <{value}> with length <{len(value)}>"
 
 
 class IsEmptyMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return len(value) == 0
 
     def describe(self) -> str:
@@ -254,7 +254,7 @@ class IsEmptyMatcher(BaseMatcher):
 
 
 class IsNotEmptyMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return len(value) > 0
 
     def describe(self) -> str:
@@ -265,7 +265,7 @@ class IsNotEmptyMatcher(BaseMatcher):
 
 
 class IsPositiveMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value > 0
 
     def describe(self) -> str:
@@ -273,7 +273,7 @@ class IsPositiveMatcher(BaseMatcher):
 
 
 class IsNegativeMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value < 0
 
     def describe(self) -> str:
@@ -281,7 +281,7 @@ class IsNegativeMatcher(BaseMatcher):
 
 
 class IsZeroMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value == 0
 
     def describe(self) -> str:
@@ -289,26 +289,26 @@ class IsZeroMatcher(BaseMatcher):
 
 
 class IsEvenMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, int) and not isinstance(value, bool) and value % 2 == 0
 
     def describe(self) -> str:
         return "an even integer"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         if isinstance(value, bool) or not isinstance(value, int):
             return f"was <{value!r}> of type <{type(value).__name__}>, not an integer"
         return f"was <{value}>, which is odd"
 
 
 class IsOddMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, int) and not isinstance(value, bool) and value % 2 != 0
 
     def describe(self) -> str:
         return "an odd integer"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         if isinstance(value, bool) or not isinstance(value, int):
             return f"was <{value!r}> of type <{type(value).__name__}>, not an integer"
         return f"was <{value}>, which is even"
@@ -318,26 +318,26 @@ class IsDivisibleByMatcher(BaseMatcher):
     def __init__(self, divisor: int):
         self.divisor = divisor
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, int) and not isinstance(value, bool) and value % self.divisor == 0
 
     def describe(self) -> str:
         return f"an integer divisible by <{self.divisor}>"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         if isinstance(value, bool) or not isinstance(value, int):
             return f"was <{value!r}> of type <{type(value).__name__}>, not an integer"
         return f"was <{value}>, which has remainder <{value % self.divisor}>"
 
 
 class IsCallableMatcher(BaseMatcher):
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return callable(value)
 
     def describe(self) -> str:
         return "a callable"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         return f"was <{value!r}> of type <{type(value).__name__}>, which is not callable"
 
 
@@ -345,13 +345,13 @@ class IsInMatcher(BaseMatcher):
     def __init__(self, *values: object):
         self.values = values
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return value in self.values
 
     def describe(self) -> str:
         return f"a value in <{self.values}>"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         return f"was <{value!r}>, which is not in <{self.values}>"
 
 
@@ -360,7 +360,7 @@ class HasPropertyMatcher(BaseMatcher):
         self.name = name
         self.matcher = matcher
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         if not hasattr(value, self.name):
             return False
         if self.matcher is not None:
@@ -372,7 +372,7 @@ class HasPropertyMatcher(BaseMatcher):
             return f"an object with property <{self.name}> matching {self.matcher.describe()}"
         return f"an object with property <{self.name}>"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         if not hasattr(value, self.name):
             return f"<{value!r}> has no property <{self.name}>"
         if self.matcher is not None:
@@ -388,7 +388,7 @@ class ContainsStringMatcher(BaseMatcher):
     def __init__(self, substring: str):
         self.substring = substring
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, str) and self.substring in value
 
     def describe(self) -> str:
@@ -399,7 +399,7 @@ class MatchesRegexMatcher(BaseMatcher):
     def __init__(self, pattern: str):
         self.pattern = pattern
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, str) and re.search(self.pattern, value) is not None
 
     def describe(self) -> str:
@@ -410,7 +410,7 @@ class StartsWithMatcher(BaseMatcher):
     def __init__(self, prefix: str):
         self.prefix = prefix
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, str) and value.startswith(self.prefix)
 
     def describe(self) -> str:
@@ -421,7 +421,7 @@ class EndsWithMatcher(BaseMatcher):
     def __init__(self, suffix: str):
         self.suffix = suffix
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, str) and value.endswith(self.suffix)
 
     def describe(self) -> str:
@@ -434,7 +434,7 @@ class EndsWithMatcher(BaseMatcher):
 class IgnoreMatcher(BaseMatcher):
     """Always matches. Used in structure specs to accept any value for a field."""
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return True
 
     def describe(self) -> str:
@@ -444,7 +444,7 @@ class IgnoreMatcher(BaseMatcher):
 class IsUuidMatcher(BaseMatcher):
     """Matches valid UUID strings."""
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         if not isinstance(value, str):
             return False
         try:
@@ -460,7 +460,7 @@ class IsUuidMatcher(BaseMatcher):
 class IsNonEmptyStringMatcher(BaseMatcher):
     """Matches non-empty strings."""
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         return isinstance(value, str) and len(value) > 0
 
     def describe(self) -> str:
@@ -473,7 +473,7 @@ class EachMatcher(BaseMatcher):
     def __init__(self, matcher: Matcher):
         self.matcher = matcher
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         try:
             return all(self.matcher.matches(item) for item in value)
         except TypeError:
@@ -482,7 +482,7 @@ class EachMatcher(BaseMatcher):
     def describe(self) -> str:
         return f"each item matching {self.matcher.describe()}"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         try:
             for i, item in enumerate(value):
                 if not self.matcher.matches(item):
@@ -498,7 +498,7 @@ class StructureMatcher(BaseMatcher):
     def __init__(self, spec: dict):
         self._spec = spec
 
-    def matches(self, value: object) -> bool:
+    def matches(self, value: Any) -> bool:
         if not isinstance(value, dict):
             return False
         return self._match_recursive(value, self._spec, "") is None
@@ -506,7 +506,7 @@ class StructureMatcher(BaseMatcher):
     def describe(self) -> str:
         return f"a dict matching structure {self._describe_spec(self._spec)}"
 
-    def describe_mismatch(self, value: object) -> str:
+    def describe_mismatch(self, value: Any) -> str:
         if not isinstance(value, dict):
             return f"was not a dict: <{value}>"
         error = self._match_recursive(value, self._spec, "")

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/numeric.py

@@ -33,13 +33,15 @@ import math
 import numbers
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
 __tracebackhide__ = True
 
 
-class NumericMixin:
+class NumericMixin(_MixinBase):
     """Numeric assertions mixin."""
 
     _NUMERIC_COMPAREABLE = frozenset({datetime.datetime, datetime.timedelta, datetime.date, datetime.time})

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/pytest_plugin.py

@@ -7,7 +7,7 @@ import warnings
 import pytest
 
 try:
-    import allure
+    import allure  # ty: ignore[unresolved-import]  # optional dependency
 
     _HAS_ALLURE = True  # pragma: no cover - only when allure-pytest is installed
 except ImportError:

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/snapshot.py

@@ -35,13 +35,15 @@ import os
 import sys
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
 __tracebackhide__ = True
 
 
-class SnapshotMixin:
+class SnapshotMixin(_MixinBase):
     """Snapshot mixin.
 
     Take a snapshot of a python data structure, store it on disk in JSON format, and automatically
@@ -187,9 +189,12 @@ class SnapshotMixin:
         else:
             # make id from filename and line number
             f = inspect.currentframe()
-            fpath = os.path.basename(f.f_back.f_code.co_filename)
+            caller = f.f_back if f is not None else None
+            if caller is None:  # pragma: no cover - frame introspection always available in CPython
+                raise RuntimeError("cannot determine caller frame")
+            fpath = os.path.basename(caller.f_code.co_filename)
             fname = os.path.splitext(fpath)[0]
-            lineno = str(f.f_back.f_lineno)
+            lineno = str(caller.f_lineno)
             snapname = _name(path, fname)
 
         if not os.path.exists(path):

{assertpy2-2.3.1 → assertpy2-2.3.2}/assertpy2/string.py

@@ -32,13 +32,15 @@ import collections.abc
 import re
 from typing import TYPE_CHECKING
 
+from ._mixin_base import _MixinBase
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
 __tracebackhide__ = True
 
 
-class StringMixin:
+class StringMixin(_MixinBase):
     """String assertions mixin."""
 
     def is_equal_to_ignoring_case(self, other) -> Self:

{assertpy2-2.3.1 → assertpy2-2.3.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "assertpy2"
-version = "2.3.1"
-description = "Fluent assertion library for Python with full type safety and soft assertions"
+version = "2.3.2"
+description = "Fluent assertion library for Python with composable matchers, structural matching, and full type safety"
 readme = "README.md"
 license = "BSD-3-Clause"
 requires-python = ">=3.10"
@@ -55,6 +55,7 @@ dev = [
     "pytest>=9.0.3",
     "pytest-cov>=6.1",
     "ruff>=0.15.17",
+    "ty>=0.0.49",
 ]
 
 [tool.pytest.ini_options]
@@ -73,7 +74,9 @@ line-length = 120
 target-version = "py310"
 
 [tool.ruff.lint]
-select = ["E", "F", "I", "UP", "B", "SIM", "RUF"]
+preview = true
+explicit-preview-rules = true
+select = ["E", "E301", "F", "I", "UP", "B", "SIM", "RUF"]
 ignore = ["E501"]
 
 [tool.ruff.lint.per-file-ignores]

{assertpy2-2.3.1 → assertpy2-2.3.2}/uv.lock

@@ -30,7 +30,7 @@ wheels = [
 
 [[package]]
 name = "assertpy2"
-version = "2.2.0"
+version = "2.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "typing-extensions" },
@@ -49,6 +49,7 @@ dev = [
     { name = "pytest" },
     { name = "pytest-cov" },
     { name = "ruff" },
+    { name = "ty" },
 ]
 
 [package.metadata]
@@ -64,6 +65,7 @@ dev = [
     { name = "pytest", specifier = ">=9.0.3" },
     { name = "pytest-cov", specifier = ">=6.1" },
     { name = "ruff", specifier = ">=0.15.17" },
+    { name = "ty", specifier = ">=0.0.49" },
 ]
 
 [[package]]
@@ -428,6 +430,31 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/7b/61/cceae43728b7de99d9b847560c262873a1f6c98202171fd5ed62640b494b/tomli-2.4.1-py3-none-any.whl", hash = "sha256:0d85819802132122da43cb86656f8d1f8c6587d54ae7dcaf30e90533028b49fe", size = 14583, upload-time = "2026-03-25T20:22:03.012Z" },
 ]
 
+[[package]]
+name = "ty"
+version = "0.0.49"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1d/8d/37cb91808069509d43a2a11743e12f1e854fd808dbef2203309d256718cd/ty-0.0.49.tar.gz", hash = "sha256:0a027bd0c9c75d035641a365d087ad883446057f9be0b9826251c2aecafbf145", size = 5884753, upload-time = "2026-06-12T03:08:20.221Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ca/de/9237c6a96356612dd0393db1e94cf21f903616adf3a3701bf3da6e4adc92/ty-0.0.49-py3-none-linux_armv6l.whl", hash = "sha256:12c0c4310b936d762a8586c210b53d4fa4bb361a04429afa89bf84b922e5e065", size = 11834671, upload-time = "2026-06-12T03:07:53.062Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/15/daf5a14a5e07012277d450c75325c94614e2acfec4c620c881486118c410/ty-0.0.49-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:737bfdc2caf9712a8580944dcdc80a450a37a4f2bc83c8fa9b7433b374f9e471", size = 11589570, upload-time = "2026-06-12T03:08:25.779Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/58/30bdf98436488aca25f0763bf7f92a061528d42461b686453029e845e4c5/ty-0.0.49-py3-none-macosx_11_0_arm64.whl", hash = "sha256:ab90c1baf3b1701d282fce4b02fa552a962d109f8972c46ef6b22429503bfea4", size = 10985236, upload-time = "2026-06-12T03:08:36.664Z" },
+    { url = "https://files.pythonhosted.org/packages/22/45/ece503e4a1396e13a1a9a0cde51afe476a6506a1d557eeadf8ad45c83bc0/ty-0.0.49-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4ce8ecf6ba6fc79bd137cc0557a754f7e5f2dfe9436412551d480d680e248ad", size = 11504302, upload-time = "2026-06-12T03:08:01.664Z" },
+    { url = "https://files.pythonhosted.org/packages/17/dc/5d09333d289dfbca1804eaade125c9e8a1a992a2a592a8b80c5e9b589ca9/ty-0.0.49-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:10d85c6865c984e78661e0bd20b180514b4a289739224e84816e342bdf381e04", size = 11626629, upload-time = "2026-06-12T03:08:06.844Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/36/155f41c9dd7237c4b609211f29f77755a139ee6218605dadc7fe21d5e3c8/ty-0.0.49-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1d96a67a206619e01fa92f35a22267ec634bba62be24b1d0e947020cc179995b", size = 12074481, upload-time = "2026-06-12T03:08:09.643Z" },
+    { url = "https://files.pythonhosted.org/packages/96/4c/998ee13cd5045f1f8b36982de7343163832ac53f27debe01b0de0e8bd968/ty-0.0.49-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3de9f648564e0a66344ef397770387cb0d093735f8679d2c5a08a4741e79814d", size = 12678042, upload-time = "2026-06-12T03:08:39.319Z" },
+    { url = "https://files.pythonhosted.org/packages/85/c9/9a505aba85c41ce54cbcaa14f8d79aa084b86151d2d70df11c4655b92898/ty-0.0.49-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5779179ab397d15f8c9dbb8f506ec1b1745f54eac639982f76ef3ce538943b50", size = 12316194, upload-time = "2026-06-12T03:08:18.023Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/b8/ded37fb93503294abbc83c36470bb1413bea05048b745881d4470b518a06/ty-0.0.49-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:792d4974e93cc09bd32f934586080bbbe21b8e777099cb521cb2de18b68a49f0", size = 12145507, upload-time = "2026-06-12T03:07:56.505Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/07/392e80d78f02445f695b815bb9eb0fffacda68b03faee38c900f7b990815/ty-0.0.49-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:727bda86deb136073e525c2e78d60e38aedcce5d80579170844a52bbf7c1440d", size = 12365967, upload-time = "2026-06-12T03:08:12.553Z" },
+    { url = "https://files.pythonhosted.org/packages/50/d3/31b0c2a7fbedd3373e389cb1d81b8d2128f6f868fafb46557736a6f9aca8/ty-0.0.49-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4f2fc2bc4a8d2ff1cca59fd94772cabdfec4062d47a0b3a0784be46d94d0540b", size = 11475283, upload-time = "2026-06-12T03:08:28.334Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/5b/329e101638920b468a3bb63059c9f66ef99b44aac501222c44832a507321/ty-0.0.49-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:3724bd9badef333321578b6a941fbc571ebf49141ec2356a8590fbe4c9aa588d", size = 11645343, upload-time = "2026-06-12T03:08:15.246Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/76/c897e615e32f80ca81c8c1bc49b9a1f72ff9e3cfea0f8345ba505fe28472/ty-0.0.49-py3-none-musllinux_1_2_i686.whl", hash = "sha256:166c6eb52ee4af3c5a9bb267d165d93000daa55c6758cd8ff3199741fb75917d", size = 11725585, upload-time = "2026-06-12T03:08:33.915Z" },
+    { url = "https://files.pythonhosted.org/packages/59/e1/fdb42ee239f618800842681af5bb8598117e74512c10974a8b7b9086a898/ty-0.0.49-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:91e81d832c287b05782ee32eb1b801f62c1fa08df37d589d2b88c3f1d51c9731", size = 12237261, upload-time = "2026-06-12T03:08:31.105Z" },
+    { url = "https://files.pythonhosted.org/packages/98/0f/a2d6a5fc9d0786cbeb3c200786da4e18c203589be3984bb5def83ca92320/ty-0.0.49-py3-none-win32.whl", hash = "sha256:7186af5ca9829d1f5d8916bcf767b8e819bfbf61b1b8ec843bb3fc699cb502e1", size = 11100789, upload-time = "2026-06-12T03:07:59.092Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/9d/473ac8bc57b5a2d121da893bf9dd74a118efb19a01d711df1a6e397f05cc/ty-0.0.49-py3-none-win_amd64.whl", hash = "sha256:ae2142fc126a01effcca0c222908b0e6654b5ba1266d4e4d406e4866aef8e1d1", size = 12204644, upload-time = "2026-06-12T03:08:04.327Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/a2/8959249da951ba3977fee20e688d28678b8a1d30a9ed4464228a85d45853/ty-0.0.49-py3-none-win_arm64.whl", hash = "sha256:75d5e2e7649765f31f4bed6c8adb149a75b18edd3fa6336dac4d0efc1a66466f", size = 11558965, upload-time = "2026-06-12T03:08:23.012Z" },
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.15.0"