diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db0dbdb3..49759c9d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -49,7 +49,6 @@ repos: - id: mypy additional_dependencies: - mypy-protobuf - # exclude: 'tests/|crypto/|identity/|pubsub/|insecure/|noise/|security/' exclude: 'tests/' - repo: local hooks: diff --git a/examples/echo/echo.py b/examples/echo/echo.py index c1fa2c98..d9039715 100644 --- a/examples/echo/echo.py +++ b/examples/echo/echo.py @@ -78,8 +78,8 @@ async def run(port: int, destination: str, seed: int = None) -> None: await stream.close() response = await stream.read() - print(f"Sent: {msg}") - print(f"Got: {response}") + print(f"Sent: {msg.decode('utf-8')}") + print(f"Got: {response.decode('utf-8')}") def main() -> None: diff --git a/libp2p/host/basic_host.py b/libp2p/host/basic_host.py index 6c39759f..18054290 100644 --- a/libp2p/host/basic_host.py +++ b/libp2p/host/basic_host.py @@ -1,3 +1,6 @@ +from contextlib import ( + asynccontextmanager, +) import logging from typing import ( TYPE_CHECKING, @@ -6,9 +9,6 @@ from typing import ( Sequence, ) -from async_generator import ( - asynccontextmanager, -) from async_service import ( background_trio_service, ) @@ -145,8 +145,7 @@ class BasicHost(IHost): addrs.append(addr.encapsulate(p2p_part)) return addrs - # type ignored because asynccontextmanager decorator is untyped - @asynccontextmanager # type: ignore + @asynccontextmanager async def run( self, listen_addrs: Sequence[multiaddr.Multiaddr] ) -> AsyncIterator[None]: diff --git a/libp2p/tools/factories.py b/libp2p/tools/factories.py index 35ed1cfb..42f81646 100644 --- a/libp2p/tools/factories.py +++ b/libp2p/tools/factories.py @@ -1,3 +1,6 @@ +from contextlib import ( + asynccontextmanager, +) from typing import ( Any, AsyncIterator, @@ -12,9 +15,6 @@ from typing import ( from async_exit_stack import ( AsyncExitStack, ) -from async_generator import ( - asynccontextmanager, -) from async_service import ( background_trio_service, ) diff --git a/libp2p/tools/interop/daemon.py b/libp2p/tools/interop/daemon.py index a7a69cec..74bbc512 100644 --- a/libp2p/tools/interop/daemon.py +++ b/libp2p/tools/interop/daemon.py @@ -1,10 +1,10 @@ +from contextlib import ( + asynccontextmanager, +) from typing import ( AsyncIterator, ) -from async_generator import ( - asynccontextmanager, -) import multiaddr from multiaddr import ( Multiaddr, diff --git a/libp2p/tools/pubsub/dummy_account_node.py b/libp2p/tools/pubsub/dummy_account_node.py index bef47553..ec12ade2 100644 --- a/libp2p/tools/pubsub/dummy_account_node.py +++ b/libp2p/tools/pubsub/dummy_account_node.py @@ -1,3 +1,6 @@ +from contextlib import ( + asynccontextmanager, +) from typing import ( AsyncIterator, Dict, @@ -7,9 +10,6 @@ from typing import ( from async_exit_stack import ( AsyncExitStack, ) -from async_generator import ( - asynccontextmanager, -) from async_service import ( Service, background_trio_service, diff --git a/newsfragments/464.internal.rst b/newsfragments/464.internal.rst new file mode 100644 index 00000000..be68fd3e --- /dev/null +++ b/newsfragments/464.internal.rst @@ -0,0 +1 @@ +Turn ``mypy`` checks on and remove ``async_generator`` dependency diff --git a/setup.py b/setup.py index f1e31729..b099687a 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,6 @@ install_requires = [ "protobuf>=3.10.0", "coincurve>=10.0.0", "pynacl==1.3.0", - "async_generator==1.10", "trio>=0.15.0", "async-service>=0.1.0a6", "async-exit-stack==1.0.1",