diff --git a/buildout.cfg b/buildout.cfg index a1050a459ee1792e4787d159f19fa969a70ad216..2f67b4894a3c053e9bd7e4d67442d8f83589ca7c 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -10,6 +10,8 @@ develop = . extensions = mr.developer auto-checkout = * prefixes = /Users/andre/work/bob/b/dbg +verbose = true +debug = true [sources] xbob.buildout = git git@github.com:bioidiap/xbob.buildout diff --git a/setup.py b/setup.py index 2a017bdd8832defaf9216d36dba08c9cc39354e8..770a52e19e5c8851ab5241a5bc784f44d1244412 100644 --- a/setup.py +++ b/setup.py @@ -9,10 +9,10 @@ version = '2.0.0a0' setup( - name='xbob.db', + name='xbob.db.base', version=version, - description='Bindings for bob.db', - url='http://github.com/anjos/xbob.db', + description='Database Bindings API', + url='http://github.com/anjos/xbob.db.base', license='BSD', author='Andre Anjos', author_email='andre.anjos@idiap.ch', @@ -24,23 +24,16 @@ setup( install_requires=[ 'setuptools', - 'xbob.io', - 'xbob.measure', - 'xbob.machine', - 'xbob.trainer', ], namespace_packages=[ "xbob", + "xbob.db", ], entry_points={ 'console_scripts': [ - 'xbob_dbmanage.py = xbob.db.script.dbmanage:main', - ], - - 'xbob.db': [ - 'iris = xbob.db.iris.driver:Interface', + 'xbob_dbmanage.py = xbob.db.base.script.dbmanage:main', ], }, diff --git a/xbob/db/__init__.py b/xbob/db/__init__.py index c9cbddf4357c4b5fc243354fa9e13c53c00a83c4..60381ea9b78a067c402bf65368cc63241b0d7456 100644 --- a/xbob/db/__init__.py +++ b/xbob/db/__init__.py @@ -1,12 +1,2 @@ -#!/usr/bin/env python -# Andre Anjos <andre.anjos@idiap.ch> -# Thu 23 Jun 20:22:28 2011 CEST -# vim: set fileencoding=utf-8 : - -"""The db package contains simplified APIs to access data for various databases -that can be used in Biometry, Machine Learning or Pattern Classification.""" - -from . import utils, driver, iris - -__all__ = [k for k in dir() if not k.startswith('_')] -if 'k' in locals(): del k +#see http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages +__import__('pkg_resources').declare_namespace(__name__) diff --git a/xbob/db/base/__init__.py b/xbob/db/base/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..c9cbddf4357c4b5fc243354fa9e13c53c00a83c4 --- /dev/null +++ b/xbob/db/base/__init__.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python +# Andre Anjos <andre.anjos@idiap.ch> +# Thu 23 Jun 20:22:28 2011 CEST +# vim: set fileencoding=utf-8 : + +"""The db package contains simplified APIs to access data for various databases +that can be used in Biometry, Machine Learning or Pattern Classification.""" + +from . import utils, driver, iris + +__all__ = [k for k in dir() if not k.startswith('_')] +if 'k' in locals(): del k diff --git a/xbob/db/driver.py b/xbob/db/base/driver.py similarity index 100% rename from xbob/db/driver.py rename to xbob/db/base/driver.py diff --git a/xbob/db/example/__init__.py b/xbob/db/base/example/__init__.py similarity index 100% rename from xbob/db/example/__init__.py rename to xbob/db/base/example/__init__.py diff --git a/xbob/db/example/iris_backprop.py b/xbob/db/base/example/iris_backprop.py similarity index 100% rename from xbob/db/example/iris_backprop.py rename to xbob/db/base/example/iris_backprop.py diff --git a/xbob/db/example/iris_lda.py b/xbob/db/base/example/iris_lda.py similarity index 100% rename from xbob/db/example/iris_lda.py rename to xbob/db/base/example/iris_lda.py diff --git a/xbob/db/example/iris_rprop.py b/xbob/db/base/example/iris_rprop.py similarity index 100% rename from xbob/db/example/iris_rprop.py rename to xbob/db/base/example/iris_rprop.py diff --git a/xbob/db/iris/__init__.py b/xbob/db/base/iris/__init__.py similarity index 100% rename from xbob/db/iris/__init__.py rename to xbob/db/base/iris/__init__.py diff --git a/xbob/db/iris/driver.py b/xbob/db/base/iris/driver.py similarity index 100% rename from xbob/db/iris/driver.py rename to xbob/db/base/iris/driver.py diff --git a/xbob/db/iris/iris.data b/xbob/db/base/iris/iris.data similarity index 100% rename from xbob/db/iris/iris.data rename to xbob/db/base/iris/iris.data diff --git a/xbob/db/iris/iris.names b/xbob/db/base/iris/iris.names similarity index 100% rename from xbob/db/iris/iris.names rename to xbob/db/base/iris/iris.names diff --git a/xbob/db/manage.py b/xbob/db/base/manage.py similarity index 100% rename from xbob/db/manage.py rename to xbob/db/base/manage.py diff --git a/xbob/db/script/__init__.py b/xbob/db/base/script/__init__.py similarity index 100% rename from xbob/db/script/__init__.py rename to xbob/db/base/script/__init__.py diff --git a/xbob/db/script/dbmanage.py b/xbob/db/base/script/dbmanage.py similarity index 100% rename from xbob/db/script/dbmanage.py rename to xbob/db/base/script/dbmanage.py diff --git a/xbob/db/sqlalchemy_migration.py b/xbob/db/base/sqlalchemy_migration.py similarity index 100% rename from xbob/db/sqlalchemy_migration.py rename to xbob/db/base/sqlalchemy_migration.py diff --git a/xbob/db/test/__init__.py b/xbob/db/base/test/__init__.py similarity index 100% rename from xbob/db/test/__init__.py rename to xbob/db/base/test/__init__.py diff --git a/xbob/db/test/data/fl/dev/for_models.lst b/xbob/db/base/test/data/fl/dev/for_models.lst similarity index 100% rename from xbob/db/test/data/fl/dev/for_models.lst rename to xbob/db/base/test/data/fl/dev/for_models.lst diff --git a/xbob/db/test/data/fl/dev/for_scores.lst b/xbob/db/base/test/data/fl/dev/for_scores.lst similarity index 100% rename from xbob/db/test/data/fl/dev/for_scores.lst rename to xbob/db/base/test/data/fl/dev/for_scores.lst diff --git a/xbob/db/test/data/fl/dev/for_tnorm.lst b/xbob/db/base/test/data/fl/dev/for_tnorm.lst similarity index 100% rename from xbob/db/test/data/fl/dev/for_tnorm.lst rename to xbob/db/base/test/data/fl/dev/for_tnorm.lst diff --git a/xbob/db/test/data/fl/dev/for_znorm.lst b/xbob/db/base/test/data/fl/dev/for_znorm.lst similarity index 100% rename from xbob/db/test/data/fl/dev/for_znorm.lst rename to xbob/db/base/test/data/fl/dev/for_znorm.lst diff --git a/xbob/db/test/data/fl/eval/for_models.lst b/xbob/db/base/test/data/fl/eval/for_models.lst similarity index 100% rename from xbob/db/test/data/fl/eval/for_models.lst rename to xbob/db/base/test/data/fl/eval/for_models.lst diff --git a/xbob/db/test/data/fl/eval/for_scores.lst b/xbob/db/base/test/data/fl/eval/for_scores.lst similarity index 100% rename from xbob/db/test/data/fl/eval/for_scores.lst rename to xbob/db/base/test/data/fl/eval/for_scores.lst diff --git a/xbob/db/test/data/fl/eval/for_tnorm.lst b/xbob/db/base/test/data/fl/eval/for_tnorm.lst similarity index 100% rename from xbob/db/test/data/fl/eval/for_tnorm.lst rename to xbob/db/base/test/data/fl/eval/for_tnorm.lst diff --git a/xbob/db/test/data/fl/eval/for_znorm.lst b/xbob/db/base/test/data/fl/eval/for_znorm.lst similarity index 100% rename from xbob/db/test/data/fl/eval/for_znorm.lst rename to xbob/db/base/test/data/fl/eval/for_znorm.lst diff --git a/xbob/db/test/data/fl/norm/train_world.lst b/xbob/db/base/test/data/fl/norm/train_world.lst similarity index 100% rename from xbob/db/test/data/fl/norm/train_world.lst rename to xbob/db/base/test/data/fl/norm/train_world.lst diff --git a/xbob/db/test/test_examples.py b/xbob/db/base/test/test_examples.py similarity index 100% rename from xbob/db/test/test_examples.py rename to xbob/db/base/test/test_examples.py diff --git a/xbob/db/test/test_scripts.py b/xbob/db/base/test/test_scripts.py similarity index 100% rename from xbob/db/test/test_scripts.py rename to xbob/db/base/test/test_scripts.py diff --git a/xbob/db/utils.py b/xbob/db/base/utils.py similarity index 100% rename from xbob/db/utils.py rename to xbob/db/base/utils.py