Skip to content

Commit

Permalink
Drop py25 from the main tox.ini
Browse files Browse the repository at this point in the history
  • Loading branch information
bdarnell committed Jan 13, 2013
1 parent 35cdbf0 commit 5cb63c9
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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:}

Expand All @@ -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
Expand Down

0 comments on commit 5cb63c9

Please sign in to comment.