diff --git a/libp2p/tools/factories.py b/libp2p/tools/factories.py index 326b1fca..b8fb8358 100644 --- a/libp2p/tools/factories.py +++ b/libp2p/tools/factories.py @@ -1,4 +1,5 @@ from contextlib import ( + AsyncExitStack, asynccontextmanager, ) from typing import ( @@ -12,9 +13,6 @@ from typing import ( cast, ) -from async_exit_stack import ( - AsyncExitStack, -) import factory from multiaddr import ( Multiaddr, diff --git a/libp2p/tools/pubsub/dummy_account_node.py b/libp2p/tools/pubsub/dummy_account_node.py index 0a80a27f..88f43ee0 100644 --- a/libp2p/tools/pubsub/dummy_account_node.py +++ b/libp2p/tools/pubsub/dummy_account_node.py @@ -1,4 +1,5 @@ from contextlib import ( + AsyncExitStack, asynccontextmanager, ) from typing import ( @@ -7,10 +8,6 @@ from typing import ( Tuple, ) -from async_exit_stack import ( - AsyncExitStack, -) - from libp2p.host.host_interface import ( IHost, ) diff --git a/newsfragments/468.removal.rst b/newsfragments/468.removal.rst new file mode 100644 index 00000000..754efe93 --- /dev/null +++ b/newsfragments/468.removal.rst @@ -0,0 +1 @@ +Drop ``async-exit-stack`` dep, as of py37 can import ``AsyncExitStack`` from contextlib diff --git a/setup.py b/setup.py index cf35f32e..fc7d24ed 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,6 @@ install_requires = [ "coincurve>=10.0.0", "pynacl==1.3.0", "trio>=0.15.0", - "async-exit-stack==1.0.1", "noiseprotocol>=0.3.0", "trio-typing>=0.0.4", "exceptiongroup>=1.2.0; python_version < '3.11'", diff --git a/tests/interop/conftest.py b/tests/interop/conftest.py index 5bf9f2ff..80785fce 100644 --- a/tests/interop/conftest.py +++ b/tests/interop/conftest.py @@ -1,7 +1,8 @@ -import anyio -from async_exit_stack import ( +from contextlib import ( AsyncExitStack, ) + +import anyio from p2pclient.datastructures import ( StreamInfo, )