diff --git a/.travis.yml b/.travis.yml index 2f7fac7..d5e914e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,6 @@ matrix: - env: TOX_SUFFIX="boto" - env: TOX_SUFFIX="boto3" exclude: - - env: TOX_SUFFIX="flakes" - python: 2.6 - env: TOX_SUFFIX="flakes" python: 2.7 - env: TOX_SUFFIX="flakes" @@ -52,8 +50,6 @@ matrix: python: 3.5 - env: TOX_SUFFIX="requests1" python: 3.6 - - env: TOX_SUFFIX="aiohttp" - python: 2.6 - env: TOX_SUFFIX="aiohttp" python: 2.7 - env: TOX_SUFFIX="aiohttp" @@ -61,7 +57,6 @@ matrix: - env: TOX_SUFFIX="aiohttp" python: pypy3 python: -- 2.6 - 2.7 - 3.5 - 3.6 diff --git a/tox.ini b/tox.ini index 93ebad5..3627c28 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {py26,py27,py35,py36,pypy,pypy3}-{flakes,requests218,requests216,requests213,requests211,requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib319,urllib3110,urllib3121,tornado3,tornado4,boto,boto3,aiohttp} +envlist = {py27,py35,py36,pypy,pypy3}-{flakes,requests218,requests216,requests213,requests211,requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib319,urllib3110,urllib3121,tornado3,tornado4,boto,boto3,aiohttp} [testenv:flakes] skipsdist = True @@ -34,12 +34,12 @@ deps = urllib319: urllib3==1.9.1 urllib3110: urllib3==1.10.2 urllib3121: urllib3==1.21.1 - {py26,py27,py35,py36,pypy}-tornado3: tornado>=3,<4 - {py26,py27,py35,py36,pypy}-tornado4: tornado>=4,<5 - {py26,py27,py35,py36,pypy}-tornado3: pytest-tornado - {py26,py27,py35,py36,pypy}-tornado4: pytest-tornado - {py26,py27,py35,py36}-tornado3: pycurl - {py26,py27,py35,py36}-tornado4: pycurl + {py27,py35,py36,pypy}-tornado3: tornado>=3,<4 + {py27,py35,py36,pypy}-tornado4: tornado>=4,<5 + {py27,py35,py36,pypy}-tornado3: pytest-tornado + {py27,py35,py36,pypy}-tornado4: pytest-tornado + {py27,py35,py36}-tornado3: pycurl + {py27,py35,py36}-tornado4: pycurl boto: boto boto3: boto3 aiohttp: aiohttp