mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 12:11:33 -06:00
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:
2
.github/workflows/unittests.yml
vendored
2
.github/workflows/unittests.yml
vendored
@@ -89,4 +89,4 @@ jobs:
|
||||
run: |
|
||||
source venv/bin/activate
|
||||
export PYTHONPATH=$(pwd)
|
||||
python test/hosting/__main__.py
|
||||
timeout 600 python test/hosting/__main__.py
|
||||
|
@@ -1960,8 +1960,10 @@ class ServerCommandProcessor(CommonCommandProcessor):
|
||||
|
||||
def _cmd_exit(self) -> bool:
|
||||
"""Shutdown the server"""
|
||||
self.ctx.server.ws_server.close()
|
||||
self.ctx.exit_event.set()
|
||||
try:
|
||||
self.ctx.server.ws_server.close()
|
||||
finally:
|
||||
self.ctx.exit_event.set()
|
||||
return True
|
||||
|
||||
@mark_raw
|
||||
|
@@ -1,5 +1,5 @@
|
||||
colorama>=0.4.6
|
||||
websockets>=13.0.1
|
||||
websockets>=13.0.1,<14
|
||||
PyYAML>=6.0.2
|
||||
jellyfish>=1.1.0
|
||||
jinja2>=3.1.4
|
||||
|
Reference in New Issue
Block a user