From 37c39b89ce8a3d50e8de198c0eeefeb25fdee423 Mon Sep 17 00:00:00 2001
From: Ro'e Katz <roekatz@gmail.com>
Date: Thu, 29 Aug 2024 16:01:46 +0300
Subject: [PATCH 1/3] Fix setuptools to 70.0.0 on root requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 69533e9fd..656fe7c60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,5 +7,5 @@ pytest-asyncio
 pytest-rerunfailures
 wheel>=0.38.0
 twine
-setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
+setuptools>=70.0.0 # not directly required, pinned by Snyk to avoid a vulnerability
 zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability

From d51399fef06e6606af0c95a9ab22bcfc69de355d Mon Sep 17 00:00:00 2001
From: Ro'e Katz <roekatz@gmail.com>
Date: Thu, 29 Aug 2024 16:27:00 +0300
Subject: [PATCH 2/3] Upgrade fastapi_websocket_rpc to 0.1.27

---
 packages/requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/requires.txt b/packages/requires.txt
index 7b3ff3e88..e37ccd553 100644
--- a/packages/requires.txt
+++ b/packages/requires.txt
@@ -2,7 +2,7 @@ idna>=3.3,<4
 typer>=0.4.1,<1
 fastapi>=0.109.1,<1
 fastapi_websocket_pubsub==0.3.7
-fastapi_websocket_rpc==0.1.25
+fastapi_websocket_rpc==0.1.27
 gunicorn>=22.0.0,<23
 pydantic[email]>=1.9.1,<2
 typing-extensions;python_version<'3.8'

From 95ee9a515e390ccf82c2f9ba66f2fded37f2f28c Mon Sep 17 00:00:00 2001
From: Ro'e Katz <roekatz@gmail.com>
Date: Thu, 29 Aug 2024 16:28:54 +0300
Subject: [PATCH 3/3] Allow websockets upgrade (up to 13)

---
 packages/opal-client/requires.txt | 1 -
 packages/opal-server/requires.txt | 1 -
 packages/requires.txt             | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/opal-client/requires.txt b/packages/opal-client/requires.txt
index e29158b99..0fb2499eb 100644
--- a/packages/opal-client/requires.txt
+++ b/packages/opal-client/requires.txt
@@ -2,6 +2,5 @@ aiofiles>=0.8.0,<1
 aiohttp>=3.9.2,<4
 psutil>=5.9.1,<6
 tenacity>=8.0.1,<9
-websockets>=10.3,<11
 dpath>=2.1.5,<3
 jsonpatch>=1.33,<2
diff --git a/packages/opal-server/requires.txt b/packages/opal-server/requires.txt
index 3a78295dc..ff3e5cb13 100644
--- a/packages/opal-server/requires.txt
+++ b/packages/opal-server/requires.txt
@@ -2,7 +2,6 @@ click>=8.1.3,<9
 permit-broadcaster[postgres,redis,kafka]==0.2.5
 gitpython>=3.1.32,<4
 pyjwt[crypto]>=2.1.0,<3
-websockets>=10.3,<11
 slowapi>=0.1.5,<1
 # slowapi is stuck on and old `redis`, so fix that and switch from aioredis to redis
 pygit2>=1.14.1,<1.15
diff --git a/packages/requires.txt b/packages/requires.txt
index e37ccd553..7c586c798 100644
--- a/packages/requires.txt
+++ b/packages/requires.txt
@@ -3,6 +3,7 @@ typer>=0.4.1,<1
 fastapi>=0.109.1,<1
 fastapi_websocket_pubsub==0.3.7
 fastapi_websocket_rpc==0.1.27
+websockets>=10.3,<14
 gunicorn>=22.0.0,<23
 pydantic[email]>=1.9.1,<2
 typing-extensions;python_version<'3.8'