Fix aiohttp 3.8.0 breaking changes (and unpin from 3.7) (#20261)

ray-project · Nov 11, 2021 · abf0eb5 · abf0eb5
1 parent dbeb2e2
commit abf0eb5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/ci/asan_tests/ray-project/requirements.txt b/ci/asan_tests/ray-project/requirements.txt
@@ -1,11 +1,13 @@
-aiohttp==3.7
+aiohttp
+aiosignal
 blist
 boto3
 cython==0.29.0
 dataclasses; python_version < '3.7'
 dm-tree==0.1.5
 feather-format
 flask
+frozenlist
 grpcio
 gym
 kubernetes

diff --git a/ci/travis/test-wheels.sh b/ci/travis/test-wheels.sh
@@ -76,7 +76,7 @@ if [[ "$platform" == "linux" ]]; then
     "$PYTHON_EXE" -u -c "import ray; print(ray.__commit__)" | grep "$TRAVIS_COMMIT" || (echo "ray.__commit__ not set properly!" && exit 1)
 
     # Install the dependencies to run the tests.
-    "$PIP_CMD" install -q aiohttp==3.7 grpcio pytest==5.4.3 requests
+    "$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==5.4.3 requests
 
     # Run a simple test script to make sure that the wheel works.
     for SCRIPT in "${TEST_SCRIPTS[@]}"; do
@@ -117,7 +117,7 @@ elif [[ "$platform" == "macosx" ]]; then
     "$PIP_CMD" install -q "$PYTHON_WHEEL"
 
     # Install the dependencies to run the tests.
-    "$PIP_CMD" install -q aiohttp==3.7 grpcio pytest==5.4.3 requests
+    "$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==5.4.3 requests
 
     # Run a simple test script to make sure that the wheel works.
     for SCRIPT in "${TEST_SCRIPTS[@]}"; do

diff --git a/dashboard/optional_deps.py b/dashboard/optional_deps.py
@@ -5,11 +5,11 @@
 import prometheus_client  # noqa: F401
 
 import aiohttp  # noqa: F401
-import aiohttp.signals
+import aiosignal  # noqa: F401
 import aiohttp.web  # noqa: F401
 import aiohttp_cors  # noqa: F401
 from aiohttp import hdrs  # noqa: F401
-from aiohttp.frozenlist import FrozenList  # noqa: F401
+from frozenlist import FrozenList  # noqa: F401
 from aiohttp.typedefs import PathLike  # noqa: F401
 from aiohttp.web import RouteDef  # noqa: F401
 

diff --git a/dashboard/utils.py b/dashboard/utils.py
@@ -26,8 +26,8 @@
 # All third-party dependencies that are not included in the minimal Ray
 # installation must be included in this file. This allows us to determine if
 # the agent has the necessary dependencies to be started.
-from ray.dashboard.optional_deps import (aiohttp, aioredis, hdrs, FrozenList,
-                                         PathLike, RouteDef)
+from ray.dashboard.optional_deps import (aiohttp, aiosignal, aioredis, hdrs,
+                                         FrozenList, PathLike, RouteDef)
 
 try:
     create_task = asyncio.create_task
@@ -401,7 +401,7 @@ def freeze(cls):
             sig.freeze()
 
 
-class Signal(aiohttp.signals.Signal):
+class Signal(aiosignal.Signal):
     __slots__ = ()
 
     def __init__(self, owner):

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -7,9 +7,11 @@
 # setup.py install_requires
 aiohttp>=3.7
 aioredis < 2
+aiosignal
 click >= 7.0
 cloudpickle
 filelock
+frozenlist
 gpustat >= 1.0.0b1
 grpcio >= 1.28.1
 jsonschema

diff --git a/python/requirements/requirements_default.txt b/python/requirements/requirements_default.txt
@@ -1,6 +1,8 @@
-aiohttp==3.7
+aiohttp>=3.7
+aiosignal
 aiohttp_cors
 aioredis<2
 colorful
+frozenlist
 opencensus
 prometheus_client>=0.7.1
diff --git a/python/setup.py b/python/setup.py
@@ -198,10 +198,12 @@ def get_packages(self):
             "fsspec",
         ],
         "default": [
-            "aiohttp == 3.7",
+            "aiohttp >= 3.7",
+            "aiosignal",
             "aiohttp_cors",
             "aioredis < 2",
             "colorful",
+            "frozenlist",
             "py-spy >= 0.2.0",
             "requests",
             "gpustat >= 1.0.0b1",  # for windows