From 795d183e028f20a83e74d050ef7b85c0b259a122 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cpcloud@gmail.com>
Date: Fri, 6 Jun 2014 17:28:43 -0400
Subject: [PATCH] CLN/TST/BLD: clean up tox files [ci skip]

---
 tox.ini      | 35 +++++++++++++++++++++++++++++++----
 tox.sh       |  8 --------
 tox_prll.ini | 46 ----------------------------------------------
 tox_prll.sh  | 28 ----------------------------
 4 files changed, 31 insertions(+), 86 deletions(-)
 delete mode 100755 tox.sh
 delete mode 100644 tox_prll.ini
 delete mode 100755 tox_prll.sh

diff --git a/tox.ini b/tox.ini
index 51480832284b9..b11a71f531524 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,21 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33
+envlist = py26, py27, py32, py33, py34
 
 [testenv]
 deps =
     cython
-    numpy >= 1.6.1
     nose
-    pytz >= 2011k
+    pytz>=2011k
+    python-dateutil
+    beautifulsoup4
+    lxml
+    openpyxl<2.0.0
+    xlsxwriter
+    xlrd
     six
+    sqlalchemy
 
 # cd to anything but the default {toxinidir} which
 # contains the pandas subdirectory and confuses
@@ -21,7 +27,7 @@ changedir = {envdir}
 
 commands =
     # TODO:  --exe because of GH #761
-    {envbindir}/nosetests --exe pandas -A "not network"
+    {envbindir}/nosetests --exe pandas {posargs:-A "not network and not disabled"}
     # cleanup the temp. build dir created by the tox build
 #    /bin/rm -rf {toxinidir}/build
 
@@ -37,9 +43,30 @@ commands =
     pip uninstall pandas -qy
 
 [testenv:py26]
+deps =
+    numpy==1.6.1
+    boto
+    bigquery
+    {[testenv]deps}
 
 [testenv:py27]
+deps =
+    numpy==1.8.1
+    boto
+    bigquery
+    {[testenv]deps}
 
 [testenv:py32]
+deps =
+    numpy==1.7.1
+    {[testenv]deps}
 
 [testenv:py33]
+deps =
+    numpy==1.8.0
+    {[testenv]deps}
+
+[testenv:py34]
+deps =
+    numpy==1.8.0
+    {[testenv]deps}
diff --git a/tox.sh b/tox.sh
deleted file mode 100755
index b68ffc7fdb91c..0000000000000
--- a/tox.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-
-if [ x"$1" == x"fast" ]; then
-    scripts/use_build_cache.py
-fi;
-
-tox
diff --git a/tox_prll.ini b/tox_prll.ini
deleted file mode 100644
index 7ae399837b4e0..0000000000000
--- a/tox_prll.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions. To use it, "pip install tox"
-# and then run "tox" from this directory.
-
-[tox]
-envlist = py26, py27, py32, py33
-sdistsrc = {env:DISTFILE}
-
-[testenv]
-deps =
-    cython
-    numpy >= 1.6.1
-    nose
-    pytz
-    six
-
-# cd to anything but the default {toxinidir} which
-# contains the pandas subdirectory and confuses
-# nose away from the fresh install in site-packages
-changedir = {envdir}
-
-commands =
-    # TODO:  --exe because of GH #761
-    {envbindir}/nosetests --exe pandas -A "not network"
-    # cleanup the temp. build dir created by the tox build
-#    /bin/rm -rf {toxinidir}/build
-
-    # quietly rollback the install.
-    # Note this line will only be reached if the
-    # previous lines succeed (in particular, the tests),
-    # but an uninstall is really only required when
-    # files are removed from the source tree, in which case,
-    # stale versions of files will will remain in the venv
-    # until the next time uninstall is run.
-    #
-    # tox should provide a preinstall-commands hook.
-    pip uninstall pandas -qy
-
-[testenv:py26]
-
-[testenv:py27]
-
-[testenv:py32]
-
-[testenv:py33]
diff --git a/tox_prll.sh b/tox_prll.sh
deleted file mode 100755
index a426d68297ac5..0000000000000
--- a/tox_prll.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-#
-# tox has an undocumented (as of 1.4.2) config option called "sdistsrc"
-# which can make a run use a pre-prepared sdist file.
-# we prepare the sdist once , then launch the tox runs in parallel using it.
-#
-# currently (tox 1.4.2) We have to skip sdist generation when running in parallel
-# or we get a race.
-#
-
-
-ENVS=$(cat tox.ini | grep envlist | tr  "," " " | cut -d " " -f 3-)
-TOX_INI_PAR="tox_prll.ini"
-
-if [ x"$1" == x"fast" ]; then
-    scripts/use_build_cache.py
-fi;
-
-echo "[Creating distfile]"
-tox --sdistonly
-export DISTFILE="$(find .tox/dist -type f )"
-
-echo -e "[Starting tests]\n"
-for e in $ENVS; do
-    echo "[launching tox for $e]"
-    tox -c "$TOX_INI_PAR" -e "$e" &
-done
-wait