scikit: simpler

component/numpy/buildout.cfg

@@ -9,15 +9,14 @@ extends =
 
 [scipy-repository.git]
 recipe = slapos.recipe.build:gitclone
-repository = https://github.com/mmariani/scipy.git
-# bumped version number to ensure we're using the freshly compiled egg
-branch = 0.13.3001
+repository = https://github.com/scipy/scipy.git
+branch = maintenance/0.13.x
 git-executable = ${git:location}/bin/git
 
 [scikit-learn-repository.git]
 recipe = slapos.recipe.build:gitclone
 repository = https://github.com/scikit-learn/scikit-learn.git
-branch = master
+branch = 0.15.X
 git-executable = ${git:location}/bin/git
 
 
@@ -38,12 +37,15 @@ install_cmd =
   export ATLAS=${libatlas:location}/lib/libsatlas.so
   export BLAS=${libblas:location}/libfblas.a
   export LAPACK=${libatlas:location}/lib/liblapack.a
+  export NUMPY_EGG=${buildout:eggs-directory}/numpy-${versions:numpy}-py2.7-linux-x86_64.egg
   ${buildout:directory}/bin/virtualenv ${:location}
   . ${:location}/bin/activate
-  ${:location}/bin/pip install numpy
-  ${:location}/bin/pip install Tempita
+  # we need to install numpy to satisfy the dependency...
+  # ${:location}/bin/pip install numpy
+  # ...but we can reuse the numpy egg that has been built by buildout.
+  ${:location}/bin/easy_install $NUMPY_EGG
   # look for numpy in buildout eggs, not in the virtualenv
-  export PYTHONPATH=${buildout:eggs-directory}/numpy-${versions:numpy}-py2.7-linux-x86_64.egg
+  export PYTHONPATH=$NUMPY_EGG
   cd ${scipy-repository.git:location}
   python setupegg.py bdist_egg
   cd ${scikit-learn-repository.git:location}
@@ -71,11 +73,12 @@ eggs =
   numpy
   scipy
   scikit-learn
+  simpy
 interpreter = python-numpy
 
 
 [versions]
 numpy = 1.8.1
-scipy = 0.13.3001
-scikit-learn = 0.16-git
+scipy = 0.13.3
+scikit-learn = 0.15.1
 

component/numpy/software.cfg

@@ -10,6 +10,6 @@ parts =
 
 [versions]
 numpy = 1.8.1
-scipy = 0.13.3001
-scikit-learn = 0.16-git
+scipy = 0.13.3
+scikit-learn = 0.15.1