From c5cca254e0d0058eab3e113939162f52b7cc0e0c Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 18 Nov 2013 22:42:02 +0100
Subject: [PATCH] Add new xbob.blitz module
---
.gitmodules | 6 +++---
buildout.cfg | 12 ++++++------
setup.py | 4 ++++
src/xbob.blitz | 1 +
4 files changed, 14 insertions(+), 9 deletions(-)
create mode 160000 src/xbob.blitz
diff --git a/.gitmodules b/.gitmodules
index 859e128..c2d50b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/blitz.array"]
- path = src/blitz.array
- url = git@github.com:anjos/blitz.array
+[submodule "src/xbob.blitz"]
+ path = src/xbob.blitz
+ url = git@github.com:anjos/xbob.blitz
diff --git a/buildout.cfg b/buildout.cfg
index 06d36d1..685e6b4 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -3,7 +3,7 @@
; Mon 16 Apr 08:29:18 2012 CEST
[buildout]
-parts = blitz.array xbob.io scripts
+parts = xbob.blitz xbob.io scripts
eggs = xbob.io
ipdb
extensions = mr.developer
@@ -14,16 +14,16 @@ verbose = true
[sources]
xbob.buildout = git git@github.com:bioidiap/xbob.buildout
-pypkg = git git@github.com:anjos/pypkg
+xbob.extension = git git@github.com:bioidiap/xbob.extension branch=xbob
-[blitz.array]
+[xbob.blitz]
recipe = xbob.buildout:develop
-setup = src/blitz.array
-eggs = pypkg
+setup = src/xbob.blitz
+eggs = xbob.buildout xbob.extension
[xbob.io]
recipe = xbob.buildout:develop
-eggs = blitz.array pypkg
+eggs = xbob.blitz
[scripts]
recipe = xbob.buildout:scripts
diff --git a/setup.py b/setup.py
index ed2fe19..beddbcf 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,10 @@
# Andre Anjos <andre.anjos@idiap.ch>
# Mon 16 Apr 08:18:08 2012 CEST
+from setuptools import setup, find_packages, dist
+dist.Distribution(dict(setup_requires=['numpy', 'xbob.extension']))
+import numpy
+from xbob.extension import Extension
from setuptools import setup, find_packages, dist
from distutils.extension import Extension
from distutils.version import LooseVersion
diff --git a/src/xbob.blitz b/src/xbob.blitz
new file mode 160000
index 0000000..6162b26
--- /dev/null
+++ b/src/xbob.blitz
@@ -0,0 +1 @@
+Subproject commit 6162b2623dcee7b7570cd0462ed5baec20320162
--
GitLab