From bf4ba2e765aed111cb8f8954ed8a4cdb7c557cba Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Wed, 20 Aug 2014 20:10:45 +0200
Subject: [PATCH] Loading our own Library.
---
bob/io/base/__init__.py | 7 +++++++
buildout.cfg | 2 --
setup.py | 28 +++++++++++++++++-----------
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/bob/io/base/__init__.py b/bob/io/base/__init__.py
index 748b438..cc2119a 100644
--- a/bob/io/base/__init__.py
+++ b/bob/io/base/__init__.py
@@ -1,3 +1,10 @@
+# import Libraries of other lib packages
+import bob.core
+
+# import our own Library
+import bob.extension
+bob.extension.load_bob_library('bob.io.base', __file__)
+
from ._library import File, HDF5File, extensions
from . import version
from .version import module as __version__
diff --git a/buildout.cfg b/buildout.cfg
index 798515b..43ff98a 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -16,8 +16,6 @@ develop = src/bob.extension
; options for bob.buildout extension
debug = true
verbose = true
-prefixes = /idiap/group/torch5spro/releases/preview/install/linux-x86_64-release
- /Users/andre/work/bob/b/dbg/
[sources]
bob.extension = git https://github.com/bioidiap/bob.extension
diff --git a/setup.py b/setup.py
index e446ae5..5d67e3a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,16 @@
# Andre Anjos <andre.anjos@idiap.ch>
# Mon 16 Apr 08:18:08 2012 CEST
+bob_packages = ['bob.core']
+
from setuptools import setup, find_packages, dist
-dist.Distribution(dict(setup_requires=['bob.blitz', 'bob.core']))
+dist.Distribution(dict(setup_requires=['bob.blitz'] + bob_packages))
from bob.extension.utils import egrep, find_header, find_library
from bob.blitz.extension import Extension, Library, build_ext
+packages = ['boost']
+boost_modules = ['system', 'filesystem']
+
version = '2.0.0a0'
def libhdf5_version(header):
@@ -137,6 +142,7 @@ setup(
install_requires=[
'setuptools',
'bob.blitz',
+ 'bob.core'
],
namespace_packages=[
@@ -152,10 +158,10 @@ setup(
define_macros = define_macros,
system_include_dirs = system_include_dirs,
version = version,
- bob_packages = ['bob.core'],
- packages = ['boost'],
- boost_modules = ['system', 'filesystem'],
- ),
+ bob_packages = bob_packages,
+ packages = packages,
+ boost_modules = boost_modules,
+ ),
Library("bob.io.base.bob_io_base",
[
@@ -184,9 +190,9 @@ setup(
system_include_dirs = system_include_dirs,
define_macros = define_macros,
version = version,
- bob_packages = ['bob.core', 'bob.blitz'],
- packages = ['boost'],
- boost_modules = ['system', 'filesystem'],
+ bob_packages = bob_packages,
+ packages = packages,
+ boost_modules = boost_modules,
),
Extension("bob.io.base._library",
@@ -202,9 +208,9 @@ setup(
define_macros = define_macros,
system_include_dirs = system_include_dirs,
version = version,
- bob_packages = ['bob.core'],
- packages = ['boost'],
- boost_modules = ['system', 'filesystem'],
+ bob_packages = bob_packages,
+ packages = packages,
+ boost_modules = boost_modules,
),
],
--
GitLab