scikit: pillow in place of PIL, removed [python2.7-virtualenv] section, added cython

component/numpy/buildout.cfg

@@ -32,12 +32,13 @@ install_cmd =
   mkdir -p ${:location}
   cd ${:location}
   unset PYTHONPATH
-  export PATH="${gcc-fortran:location}/bin:$PATH"
+  # need to find our gcc, and cython
+  export PATH="${gcc-fortran:location}/bin:${buildout:directory}/bin:$PATH"
   export LD_PRELOAD="${gcc-fortran:location}/lib64/libgfortran.so.3 ${libblas:location}/libf77blas.so.3"
   export ATLAS=${libatlas:location}/lib/libsatlas.so
-  export BLAS=${libblas:location}/lib/libfblas.a
+  export BLAS=${libblas:location}/libfblas.a
   export LAPACK=${libatlas:location}/lib/liblapack.a
-  ${python2.7-virtualenv:executable} ${:location}
+  ${buildout:directory}/bin/virtualenv ${:location}
   . ${:location}/bin/activate
   ${:location}/bin/pip install numpy
   ${:location}/bin/pip install Tempita
@@ -55,6 +56,8 @@ recipe = zc.recipe.egg
 # this must be installed before building scipy and scikit-learn
 eggs =
   ${lxml-python:egg}
+  virtualenv
+  cython
   numpy
 
 

component/python-2.7/buildout.cfg

@@ -58,19 +58,3 @@ environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
 
-
-[python2.7-virtualenv]
-recipe = collective.recipe.cmd
-version = 1.11.4
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-executable = ${python2.7:prefix}/bin/virtualenv
-cmds =
-  mkdir -p ${:location}
-  cd ${:location}
-  unset PYTHONPATH
-  # XXX the following commands are not shacache-aware
-  ${python2.7:executable} -c 'import urllib2;print urllib2.urlopen("https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py").read()' | ${python2.7:executable} -
-  ${python2.7:prefix}/bin/easy_install virtualenv
-on_install = true
-on_update = false
-

stack/erp5/buildout.cfg

@@ -42,7 +42,7 @@ extends =
   ../../component/mariadb/buildout.cfg
   ../../component/mysql-python/buildout.cfg
   ../../component/patch/buildout.cfg
-  ../../component/pil-python/buildout.cfg
+  ../../component/pillow/buildout.cfg
   ../../component/pycrypto-python/buildout.cfg
   ../../component/pysvn-python/buildout.cfg
   ../../component/python-2.7/buildout.cfg
@@ -434,7 +434,7 @@ eggs =
   ${numpy-dependent-eggs:eggs}
   ${mysql-python:egg}
   ${lxml-python:egg}
-  ${pil-python:egg}
+  ${pillow-python:egg}
   ${python-ldap-python:egg}
   ${pysvn-python:egg}
   ${pycrypto-python:egg}