From 5b5524ce69d9ef75eec0e3f1a2ee6e43d666885d Mon Sep 17 00:00:00 2001 From: Eyshika Agarwal Date: Wed, 2 Oct 2024 10:54:16 -0500 Subject: [PATCH 1/6] updated wraps import for latest wrap updates --- iters/async_iters.py | 8 +++++--- iters/async_wraps.py | 4 ++-- iters/iters.py | 4 ++-- iters/mapping_view.py | 2 +- iters/ordered_set.py | 2 +- iters/sequence_view.py | 2 +- iters/types.py | 2 +- iters/wraps.py | 4 ++-- 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/iters/async_iters.py b/iters/async_iters.py index b2c6e12..6885078 100644 --- a/iters/async_iters.py +++ b/iters/async_iters.py @@ -61,9 +61,11 @@ ) from typing_extensions import Never, ParamSpec 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 wraps.option import Option, Some +from wraps.result import Result +from wraps.futures.future import wrap_future +from wraps.futures.optiion import wrap_future_option +from wraps.futures.result import wrap_future_result from iters.async_utils import ( async_accumulate_fold, diff --git a/iters/async_wraps.py b/iters/async_wraps.py index ef577fd..23ba929 100644 --- a/iters/async_wraps.py +++ b/iters/async_wraps.py @@ -1,8 +1,8 @@ from typing import AsyncIterator, TypeVar from typing_aliases import AnyIterable, AsyncBinary, AsyncUnary, Binary, Unary -from wraps.primitives.option import NULL, Option, Some -from wraps.primitives.result import Error, Ok, Result +from wraps.option import NULL, Option, Some +from wraps.result import Error, Ok, Result from iters.async_utils import async_chain, async_iter, async_next_unchecked from iters.types import is_marker, marker diff --git a/iters/iters.py b/iters/iters.py index 836cb18..794c332 100644 --- a/iters/iters.py +++ b/iters/iters.py @@ -49,8 +49,8 @@ ) from typing_extensions import Never, ParamSpec from wraps.early.decorators import early_option -from wraps.primitives.option import Option, Some -from wraps.primitives.result import Result +from wraps.option import Option, Some +from wraps.result import Result from iters.constants import DEFAULT_START, DEFAULT_STEP, EMPTY_BYTES, EMPTY_STRING from iters.ordered_set import OrderedSet, ordered_set diff --git a/iters/mapping_view.py b/iters/mapping_view.py index 01b4219..136b46f 100644 --- a/iters/mapping_view.py +++ b/iters/mapping_view.py @@ -2,7 +2,7 @@ from attrs import frozen from typing_extensions import Self -from wraps.wraps.option import wrap_option_on +from wraps.option import wrap_option_on __all__ = ("MappingView", "mapping_view") diff --git a/iters/ordered_set.py b/iters/ordered_set.py index 4b189bf..5672491 100644 --- a/iters/ordered_set.py +++ b/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.option import wrap_option_on +from wraps.option import wrap_option_on __all__ = ("OrderedSet", "ordered_set", "ordered_set_unchecked") diff --git a/iters/sequence_view.py b/iters/sequence_view.py index b67813c..ec4b2b5 100644 --- a/iters/sequence_view.py +++ b/iters/sequence_view.py @@ -4,7 +4,7 @@ from attrs import frozen from typing_aliases import is_slice -from wraps.wraps.option import wrap_option_on +from wraps.option import wrap_option_on __all__ = ("SequenceView", "sequence_view") diff --git a/iters/types.py b/iters/types.py index 36eda87..ca8f850 100644 --- a/iters/types.py +++ b/iters/types.py @@ -4,7 +4,7 @@ from solus import Singleton from typing_extensions import TypeIs -from wraps.primitives.option import NULL, Option, Some +from wraps.option import NULL, Option, Some T = TypeVar("T") diff --git a/iters/wraps.py b/iters/wraps.py index 53a7ec6..0a333e7 100644 --- a/iters/wraps.py +++ b/iters/wraps.py @@ -1,8 +1,8 @@ from typing import Iterable, Iterator, TypeVar from typing_aliases import Binary, Unary -from wraps.primitives.option import NULL, Option, Some -from wraps.primitives.result import Error, Ok, Result +from wraps.option import NULL, Option, Some +from wraps.result import Error, Ok, Result from iters.types import is_marker, marker from iters.utils import chain From 2dbefe93ac06fa72cdd937910e1619b80f9fbd7d Mon Sep 17 00:00:00 2001 From: Eyshika Agarwal Date: Wed, 2 Oct 2024 10:59:49 -0500 Subject: [PATCH 2/6] Renamed Error to Err from wraps 0.15.0 --- iters/async_wraps.py | 2 +- iters/wraps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iters/async_wraps.py b/iters/async_wraps.py index 23ba929..4e9cbf3 100644 --- a/iters/async_wraps.py +++ b/iters/async_wraps.py @@ -2,7 +2,7 @@ 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.result import Err, Ok, Result from iters.async_utils import async_chain, async_iter, async_next_unchecked from iters.types import is_marker, marker diff --git a/iters/wraps.py b/iters/wraps.py index 0a333e7..3a7c206 100644 --- a/iters/wraps.py +++ b/iters/wraps.py @@ -2,7 +2,7 @@ from typing_aliases import Binary, Unary from wraps.option import NULL, Option, Some -from wraps.result import Error, Ok, Result +from wraps.result import Err, Ok, Result from iters.types import is_marker, marker from iters.utils import chain From 698cfdabfd08241dda5c4543aa289683e05d2a7a Mon Sep 17 00:00:00 2001 From: Eyshika Agarwal Date: Wed, 2 Oct 2024 11:00:29 -0500 Subject: [PATCH 3/6] update wraps to latest --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a88a7df..e3cead4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ async-extensions = ">= 4.0.0" mixed-methods = ">= 1.1.1" funcs = ">= 0.10.1" -wraps = ">= 0.11.0" +wraps = ">= 0.15.0" [tool.poetry.group.format.dependencies] ruff = "0.4.1" From 5238446671ca3e26d67945cc59eaacf423762d84 Mon Sep 17 00:00:00 2001 From: Eyshika Agarwal Date: Wed, 2 Oct 2024 11:20:56 -0500 Subject: [PATCH 4/6] added release in changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30023d2..7b4d9b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ +## 0.19.0 (2024-10-02) + +### Changes + +- Migrated to the latest version of the `wraps` library. + ## 0.18.0 (2024-04-23) ### Changes From 48d966e2070ca985f247115cecc9c579e968f825 Mon Sep 17 00:00:00 2001 From: Eyshika Agarwal Date: Wed, 2 Oct 2024 11:33:02 -0500 Subject: [PATCH 5/6] fix name --- iters/async_iters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iters/async_iters.py b/iters/async_iters.py index 6885078..cdd3afc 100644 --- a/iters/async_iters.py +++ b/iters/async_iters.py @@ -64,7 +64,7 @@ from wraps.option import Option, Some from wraps.result import Result from wraps.futures.future import wrap_future -from wraps.futures.optiion import wrap_future_option +from wraps.futures.option import wrap_future_option from wraps.futures.result import wrap_future_result from iters.async_utils import ( From 61caab036f65b2683766912be506d2b617a73b74 Mon Sep 17 00:00:00 2001 From: Eyshika Agarwal Date: Wed, 2 Oct 2024 11:35:11 -0500 Subject: [PATCH 6/6] Error to Err --- iters/async_wraps.py | 6 +++--- iters/wraps.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iters/async_wraps.py b/iters/async_wraps.py index 4e9cbf3..f52644a 100644 --- a/iters/async_wraps.py +++ b/iters/async_wraps.py @@ -64,12 +64,12 @@ async def async_exactly_one(iterable: AnyIterable[T]) -> Result[T, Option[AsyncI first = await async_next_unchecked(iterator, marker) if is_marker(first): - return Error(NULL) + return Err(NULL) second = await async_next_unchecked(iterator, marker) if not is_marker(second): - return Error(Some(async_chain((first, second), iterator))) + return Err(Some(async_chain((first, second), iterator))) return Ok(first) @@ -85,6 +85,6 @@ async def async_at_most_one(iterable: AnyIterable[T]) -> Result[Option[T], Async second = await async_next_unchecked(iterator, marker) if not is_marker(second): - return Error(async_chain((first, second), iterator)) + return Err(async_chain((first, second), iterator)) return Ok(Some(first)) diff --git a/iters/wraps.py b/iters/wraps.py index 3a7c206..4533f8a 100644 --- a/iters/wraps.py +++ b/iters/wraps.py @@ -37,12 +37,12 @@ def exactly_one(iterable: Iterable[T]) -> Result[T, Option[Iterator[T]]]: first = next(iterator, marker) if is_marker(first): - return Error(NULL) + return Err(NULL) second = next(iterator, marker) if not is_marker(second): - return Error(Some(chain((first, second), iterator))) + return Err(Some(chain((first, second), iterator))) return Ok(first) @@ -58,6 +58,6 @@ def at_most_one(iterable: Iterable[T]) -> Result[Option[T], Iterator[T]]: second = next(iterator, marker) if not is_marker(second): - return Error(chain((first, second), iterator)) + return Err(chain((first, second), iterator)) return Ok(Some(first))