monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: downgrade websockets and minor fixes (#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.
This commit is contained in:
black-sliver 2024-11-10 01:23:29 +01:00 committed by GitHub
parent fa93bc5d1e
commit 9be996ba0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/unittests.yml vendored
View File

@ -89,4 +89,4 @@ jobs:
run: | run: |
source venv/bin/activate source venv/bin/activate
export PYTHONPATH=$(pwd) export PYTHONPATH=$(pwd)
python test/hosting/__main__.py timeout 600 python test/hosting/__main__.py

2
MultiServer.py
View File

@ -1960,7 +1960,9 @@ class ServerCommandProcessor(CommonCommandProcessor):
def _cmd_exit(self) -> bool: def _cmd_exit(self) -> bool:
"""Shutdown the server""" """Shutdown the server"""
try:
self.ctx.server.ws_server.close() self.ctx.server.ws_server.close()
finally:
self.ctx.exit_event.set() self.ctx.exit_event.set()
return True return True

2
requirements.txt
View File

@ -1,5 +1,5 @@
colorama>=0.4.6 colorama>=0.4.6
websockets>=13.0.1 websockets>=13.0.1,<14
PyYAML>=6.0.2 PyYAML>=6.0.2
jellyfish>=1.1.0 jellyfish>=1.1.0
jinja2>=3.1.4 jinja2>=3.1.4