From 2091db4e2baafd9f4754cb23a16b71237f990690 Mon Sep 17 00:00:00 2001 From: y-p Date: Thu, 22 Nov 2012 01:32:20 +0200 Subject: [PATCH] CLN: drop py25 from tox ini files --- tox.ini | 11 +---------- tox_prll.ini | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/tox.ini b/tox.ini index 7d09b3aa887e1..9f8e1af8ae924 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py25, py26, py27, py31, py32 +envlist = py26, py27, py31, py32 [testenv] deps = @@ -35,15 +35,6 @@ commands = # tox should provide a preinstall-commands hook. pip uninstall pandas -qy - -[testenv:py25] -deps = - cython - numpy >= 1.6.1 - nose - pytz - simplejson - [testenv:py26] [testenv:py27] diff --git a/tox_prll.ini b/tox_prll.ini index 85856db064ca3..70edffac717a2 100644 --- a/tox_prll.ini +++ b/tox_prll.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py25, py26, py27, py31, py32 +envlist = py26, py27, py31, py32 sdistsrc = {env:DISTFILE} [testenv] @@ -36,15 +36,6 @@ commands = # tox should provide a preinstall-commands hook. pip uninstall pandas -qy - -[testenv:py25] -deps = - cython - numpy >= 1.6.1 - nose - pytz - simplejson - [testenv:py26] [testenv:py27]