feat: update min. python version to 3.10

BREAKING CHANGE: Min. python version is now 3.10.

Author: noahnu

.poetry-version

@@ -1 +1 @@
-2.1.2
+2.2.1

README.md

@@ -6,15 +6,15 @@
 
 [![All Contributors](https://img.shields.io/github/all-contributors/syrupy-project/syrupy?color=ee8449&style=flat-square)](#contributors) [![Stage](https://img.shields.io/pypi/status/syrupy)](https://pypi.org/project/syrupy/) [![codecov](https://codecov.io/gh/syrupy-project/syrupy/graph/badge.svg?token=GB9EmYKPAl)](https://codecov.io/gh/syrupy-project/syrupy)
 
-![Pytest>=5.1.0,<9.0.0](https://img.shields.io/badge/pytest-%3E%3D5.1.0,%20%3C9.0.0-green) [![Pypi](https://img.shields.io/pypi/v/syrupy)](https://pypi.org/project/syrupy/) [![Wheel](https://img.shields.io/pypi/wheel/syrupy)](https://pypi.org/project/syrupy/) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/syrupy) [![PyPI - Downloads](https://img.shields.io/pypi/dm/syrupy)](https://pypi.org/project/syrupy/) [![PyPI - License](https://img.shields.io/pypi/l/syrupy)](./LICENSE)
+![Pytest>=8,<9.0.0](https://img.shields.io/badge/pytest-%3E=8,%20%3C9.0.0-green) [![Pypi](https://img.shields.io/pypi/v/syrupy)](https://pypi.org/project/syrupy/) [![Wheel](https://img.shields.io/pypi/wheel/syrupy)](https://pypi.org/project/syrupy/) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/syrupy) [![PyPI - Downloads](https://img.shields.io/pypi/dm/syrupy)](https://pypi.org/project/syrupy/) [![PyPI - License](https://img.shields.io/pypi/l/syrupy)](./LICENSE)
 
 ## Overview
 
 Syrupy is a zero-dependency [pytest](https://docs.pytest.org/en/latest/) snapshot plugin. It enables developers to write tests which assert immutability of computed results.
 
 ## Motivation
 
-The most popular snapshot test plugin compatible with pytest has some core limitations which this package attempts to address by upholding some key values:
+Syrupy upholds three principles:
 
 - Extensible: If a particular data type is not supported, users should be able to easily and quickly add support.
 - Idiomatic: Snapshot testing should fit naturally among other test cases in pytest, e.g. `assert x == snapshot` vs. `snapshot.assert_match(x)`.
@@ -26,23 +26,14 @@ The most popular snapshot test plugin compatible with pytest has some core limit
 python -m pip install syrupy
 ```
 
-### Migration from snapshottest
-
-You cannot use syrupy alongside snapshottest due to argument conflicts. To ease migration, we've made syrupy aware of snapshottest call syntax. Simply uninstall snapshottest and remove old snapshots:
-
-```shell
-pip uninstall snapshottest -y;
-find . -type d ! -path '*/\.*' -name 'snapshots' | xargs rm -r
-```
-
 ### Pytest and Python Compatibility
 
 Syrupy will always be compatible with the latest version of Python and Pytest. If you're running an old version of Python or Pytest, you will need to use an older major version of Syrupy:
 
 | Syrupy Version | Python Support | Pytest Support |
 | -------------- | -------------- | -------------- |
-| 5.x.x          | >3.9           | >=8            |
-| 4.x.x          | >3.8.1,        | >=7,   <9      |
+| 5.x.x          | >=3.10         | >=8            |
+| 4.x.x          | >=3.8.1,       | >=7,   <9      |
 | 3.x.x          | >=3.7, <4      | >=5.1, <8      |
 | 2.x.x          | >=3.6, <4      | >=5.1, <8      |
 
@@ -545,6 +536,17 @@ See [#675](https://github.com/syrupy-project/syrupy/issues/675) for the original
 
 _We welcome contributions to patch these known limitations._
 
+## Migrating from another tool
+
+### From snapshottest
+
+You cannot use syrupy alongside snapshottest due to argument conflicts. To ease migration, we've made syrupy aware of snapshottest call syntax. Simply uninstall snapshottest and remove old snapshots:
+
+```shell
+pip uninstall snapshottest -y;
+find . -type d ! -path '*/\.*' -name 'snapshots' | xargs rm -r
+```
+
 ## Uninstalling
 
 ```python

poetry.lock

@@ -4,7 +4,7 @@ license = 'MIT'
 dynamic = [ "version", "classifiers" ]
 description = 'Pytest Snapshot Test Utility'
 readme = 'README.md'
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [{name = 'Noah Ulster'}]
 dependencies = [
   "pytest (>= 8.0.0)"
@@ -22,7 +22,6 @@ classifiers = [
     'Intended Audience :: Developers',
     'Operating System :: OS Independent',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
@@ -64,7 +63,6 @@ exclude_lines = ['pragma: no-cover', 'if TYPE_CHECKING:', '@abstractmethod']
 
 [tool.ruff]
 line-length = 88
-target-version = "py39"
 unsafe-fixes = true
 
 [tool.ruff.lint]
@@ -77,5 +75,5 @@ extend-select = [
 ]
 
 [build-system]
-requires = ['poetry-core>=2.1.2']
+requires = ['poetry-core>=2.2.1']
 build-backend = 'poetry.core.masonry.api'

pyproject.toml

@@ -34,7 +34,7 @@
 
 
 @lru_cache(maxsize=1)
-def __import_extension(value: Optional[str]) -> Any:
+def __import_extension(value: str | None) -> Any:
     if not value:
         return DEFAULT_EXTENSION
     try:
@@ -126,7 +126,7 @@ def __terminal_color(
 @pytest.hookimpl(tryfirst=True)
 def pytest_assertrepr_compare(
     config: "pytest.Config", op: str, left: Any, right: Any
-) -> Optional[list[str]]:
+) -> list[str] | None:
     """
     Return explanation for comparisons in failing assert expressions.
     https://docs.pytest.org/en/latest/reference.html#pytest.hookspec.pytest_assertrepr_compare

src/syrupy/__init__.py

@@ -1,5 +1,6 @@
 import traceback
 from collections import namedtuple
+from collections.abc import Callable
 from dataclasses import (
     dataclass,
     field,
@@ -9,7 +10,6 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Optional,
 )
 
@@ -49,7 +49,7 @@ class AssertionResult:
     created: bool
     updated: bool
     success: bool
-    exception: Optional[Exception]
+    exception: Exception | None
     test_location: "PyTestLocation"
 
     @property
@@ -77,7 +77,7 @@ class SnapshotAssertion:
         init=False,
         default=None,
     )
-    _custom_index: Optional[str] = field(
+    _custom_index: str | None = field(
         init=False,
         default=None,
     )
@@ -182,7 +182,7 @@ def with_defaults(
         exclude: Optional["PropertyFilter"] = None,
         include: Optional["PropertyFilter"] = None,
         matcher: Optional["PropertyMatcher"] = None,
-        extension_class: Optional[type["AbstractSyrupyExtension"]] = None,
+        extension_class: type["AbstractSyrupyExtension"] | None = None,
     ) -> "SnapshotAssertion":
         """
         Create new snapshot assertion fixture with provided values. This preserves
@@ -199,7 +199,7 @@ def with_defaults(
         )
 
     def use_extension(
-        self, extension_class: Optional[type["AbstractSyrupyExtension"]] = None
+        self, extension_class: type["AbstractSyrupyExtension"] | None = None
     ) -> "SnapshotAssertion":
         """
         Create new snapshot assertion fixture with the same options but using
@@ -269,7 +269,7 @@ def __call__(
         diff: Optional["SnapshotIndex"] = None,
         exclude: Optional["PropertyFilter"] = None,
         include: Optional["PropertyFilter"] = None,
-        extension_class: Optional[type["AbstractSyrupyExtension"]] = None,
+        extension_class: type["AbstractSyrupyExtension"] | None = None,
         matcher: Optional["PropertyMatcher"] = None,
         name: Optional["SnapshotIndex"] = None,
     ) -> "SnapshotAssertion":
@@ -303,8 +303,8 @@ def _assert(self, data: "SerializableData") -> bool:
         snapshot_name = self.extension.get_snapshot_name(
             test_location=self.test_location, index=self.index
         )
-        snapshot_data: Optional[SerializedData] = None
-        serialized_data: Optional[SerializedData] = None
+        snapshot_data: SerializedData | None = None
+        serialized_data: SerializedData | None = None
         matches = False
         assertion_success = False
         assertion_exception = None

src/syrupy/assertion.py

@@ -22,7 +22,7 @@ class Snapshot:
     name: str
     data: Optional["SerializedData"] = None
     # A tainted snapshot needs to be regenerated
-    tainted: Optional[bool] = field(default=None)
+    tainted: bool | None = field(default=None)
 
 
 @dataclass(frozen=True)
@@ -43,7 +43,7 @@ class SnapshotCollection:
     _snapshots: dict[str, "Snapshot"] = field(default_factory=dict)
 
     # A tainted collection needs to be regenerated
-    tainted: Optional[bool] = field(default=None)
+    tainted: bool | None = field(default=None)
 
     @property
     def has_snapshots(self) -> bool:
@@ -125,8 +125,8 @@ def __contains__(self, key: str) -> bool:
 
 @dataclass
 class DiffedLine:
-    a: Optional[str] = None
-    b: Optional[str] = None
+    a: str | None = None
+    b: str | None = None
     c: list[str] = field(default_factory=list)
     diff_a: str = ""
     diff_b: str = ""

src/syrupy/data.py

@@ -1,7 +1,7 @@
 import collections
 import inspect
 from collections import OrderedDict
-from collections.abc import Generator, Iterable
+from collections.abc import Callable, Generator, Iterable
 from types import (
     FunctionType,
     GeneratorType,
@@ -10,10 +10,8 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     NamedTuple,
     Optional,
-    Union,
 )
 
 from syrupy.constants import (
@@ -41,7 +39,7 @@
     IterableEntries = tuple[
         Iterable["PropertyName"],
         "PropertyValueGetter",
-        Optional["PropertyValueFilter"],
+        "PropertyValueFilter" | None,
     ]
 
 
@@ -240,7 +238,7 @@ def _serialize(
         include: Optional["PropertyFilter"] = None,
         matcher: Optional["PropertyMatcher"] = None,
         path: "PropertyPath" = (),
-        visited: Optional[set[Any]] = None,
+        visited: set[Any] | None = None,
     ) -> str:
         visited = set() if visited is None else visited
         data_id = id(data)
@@ -276,7 +274,7 @@ def _serialize(
 
     @classmethod
     def serialize_number(
-        cls, data: Union[int, float], *, depth: int = 0, **kwargs: Any
+        cls, data: int | float, *, depth: int = 0, **kwargs: Any
     ) -> str:
         return cls.__serialize_plain(data=data, depth=depth)
 
@@ -424,13 +422,13 @@ def serialize_custom_iterable(
         *,
         data: "SerializableData",
         resolve_entries: "IterableEntries",
-        open_paren: Optional[str] = None,
-        close_paren: Optional[str] = None,
+        open_paren: str | None = None,
+        close_paren: str | None = None,
         depth: int = 0,
         exclude: Optional["PropertyFilter"] = None,
         include: Optional["PropertyFilter"] = None,
         path: "PropertyPath" = (),
-        separator: Optional[str] = None,
+        separator: str | None = None,
         serialize_key: bool = False,
         **kwargs: Any,
     ) -> str:
@@ -507,7 +505,7 @@ class AmberDataSerializerSorted(AmberDataSerializer):
     VERSION = f"{AmberDataSerializer.VERSION}-sorted"
 
     @classmethod
-    def __maybe_int(cls, part: str) -> tuple[int, Union[str, int]]:
+    def __maybe_int(cls, part: str) -> tuple[int, str | int]:
         try:
             # cast to int only if the string is the exact representation of the int
             # for example, '012' != str(int('012'))

src/syrupy/extensions/amber/serializer.py

@@ -3,13 +3,12 @@
     ABC,
     abstractmethod,
 )
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from gettext import gettext
 from itertools import zip_longest
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
-    Callable,
     Optional,
 )
 
@@ -107,7 +106,7 @@ def discover_snapshots(
         self,
         *,
         test_location: "PyTestLocation",
-        ignore_extensions: Optional[list[str]] = None,
+        ignore_extensions: list[str] | None = None,
     ) -> "SnapshotCollections":
         """
         Returns all snapshot collections in test site
@@ -317,7 +316,7 @@ def __diff_lines(self, a: str, b: str) -> Iterator[str]:
             yield from map(context_style, self.__limit_context(line.c))
 
     def __diffed_lines(self, a: str, b: str) -> Iterator["DiffedLine"]:
-        staged_diffed_line: Optional[DiffedLine] = None
+        staged_diffed_line: DiffedLine | None = None
         for line in qdiff(a.splitlines(keepends=True), b.splitlines(keepends=True)):
             is_context_line = line[0] == " "
             is_snapshot_line = line[0] == "-"

src/syrupy/extensions/base.py

@@ -59,7 +59,7 @@ def _filter(
         exclude: Optional["PropertyFilter"] = None,
         include: Optional["PropertyFilter"] = None,
         matcher: Optional["PropertyMatcher"] = None,
-        visited: Optional[set[Any]] = None,
+        visited: set[Any] | None = None,
     ) -> "SerializableData":
         data_id = id(data)
         visited = set() if visited is None else visited