From a5897783b94f124d2f6a19d76945cb00856eee61 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Tue, 21 Aug 2012 22:21:10 +0200
Subject: [PATCH] Fix replay database with newest buildout strategy
---
buildout.cfg | 20 +++++++++++++++-----
localbob.cfg | 33 ---------------------------------
2 files changed, 15 insertions(+), 38 deletions(-)
delete mode 100644 localbob.cfg
diff --git a/buildout.cfg b/buildout.cfg
index 60e3fd3..276d2f0 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -3,12 +3,22 @@
; Mon 16 Apr 08:29:18 2012 CEST
[buildout]
-parts = python tests sphinx
+parts = external python tests sphinx
develop = .
eggs = bob.db.replay
+versions = versions
+index = http://d.pypi.python.org/simple
+
+[versions]
+;idiap.recipe.externaleggs = 0.1
+;idiap.recipe.sphinx = 0.1
+
+[external]
+recipe = idiap.recipe.externaleggs:recipe
+egg-directories = /Users/andre/work/bob-master/build/lib
[python]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
interpreter = python
eggs = ${buildout:eggs}
@@ -18,7 +28,7 @@ eggs = ${buildout:eggs}
script = tests.py
[sphinx]
-recipe = collective.recipe.sphinxbuilder
+recipe = idiap.recipe.sphinx:recipe
+eggs = ${buildout:eggs}
source = ${buildout:directory}/docs
-build = ${buildout:directory}/built-docs
-interpreter = ${buildout:bin-directory}/python
+build = ${buildout:directory}/sphinx
diff --git a/localbob.cfg b/localbob.cfg
deleted file mode 100644
index cadd1be..0000000
--- a/localbob.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-; vim: set fileencoding=utf-8 :
-; Andre Anjos <andre.anjos@idiap.ch>
-; Mon 16 Apr 08:29:18 2012 CEST
-
-; Example buildout recipe using a local (off-root) Bob installation
-
-[buildout]
-parts = bob python tests sphinx
-develop = .
-eggs = bob.db.replay
- bob
-
-[bob]
-recipe = local.bob.recipe:config
-
-; Set here the private installation directory for Bob
-install-directory = /scratch/aanjos/bob-master/build/newdb/release
-
-[python]
-recipe = zc.recipe.egg
-interpreter = python
-eggs = ${buildout:eggs}
-
-[tests]
-recipe = pbp.recipe.noserunner
-eggs = ${buildout:eggs}
-script = tests.py
-
-[sphinx]
-recipe = collective.recipe.sphinxbuilder
-source = ${buildout:directory}/docs
-build = ${buildout:directory}/built-docs
-interpreter = ${buildout:bin-directory}/python
--
GitLab