.

component/wendelin.core/buildout.cfg

@@ -3,6 +3,9 @@
 [buildout]
 extends =
   ../pygolang/buildout.cfg
+  ../ZODB/buildout.cfg
+  ../zodbtools/buildout.cfg
+  ../numpy/buildout.cfg
   ../golang/buildout.cfg
   ../zlib/buildout.cfg
   ../git/buildout.cfg
@@ -29,6 +32,13 @@ setup-eggs =
     ${pygolang:egg}[pyx.build]
 environment = wendelin.core-env
 
+# dependent eggs that must come through in-tree recipes
+depends =
+    ${ZODB:egg}
+    ${zodbtools:egg}
+    ${numpy:egg}
+
+
 [wendelin.core-env]
 # wendelin.core needs git(dev) and go to build
 PATH = ${git:location}/bin:%(PATH)s

software/neotest/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [neotest-env.sh]
 filename = neotest-env.sh.in
-md5sum = bd46e95f1cea62c3b0082fe8c0c9c90b
+md5sum = dd41bd736561b7d59b5ec7e0ab7cde98
 
 [neotest]
 filename = neotest.in

software/neotest/neotest-env.sh.in

@@ -9,24 +9,7 @@ PATH="${ioping:location}/bin:$PATH"
 PATH="${lmbench:location}/bin:$PATH"
 PATH="${mariadb:location}/bin:$PATH"
 PATH="${mariadb:location}/scripts:$PATH"
-PATH="${python:location}/bin:$PATH"
-
-# add all eggs and develop-eggs to py path
-#
-# XXX better leverage something like zc.recipe.egg to generate eggs path buildout way
-# XXX see e.g. https://lab.nexedi.com/nexedi/slapos/merge_requests/242#note_49644 for why
-# TODO(kirr) try doing so
-PYTHONPATH=${buildout:develop-eggs-directory}:$PYTHONPATH       # for .egg-link to be found by setuptools
-for egglink in ${buildout:develop-eggs-directory}/*.egg-link; do
-    PYTHONPATH=`cat $egglink |head -1`:$PYTHONPATH
-done
-
-for egg in ${buildout:develop-eggs-directory}/*.egg ${buildout:eggs-directory}/*.egg; do
-        export PYTHONPATH=$egg:$PYTHONPATH
-done
-
+PATH="${buildout:bin-directory}/:$PATH"  # for python with eggs
 
 export PATH
-export PYTHONPATH
-
 export PS1="(neotest-`basename ${buildout:directory}`) $PS1"

software/neotest/software.cfg

@@ -36,12 +36,12 @@ parts =
     neoppod-develop
     neoppod
     wendelin.core-dev
-    eggs
     scripts
 
 # for ZEO scripts (runzeo)
     ZEO/scripts
 
+    neotest-python
     neotest-env.sh
     neotest
 
@@ -104,17 +104,12 @@ template = inline:
 
 
 
-# eggs:
-[eggs]
-recipe  = zc.recipe.egg:eggs
-eggs    =
-# wendelin.core still requires ZODB3 but having ZODB4 or 5 installed satisfies latest ZODB3
-#   ZODB3
-    ${ZODB:egg}
-# also for wc
-    ${numpy:egg}
-# for e.g. tcpu.py
-    ${pygolang:egg}
+# bin/python is preinstalled with sys.path to wendelin.core & friends.
+[neotest-python]
+<= python-interpreter
+eggs +=
+    ${wendelin.core-dev:egg}
+    ${neoppod:eggs}
 # for instance
     plone.recipe.command
 
@@ -122,17 +117,14 @@ eggs    =
 recipe  = zc.recipe.egg:scripts
 eggs    =
 # to install not only wendelin.core modules but also scripts
-    wendelin.core
+    ${wendelin.core-dev:egg}
 
 
 # wendelin.core: latest not yet released
 [wendelin.core-repository]
 revision= v0.11-15-gf785ac079b
 
-# ping eggs versions
+# pin eggs versions
+# XXX -> component/ZODB
 [versions]
 ZODB3 = 3.11.0
-
-# Required by:
-# neoppod==1.8.1
-python-dateutil = 2.7.1