Skip to content

BLD: add SITE_PKG_DIR back in and fix numpy 1.6.1 install #4143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

BLD: add SITE_PKG_DIR back in and fix numpy 1.6.1 install #4143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
309aa57
BLD: add SITE_PKG_DIR back in
cpcloud Jul 5, 2013
c2dce3d
BLD: add lxml back in
cpcloud Jul 5, 2013
b6a3c91
CLN: move numexpr out of iff
cpcloud Jul 5, 2013
434af53
BLD: remove -I flag from PIP_ARGS
cpcloud Jul 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ci/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ 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
rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt

Expand Down Expand Up @@ -57,11 +58,9 @@ 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
# 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
Expand All @@ -70,13 +69,12 @@ fi
if [ x"$FULL_DEPS" == x"true" ]; then
echo "Installing FULL_DEPS"

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

Expand All @@ -93,6 +91,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.

Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"\n$ pip install distribute")

else:
min_numpy_ver = '1.6.1'
setuptools_kwargs = {
'install_requires': ['python-dateutil',
'pytz',
Expand Down