component/zodbtools: switch to always using a git checkout

This ease the development and version updates

component/zodbtools/buildout-dev.cfg

-# SlapOS component for zodbtools development.
-
-[buildout]
-extends =
-    buildout.cfg
-    ../git/buildout.cfg
-
-# override zodbtools to install it from latest git version
-[zodbtools]
-recipe  = zc.recipe.egg:develop
-setup   = ${zodbtools-repository:location}
-
-[zodbtools-repository]
-recipe  = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/zodbtools.git
-branch  = master
-location = ${buildout:parts-directory}/zodbtools-dev
-git-executable = ${git:location}/bin/git
-
-
-# unpin zodbtools from versions, so that buildout does not fallback to
-# installing non-dev egg if dev one has changed its version.
-[versions]
-zodbtools =

component/zodbtools/buildout.cfg

@@ -6,13 +6,15 @@ extends =
     ../pygolang/buildout.cfg
     ../ZODB/buildout.cfg
     ../ZEO/buildout.cfg
+    ../git/buildout.cfg
 
 parts =
-    zodbtools/scripts
+    zodbtools
 
 
 [zodbtools]
-recipe  = zc.recipe.egg:eggs
+recipe  = zc.recipe.egg:develop
+setup   = ${zodbtools-repository:location}
 egg     = zodbtools
 eggs    =
     ${:egg}
@@ -29,5 +31,9 @@ recipe  = zc.recipe.egg:scripts
 eggs    = ${zodbtools:eggs}
 
 
-[versions]
-zodbtools = 0.0.0.dev9
+[zodbtools-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/zodbtools.git
+location = ${buildout:parts-directory}/zodbtools
+git-executable = ${git:location}/bin/git
+revision = 0.0.0.dev9-21-gb0fdb5f

component/zodbtools/test-common.cfg

@@ -4,10 +4,9 @@
 [buildout]
 extends =
 # test<X>.cfg configures ZODB.major=<X>.
-
     ../../stack/nxdtest.cfg
     ../pytest/buildout.cfg
-    buildout-dev.cfg
+    buildout.cfg
 
 parts =
 #   for instance