From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 19 Jul 2014 15:18:24 +0000 (-0400)
Subject: Add an ubuntu 14.04 vagrant config; drop 12.10.
X-Git-Tag: v4.1.0b1~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e272adca8c120ff3d70629a0f626344d5cc79e;p=thirdparty%2Ftornado.git

Add an ubuntu 14.04 vagrant config; drop 12.10.
---

diff --git a/maint/vm/ubuntu12.10/Vagrantfile b/maint/vm/ubuntu12.10/Vagrantfile
deleted file mode 100644
index 71f78f701..000000000
--- a/maint/vm/ubuntu12.10/Vagrantfile
+++ /dev/null
@@ -1,9 +0,0 @@
-Vagrant::Config.run do |config|
-    config.vm.box = "ubuntu12.10"
-    config.vm.box_url = "http://cloud-images.ubuntu.com/quantal/current/quantal-server-cloudimg-vagrant-i386-disk1.box"
-
-    config.vm.network :hostonly, "172.19.1.7"
-    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/ubuntu14.04/Vagrantfile b/maint/vm/ubuntu14.04/Vagrantfile
new file mode 100644
index 000000000..05b5e6dcc
--- /dev/null
+++ b/maint/vm/ubuntu14.04/Vagrantfile
@@ -0,0 +1,8 @@
+Vagrant::Config.run do |config|
+    config.vm.box = "ubuntu/trusty64"
+
+    config.vm.network :hostonly, "172.19.1.8"
+    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/ubuntu12.10/setup.sh b/maint/vm/ubuntu14.04/setup.sh
similarity index 92%
rename from maint/vm/ubuntu12.10/setup.sh
rename to maint/vm/ubuntu14.04/setup.sh
index 80252d6fd..7e7b4bba3 100644
--- a/maint/vm/ubuntu12.10/setup.sh
+++ b/maint/vm/ubuntu14.04/setup.sh
@@ -17,7 +17,7 @@ libcurl4-openssl-dev
 
 apt-get -y install $APT_PACKAGES
 
-# Ubuntu 12.10 includes python 2.7 and 3.2.
+# Ubuntu 14.04 includes python 2.7 and 3.4.
 
 PIP_PACKAGES="
 futures
diff --git a/maint/vm/ubuntu12.10/tox.ini b/maint/vm/ubuntu14.04/tox.ini
similarity index 82%
rename from maint/vm/ubuntu12.10/tox.ini
rename to maint/vm/ubuntu14.04/tox.ini
index e7aacb9bf..52d973279 100644
--- a/maint/vm/ubuntu12.10/tox.ini
+++ b/maint/vm/ubuntu14.04/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-full, py32, py27, py27-select, py27-twisted
+envlist = py27-full, py34, py27, py27-select, py27-twisted
 setupdir=/tornado
 toxworkdir=/home/vagrant/tox-tornado
 
@@ -12,7 +12,7 @@ deps =
      futures
      mock
      pycurl
-     twisted==12.2.0
+     twisted==14.0.0
 
 [testenv:py27-select]
 basepython = python2.7
@@ -20,7 +20,7 @@ deps =
      futures
      mock
      pycurl
-     twisted==12.2.0
+     twisted==14.0.0
 commands = python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop {posargs:}
 
 [testenv:py27-twisted]
@@ -29,5 +29,5 @@ deps =
      futures
      mock
      pycurl
-     twisted==12.2.0
+     twisted==14.0.0
 commands = python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop {posargs:}