chore/format/ci: use black stable style 2024; bump flake8 version; add black config to pyproject.toml

.pre-commit-config.yaml

@@ -6,14 +6,17 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/ambv/black
-    rev: 23.3.0
+    rev: 24.3.0
     hooks:
     - id: black
       language_version: python3
 -   repo: https://github.com/pycqa/flake8
-    rev: 5.0.4
+    rev: 7.0.0
     hooks:
     - id: flake8
+      args:
+        - --extend-ignore=E704
+      # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
     # We can't use the latest version due to a regression in mypy 1.7.0
     # See https://github.com/python/mypy/issues/17191 for more information

aiostream/aiter_utils.py

@@ -1,4 +1,5 @@
 """Utilities for asynchronous iteration."""
+
 from __future__ import annotations
 
 import sys

aiostream/core.py

@@ -1,4 +1,5 @@
 """Core objects for stream operators."""
+
 from __future__ import annotations
 
 import inspect
@@ -258,28 +259,23 @@ def streamcontext(aiterable: AsyncIterable[T]) -> Streamer[T]:
 
 
 class OperatorType(Protocol[P, T]):
-    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Stream[T]:
-        ...
+    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Stream[T]: ...
 
-    def raw(self, *args: P.args, **kwargs: P.kwargs) -> AsyncIterator[T]:
-        ...
+    def raw(self, *args: P.args, **kwargs: P.kwargs) -> AsyncIterator[T]: ...
 
 
 class PipableOperatorType(Protocol[A, P, T]):
     def __call__(
         self, source: AsyncIterable[A], /, *args: P.args, **kwargs: P.kwargs
-    ) -> Stream[T]:
-        ...
+    ) -> Stream[T]: ...
 
     def raw(
         self, source: AsyncIterable[A], /, *args: P.args, **kwargs: P.kwargs
-    ) -> AsyncIterator[T]:
-        ...
+    ) -> AsyncIterator[T]: ...
 
     def pipe(
         self, *args: P.args, **kwargs: P.kwargs
-    ) -> Callable[[AsyncIterable[A]], Stream[T]]:
-        ...
+    ) -> Callable[[AsyncIterable[A]], Stream[T]]: ...
 
 
 # Operator decorator
@@ -494,7 +490,10 @@ def raw(
 
     # Init method
     def init(
-        self: BaseStream[T], arg: AsyncIterable[X], *args: P.args, **kwargs: P.kwargs
+        self: BaseStream[T],
+        arg: AsyncIterable[X],
+        *args: P.args,
+        **kwargs: P.kwargs,
     ) -> None:
         assert_async_iterable(arg)
         if more_sources_index is not None:

aiostream/manager.py

@@ -1,6 +1,7 @@
 """Provide a context to easily manage several streamers running
 concurrently.
 """
+
 from __future__ import annotations
 
 import asyncio

aiostream/pipe.py

@@ -1,4 +1,5 @@
 """Gather the pipe operators."""
+
 from __future__ import annotations
 
 from . import stream

aiostream/stream/advanced.py

@@ -1,4 +1,5 @@
 """Advanced operators (to deal with streams of higher order) ."""
+
 from __future__ import annotations
 
 from typing import AsyncIterator, AsyncIterable, TypeVar, Union, cast
@@ -46,9 +47,9 @@ async def base_combine(
 
     # Safe context
     async with StreamerManager[Union[AsyncIterable[T], T]]() as manager:
-        main_streamer: Streamer[
-            AsyncIterable[T] | T
-        ] | None = await manager.enter_and_create_task(source)
+        main_streamer: Streamer[AsyncIterable[T] | T] | None = (
+            await manager.enter_and_create_task(source)
+        )
 
         # Loop over events
         while manager.tasks:

aiostream/stream/aggregate.py

@@ -1,10 +1,18 @@
 """Aggregation operators."""
+
 from __future__ import annotations
 
 import asyncio
 import builtins
 import operator as op
-from typing import AsyncIterator, Awaitable, Callable, TypeVar, AsyncIterable, cast
+from typing import (
+    AsyncIterator,
+    Awaitable,
+    Callable,
+    TypeVar,
+    AsyncIterable,
+    cast,
+)
 
 
 from . import select

aiostream/stream/combine.py

@@ -1,4 +1,5 @@
 """Combination operators."""
+
 from __future__ import annotations
 
 import asyncio
@@ -93,18 +94,15 @@ async def zip(
 
 
 class SmapCallable(Protocol[X, Y]):
-    def __call__(self, arg: X, /, *args: X) -> Y:
-        ...
+    def __call__(self, arg: X, /, *args: X) -> Y: ...
 
 
 class AmapCallable(Protocol[X, Y]):
-    async def __call__(self, arg: X, /, *args: X) -> Y:
-        ...
+    async def __call__(self, arg: X, /, *args: X) -> Y: ...
 
 
 class MapCallable(Protocol[X, Y]):
-    def __call__(self, arg: X, /, *args: X) -> Awaitable[Y] | Y:
-        ...
+    def __call__(self, arg: X, /, *args: X) -> Awaitable[Y] | Y: ...
 
 
 @pipable_operator

aiostream/stream/create.py

@@ -1,4 +1,5 @@
 """Non-pipable creation operators."""
+
 from __future__ import annotations
 
 import sys
@@ -96,18 +97,18 @@ async def just(value: T) -> AsyncIterator[T]:
 
 
 class SyncCallable(Protocol[P, Y]):
-    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Y:
-        ...
+    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Y: ...
 
 
 class AsyncCallable(Protocol[P, Y]):
-    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Awaitable[Y]:
-        ...
+    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Awaitable[Y]: ...
 
 
 @operator
 async def call(
-    func: SyncCallable[P, T] | AsyncCallable[P, T], *args: P.args, **kwargs: P.kwargs
+    func: SyncCallable[P, T] | AsyncCallable[P, T],
+    *args: P.args,
+    **kwargs: P.kwargs,
 ) -> AsyncIterator[T]:
     """Call the given function and generate a single value.
 

aiostream/stream/misc.py

@@ -1,10 +1,18 @@
 """Extra operators."""
+
 from __future__ import annotations
 
 import asyncio
 import builtins
 
-from typing import TypeVar, Awaitable, Callable, AsyncIterable, AsyncIterator, Any
+from typing import (
+    TypeVar,
+    Awaitable,
+    Callable,
+    AsyncIterable,
+    AsyncIterator,
+    Any,
+)
 
 from .combine import amap, smap
 from ..core import pipable_operator

aiostream/stream/select.py

@@ -1,4 +1,5 @@
 """Selection operators."""
+
 from __future__ import annotations
 
 import asyncio

aiostream/stream/time.py

@@ -1,4 +1,5 @@
 """Time-specific operators."""
+
 from __future__ import annotations
 import asyncio
 

aiostream/stream/transform.py

@@ -49,13 +49,11 @@ async def enumerate(
 
 
 class AsyncStarmapCallable(Protocol[X, Y]):
-    def __call__(self, arg: X, /, *args: X) -> Awaitable[Y]:
-        ...
+    def __call__(self, arg: X, /, *args: X) -> Awaitable[Y]: ...
 
 
 class SyncStarmapCallable(Protocol[X, Y]):
-    def __call__(self, arg: X, /, *args: X) -> Y:
-        ...
+    def __call__(self, arg: X, /, *args: X) -> Y: ...
 
 
 @pipable_operator

pyproject.toml

@@ -4,6 +4,10 @@ addopts = "--strict-markers --cov aiostream"
 [tool.pyright]
 ignore = ["aiostream/test_utils.py"]
 
+[tool.black]
+line-length = 88
+target_version = ["py38", "py39", "py310", "py311", "py312"]
+
 [tool.mypy]
 strict = true
 packages = ["aiostream", "examples"]