deprecate libcurl < 7.22.0 and remove Ubuntu 10.04 Vagrant configs

diff --git a/maint/vm/README b/maint/vm/README
index 7660588c86fe5ef914e5a272b3a0f4a656276ad4..a29cffee710c810672dee4c19d66694d090ef08a 100644 (file)
--- a/maint/vm/README
+++ b/maint/vm/README
@@ -3,8 +3,8 @@ This directory contains virtual machine setup scripts for testing Tornado.
 Requirements:
 
 Vagrant (http://vagrantup.com) and VirtualBox (http://virtualbox.org).
-Vagrant provides an easy download for Ubuntu 10.04 (aka lucid64); base
-images for other platforms are harder to find and can be built with
+Vagrant provides an easy download for Ubuntu images, base images for
+other platforms are harder to find and can be built with
 VeeWee (https://github.com/jedi4ever/veewee).
 
 Usage:

diff --git a/maint/vm/ubuntu10.04/Vagrantfile b/maint/vm/ubuntu10.04/Vagrantfile
deleted file mode 100644 (file)
index 31f7b18..0000000
--- a/maint/vm/ubuntu10.04/Vagrantfile
+++ /dev/null
@@ -1,9 +0,0 @@
-Vagrant::Config.run do |config|
-    config.vm.box = "lucid64"
-    config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
-
-    config.vm.network :hostonly, "172.19.1.2"
-    config.vm.share_folder("tornado", "/tornado", "../../..", :nfs=> true)
-
-    config.vm.provision :shell, :path => "setup.sh"
-end
\ No newline at end of file

diff --git a/maint/vm/ubuntu10.04/setup.sh b/maint/vm/ubuntu10.04/setup.sh
deleted file mode 100644 (file)
index 14dcb95..0000000
--- a/maint/vm/ubuntu10.04/setup.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-apt-get update
-
-# libcurl4-gnutls-dev is the default if you ask for libcurl4-dev, but it
-# has bugs that make our tests deadlock (the relevant tests detect this and
-# disable themselves, but it means that to get full coverage we have to use
-# the openssl version).
-# The oddly-named python-software-properties includes add-apt-repository.
-APT_PACKAGES="
-python-pip
-python-dev
-libcurl4-openssl-dev
-python-software-properties
-"
-
-apt-get -y install $APT_PACKAGES
-
-
-# Ubuntu 10.04 has python 2.6 as default; install more from here.
-add-apt-repository ppa:fkrull/deadsnakes
-apt-get update
-
-DEADSNAKES_PACKAGES="
-python2.7
-python2.7-dev
-"
-apt-get -y install $DEADSNAKES_PACKAGES
-
-
-PIP_PACKAGES="
-futures
-pycurl
-tox
-twisted
-virtualenv
-"
-
-pip install $PIP_PACKAGES
-
-/tornado/maint/vm/shared-setup.sh

diff --git a/maint/vm/ubuntu10.04/tox.ini b/maint/vm/ubuntu10.04/tox.ini
deleted file mode 100644 (file)
index df3d5df..0000000
--- a/maint/vm/ubuntu10.04/tox.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[tox]
-envlist = py27-full, py27
-setupdir=/tornado
-toxworkdir=/home/vagrant/tox-tornado
-
-[testenv]
-commands = python -m tornado.test.runtests {posargs:}
-
-[testenv:py27-full]
-basepython = python2.7
-deps =
-     futures
-     pycurl
-     twisted==11.0.0

diff --git a/tornado/httpclient.py b/tornado/httpclient.py
index 635e265c3bbc47a4710495c3fbfe910c1e260ec3..5f6c70f4db5e85a06ca2264cad1272802fc36ac7 100644 (file)
--- a/tornado/httpclient.py
+++ b/tornado/httpclient.py
@@ -25,7 +25,7 @@ to switch to ``curl_httpclient`` for reasons such as the following:
 Note that if you are using ``curl_httpclient``, it is highly
 recommended that you use a recent version of ``libcurl`` and
 ``pycurl``.  Currently the minimum supported version of libcurl is
-7.21.1, and the minimum version of pycurl is 7.18.2.  It is highly
+7.22.0, and the minimum version of pycurl is 7.18.2.  It is highly
 recommended that your ``libcurl`` installation is built with
 asynchronous DNS resolver (threaded or c-ares), otherwise you may
 encounter various problems with request timeouts (for more