From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 13 Jan 2013 23:09:43 +0000 (-0500)
Subject: Drop py25 from the main tox.ini
X-Git-Tag: v3.0.0~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cb63c9ca8266225fcafc35d75c9379470725e48;p=thirdparty%2Ftornado.git

Drop py25 from the main tox.ini
---

diff --git a/tox.ini b/tox.ini
index eb0c099e3..cfbf468df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@
 [tox]
 # "-full" variants include optional dependencies, to ensure
 # that things work both in a bare install and with all the extras.
-envlist = py27-full, py27-curl, py25-full, py32-full, pypy, py25, py26, py26-full, py27, py32, py32-utf8, py33, py27-opt, py32-opt, pypy-full, py27-select, py27-monotonic, py33-monotonic, py27-twisted
+envlist = py27-full, py27-curl, py32-full, pypy, py26, py26-full, py27, py32, py32-utf8, py33, py27-opt, py32-opt, pypy-full, py27-select, py27-monotonic, py33-monotonic, py27-twisted
 [testenv]
 commands = python -m tornado.test.runtests {posargs:}
 
@@ -24,25 +24,6 @@ changedir = {toxworkdir}
 # PYTHONPATH)
 #environment = PYTHONPATH=
 
-[testenv:py25]
-basepython = python2.5
-deps =
-     simplejson
-     unittest2
-
-[testenv:py25-full]
-basepython = python2.5
-deps =
-     futures
-     mock
-     pycurl
-     simplejson
-     # twisted is dropping python 2.5 support in 12.2.0
-     twisted<=12.1.0
-     unittest2
-     # zope.interface (used by twisted) dropped python 2.5 support in 4.0
-     zope.interface<4.0
-
 [testenv:py26]
 basepython = python2.6
 deps = unittest2