Commit 400ccad4 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5-cluster

parents 6555caf4 d0807d90
...@@ -7,7 +7,6 @@ extends = ...@@ -7,7 +7,6 @@ extends =
../../component/scipy/buildout.cfg ../../component/scipy/buildout.cfg
../../component/scikit-learn/buildout.cfg ../../component/scikit-learn/buildout.cfg
../../component/pandas/buildout.cfg ../../component/pandas/buildout.cfg
../../component/manpy/buildout.cfg
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
parts = parts =
monitor-eggs monitor-eggs
...@@ -23,9 +22,6 @@ eggs += ...@@ -23,9 +22,6 @@ eggs +=
${scipy:egg} ${scipy:egg}
${pandas:egg} ${pandas:egg}
${scikit-learn:egg} ${scikit-learn:egg}
${manpy:eggs}
initialization +=
${manpy:initialization}
[ipython_notebook_config] [ipython_notebook_config]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
......
[buildout] [buildout]
extends = extends =
../../component/manpy/buildout.cfg
../../software/ipython_notebook/software.cfg ../../software/ipython_notebook/software.cfg
../../component/fluentd/buildout.cfg ../../component/fluentd/buildout.cfg
../../component/matplotlib/buildout.cfg ../../component/matplotlib/buildout.cfg
...@@ -22,7 +21,6 @@ parts += ...@@ -22,7 +21,6 @@ parts +=
matplotlib matplotlib
fluentd fluentd
ipython_notebook ipython_notebook
manpy
[eggs] [eggs]
initialization = initialization =
......
...@@ -105,7 +105,7 @@ eggs = ...@@ -105,7 +105,7 @@ eggs =
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.7.1.post9 zc.buildout = 1.7.1.post9
# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2) # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
zc.recipe.egg = 1.3.2.post3 zc.recipe.egg = 1.3.2.post4
# Use own version of h.r.download to be able to open .xz and .lz archives # Use own version of h.r.download to be able to open .xz and .lz archives
hexagonit.recipe.download = 1.7.post4 hexagonit.recipe.download = 1.7.post4
......
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