Add an ubuntu 14.04 vagrant config; drop 12.10.

tornadoweb · Jul 19, 2014 · a8e272a · a8e272a
1 parent 8ca94a8
commit a8e272a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/maint/vm/ubuntu12.10/Vagrantfile b/maint/vm/ubuntu12.10/Vagrantfile
diff --git a/maint/vm/ubuntu14.04/Vagrantfile 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
diff --git a/maint/vm/ubuntu12.10/setup.sh → maint/vm/ubuntu14.04/setup.sh b/maint/vm/ubuntu12.10/setup.sh → 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 → maint/vm/ubuntu14.04/tox.ini b/maint/vm/ubuntu12.10/tox.ini → 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,15 +12,15 @@ deps =
      futures
      mock
      pycurl
-     twisted==12.2.0
+     twisted==14.0.0
 
 [testenv:py27-select]
 basepython = python2.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:}