Remove more py25 testing configs

diff --git a/maint/test/appengine/py25/app.yaml b/maint/test/appengine/py25/app.yaml
deleted file mode 100644 (file)
index 8bd7892..0000000
--- a/maint/test/appengine/py25/app.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-application: tornado-tests-appengine25
-version: 1
-runtime: python
-api_version: 1
-
-handlers:
-- url: /
-  script: cgi_runtests.py
\ No newline at end of file

diff --git a/maint/test/appengine/py25/cgi_runtests.py b/maint/test/appengine/py25/cgi_runtests.py
deleted file mode 120000 (symlink)
index a9fc90e..0000000
--- a/maint/test/appengine/py25/cgi_runtests.py
+++ /dev/null
@@ -1 +0,0 @@
-../common/cgi_runtests.py
\ No newline at end of file

diff --git a/maint/test/appengine/py25/runtests.py b/maint/test/appengine/py25/runtests.py
deleted file mode 120000 (symlink)
index 2cce26b..0000000
--- a/maint/test/appengine/py25/runtests.py
+++ /dev/null
@@ -1 +0,0 @@
-../common/runtests.py
\ No newline at end of file

diff --git a/maint/test/appengine/py25/tornado b/maint/test/appengine/py25/tornado
deleted file mode 120000 (symlink)
index d4f6cc3..0000000
--- a/maint/test/appengine/py25/tornado
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tornado
\ No newline at end of file

diff --git a/maint/test/appengine/tox.ini b/maint/test/appengine/tox.ini
index dcc7ac2f8e64ac7772d4db863ace6455546dd939..ca7a861aeef9ef49785bf62c31ddd195fdd5ef2e 100644 (file)
--- a/maint/test/appengine/tox.ini
+++ b/maint/test/appengine/tox.ini
@@ -10,14 +10,6 @@ envlist = py27-appengine
 [testenv]
 changedir = {toxworkdir}
 
-# py25-appengine was broken by the addition of unittest2.  Need to figure
-# out a way to smuggle unittest2 into the appengine environment if we don't
-# drop py25 support.
-[testenv:py25-appengine]
-basepython = python2.5
-commands = python {toxinidir}/py25/runtests.py {posargs:}
-deps = unittest2
-
 [testenv:py27-appengine]
 basepython = python2.7
 commands = python {toxinidir}/py27/runtests.py {posargs:}

diff --git a/maint/test/websocket/run.sh b/maint/test/websocket/run.sh
index 9478687d47b628bdec1795ea36d0ed98f4d9d827..ae686b1acacdcf49089e8f388d4ddcc2d360e651 100755 (executable)
--- a/maint/test/websocket/run.sh
+++ b/maint/test/websocket/run.sh
@@ -12,8 +12,8 @@ set -e
 # build/update the virtualenvs
 tox
 
-.tox/py25/bin/python server.py --port=9001 &
-PY25_SERVER_PID=$!
+.tox/py26/bin/python server.py --port=9001 &
+PY26_SERVER_PID=$!
 
 .tox/py27/bin/python server.py --port=9002 &
 PY27_SERVER_PID=$!
@@ -26,12 +26,12 @@ PYPY_SERVER_PID=$!
 
 sleep 1
 
-.tox/py27/bin/python ./client.py --servers=Tornado/py25=ws://localhost:9001,Tornado/py27=ws://localhost:9002,Tornado/py32=ws://localhost:9003,Tornado/pypy=ws://localhost:9004 "$@" || true
+.tox/py27/bin/python ./client.py --servers=Tornado/py26=ws://localhost:9001,Tornado/py27=ws://localhost:9002,Tornado/py32=ws://localhost:9003,Tornado/pypy=ws://localhost:9004 "$@" || true
 
-kill $PY25_SERVER_PID
+kill $PY26_SERVER_PID
 kill $PY27_SERVER_PID
 kill $PY32_SERVER_PID
 kill $PYPY_SERVER_PID
 wait
 
-echo "Tests complete. Output is in ./reports/servers/index.html"
\ No newline at end of file
+echo "Tests complete. Output is in ./reports/servers/index.html"

diff --git a/maint/test/websocket/tox.ini b/maint/test/websocket/tox.ini
index e1ce442ba612703ef9a248dd6e6f52e04ab8973c..0d89c0f327015476f72be01ff61e50384c2f23ae 100644 (file)
--- a/maint/test/websocket/tox.ini
+++ b/maint/test/websocket/tox.ini
@@ -2,7 +2,7 @@
 # to install autobahn and deal with 2to3 for the python3 version.
 # See run.sh for the real test runner.
 [tox]
-envlist = py27, py32, py25, pypy
+envlist = py27, py32, py26, pypy
 setupdir=../../..
 
 [testenv]

diff --git a/maint/vm/ubuntu10.04/setup.sh b/maint/vm/ubuntu10.04/setup.sh
index 8612cf492417d2473ef11ec730025ed31907c8c9..64c5250bf08cee6766e2ccbb57ae7311534847b7 100644 (file)
--- a/maint/vm/ubuntu10.04/setup.sh
+++ b/maint/vm/ubuntu10.04/setup.sh
@@ -20,14 +20,10 @@ apt-get -y install $APT_PACKAGES
 
 
 # Ubuntu 10.04 has python 2.6 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
 apt-get update
 
 DEADSNAKES_PACKAGES="
-python2.5
-python2.5-dev
 python2.7
 python2.7-dev
 python3.2

diff --git a/maint/vm/ubuntu10.04/tox.ini b/maint/vm/ubuntu10.04/tox.ini
index 6feaa137ab644eb7c7fb41223dca3d9a6dc6d248..21944e81956de5e8be8526f1b8bc4b1fbbba4564 100644 (file)
--- a/maint/vm/ubuntu10.04/tox.ini
+++ b/maint/vm/ubuntu10.04/tox.ini
@@ -1,27 +1,11 @@
 [tox]
-envlist = py27-full, py25-full, py32, py25, py26, py26-full, py27
+envlist = py27-full, py32, py26, py26-full, py27
 setupdir=/tornado
 toxworkdir=/home/vagrant/tox-tornado
 
 [testenv]
 commands = python -m tornado.test.runtests {posargs:}
 
-[testenv:py25]
-basepython = python2.5
-deps =
-     simplejson
-     unittest2
-
-[testenv:py25-full]
-basepython = python2.5
-deps =
-     futures
-     pycurl
-     simplejson
-     twisted==11.0.0
-     unittest2
-     zope.interface<4.0
-
 [testenv:py26]
 deps = unittest2
 

diff --git a/maint/vm/ubuntu12.04/setup.sh b/maint/vm/ubuntu12.04/setup.sh
index 33c1e2bac20cd197d88e31f8fd0a0ffbbde7ed4e..3c8728aa8da5bfab8103c229bc353500cf59b251 100644 (file)
--- a/maint/vm/ubuntu12.04/setup.sh
+++ b/maint/vm/ubuntu12.04/setup.sh
@@ -20,14 +20,10 @@ apt-get -y install $APT_PACKAGES
 
 
 # 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
 apt-get update
 
 DEADSNAKES_PACKAGES="
-python2.5
-python2.5-dev
 python3.2
 python3.2-dev
 "

diff --git a/maint/vm/ubuntu12.04/tox.ini b/maint/vm/ubuntu12.04/tox.ini
index a7772091fd63fa43afb49b8335f2ef11d7e2903e..3a187f44866ad0a4414a62a174b45fbbd671030c 100644 (file)
--- a/maint/vm/ubuntu12.04/tox.ini
+++ b/maint/vm/ubuntu12.04/tox.ini
@@ -1,27 +1,11 @@
 [tox]
-envlist = py27-full, py25-full, py32, py25, py27, py27-select, py27-twisted
+envlist = py27-full, py32, py27, py27-select, py27-twisted
 setupdir=/tornado
 toxworkdir=/home/vagrant/tox-tornado
 
 [testenv]
 commands = python -m tornado.test.runtests {posargs:}
 
-[testenv:py25]
-basepython = python2.5
-deps =
-     simplejson
-     unittest2
-
-[testenv:py25-full]
-basepython = python2.5
-deps =
-     futures
-     pycurl
-     simplejson
-     twisted==11.0.0
-     unittest2
-     zope.interface<4.0
-
 [testenv:py27-full]
 basepython = python2.7
 deps =