build(deps): bump for dependabot

Author: Laur04

manager/Pipfile

@@ -21,7 +21,7 @@ celery = "~=5.0.5"
 channels = "~=3.0.3"
 channels-redis = "~=3.2.0"
 daphne = "~=3.0.1"
-django = "~=2.2.20"
+django = "~=2.2.24"
 django-extensions = "~=3.1.2"
 django-redis-cache = "~=3.0.0"
 importlib-metadata = {version = "~=3.10.0",markers = "python_version < '3.8'"}
@@ -31,6 +31,6 @@ psycopg2 = "~=2.8.6"
 pycryptodome = "~=3.10.1"
 redis = "~=3.5.3"
 social-auth-app-django = "~=4.0.0"
-websockets = "~=8.1"
+websockets = "~=9.1"
 # Required by importlib-metadata, but Pipenv doesn't pull it in correctly
 zipp = {version = "~=3.4.1", markers = "python_version < '3.8'"}

manager/Pipfile.lock

@@ -9,6 +9,7 @@
 import websockets
 from channels.db import database_sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer, AsyncWebsocketConsumer
+from websockets import client as client
 
 from django.conf import settings
 
@@ -28,7 +29,7 @@ def __init__(self, *args: Any, **kwargs: Any):
         self.site: Optional[Site] = None
         self.connected = False
 
-        self.status_websocket: Optional[websockets.client.WebSocketClientProtocol] = None
+        self.status_websocket: Optional[client.WebSocketClientProtocol] = None
 
     async def connect(self) -> None:
         if not self.scope["user"].is_authenticated:
@@ -251,7 +252,7 @@ def __init__(self, *args: Any, **kwargs: Any):
         self.site: Optional[Site] = None
         self.connected = False
 
-        self.terminal_websock: Optional[websockets.client.WebSocketClientProtocol] = None
+        self.terminal_websock: Optional[client.WebSocketClientProtocol] = None
 
     async def connect(self) -> None:
         if not self.scope["user"].is_authenticated:
@@ -397,7 +398,7 @@ def __init__(self, *args: Any, **kwargs: Any):
         self.site: Optional[Site] = None
         self.connected = False
 
-        self.monitor_websocks: List[websockets.client.WebSocketClientProtocol] = []
+        self.monitor_websocks: List[client.WebSocketClientProtocol] = []
 
     async def connect(self) -> None:
         if not self.scope["user"].is_authenticated:
@@ -461,7 +462,7 @@ async def open_monitor_connections(self) -> None:
 
     async def monitor_mainloop(
         self,
-        monitor_websock: websockets.client.WebSocketClientProtocol,
+        monitor_websock: client.WebSocketClientProtocol,
     ) -> None:
         while True:
             try:
@@ -516,7 +517,7 @@ def __init__(self, *args: Any, **kwargs: Any):
 
         self.site: Optional[Site] = None
 
-        self.logs_websock: Optional[websockets.client.WebSocketClientProtocol] = None
+        self.logs_websock: Optional[client.WebSocketClientProtocol] = None
 
     async def connect(self) -> None:
         if not self.scope["user"].is_authenticated:
@@ -616,7 +617,7 @@ def __init__(self, *args: Any, **kwargs: Any):
 
         self.site_ids: List[int] = []
 
-        self.monitor_websock: Optional[websockets.client.WebSocketClientProtocol] = None
+        self.monitor_websock: Optional[client.WebSocketClientProtocol] = None
 
     async def connect(self) -> None:
         if not self.scope["user"].is_authenticated:
@@ -674,7 +675,7 @@ async def open_monitor_connection(self) -> None:
 
     async def monitor_mainloop(
         self,
-        monitor_websock: websockets.client.WebSocketClientProtocol,
+        monitor_websock: client.WebSocketClientProtocol,
     ) -> None:
         while True:
             try:

manager/director/apps/sites/consumers.py

@@ -12,6 +12,7 @@
 from typing import Any, Dict, Iterable, Iterator, Optional, Sequence, Tuple, Union
 
 import websockets
+from websockets.legacy.client import Connect as Connect
 
 from django.conf import settings
 
@@ -294,7 +295,7 @@ def appserver_open_websocket(
     ping_interval: Union[int, float] = 20,
     ping_timeout: Union[int, float] = 20,
     close_timeout: Union[int, float, None] = None,
-) -> websockets.client.Connect:
+) -> Connect:
     assert path[0] == "/"
 
     appserver = get_appserver_addr(appserver, allow_random=True, websocket=True)

manager/director/utils/appserver.py

@@ -1,4 +1,4 @@
-import websockets
+from websockets.legacy.client import Connect as Connect
 
 from ...test.director_test import DirectorTestCase
 from ..appserver import (
@@ -60,6 +60,6 @@ def test_iter_random_pingable_appservers(self):
 
     def test_appserver_open_websocket(self):
         self.assertEqual(
-            websockets.client.Connect,
+            Connect,
             type(appserver_open_websocket("director-apptest1", "/test", ping_timeout=1)),
         )

manager/director/utils/tests/test_appserver.py

@@ -23,4 +23,4 @@ gunicorn = "~=20.1.0"
 mysqlclient = "~=2.0.3"
 psycopg2 = "~=2.8.6"
 pycryptodome = "~=3.10.1"
-websockets = "~=8.1"
+websockets = "~=9.1"