Migrate to the latest version of the wraps library.

Author: nekitdev

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!-- changelogging: start -->
 
+## 0.18.0 (2024-04-23)
+
+### Changes
+
+- Migrated to the latest version of the `wraps` library.
+
 ## 0.17.0 (2024-03-23)
 
 ### Features

README.md

@@ -48,7 +48,7 @@ Or by directly specifying it in the configuration like so:
 
 ```toml
 [tool.poetry.dependencies]
-iters = "^0.17.0"
+iters = "^0.18.0"
 ```
 
 Alternatively, you can add it directly from the source:

iters/__init__.py

@@ -11,7 +11,7 @@
 __title__ = "iters"
 __author__ = "nekitdev"
 __license__ = "MIT"
-__version__ = "0.17.0"
+__version__ = "0.18.0"
 
 from iters.async_iters import (
     AsyncIter,

iters/async_iters.py

@@ -60,10 +60,10 @@
     Validate,
 )
 from typing_extensions import Never, ParamSpec
-from wraps.early import early_option_await
-from wraps.option import Option, Some
-from wraps.result import Result
-from wraps.wraps import wrap_future, wrap_future_option, wrap_future_result
+from wraps.early.decorators import early_option_await
+from wraps.primitives.option import Option, Some
+from wraps.primitives.result import Result
+from wraps.wraps.futures import wrap_future, wrap_future_option, wrap_future_result
 
 from iters.async_utils import (
     async_accumulate_fold,

iters/async_wraps.py

@@ -1,8 +1,8 @@
 from typing import AsyncIterator, TypeVar
 
 from typing_aliases import AnyIterable, AsyncBinary, AsyncUnary, Binary, Unary
-from wraps.option import NULL, Option, Some
-from wraps.result import Error, Ok, Result
+from wraps.primitives.option import NULL, Option, Some
+from wraps.primitives.result import Error, Ok, Result
 
 from iters.async_utils import async_chain, async_iter, async_next_unchecked
 from iters.types import is_marker, marker

iters/iters.py

@@ -48,9 +48,9 @@
     Unary,
 )
 from typing_extensions import Never, ParamSpec
-from wraps.early import early_option
-from wraps.option import Option, Some
-from wraps.result import Result
+from wraps.early.decorators import early_option
+from wraps.primitives.option import Option, Some
+from wraps.primitives.result import Result
 
 from iters.constants import DEFAULT_START, DEFAULT_STEP, EMPTY_BYTES, EMPTY_STRING
 from iters.ordered_set import OrderedSet, ordered_set

iters/mapping_view.py

@@ -2,14 +2,14 @@
 
 from attrs import frozen
 from typing_extensions import Self
-from wraps.wraps import WrapOption
+from wraps.wraps.option import wrap_option_on
 
 __all__ = ("MappingView", "mapping_view")
 
 K = TypeVar("K")
 V = TypeVar("V")
 
-wrap_key_error = WrapOption(KeyError)
+wrap_key_error = wrap_option_on(KeyError)
 
 
 @final

iters/ordered_set.py

@@ -19,7 +19,7 @@
 from named import get_type_name
 from typing_aliases import AnySet, is_instance, is_sized, is_slice
 from typing_extensions import TypeIs
-from wraps.wraps import wrap_option
+from wraps.wraps.option import wrap_option_on
 
 __all__ = ("OrderedSet", "ordered_set", "ordered_set_unchecked")
 
@@ -49,6 +49,9 @@ def is_any_set(iterable: Iterable[T]) -> TypeIs[AnySet[T]]:
     return is_instance(iterable, AnySet)
 
 
+wrap_index_error = wrap_option_on(IndexError)
+
+
 class OrderedSet(MutableSet[Q], Sequence[Q]):
     """Represents ordered sets, i.e. mutable hash sets that preserve insertion order.
 
@@ -350,7 +353,7 @@ def index(self, item: Q, start: Optional[int] = None, stop: Optional[int] = None
 
         return index
 
-    get_index = wrap_option(index)
+    get_index = wrap_index_error(index)
     """An alias of [`index`][iters.ordered_set.OrderedSet.index] wrapped to return
     [`Option[int]`][wraps.option.Option] instead of erroring.
     """
@@ -405,7 +408,7 @@ def pop(self, index: int = LAST) -> Q:
 
         return item
 
-    get_pop = wrap_option(pop)
+    get_pop = wrap_index_error(pop)
     """An alias of [`pop`][iters.ordered_set.OrderedSet.pop] wrapped to return
     [`Option[Q]`][wraps.option.Option] instead of erroring.
     """

iters/sequence_view.py

@@ -4,13 +4,13 @@
 
 from attrs import frozen
 from typing_aliases import is_slice
-from wraps.wraps import WrapOption
+from wraps.wraps.option import wrap_option_on
 
 __all__ = ("SequenceView", "sequence_view")
 
 T = TypeVar("T")
 
-wrap_index_error = WrapOption(IndexError)
+wrap_index_error = wrap_option_on(IndexError)
 
 
 @final

iters/types.py

@@ -4,7 +4,7 @@
 
 from solus import Singleton
 from typing_extensions import TypeIs
-from wraps.option import NULL, Option, Some
+from wraps.primitives.option import NULL, Option, Some
 
 T = TypeVar("T")