Commit 2c41c656 authored by Aurel's avatar Aurel

it's working

parent 14ba6747
...@@ -10,6 +10,9 @@ parts += ...@@ -10,6 +10,9 @@ parts +=
slapos-cookbook-develop slapos-cookbook-develop
slapos-cookbook slapos-cookbook
parts -=
template-neo
[python] [python]
part = python3 part = python3
...@@ -22,7 +25,36 @@ parts -= ...@@ -22,7 +25,36 @@ parts -=
rdiff-backup rdiff-backup
ocropy ocropy
hookbox hookbox
scipy
numpy
scikit-learn
scikit-image
PyWavelets
jupyter-notebook-initialized-scripts
jupyter
matplotlibrc
pandas
h5py
ipython
tesseract
tesseract-eng-traineddata
tesseract-osd-traineddata
neoppod
testrunner
test_suite_runner
[test_suite_runner]
recipe =
[testrunner]
recipe =
[neoppod]
recipe =
[h5py]
recipe =
[matplotlibrc]
recipe =
[jupyter]
recipe =
[rdiff-backup] [rdiff-backup]
recipe = recipe =
[rdiff-backup-build] [rdiff-backup-build]
...@@ -31,23 +63,23 @@ recipe = ...@@ -31,23 +63,23 @@ recipe =
recipe = recipe =
[hookbox] [hookbox]
recipe = recipe =
[scipy]
[numpy-egg-abspath] recipe =
# XXX: The only purpose of this section is to dynamically get the absolute path [scikit-learn]
# of the numpy egg. There's probably a better way. recipe =
recipe = slapos.recipe.build [PyWavelets]
init = recipe =
import glob, os [scikit-image]
paths = glob.glob(os.path.join(self.buildout['buildout']['develop-eggs-directory'], 'numpy-*.egg')) recipe =
assert len(paths) == 1, paths [numpy]
options['abspath'] = paths[0] recipe =
[openblas]
[scipy-env] recipe =
# See https://github.com/scipy/scipy/blob/b285d269decb8ed11079c9d4e450391eda26e9ad/scipy/special/setup.py#L158 [pandas]
# `sys.executable` is a "raw" python 3, and can't find numpy. We thus tell it recipe =
# where to find it, because it needs it. [ipython]
PYTHONPATH=${numpy-egg-abspath:abspath}:$PYTHONPATH recipe =
[python-ldap-python] [python-ldap-python]
# No patch needed anymore # No patch needed anymore
patches = patches =
...@@ -69,7 +101,46 @@ eggs -= ...@@ -69,7 +101,46 @@ eggs -=
xupdate_processor xupdate_processor
SOAPpy SOAPpy
fpconst fpconst
${scipy:egg}
${scikit-learn:egg}
${scikit-image:egg}
${numpy:egg}
${matplotlib:egg}
${pandas:egg}
h5py
${h5py:egg}
${statsmodels:egg}
astor
${ipython:egg}
# jupter base egg
jupyter
# explicit eggs to generate scripts from them
jupyter_client
jupyter_console
jupyter_core
nbconvert
nbformat
notebook
# additional eggs
requests
astor
${matplotlib:egg}
${scipy:egg}
${pandas:egg}
${scikit-learn:egg}
${seaborn:egg}
${statsmodels:egg}
patsy
${h5py:egg}
openpyxl
sympy
xlrd
# additional eggs for jupyterlab
jupyterlab
jupyterlab-launcher
pytesseract
${neoppod:eggs}
Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.5.patch#e923ab436d53282df536de3ef7d3e127 Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.5.patch#e923ab436d53282df536de3ef7d3e127
[versions] [versions]
...@@ -88,8 +159,9 @@ numpy = 1.16.6 ...@@ -88,8 +159,9 @@ numpy = 1.16.6
pandas = 0.24.2 pandas = 0.24.2
# XXX: No version of scipy is both compatible with Python 2.7 and 3.7 # XXX: No version of scipy is both compatible with Python 2.7 and 3.7
scipy = 1.5.2 scipy = 1.5.2
scikit-learn = 0.20.4 #scikit-learn = 0.20.4
statsmodels = 0.10.2 statsmodels = 0.10.2
pyzmq = 19.0.2 pyzmq = 19.0.2
PyStemmer = 2.0.1 PyStemmer = 2.0.1
python-ldap = 3.1.0 python-ldap = 3.1.0
ipython = 0.10.2
\ No newline at end of file
...@@ -54,8 +54,8 @@ extends = ...@@ -54,8 +54,8 @@ extends =
../../component/pylint/buildout.cfg ../../component/pylint/buildout.cfg
../../component/perl-Image-ExifTool/buildout.cfg ../../component/perl-Image-ExifTool/buildout.cfg
../../stack/caucase/buildout.cfg ../../stack/caucase/buildout.cfg
../../software/jupyter/software.cfg # ../../software/jupyter/software.cfg
../../software/neoppod/software-common.cfg ../../software/neoppod/software-zodb5.cfg
# keep neoppod extends last # keep neoppod extends last
parts += parts +=
...@@ -84,7 +84,7 @@ parts += ...@@ -84,7 +84,7 @@ parts +=
template template
# jupyter # jupyter
jupyter-notebook-initialized-scripts # jupyter-notebook-initialized-scripts
# override instance-jupyter-notebook not to render into default template.cfg # override instance-jupyter-notebook not to render into default template.cfg
...@@ -255,7 +255,7 @@ link-binary = ...@@ -255,7 +255,7 @@ link-binary =
${poppler:location}/bin/pdftohtml ${poppler:location}/bin/pdftohtml
${poppler:location}/bin/pdftotext ${poppler:location}/bin/pdftotext
${sed:location}/bin/sed ${sed:location}/bin/sed
${tesseract:location}/bin/tesseract # ${tesseract:location}/bin/tesseract
${w3m:location}/bin/w3m ${w3m:location}/bin/w3m
fonts = fonts =
${liberation-fonts:location} ${liberation-fonts:location}
...@@ -373,7 +373,7 @@ initialization = ...@@ -373,7 +373,7 @@ initialization =
<= neoppod <= neoppod
eggs = ${neoppod:eggs} eggs = ${neoppod:eggs}
${caucase-eggs:eggs} ${caucase-eggs:eggs}
${numpy:egg} # ${numpy:egg}
${matplotlib:egg} ${matplotlib:egg}
${lxml-python:egg} ${lxml-python:egg}
${ocropy:egg} ${ocropy:egg}
...@@ -382,9 +382,9 @@ eggs = ${neoppod:eggs} ...@@ -382,9 +382,9 @@ eggs = ${neoppod:eggs}
${python-ldap-python:egg} ${python-ldap-python:egg}
${pysvn-python:egg} ${pysvn-python:egg}
${pycrypto-python:egg} ${pycrypto-python:egg}
${scipy:egg} # ${scipy:egg}
${scikit-learn:egg} # ${scikit-learn:egg}
${scikit-image:egg} # ${scikit-image:egg}
sympy sympy
more-itertools more-itertools
${h5py:egg} ${h5py:egg}
...@@ -497,7 +497,7 @@ eggs = ${neoppod:eggs} ...@@ -497,7 +497,7 @@ eggs = ${neoppod:eggs}
facebook-sdk facebook-sdk
# Used by ERP5 Jupyter backend # Used by ERP5 Jupyter backend
ipykernel # ipykernel
# Used by DiffTool # Used by DiffTool
xmltodict xmltodict
...@@ -523,7 +523,7 @@ scripts = ...@@ -523,7 +523,7 @@ scripts =
runzeo runzeo
tidstoraged tidstoraged
tidstorage_repozo tidstorage_repozo
web_checker_utility # web_checker_utility
extra-paths = extra-paths =
${erp5:location} ${erp5:location}
...@@ -669,7 +669,7 @@ validictory = 1.1.0 ...@@ -669,7 +669,7 @@ validictory = 1.1.0
xfw = 0.10 xfw = 0.10
xupdate-processor = 0.4 xupdate-processor = 0.4
selenium = 3.8.0 selenium = 3.8.0
scikit-image = 0.14.0 #scikit-image = 0.14.0
PyWavelets = 0.5.2 PyWavelets = 0.5.2
networkx = 2.1 networkx = 2.1
pytesseract = 0.2.2 pytesseract = 0.2.2
......
...@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196 ...@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 7fdf1a42b252f9dfdf3a05ebabf608f2 md5sum = f4e10df6253a76fcdb95458516ce9bdd
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
...@@ -70,7 +70,7 @@ md5sum = 6afc237458fcc0538dd7971c2e90aa96 ...@@ -70,7 +70,7 @@ md5sum = 6afc237458fcc0538dd7971c2e90aa96
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 87ac816fc7b5d0232e21e2cae2ac2840 md5sum = f183f4bae59f9ee7ad99a37439f82de8
[monitor-template-dummy] [monitor-template-dummy]
filename = dummy.cfg filename = dummy.cfg
...@@ -86,7 +86,7 @@ md5sum = 862d3b5309aa4d80bfa48703fcffbed0 ...@@ -86,7 +86,7 @@ md5sum = 862d3b5309aa4d80bfa48703fcffbed0
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 60ca6aa3e110487e4dcd43bf2a8d185b md5sum = fa90afdf79d9b6e433042919115f39f3
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
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