Bump dependencies (#640)

* Bump dependencies

* Fix warnings

requirements/base.txt

@@ -1,2 +1,3 @@
-aiohttp>=3.0
-yarl>=1.0
+aiohttp>=3.8
+async-timeout>=4.0
+yarl>=1.7.2

requirements/ci.txt

@@ -3,6 +3,6 @@ docutils==0.17.1
 tox==3.24.4
 tox-travis==0.12
 pygments==2.10.0
-aiohttp==3.7.4.post0
-yarl==1.7.0
+aiohttp==3.8.0
+yarl==1.7.2
 multidict==5.2.0

tests/test_integration.py

@@ -175,7 +175,7 @@ async def test_stdio_stdin(docker, testing_images, shell_container):
     try:
         # collect the websocket outputs for at most 2 secs until we see the
         # output.
-        with timeout(2):
+        async with timeout(2):
             while True:
                 output += await ws.receive_bytes()
                 if b"print('hello world\\n')" in output:
@@ -194,7 +194,7 @@ async def test_stdio_stdin(docker, testing_images, shell_container):
 
     try:
         # collect the logs for at most 2 secs until we see the output.
-        with timeout(2):
+        async with timeout(2):
             async for s in shell_container.log(stdout=True, follow=True):
                 log.append(s)
                 if "hello world\r\n" in s:
@@ -434,7 +434,7 @@ async def test_events(docker, image_name, event_loop):
     events_occurred = []
     while True:
         try:
-            with timeout(0.2):
+            async with timeout(0.2):
                 event = await subscriber.get()
             if event["Actor"]["ID"] == container._id:
                 events_occurred.append(event["Action"])

tests/test_services.py

@@ -66,7 +66,7 @@ async def test_logs_services(swarm):
     filters = {"service": service_id}
 
     # wait till task status is `complete`
-    with timeout(60):
+    async with timeout(60):
         while True:
             await asyncio.sleep(2)
             task = await swarm.tasks.list(filters=filters)
@@ -96,7 +96,7 @@ async def test_logs_services_stream(swarm):
     filters = {"service": service_id}
 
     # wait till task status is `complete`
-    with timeout(60):
+    async with timeout(60):
         while True:
             await asyncio.sleep(2)
             task = await swarm.tasks.list(filters=filters)
@@ -109,7 +109,7 @@ async def test_logs_services_stream(swarm):
     # let's check for them
     count = 0
     try:
-        with timeout(2):
+        async with timeout(2):
             while True:
                 async for log in swarm.services.logs(
                     service_id, stdout=True, follow=True