Ubuntu 12.04 is out, so add a vagrant config for it.

Replace the 11.04 config, but keep 10.04 to cover the two LTS releases.
This commit is contained in:
Ben Darnell 2012-04-27 20:50:01 -07:00
parent 29f98d0768
commit 50244877b5
3 changed files with 4 additions and 18 deletions

View File

@ -1,7 +1,7 @@
Vagrant::Config.run do |config|
config.vm.box = "ubuntu11.04"
config.vm.box = "ubuntu12.04"
config.vm.network :hostonly, "172.19.1.4"
config.vm.network :hostonly, "172.19.1.5"
config.vm.share_folder("tornado", "/tornado", "../../..", :nfs=> true)
config.vm.provision :shell, :path => "setup.sh"

View File

@ -2,12 +2,6 @@
set -e
# Ubuntu 10.10+ do some extra permissions checks for hard links.
# Vagrant's nfs shared folders come through with funny uids, but
# attempts to access them still work despite the visible permissions
# being incorrect.
sysctl -w kernel.yama.protected_nonaccess_hardlinks=0
apt-get update
# libcurl4-gnutls-dev is the default if you ask for libcurl4-dev, but it
@ -26,7 +20,7 @@ python-software-properties
apt-get -y install $APT_PACKAGES
# Ubuntu 11.04 has python 2.7 as default; install more from here.
# Ubuntu 12.04 has python 2.7 as default; install more from here.
# The most important thing is to have both 2.5 and a later version so we
# test with both tornado.epoll and 2.6+ stdlib's select.epoll.
add-apt-repository ppa:fkrull/deadsnakes
@ -35,8 +29,6 @@ apt-get update
DEADSNAKES_PACKAGES="
python2.5
python2.5-dev
python2.6
python2.6-dev
python3.2
python3.2-dev
"

View File

@ -1,5 +1,5 @@
[tox]
envlist = py27-full, py25-full, py32, py25, py26, py26-full, py27
envlist = py27-full, py25-full, py32, py25, py27
setupdir=/tornado
toxworkdir=/home/vagrant/tox-tornado
@ -18,12 +18,6 @@ deps =
simplejson
twisted==11.0.0
[testenv:py26-full]
deps =
MySQL-python
pycurl
twisted==11.0.0
[testenv:py27-full]
basepython = python2.7
deps =