From 309aa576dbedd897e792632463c91db06fe95328 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cpcloud@gmail.com>
Date: Fri, 5 Jul 2013 19:00:26 -0400
Subject: [PATCH 1/4] BLD: add SITE_PKG_DIR back in

---
 ci/install.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ci/install.sh b/ci/install.sh
index 4795ac8f4f59d..81b97a978ecc4 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -25,6 +25,7 @@ pip install wheel
 # comment this line to disable the fetching of wheel files
 PIP_ARGS+=" -I --use-wheel --find-links=https://cache27-pypandas.rhcloud.com/"
 
+SITE_PKG_DIR=$VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/site-packages
 # Force virtualenv to accpet system_site_packages
 rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt
 
@@ -57,6 +58,7 @@ for dep in nose 'python-dateutil' 'pytz>=2013a' 'cython==0.19.1'; do
     time pip install $PIP_ARGS $dep
 done
 
+
 if [ ${TRAVIS_PYTHON_VERSION} == "3.3" ]; then # should be >=3,3
     time pip install $PIP_ARGS numpy==1.7.1
 elif [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
@@ -69,6 +71,11 @@ fi
 # Optional Deps
 if [ x"$FULL_DEPS" == x"true" ]; then
     echo "Installing FULL_DEPS"
+   if [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
+       sudo apt-get $APT_ARGS remove python3-numpy
+   elif [ ${TRAVIS_PYTHON_VERSION} == "2.7" ]; then
+       sudo apt-get $APT_ARGS remove python-numpy
+   fi
 
     if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
         time pip install $PIP_ARGS xlwt

From c2dce3d5e558281799975161951ca1f37f0169bf Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cpcloud@gmail.com>
Date: Fri, 5 Jul 2013 19:30:49 -0400
Subject: [PATCH 2/4] BLD: add lxml back in

---
 ci/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/install.sh b/ci/install.sh
index 81b97a978ecc4..1a5763038d184 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -100,6 +100,7 @@ if [ x"$FULL_DEPS" == x"true" ]; then
       time sudo apt-get $APT_ARGS remove python-lxml
     fi
 
+    pip install $PIP_ARGS lxml
     # fool statsmodels into thinking pandas was already installed
     # so it won't refuse to install itself.
 

From b6a3c91f65ab7733aca0bad03c0e8a589178b326 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cpcloud@gmail.com>
Date: Fri, 5 Jul 2013 19:34:12 -0400
Subject: [PATCH 3/4] CLN: move numexpr out of iff

---
 ci/install.sh | 11 +----------
 setup.py      |  3 +--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/ci/install.sh b/ci/install.sh
index 1a5763038d184..d89c61feb726c 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -61,9 +61,6 @@ done
 
 if [ ${TRAVIS_PYTHON_VERSION} == "3.3" ]; then # should be >=3,3
     time pip install $PIP_ARGS numpy==1.7.1
-elif [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
-    # sudo apt-get $APT_ARGS install python3-numpy; # 1.6.2 or precise
-    time pip install $PIP_ARGS numpy==1.6.1
 else
     time pip install $PIP_ARGS numpy==1.6.1
 fi
@@ -71,19 +68,13 @@ fi
 # Optional Deps
 if [ x"$FULL_DEPS" == x"true" ]; then
     echo "Installing FULL_DEPS"
-   if [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
-       sudo apt-get $APT_ARGS remove python3-numpy
-   elif [ ${TRAVIS_PYTHON_VERSION} == "2.7" ]; then
-       sudo apt-get $APT_ARGS remove python-numpy
-   fi
 
+    time pip install $PIP_ARGS numexpr==2.1
     if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
         time pip install $PIP_ARGS xlwt
         time pip install $PIP_ARGS bottleneck==0.6.0
-        time pip install $PIP_ARGS numexpr==2.1
         time pip install $PIP_ARGS tables==2.3.1
     else
-        time pip install $PIP_ARGS numexpr==2.1
         time pip install $PIP_ARGS tables==3.0.0
     fi
 
diff --git a/setup.py b/setup.py
index 7d59e0f95f0e8..4a5a785ba20a4 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
     _have_setuptools = False
 
 setuptools_kwargs = {}
-min_numpy_ver = '1.6'
+min_numpy_ver = '1.6.1'
 if sys.version_info[0] >= 3:
 
     if sys.version_info[1] >= 3:  # 3.3 needs numpy 1.7+
@@ -54,7 +54,6 @@
                  "\n$ pip install distribute")
 
 else:
-    min_numpy_ver = '1.6.1'
     setuptools_kwargs = {
         'install_requires': ['python-dateutil',
                              'pytz',

From 434af539a8a922b1de1932d778a757916ff4d1e3 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cpcloud@gmail.com>
Date: Fri, 5 Jul 2013 21:20:55 -0400
Subject: [PATCH 4/4] BLD: remove -I flag from PIP_ARGS

---
 ci/install.sh | 2 +-
 setup.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/install.sh b/ci/install.sh
index d89c61feb726c..a6fe57818a376 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -23,7 +23,7 @@ pip Install -I https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.8b6.
 pip install wheel
 
 # comment this line to disable the fetching of wheel files
-PIP_ARGS+=" -I --use-wheel --find-links=https://cache27-pypandas.rhcloud.com/"
+PIP_ARGS+=" --use-wheel --find-links=https://cache27-pypandas.rhcloud.com/"
 
 SITE_PKG_DIR=$VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/site-packages
 # Force virtualenv to accpet system_site_packages
diff --git a/setup.py b/setup.py
index 4a5a785ba20a4..2bc99b46f13c1 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
     _have_setuptools = False
 
 setuptools_kwargs = {}
-min_numpy_ver = '1.6.1'
+min_numpy_ver = '1.6'
 if sys.version_info[0] >= 3:
 
     if sys.version_info[1] >= 3:  # 3.3 needs numpy 1.7+