From: Ben Darnell <ben@bendarnell.com>
Date: Fri, 31 Aug 2012 01:55:34 +0000 (-0400)
Subject: Add concurrent.futures as an optional dependency for -full builds
X-Git-Tag: v3.0.0~263^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eef8d9ffc4660a2520de6b849695ac55ea1876de;p=thirdparty%2Ftornado.git

Add concurrent.futures as an optional dependency for -full builds
---

diff --git a/tox.ini b/tox.ini
index f4291e385..4b73a1aa5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,6 +35,7 @@ deps =
 [testenv:py25-full]
 basepython = python2.5
 deps =
+     futures
      MySQL-python
      pycurl
      simplejson
@@ -53,6 +54,7 @@ deps = unittest2
 [testenv:py26-full]
 basepython = python2.6
 deps =
+     futures
      MySQL-python
      pycurl
      twisted==11.0.0
@@ -61,6 +63,7 @@ deps =
 [testenv:py27-full]
 basepython = python2.7
 deps =
+     futures
      MySQL-python
      pycurl
      twisted>=12.0.0
@@ -71,6 +74,7 @@ deps =
 # this flag controls which client all the other tests use.
 basepython = python2.7
 deps =
+     futures
      MySQL-python
      pycurl
      twisted>=11.1.0
@@ -83,6 +87,7 @@ commands = python -m tornado.test.runtests --httpclient=tornado.curl_httpclient.
 # run this configuration there.
 basepython = pypy
 deps =
+     futures
      MySQL-python
      twisted>=12.1.0
 
@@ -113,6 +118,7 @@ basepython = python3.3
 [testenv:py27-opt]
 basepython = python2.7
 deps =
+     futures
      MySQL-python
      pycurl
      twisted>=12.0.0