Merge pull request #25 from UniversityRadioYork/dependabot/pip/build/websockets-9.1

Bump websockets from 8.1 to 10.1 in /build

.github/workflows/build.yaml

@@ -9,7 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ['3.9']
+        node-version: ['14']
 
     steps:
     - uses: actions/checkout@v2
@@ -17,6 +18,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: actions/checkout@v2
+    - name: Set up Node ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Build .app
       run: |
         npm run presenter-make
@@ -40,7 +46,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ['3.9']
+        node-version: ['14']
 
     steps:
     - uses: actions/checkout@v2
@@ -48,6 +55,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: actions/checkout@v2
+    - name: Set up Node ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Build executable
       run: |
         npm run presenter-make
@@ -70,7 +82,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ['3.9']
+        node-version: ['14']
 
     steps:
     - uses: actions/checkout@v2
@@ -78,6 +91,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: actions/checkout@v2
+    - name: Set up Node ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Build .exe
       run: |
         npm run presenter-make

build/requirements.txt

@@ -1,14 +1,14 @@
 wheel
 pygame==2.0.2
-sanic==21.3.4
+sanic==21.9.3
-sanic-Cors==1.0.0
+sanic-Cors==1.0.1
 syncer==1.3.0
 aiohttp==3.7.4.post0
 mutagen==1.45.1
 sounddevice==0.4.2
 setproctitle==1.2.2
 pyttsx3==2.90
-websockets==8.1
+websockets==10.1
 typing_extensions==3.10.0.0
 pyserial==3.5
 requests==2.26.0

websocket_server.py

@@ -7,7 +7,8 @@ from typing import List
 import websockets
 import json
 from os import _exit
-from websockets.server import Serve
+from websockets.legacy.server import Serve
+from websockets.server import serve
 from setproctitle import setproctitle
 from multiprocessing import current_process
 
@@ -39,7 +40,7 @@ class WebsocketServer:
         self.logger = LoggingManager("Websockets")
         self.server_name = state.get()["server_name"]
 
-        self.websocket_server = websockets.serve(
+        self.websocket_server = serve(
             self.websocket_handler, state.get()["host"], state.get()["ws_port"]
         )