Commit a76adc28 by Slater-Victoroff

Added useful requirements and removed problematic scipy

parent ab2a919c
...@@ -3,6 +3,7 @@ pkg-config ...@@ -3,6 +3,7 @@ pkg-config
curl curl
git git
python-virtualenv python-virtualenv
python-scipy
build-essential build-essential
python-dev python-dev
gfortran gfortran
......
...@@ -416,18 +416,18 @@ SCIPY_VER="0.10.1" ...@@ -416,18 +416,18 @@ SCIPY_VER="0.10.1"
if [[ -n $compile ]]; then if [[ -n $compile ]]; then
output "Downloading numpy and scipy" output "Downloading numpy and scipy"
curl -sL -o numpy.tar.gz http://downloads.sourceforge.net/project/numpy/NumPy/${NUMPY_VER}/numpy-${NUMPY_VER}.tar.gz curl -sL -o numpy.tar.gz http://downloads.sourceforge.net/project/numpy/NumPy/${NUMPY_VER}/numpy-${NUMPY_VER}.tar.gz
curl -sL -o scipy.tar.gz http://downloads.sourceforge.net/project/scipy/scipy/${SCIPY_VER}/scipy-${SCIPY_VER}.tar.gz #curl -sL -o scipy.tar.gz http://downloads.sourceforge.net/project/scipy/scipy/${SCIPY_VER}/scipy-${SCIPY_VER}.tar.gz
tar xf numpy.tar.gz tar xf numpy.tar.gz
tar xf scipy.tar.gz #tar xf scipy.tar.gz
rm -f numpy.tar.gz scipy.tar.gz rm -f numpy.tar.gz #scipy.tar.gz
output "Compiling numpy" output "Compiling numpy"
cd "$BASE/numpy-${NUMPY_VER}" cd "$BASE/numpy-${NUMPY_VER}"
python setup.py install python setup.py install
output "Compiling scipy" #output "Compiling scipy"
cd "$BASE/scipy-${SCIPY_VER}" #cd "$BASE/scipy-${SCIPY_VER}"
python setup.py install #python setup.py install
cd "$BASE" cd "$BASE"
rm -rf numpy-${NUMPY_VER} scipy-${SCIPY_VER} rm -rf numpy-${NUMPY_VER} #scipy-${SCIPY_VER}
fi fi
# building correct version of distribute from source # building correct version of distribute from source
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment