add aiohttp to tests config

kevin1024 · Aug 4, 2016 · 77ae99b · 77ae99b
1 parent 8851571
commit 77ae99b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -22,10 +22,12 @@ env:
     - TOX_SUFFIX="urllib3110"
     - TOX_SUFFIX="tornado3"
     - TOX_SUFFIX="tornado4"
+    - TOX_SUFFIX="aiohttp"
 matrix:
   allow_failures:
     - env: TOX_SUFFIX="boto"
     - env: TOX_SUFFIX="boto3"
+    - TOX_SUFFIX="aiohttp"
   exclude:
     - env: TOX_SUFFIX="boto"
       python: 3.3
@@ -35,6 +37,10 @@ matrix:
       python: 3.4
     - env: TOX_SUFFIX="requests1"
       python: 3.5
+    - env: TOX_SUFFIX="aiohttp"
+      python: 3.4
+    - env: TOX_SUFFIX="aiohttp"
+      python: 3.5
 python:
 - 2.6
 - 2.7

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py33,py34,pypy,pypy3}-{flakes,requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib317,urllib319,urllib3110,tornado3,tornado4,boto,boto3}
+envlist = {py26,py27,py33,py34,pypy,pypy3}-{flakes,requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib317,urllib319,urllib3110,tornado3,tornado4,boto,boto3,aiohttp}
 
 [testenv:flakes]
 skipsdist = True
@@ -38,6 +38,7 @@ deps =
     {py26,py27,py33,py34}-tornado4: pycurl
     boto: boto
     boto3: boto3
+    aiohttp: aiohttp
 
 [flake8]
 max_line_length = 110