Skip to content

Commit ae35c78

Browse files
authored
Bump websockets to >=9 (#214)
1 parent 35203e8 commit ae35c78

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

gql/transport/websockets.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import websockets
99
from graphql import DocumentNode, ExecutionResult, print_ast
1010
from websockets.client import WebSocketClientProtocol
11+
from websockets.datastructures import HeadersLike
1112
from websockets.exceptions import ConnectionClosed
12-
from websockets.http import HeadersLike
1313
from websockets.typing import Data, Subprotocol
1414

1515
from .async_transport import AsyncTransport
@@ -573,7 +573,8 @@ async def connect(self) -> None:
573573
# Set the _connecting flag to False after in all cases
574574
try:
575575
self.websocket = await asyncio.wait_for(
576-
websockets.connect(self.url, **connect_args,), self.connect_timeout,
576+
websockets.client.connect(self.url, **connect_args,),
577+
self.connect_timeout,
577578
)
578579
finally:
579580
self._connecting = False

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
]
4242

4343
install_websockets_requires = [
44-
"websockets>=8.1,<9",
44+
"websockets>=9,<10",
4545
]
4646

4747
install_all_requires = (

tests/conftest.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ async def go(app, *, port=None, **kwargs): # type: ignore
100100

101101

102102
# Adding debug logs to websocket tests
103-
for name in ["websockets.server", "gql.transport.websockets", "gql.dsl"]:
103+
for name in ["websockets.legacy.server", "gql.transport.websockets", "gql.dsl"]:
104104
logger = logging.getLogger(name)
105105
logger.setLevel(logging.DEBUG)
106106

@@ -125,7 +125,7 @@ def __init__(self, with_ssl: bool = False):
125125

126126
async def start(self, handler):
127127

128-
import websockets
128+
from websockets.legacy import server
129129

130130
print("Starting server")
131131

@@ -149,9 +149,7 @@ async def start(self, handler):
149149
extra_serve_args["ssl"] = ssl_context
150150

151151
# Start a server with a random open port
152-
self.start_server = websockets.server.serve(
153-
handler, "127.0.0.1", 0, **extra_serve_args
154-
)
152+
self.start_server = server.serve(handler, "127.0.0.1", 0, **extra_serve_args)
155153

156154
# Wait that the server is started
157155
self.server = await self.start_server

0 commit comments

Comments
 (0)