Skip to content

Commit 9be996b

Browse files
authored
Core: downgrade websockets and minor fixes (ArchipelagoMW#4166)
* Core: downgrade websockets to 13.x 14.x currently doesn't work for MultiServer. 14.x is not supported with py3.8, so updating to 14.x should be scheduled for AP 0.6.0. * CI: 5min timeout for hosting test * MultiServer: properly shutdown even if ctx is invalid * CI: increase hosting test timeout to 10min this is 4x expected time, just to be safe.
1 parent fa93bc5 commit 9be996b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/unittests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ jobs:
8989
run: |
9090
source venv/bin/activate
9191
export PYTHONPATH=$(pwd)
92-
python test/hosting/__main__.py
92+
timeout 600 python test/hosting/__main__.py

MultiServer.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,8 +1960,10 @@ def _cmd_status(self, tag: str = "") -> bool:
19601960

19611961
def _cmd_exit(self) -> bool:
19621962
"""Shutdown the server"""
1963-
self.ctx.server.ws_server.close()
1964-
self.ctx.exit_event.set()
1963+
try:
1964+
self.ctx.server.ws_server.close()
1965+
finally:
1966+
self.ctx.exit_event.set()
19651967
return True
19661968

19671969
@mark_raw

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
colorama>=0.4.6
2-
websockets>=13.0.1
2+
websockets>=13.0.1,<14
33
PyYAML>=6.0.2
44
jellyfish>=1.1.0
55
jinja2>=3.1.4

0 commit comments

Comments
 (0)