Moved to new version of bob.

xbob/db/atnt/driver.py → bob/db/atnt/driver.py

@@ -22,7 +22,7 @@
 
 import os
 import sys
-from bob.db.driver import Interface as BaseInterface
+from bob.db.base.driver import Interface as BaseInterface
 
 def dumplist(args):
   """Dumps lists of files based on your criteria."""
@@ -38,7 +38,7 @@ def dumplist(args):
 
   output = sys.stdout
   if args.selftest:
-    from bob.db.utils import null
+    from bob.db.base.utils import null
     output = null()
 
   for f in r:
@@ -65,7 +65,7 @@ def checkfiles(args):
   # report
   output = sys.stdout
   if args.selftest:
-    from bob.db.utils import null
+    from bob.db.base.utils import null
     output = null()
 
   if bad:
@@ -85,7 +85,7 @@ def reverse(args):
 
   output = sys.stdout
   if args.selftest:
-    from bob.db.utils import null
+    from bob.db.base.utils import null
     output = null()
 
   r = db.reverse(args.path)
@@ -104,7 +104,7 @@ def path(args):
 
   output = sys.stdout
   if args.selftest:
-    from bob.db.utils import null
+    from bob.db.base.utils import null
     output = null()
 
   r = db.paths(args.id, prefix=args.directory, suffix=args.extension)
@@ -123,7 +123,7 @@ class Interface(BaseInterface):
 
   def version(self):
     import pkg_resources  # part of setuptools
-    return pkg_resources.require('xbob.db.%s' % self.name())[0].version
+    return pkg_resources.require('bob.db.%s' % self.name())[0].version
 
   def files(self):
     return ()

xbob/db/atnt/models.py → bob/db/atnt/models.py

@@ -19,13 +19,13 @@
 
 """
 This file defines simple Client and File interfaces that should be comparable
-with other xbob.db databases.
+with other bob.db databases.
 """
 
 import os
 import bob
 
-import xbob.db.verification.utils
+import bob.db.verification.utils
 
 class Client:
   """The clients of this database contain ONLY client ids. Nothing special."""
@@ -37,7 +37,7 @@ class Client:
 
 
 
-class File (xbob.db.verification.utils.File):
+class File (bob.db.verification.utils.File):
   """Files of this database are composed from the client id and a file id."""
   m_valid_file_ids = set(range(1, 11))
 
@@ -48,7 +48,7 @@ class File (xbob.db.verification.utils.File):
     # generate path on the fly
     path = os.path.join("s" + str(client_id), str(client_file_id))
     # call base class constructor
-    xbob.db.verification.utils.File.__init__(self, client_id = client_id, file_id = file_id, path = path)
+    bob.db.verification.utils.File.__init__(self, client_id = client_id, file_id = file_id, path = path)
 
 
   @staticmethod

xbob/db/atnt/query.py → bob/db/atnt/query.py

@@ -19,16 +19,16 @@
 
 from .models import Client, File
 
-import xbob.db.verification.utils
+import bob.db.verification.utils
 
-class Database(xbob.db.verification.utils.Database):
+class Database(bob.db.verification.utils.Database):
   """Wrapper class for the AT&T (aka ORL) database of faces (http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html).
   This class defines a simple protocol for training, enrollment and probe by splitting the few images of the database in a reasonable manner.
   Due to the small size of the database, there is only a 'dev' group, and I did not define an 'eval' group."""
 
   def __init__(self):
     # call base class constructor
-    xbob.db.verification.utils.Database.__init__(self)
+    bob.db.verification.utils.Database.__init__(self)
     # initialize members
     self.m_groups = ('world', 'dev')
     self.m_purposes = ('enrol', 'probe')

xbob/db/atnt/test.py → bob/db/atnt/test.py

@@ -87,7 +87,7 @@ class ATNTDatabaseTest(unittest.TestCase):
 
   def test02_driver_api(self):
 
-    from bob.db.script.dbmanage import main
+    from bob.db.base.script.dbmanage import main
 
     self.assertEqual(main('atnt dumplist --self-test'.split()), 0)
     self.assertEqual(main('atnt checkfiles -d "." --self-test'.split()), 0)

buildout.cfg

 ; vim: set fileencoding=utf-8 :
-; author: Manuel Guenther <manuel.guenther@idiap.ch>
-; date:   Wed Feb 13 12:35:29 CET 2013
+; Manuel Guenther <manuel.guenther@idiap.ch>
+; Mon Aug 25 15:58:39 CEST 2014
 
 [buildout]
 parts = scripts
-develop = .
-eggs = xbob.db.atnt
+eggs = bob.db.atnt
+extensions = bob.buildout
+             mr.developer
+auto-checkout = *
+develop = src/bob.extension
+          src/bob.blitz
+          src/bob.core
+          src/bob.io.base
+          src/bob.db.base
+          src/bob.db.verification.utils
+          .
+
+; options for bob.buildout extension
+debug = true
+verbose = true
 newest = false
 
+[sources]
+bob.extension = git https://github.com/bioidiap/bob.extension
+bob.blitz = git https://github.com/bioidiap/bob.blitz
+bob.core = git https://github.com/bioidiap/bob.core
+bob.io.base = git https://github.com/bioidiap/bob.io.base
+bob.db.base = git https://github.com/bioidiap/bob.db.base
+bob.db.verification.utils = git https://github.com/bioidiap/bob.db.verification.utils
+
 [scripts]
-recipe = xbob.buildout:scripts
-dependent-scripts = true
+recipe = bob.buildout:scripts
+dependent-scripts=true

setup.py

@@ -8,10 +8,10 @@ from setuptools import setup, find_packages
 # parameters that define our package.
 setup(
 
-    name='xbob.db.atnt',
-    version='1.1.3a0',
+    name='bob.db.atnt',
+    version='2.0.0a0',
     description='ATNT/ORL Database Access API for Bob',
-    url='http://github.com/bioidiap/xbob.db.atnt',
+    url='http://github.com/bioidiap/bob.db.atnt',
     license='GPLv3',
     author='Manuel Guenther',
     author_email='manuel.guenther@idiap.ch',
@@ -24,28 +24,28 @@ setup(
 
     install_requires=[
       'setuptools',
-      'bob',  # base signal proc./machine learning library
-      'xbob.db.verification.utils>=0.1.4' # defines a set of utilities for face verification databases like this one.
+      'bob.db.base',
+      'bob.db.verification.utils' # defines a set of utilities for face verification databases like this one.
     ],
 
     namespace_packages = [
-      'xbob',
-      'xbob.db',
-      ],
+      'bob',
+      'bob.db',
+    ],
 
     entry_points={
 
       # declare database to bob
       'bob.db': [
-        'atnt = xbob.db.atnt.driver:Interface',
-        ],
+        'atnt = bob.db.atnt.driver:Interface',
+      ],
 
       # declare tests to bob
       'bob.test': [
-        'atnt = xbob.db.atnt.test:ATNTDatabaseTest',
-        ],
+        'atnt = bob.db.atnt.test:ATNTDatabaseTest',
+      ],
 
-      },
+    },
 
     classifiers = [
       'Development Status :: 4 - Beta',
@@ -56,5 +56,5 @@ setup(
       'Programming Language :: Python :: 3',
       'Topic :: Scientific/Engineering :: Artificial Intelligence',
       'Topic :: Database :: Front-Ends',
-      ],
+    ],
 )