From a76adc287150f0004bb1a6611dbbe90edf395859 Mon Sep 17 00:00:00 2001 From: Slater-Victoroff Date: Fri, 31 May 2013 12:40:43 -0400 Subject: [PATCH] Added useful requirements and removed problematic scipy --- requirements/system/ubuntu/apt-packages.txt | 1 + scripts/create-dev-env.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/requirements/system/ubuntu/apt-packages.txt b/requirements/system/ubuntu/apt-packages.txt index 4667b4539e..a5a954b687 100644 --- a/requirements/system/ubuntu/apt-packages.txt +++ b/requirements/system/ubuntu/apt-packages.txt @@ -3,6 +3,7 @@ pkg-config curl git python-virtualenv +python-scipy build-essential python-dev gfortran diff --git a/scripts/create-dev-env.sh b/scripts/create-dev-env.sh index a00b0f5d84..f48f117ddc 100755 --- a/scripts/create-dev-env.sh +++ b/scripts/create-dev-env.sh @@ -416,18 +416,18 @@ SCIPY_VER="0.10.1" if [[ -n $compile ]]; then 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 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 scipy.tar.gz - rm -f numpy.tar.gz scipy.tar.gz + #tar xf scipy.tar.gz + rm -f numpy.tar.gz #scipy.tar.gz output "Compiling numpy" cd "$BASE/numpy-${NUMPY_VER}" python setup.py install - output "Compiling scipy" - cd "$BASE/scipy-${SCIPY_VER}" - python setup.py install + #output "Compiling scipy" + #cd "$BASE/scipy-${SCIPY_VER}" + #python setup.py install cd "$BASE" - rm -rf numpy-${NUMPY_VER} scipy-${SCIPY_VER} + rm -rf numpy-${NUMPY_VER} #scipy-${SCIPY_VER} fi # building correct version of distribute from source