Add futures to travis and vm tests, update assorted dependency versions.

diff --git a/.travis.yml b/.travis.yml
index 126eefeec7f3ea0ef4e401e01763277da6f96d9b..cb0652b5241c03e1c7655f8d2562467c8c8fda73 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,10 @@ matrix:
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors simplejson unittest2; fi
     - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi
-    - if [[ $FULL == 'true' ]]; then sudo apt-get install librtmp-dev; pip install --use-mirrors pycurl; fi
+    - if [[ $FULL == 'true' ]]; then sudo apt-get install librtmp-dev; pip install --use-mirrors pycurl futures; fi
     - if [[ $FULL == 'true' && $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors twisted==11.0.0 'zope.interface<4.0'; fi
-    - if [[ $FULL == 'true' && $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors twisted==11.0.0; fi
-    - if [[ $FULL == 'true' && $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors twisted==12.0.0; fi
+    - if [[ $FULL == 'true' && $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors twisted==12.0.0; fi
+    - if [[ $FULL == 'true' && $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors twisted==12.2.0; fi
     - python setup.py install
 script:
     # Must cd somewhere else so python3 doesn't get confused and run

diff --git a/maint/requirements.txt b/maint/requirements.txt
index e387759aeb022b867545ace20592db6da13cc0aa..7ec3c490e36716d88a5cb1273b36cfaa6d321405 100644 (file)
--- a/maint/requirements.txt
+++ b/maint/requirements.txt
@@ -1,17 +1,18 @@
 # Frozen pip requirements for tools used in the development of tornado
 
 # Tornado's optional dependencies
-Twisted==12.1.0
+Twisted==12.2.0
+futures==2.1.3
 pycurl==7.19.0
 
 # Other useful tools
 Sphinx==1.1.3
-autopep8==0.6.5
+autopep8==0.8.1
 coverage==3.5.2
-pep8==1.2
+pep8==1.3.3
 pyflakes==0.5.0
-tox==1.4
-virtualenv==1.7.1.2
+tox==1.4.2
+virtualenv==1.8.2
 
 # Indirect dependencies
 Jinja2==2.6

diff --git a/maint/vm/freebsd/setup.sh b/maint/vm/freebsd/setup.sh
index 25003c2158a227419c5cf7d6032adbb6634db05a..3a55226fd9584a937f9f6466760c5f60410b0828 100644 (file)
--- a/maint/vm/freebsd/setup.sh
+++ b/maint/vm/freebsd/setup.sh
@@ -14,8 +14,9 @@ ftp/curl
 "
 
 PIP_PACKAGES="
-tox
+futures
 pycurl
+tox
 "
 
 cd /usr/ports

diff --git a/maint/vm/freebsd/tox.ini b/maint/vm/freebsd/tox.ini
index ef1c4bc4c848b340b1f0be117bf889f011aef406..6a4d1e2f96ea6d339b52f1a130844ec7b3ac22fc 100644 (file)
--- a/maint/vm/freebsd/tox.ini
+++ b/maint/vm/freebsd/tox.ini
@@ -8,6 +8,7 @@ toxworkdir=/usr/home/vagrant/tox-tornado
 commands = python -m tornado.test.runtests {posargs:}
 
 [testenv:py27-full]
-# other dependencies aren't really worth the install time
+# twisted's tests fail on freebsd
 deps =
+     futures
      pycurl

diff --git a/maint/vm/ubuntu10.04/setup.sh b/maint/vm/ubuntu10.04/setup.sh
index f54e3858a7bc130b7ee73e90bd753a6f32aba1e0..8612cf492417d2473ef11ec730025ed31907c8c9 100644 (file)
--- a/maint/vm/ubuntu10.04/setup.sh
+++ b/maint/vm/ubuntu10.04/setup.sh
@@ -37,10 +37,11 @@ apt-get -y install $DEADSNAKES_PACKAGES
 
 
 PIP_PACKAGES="
-virtualenv
-tox
+futures
 pycurl
+tox
 twisted
+virtualenv
 "
 
 pip install $PIP_PACKAGES

diff --git a/maint/vm/ubuntu10.04/tox.ini b/maint/vm/ubuntu10.04/tox.ini
index e8cfea274956ed6e4d5e6fbb0e183a9e0bd1ebff..6feaa137ab644eb7c7fb41223dca3d9a6dc6d248 100644 (file)
--- a/maint/vm/ubuntu10.04/tox.ini
+++ b/maint/vm/ubuntu10.04/tox.ini
@@ -15,6 +15,7 @@ deps =
 [testenv:py25-full]
 basepython = python2.5
 deps =
+     futures
      pycurl
      simplejson
      twisted==11.0.0
@@ -26,6 +27,7 @@ deps = unittest2
 
 [testenv:py26-full]
 deps =
+     futures
      pycurl
      twisted==11.0.0
      unittest2
@@ -33,5 +35,6 @@ deps =
 [testenv:py27-full]
 basepython = python2.7
 deps =
+     futures
      pycurl
      twisted==11.0.0

diff --git a/maint/vm/ubuntu12.04/setup.sh b/maint/vm/ubuntu12.04/setup.sh
index aba24fd3029abacde008f717ad5220783943234a..33c1e2bac20cd197d88e31f8fd0a0ffbbde7ed4e 100644 (file)
--- a/maint/vm/ubuntu12.04/setup.sh
+++ b/maint/vm/ubuntu12.04/setup.sh
@@ -35,10 +35,11 @@ apt-get -y install $DEADSNAKES_PACKAGES
 
 
 PIP_PACKAGES="
-virtualenv
-tox
+futures
 pycurl
+tox
 twisted
+virtualenv
 "
 
 pip install $PIP_PACKAGES

diff --git a/maint/vm/ubuntu12.04/tox.ini b/maint/vm/ubuntu12.04/tox.ini
index 48177476a0e5b76922489c20617290a4c06028ac..4098f883faf0eb7788e90d0ff56e239ed731f26a 100644 (file)
--- a/maint/vm/ubuntu12.04/tox.ini
+++ b/maint/vm/ubuntu12.04/tox.ini
@@ -15,18 +15,16 @@ deps =
 [testenv:py25-full]
 basepython = python2.5
 deps =
+     futures
      pycurl
      simplejson
      twisted==11.0.0
      unittest2
      zope.interface<4.0
 
-[testenv:py26]
-basepython = python2.6
-deps = unittest2
-
 [testenv:py27-full]
 basepython = python2.7
 deps =
+     futures
      pycurl
-     twisted==11.0.0
\ No newline at end of file
+     twisted==12.2.0
\ No newline at end of file