scikit: cleanup

component/libatlas/buildout.cfg

@@ -37,7 +37,6 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [libatlas]
 recipe = cp.recipe.cmd
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-lapack_version = 3.5.0
 install_cmd =
   set -e
   mkdir -p ${:location}__compile__

component/libblas/buildout.cfg

@@ -3,6 +3,16 @@ parts =
   libblas
 
 
+[libblas-download]
+recipe = hexagonit.recipe.download
+filename = blas.tgz
+url = http://www.netlib.org/blas/${:filename}
+md5sum = 5e99e975f7a1e3ea6abcad7c6e7e42e6
+download-only = true
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+
 [libblas]
 recipe = cp.recipe.cmd
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -12,8 +22,7 @@ install_cmd =
   set -e
   mkdir -p ${:location}__compile__
   cd ${:location}__compile__
-  wget -nc http://www.netlib.org/blas/blas.tgz
-  tar xzf blas.tgz
+  tar xzf ${libblas-download:location}/${libblas-download:filename}
   cd BLAS
   ${:gfortran} -O3 -std=legacy -m64 -fno-second-underscore -fPIC -c *.f
   ar r libfblas.a *.o

component/numpy/buildout.cfg

@@ -21,8 +21,8 @@ branch = master
 git-executable = ${git:location}/bin/git
 
 
-[build-venv]
-dependency = ${prerequired-eggs:recipe}
+[numpy-build-venv]
+dependency = ${numpy-prerequired-egg:recipe}
 recipe = cp.recipe.cmd
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 install_cmd =
@@ -41,6 +41,7 @@ install_cmd =
   . ${:location}/bin/activate
   ${:location}/bin/pip install numpy
   ${:location}/bin/pip install Tempita
+  # look for numpy in buildout eggs, not in the virtualenv
   export PYTHONPATH=${buildout:eggs-directory}/numpy-${versions:numpy}-py2.7-linux-x86_64.egg
   cd ${scipy-repository.git:location}
   python setupegg.py bdist_egg
@@ -49,15 +50,16 @@ install_cmd =
 update_cmd = ${:install_cmd}
 
 
-[prerequired-eggs]
+[numpy-prerequired-egg]
 recipe = zc.recipe.egg
+# this must be installed before building scipy and scikit-learn
 eggs =
-  slapos.cookbook
+  ${lxml-python:egg}
   numpy
 
 
-[numpy-eggs]
-dependencies = ${build-venv:recipe}
+[numpy-dependent-eggs]
+dependencies = ${numpy-build-venv:recipe}
 recipe = zc.recipe.egg
 find-links =
     ${scipy-repository.git:location}/dist

component/numpy/software.cfg

@@ -6,7 +6,7 @@ extends =
   ../../component/numpy/buildout.cfg
 
 parts =
-  numpy-eggs
+  numpy-dependent-eggs
 
 [versions]
 numpy = 1.8.1

stack/erp5/buildout.cfg

@@ -431,7 +431,7 @@ ZODB3-patch-binary = ${patch:location}/bin/patch
 [eggs]
 recipe = zc.recipe.egg
 eggs =
-  ${numpy-eggs:eggs}
+  ${numpy-dependent-eggs:eggs}
   ${mysql-python:egg}
   ${lxml-python:egg}
   ${pil-python:egg}