diff --git a/tox.ini b/tox.ini index a82bbc4e..9f7cf379 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,7 @@ envlist = py27, py27-full, py32, py32-full, py33, py33-full, + py34, py34-full, pypy, pypy-full, # Also run the tests with each possible replacement of a default @@ -28,7 +29,7 @@ envlist = # Alternate IOLoops. py2-select, py3-select, py2-twisted, py26-twisted, py2-twistedlayered, - py33-asyncio, py26-trollius, py2-trollius, + py3-asyncio, py33-asyncio, py26-trollius, py2-trollius, # Other configurations; see comments below. py2-monotonic, py3-monotonic, @@ -103,6 +104,14 @@ setenv = TORNADO_EXTENSION=1 deps = pycurl>=7.19.3 +[testenv:py34-full] +basepython = python3.4 +setenv = TORNADO_EXTENSION=1 +# pycares installation currently fails on py34 +# (https://github.com/pypa/pip/pull/816) +deps = + pycurl>=7.19.3 + [testenv:pypy-full] # This configuration works with pypy 1.9. pycurl installs ok but # curl_httpclient doesn't work. pycares also installs but doesn't @@ -156,9 +165,13 @@ basepython = python2.7 deps = {[testenv:py27-full]deps} commands = python -m tornado.test.runtests --ioloop=tornado.test.twisted_test.LayeredTwistedIOLoop --resolver=tornado.platform.twisted.TwistedResolver {posargs:} +[testenv:py3-asyncio] +basepython = python3.4 +deps = {[testenv:py34-full]deps} +commands = python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop {posargs:} + [testenv:py33-asyncio] basepython = python3.3 -# Pycurl tests currently fail with asyncio. deps = {[testenv:py33-full]deps} asyncio @@ -167,7 +180,6 @@ commands = python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.Asy # Trollius is the py2 backport of asyncio. [testenv:py2-trollius] basepython = python2.7 -# Pycurl tests currently fail with trollius. deps = {[testenv:py27-full]deps} trollius>=0.1.1 @@ -175,7 +187,6 @@ commands = python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.Asy [testenv:py26-trollius] basepython = python2.6 -# Pycurl tests currently fail with trollius. deps = {[testenv:py26-full]deps} trollius>=0.1.3