diff --git a/.travis.yml b/.travis.yml index dbee7067..e948418c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ env: - TOX_ENV=py33-trollius - TOX_ENV=py34-twtrunk - TOX_ENV=py34-asyncio - - TOX_ENV=pypy-tw122 + - TOX_ENV=pypy-tw121 - TOX_ENV=pypy-tw132 - TOX_ENV=pypy-twcurrent - - TOX_ENV=py26-tw122 + - TOX_ENV=py26-tw121 - TOX_ENV=py26-tw132 - TOX_ENV=py26-twcurrent - - TOX_ENV=py27-tw122 + - TOX_ENV=py27-tw121 - TOX_ENV=py27-tw132 - TOX_ENV=py27-twcurrent diff --git a/tox.ini b/tox.ini index ec5b2181..1f5b8d88 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = flake8 {pypy,py27,py33}-{twtrunk,trollius} {py34}-{twtrunk,asyncio} - {pypy,py26,py27}-{tw122,tw132,twcurrent} + {pypy,py26,py27}-{tw121,tw132,twcurrent} [testenv] deps = @@ -14,7 +14,7 @@ deps = ; twisted dependencies twtrunk: https://github.com/twisted/twisted/archive/trunk.zip - tw122: Twisted==12.2 + tw121: Twisted==12.1 tw132: Twisted==13.2 twcurrent: Twisted @@ -27,12 +27,12 @@ commands = python -V coverage --version asyncio,trollius: coverage run {envbindir}/py.test autobahn - twtrunk,twcurrent,tw122,tw132,twcurrent: coverage run {envbindir}/trial autobahn + twtrunk,twcurrent,tw121,tw132,twcurrent: coverage run {envbindir}/trial autobahn coverage report whitelist_externals = sh setenv = asyncio,trollius: USE_ASYNCIO = 1 - twtrunk,twcurrent,tw122,tw132,twcurrent: USE_TWISTED = 1 + twtrunk,twcurrent,tw121,tw132,twcurrent: USE_TWISTED = 1 [testenv:flake8]