Merge remote-tracking branch 'origin/dev-0.18.7' into dev-0.18.7

julien6387 · Jan 8, 2025 · 91ce2cf · 91ce2cf
2 parents 3def603 + b330adb
commit 91ce2cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 flask_require_36 = ['flask-restx == 0.5.1', 'Flask < 3', 'Werkzeug == 2.0.3']
 flask_require = ['flask-restx >= 1.1.0, < 1.3']
 zmq_require = ['pyzmq >= 25.1.1']
-websockets_require = ['websockets >= 10.4']
+websockets_require = ['websockets >= 10.4, < 14']
 
 testing_extras = ['pytest >= 2.5.2', 'pytest-cov', 'pytest-mock', 'pytest-asyncio < 0.22']
 

diff --git a/tox.ini b/tox.ini
@@ -29,7 +29,7 @@ commands = {[testenv:common]commands}
 deps =
     {[testenv:common]deps}
     flask-restx >= 1.1.0, < 1.3
-    websockets >= 10.4
+    websockets >= 10.4, < 14
 commands = {[testenv:common]commands}
 
 
@@ -44,7 +44,7 @@ commands =
 [testenv:docs]
 deps =
     pyzmq >= 25.1.1
-    websockets >= 10.4
+    websockets >= 10.4, > 14
     sphinx == 7.2.6
     renku-sphinx-theme == 0.4.0
     myst-parser == 2.0.0