wendelin.core: Always use git checkout for both release and development version

Having only one section [wendelin.core] instead of [wendelin.core] and
[wendelin.core-dev] is easier to handle in "we want to use such and such
particular version" scenarious without deciding in advance whether an SR needs
to inherit from wendelin/software.cfg or wendelin/software-dev.cfg

/reviewed-on nexedi/slapos!874

component/wendelin.core/buildout.cfg

@@ -10,19 +10,10 @@ parts =
   wendelin.core
 
 
-# wendelin.core installed from released egg from pypi
+# wendelin.core is installed from git checkout
 [wendelin.core]
-recipe = zc.recipe.egg:custom
-<= wendelin.core-eggcommon
-
-# wendelin.core installed from latest git version
-[wendelin.core-dev]
 recipe = zc.recipe.egg:develop
 setup = ${wendelin.core-repository:location}
-<= wendelin.core-eggcommon
-
-# common parts in between wendelin.core and wendelin.core-dev
-[wendelin.core-eggcommon]
 egg = wendelin.core
 setup-eggs =
     ${pygolang:egg}[pyx.build]
@@ -41,6 +32,8 @@ PATH = ${git:location}/bin:%(PATH)s
 [wendelin.core-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/wendelin.core.git
-# dir is pretty name as top-level -dev recipe
-location = ${buildout:parts-directory}/wendelin.core-dev
+branch   = master
+revision = v0.13-0-gb26ba55
+# dir is pretty name as top-level recipe
+location = ${buildout:parts-directory}/wendelin.core
 git-executable = ${git:location}/bin/git

component/wendelin.core/test-common.cfg

@@ -15,7 +15,7 @@ parts =
 # keep neoppod first and in parts so that ZODB is built correctly
     neoppod
 
-    wendelin.core-dev
+    wendelin.core
 
 #   for instance
     wendelin.core-python

software/neotest/software.cfg

@@ -34,7 +34,7 @@ parts =
 
     neoppod-develop
     neoppod
-    wendelin.core-dev
+    wendelin.core
     scripts
 
 # for ZEO scripts (runzeo)
@@ -107,7 +107,7 @@ template = inline:
 [neotest-python]
 <= python-interpreter
 eggs +=
-    ${wendelin.core-dev:egg}
+    ${wendelin.core:egg}
     ${neoppod:eggs}
 # for instance
     plone.recipe.command
@@ -116,7 +116,7 @@ eggs +=
 recipe  = zc.recipe.egg:scripts
 eggs    =
 # to install not only wendelin.core modules but also scripts
-    ${wendelin.core-dev:egg}
+    ${wendelin.core:egg}
 
 
 # wendelin.core: latest not yet released

software/wendelin/software-dev.cfg

@@ -2,20 +2,8 @@
 [buildout]
 extends = software.cfg
 
-# wendelin.core
-parts -= wendelin.core
-parts += wendelin.core-dev
+[wendelin.core-repository]
+revision =
 
-
-[eggs]
-# tell erp5 to use -dev eggs instead of released ones
-eggs -= ${wendelin.core:egg}
-eggs += ${wendelin.core-dev:egg}
-
-
-# unpin wendelin.core from versions, so that if there is difference between
-# version of wendelin.core-dev and what was pinned, buildout does not fallback
-# to installing non-dev egg
 [versions]
-wendelin.core =
 scikit-learn = 0.20

software/wendelin/software.cfg

@@ -77,4 +77,3 @@ branch = master
 
 [versions]
 msgpack-numpy = 0.4.4.3
-wendelin.core = 0.13