Merge pull request #873 from jd/aiohttp-upgrade

[tests] Add support for aiohttp up to 3.5

Author: jd

.circleci/config.yml

@@ -253,13 +253,11 @@ jobs:
     steps:
       - checkout
       - *restore_cache_step
-      - run: tox -e 'aiohttp_contrib-{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl' --result-json /tmp/aiohttp.1.results
-      - run: tox -e 'aiohttp_contrib-{py34,py35,py36}-aiohttp{23}-aiohttp_jinja{015}-yarl10' --result-json /tmp/aiohttp.2.results
+      - run: tox -e 'aiohttp_contrib-{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl,aiohttp_contrib-{py34,py35,py36}-aiohttp23-aiohttp_jinja015-yarl10,aiohttp_contrib-{py35,py36}-aiohttp{30,31,32,33,34,35}-aiohttp_jinja015-yarl10' --result-json /tmp/aiohttp.results
       - persist_to_workspace:
           root: /tmp
           paths:
-            - aiohttp.1.results
-            - aiohttp.2.results
+            - aiohttp.results
       - *save_cache_step
 
   tornado:

tests/contrib/aiohttp/app/web.py

@@ -94,6 +94,7 @@ def delayed_handler(request):
 
 @asyncio.coroutine
 def noop_middleware(app, handler):
+    @asyncio.coroutine
     def middleware_handler(request):
         # noop middleware
         response = yield from handler(request)

tox.ini

@@ -38,7 +38,8 @@ envlist =
     aiobotocore_contrib-py34-aiobotocore{02,03,04}
     aiobotocore_contrib-{py35,py36}-aiobotocore{02,03,04,05,07,08,09,010}
     aiohttp_contrib-{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl
-    aiohttp_contrib-{py34,py35,py36}-aiohttp{23}-aiohttp_jinja{015}-yarl10
+    aiohttp_contrib-{py34,py35,py36}-aiohttp23-aiohttp_jinja{015}-yarl10
+    aiohttp_contrib-{py35,py36}-aiohttp{30,31,32,33,34,35}-aiohttp_jinja{015}-yarl10
     aiopg_contrib-{py34,py35,py36}-aiopg{012,015}
     asyncio_contrib-{py34,py35,py36}
     boto_contrib-{py27,py34}-boto
@@ -156,6 +157,12 @@ deps =
     aiohttp21: aiohttp>=2.1,<2.2
     aiohttp22: aiohttp>=2.2,<2.3
     aiohttp23: aiohttp>=2.3,<2.4
+    aiohttp30: aiohttp>=3.0,<3.1
+    aiohttp31: aiohttp>=3.1,<3.2
+    aiohttp32: aiohttp>=3.2,<3.3
+    aiohttp33: aiohttp>=3.3,<3.4
+    aiohttp34: aiohttp>=3.4,<3.5
+    aiohttp35: aiohttp>=3.5,<3.6
     aiohttp_jinja012: aiohttp_jinja2>=0.12,<0.13
     aiohttp_jinja013: aiohttp_jinja2>=0.13,<0.14
     aiohttp_jinja015: aiohttp_jinja2>=0.15,<0.16