Switched to new bob version.

.travis.yml

+language: python
+matrix:
+  include:
+  - python: 2.6
+  - python: 2.7
+    env:
+    - secure: nFUUA3ju4Y+JTuLS4N2u+9FZtvWMIKij8wz4OzpLNtPhAitdzZJSiAUgE5uY94MbRlsyBkLuyUiJ144RVRoRmZuaw4Dkr/ntW3Z/zqIni7IYJ4yl3QUPXGSbTH7HR2LQIid7mHkeWcEguyfiusSYhBhmEtxPJoHN4SfaFfveX28=
+    - secure: bN9g+XWFSBHYsJdjNVk/h0ijua42yi5pfw2EIEpSGAg5IoIVP2ZwwC5Nc3z+w08+TpdyHjFqP7wVj0e0Ltcz2+Ia3sG8sprqC4jaVrEe4E2xaImvzxRUpLBzgO7jbPsi8Kulz1BCuSKcE+P9/wHpGi92DX42+lVw4f2iFtKWEaM=
+  - python: 3.2
+    env:
+    - NUMPYSPEC===1.8.0
+  - python: 3.3
+    env:
+    - NUMPYSPEC===1.8.0
+before_install:
+- sudo add-apt-repository -y ppa:biometrics/bob
+- sudo apt-get update -qq
+- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libhdf5-serial-dev libatlas-dev libatlas-base-dev liblapack-dev
+- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq gfortran; fi
+- if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
+- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC matplotlib==1.3.0 sphinx nose==1.3.0; fi
+- pip install coveralls
+install:
+- python bootstrap.py
+- ./bin/buildout
+script:
+- ./bin/python -c 'from bob.db.mobio import get_config; print(get_config())'
+- ./bin/coverage run --source=bob.db.mobio ./bin/nosetests -sv
+- ./bin/sphinx-build -b doctest doc sphinx
+- ./bin/sphinx-build -b html doc sphinx
+after_success:
+- coveralls
+- ./src/bob.extension/scripts/upload-sphinx.sh

MANIFEST.in

 include README.rst bootstrap.py buildout.cfg COPYING
-recursive-include docs *.py *.rst
-recursive-include xbob *.sql3
+recursive-include doc *.py *.rst
+recursive-include bob *.sql3

README.rst

@@ -24,10 +24,10 @@ There are a few ways to achieve this:
 
 The package is available in two different distribution formats:
 
-1. You can download it from `PyPI <http://pypi.python.org/pypi/xbob.db.mobio>`_, or
+1. You can download it from `PyPI <http://pypi.python.org/pypi/bob.db.mobio>`_, or
 
 2. You can download it in its source form from `its git repository
-   <https://github.com/bioidiap/xbob.db.mobio>`_. When you download the
+   <https://github.com/bioidiap/bob.db.mobio>`_. When you download the
    version at the git repository, you will need to run a command to recreate
    the backend SQLite file required for its operation. This means that the
    database raw files must be installed somewhere in this case. With option
@@ -47,11 +47,11 @@ script)::
 
     install_requires=[
       ...
-      "xbob.db.mobio",
+      "bob.db.mobio",
     ],
 
 Proceed normally with your ``boostrap/buildout`` steps and you should be all
-set. That means you can now import the ``xbob.db.mobio`` namespace into your scripts.
+set. That means you can now import the ``bob.db.mobio`` namespace into your scripts.
 
 Modify your buildout.cfg and download from git
 ==============================================
@@ -67,10 +67,10 @@ lines::
   auto-checkout = *
   eggs = bob
          ...
-         xbob.db.mobio
+         bob.db.mobio
 
   [sources]
-  xbob.db.mobio = git https://github.com/bioidiap/xbob.db.mobio.git
+  bob.db.mobio = git https://github.com/bioidiap/bob.db.mobio.git
   ...
 
 MOBIO protocols
@@ -82,10 +82,10 @@ has increased, considering the additional data recorded using laptops, which
 has led to 8 protocols.
 
 The two initial protocols 'female' and 'male' now correspond to the protocols
-called 'mobile0-female' and 'mobile0-male', respectively. The training, 
+called 'mobile0-female' and 'mobile0-male', respectively. The training,
 development and evaluation sets are indeed identical.
 
-However, if you want to use the same ZT score normalization files as in this 
+However, if you want to use the same ZT score normalization files as in this
 publication::
 
   @article{McCool_IET_BMT_2013,

xbob/db/mobio/__init__.py → bob/db/mobio/__init__.py

@@ -21,4 +21,21 @@
 from .query import Database
 from .models import Client, Subworld, TModel, File, Protocol, ProtocolPurpose
 
-__all__ = dir()
+def get_config():
+  """Returns a string containing the configuration information.
+  """
+
+  import pkg_resources
+
+  packages = pkg_resources.require(__name__)
+  this = packages[0]
+  deps = packages[1:]
+
+  retval =  "%s: %s (%s)\n" % (this.key, this.version, this.location)
+  retval += "  - python dependencies:\n"
+  for d in deps: retval += "    - %s: %s (%s)\n" % (d.key, d.version, d.location)
+
+  return retval.strip()
+
+# gets sphinx autodoc done right - don't remove it
+__all__ = [_ for _ in dir() if not _.startswith('_')]

xbob/db/mobio/create.py → bob/db/mobio/create.py

@@ -142,15 +142,15 @@ def add_subworlds(session, verbose):
     "unis/f218/11_mobile/f218_11_p01_i0_0", "unis/f218/11_mobile/f218_11_f12_i0_0", "unis/f218/11_mobile/f218_11_l11_i0_0",
     "unis/f218/12_mobile/f218_12_p01_i0_0", "unis/f218/12_mobile/f218_12_f07_i0_0", "unis/f218/12_mobile/f218_12_l06_i0_0",
     "unis/f218/13_mobile/f218_13_p01_i0_0", "unis/f218/13_mobile/f218_13_f07_i0_0", "unis/f218/13_mobile/f218_13_l06_i0_0",
-    "unis/f218/14_mobile/f218_14_p01_i0_0", "unis/f218/14_mobile/f218_14_f07_i0_0", "unis/f218/14_mobile/f218_14_l06_i0_0", 
-    "unis/f218/15_mobile/f218_15_p01_i0_0", "unis/f218/15_mobile/f218_15_f07_i0_0", "unis/f218/15_mobile/f218_15_l06_i0_0", 
-    "unis/f218/16_mobile/f218_16_p01_i0_0", "unis/f218/16_mobile/f218_16_f07_i0_0", "unis/f218/16_mobile/f218_16_l06_i0_0", 
-    "unis/f218/17_mobile/f218_17_p01_i0_0", "unis/f218/17_mobile/f218_17_f07_i0_0", "unis/f218/17_mobile/f218_17_l06_i0_0", 
+    "unis/f218/14_mobile/f218_14_p01_i0_0", "unis/f218/14_mobile/f218_14_f07_i0_0", "unis/f218/14_mobile/f218_14_l06_i0_0",
+    "unis/f218/15_mobile/f218_15_p01_i0_0", "unis/f218/15_mobile/f218_15_f07_i0_0", "unis/f218/15_mobile/f218_15_l06_i0_0",
+    "unis/f218/16_mobile/f218_16_p01_i0_0", "unis/f218/16_mobile/f218_16_f07_i0_0", "unis/f218/16_mobile/f218_16_l06_i0_0",
+    "unis/f218/17_mobile/f218_17_p01_i0_0", "unis/f218/17_mobile/f218_17_f07_i0_0", "unis/f218/17_mobile/f218_17_l06_i0_0",
     "unis/f230/01_mobile/f230_01_p01_i0_0", "unis/f230/01_mobile/f230_01_f12_i0_0", "unis/f230/01_mobile/f230_01_l11_i0_0",
-    "unis/f230/02_mobile/f230_02_p01_i0_0", "unis/f230/02_mobile/f230_02_f12_i0_0", "unis/f230/02_mobile/f230_02_l11_i0_0", 
+    "unis/f230/02_mobile/f230_02_p01_i0_0", "unis/f230/02_mobile/f230_02_f12_i0_0", "unis/f230/02_mobile/f230_02_l11_i0_0",
     "unis/f230/03_mobile/f230_03_p01_i0_0", "unis/f230/03_mobile/f230_03_f12_i0_0", "unis/f230/03_mobile/f230_03_l11_i0_0",
-    "unis/f230/04_mobile/f230_04_p01_i0_0", "unis/f230/04_mobile/f230_04_f12_i0_0", "unis/f230/04_mobile/f230_04_l11_i0_0", 
-    "unis/f230/05_mobile/f230_05_p01_i0_0", "unis/f230/05_mobile/f230_05_f12_i0_0", "unis/f230/05_mobile/f230_05_l11_i0_0", 
+    "unis/f230/04_mobile/f230_04_p01_i0_0", "unis/f230/04_mobile/f230_04_f12_i0_0", "unis/f230/04_mobile/f230_04_l11_i0_0",
+    "unis/f230/05_mobile/f230_05_p01_i0_0", "unis/f230/05_mobile/f230_05_f12_i0_0", "unis/f230/05_mobile/f230_05_l11_i0_0",
     "unis/f230/06_mobile/f230_06_p01_i0_0", "unis/f230/06_mobile/f230_06_f12_i0_0", "unis/f230/06_mobile/f230_06_l11_i0_0",
     "unis/f230/07_mobile/f230_07_p01_i0_0", "unis/f230/07_mobile/f230_07_f07_i0_0", "unis/f230/07_mobile/f230_07_l06_i0_0",
     "unis/f230/08_mobile/f230_08_p01_i0_0", "unis/f230/08_mobile/f230_08_f07_i0_0", "unis/f230/08_mobile/f230_08_l06_i0_0",
@@ -160,9 +160,9 @@ def add_subworlds(session, verbose):
     "unis/f230/12_mobile/f230_12_p01_i0_0", "unis/f230/12_mobile/f230_12_f07_i0_0", "unis/f230/12_mobile/f230_12_l06_i0_0",
     "unis/f232/01_mobile/f232_01_p01_i0_0", "unis/f232/01_mobile/f232_01_f12_i0_0", "unis/f232/01_mobile/f232_01_l11_i0_0",
     "unis/f232/02_mobile/f232_02_p01_i0_0", "unis/f232/02_mobile/f232_02_f12_i0_0", "unis/f232/02_mobile/f232_02_l11_i0_0",
-    "unis/f232/03_mobile/f232_03_p01_i0_0", "unis/f232/03_mobile/f232_03_f12_i0_0", "unis/f232/03_mobile/f232_03_l11_i0_0", 
+    "unis/f232/03_mobile/f232_03_p01_i0_0", "unis/f232/03_mobile/f232_03_f12_i0_0", "unis/f232/03_mobile/f232_03_l11_i0_0",
     "unis/f232/04_mobile/f232_04_p01_i0_0", "unis/f232/04_mobile/f232_04_f12_i0_0", "unis/f232/04_mobile/f232_04_l11_i0_0",
-    "unis/f232/05_mobile/f232_05_p01_i0_0", "unis/f232/05_mobile/f232_05_f12_i0_0", "unis/f232/05_mobile/f232_05_l11_i0_0", 
+    "unis/f232/05_mobile/f232_05_p01_i0_0", "unis/f232/05_mobile/f232_05_f12_i0_0", "unis/f232/05_mobile/f232_05_l11_i0_0",
     "unis/f232/07_mobile/f232_07_p01_i0_0", "unis/f232/07_mobile/f232_07_f12_i0_0", "unis/f232/07_mobile/f232_07_l11_i0_0",
     "unis/f232/08_mobile/f232_08_p01_i0_0", "unis/f232/08_mobile/f232_08_f07_i0_0", "unis/f232/08_mobile/f232_08_l06_i0_0",
     "unis/f232/09_mobile/f232_09_p01_i0_0", "unis/f232/09_mobile/f232_09_f07_i0_0", "unis/f232/09_mobile/f232_09_l06_i0_0",
@@ -272,8 +272,8 @@ def add_subworlds(session, verbose):
     "unis/m208/04_mobile/m208_04_p01_i0_0", "unis/m208/04_mobile/m208_04_f12_i0_0", "unis/m208/04_mobile/m208_04_l11_i0_0",
     "unis/m208/05_mobile/m208_05_p01_i0_0", "unis/m208/05_mobile/m208_05_f12_i0_0", "unis/m208/05_mobile/m208_05_l11_i0_0",
     "unis/m208/06_mobile/m208_06_p01_i0_0", "unis/m208/06_mobile/m208_06_f12_i0_0", "unis/m208/06_mobile/m208_06_l11_i0_0",
-    "unis/m208/07_mobile/m208_07_p01_i0_0", "unis/m208/07_mobile/m208_07_f07_i0_0", "unis/m208/07_mobile/m208_07_l06_i0_0", 
-    "unis/m208/08_mobile/m208_08_p01_i0_0", "unis/m208/08_mobile/m208_08_f07_i0_0", "unis/m208/08_mobile/m208_08_l06_i0_0", 
+    "unis/m208/07_mobile/m208_07_p01_i0_0", "unis/m208/07_mobile/m208_07_f07_i0_0", "unis/m208/07_mobile/m208_07_l06_i0_0",
+    "unis/m208/08_mobile/m208_08_p01_i0_0", "unis/m208/08_mobile/m208_08_f07_i0_0", "unis/m208/08_mobile/m208_08_l06_i0_0",
     "unis/m208/09_mobile/m208_09_p01_i0_0", "unis/m208/09_mobile/m208_09_f07_i0_0", "unis/m208/09_mobile/m208_09_l06_i0_0",
     "unis/m208/10_mobile/m208_10_p01_i0_0", "unis/m208/10_mobile/m208_10_f07_i0_0", "unis/m208/10_mobile/m208_10_l06_i0_0",
     "unis/m208/11_mobile/m208_11_p01_i0_0", "unis/m208/11_mobile/m208_11_f07_i0_0", "unis/m208/11_mobile/m208_11_l06_i0_0",
@@ -374,7 +374,7 @@ def add_subworlds(session, verbose):
     "unis/m228/10_mobile/m228_10_p01_i0_0", "unis/m228/10_mobile/m228_10_f07_i0_0", "unis/m228/10_mobile/m228_10_l06_i0_0",
     "unis/m228/11_mobile/m228_11_p01_i0_0", "unis/m228/11_mobile/m228_11_f07_i0_0", "unis/m228/11_mobile/m228_11_l06_i0_0",
     "unis/m228/12_mobile/m228_12_p01_i0_0", "unis/m228/12_mobile/m228_12_f07_i0_0", "unis/m228/12_mobile/m228_12_l06_i0_0",
-    "lia/m501/01_mobile/m501_01_p01_i0_0", "lia/m501/01_mobile/m501_01_f12_i0_0", "lia/m501/01_mobile/m501_01_l11_i0_0", 
+    "lia/m501/01_mobile/m501_01_p01_i0_0", "lia/m501/01_mobile/m501_01_f12_i0_0", "lia/m501/01_mobile/m501_01_l11_i0_0",
     "lia/m501/02_mobile/m501_02_p01_i0_0", "lia/m501/02_mobile/m501_02_f12_i0_0", "lia/m501/02_mobile/m501_02_l11_i0_0",
     "lia/m501/03_mobile/m501_03_p01_i0_0", "lia/m501/03_mobile/m501_03_f12_i0_0", "lia/m501/03_mobile/m501_03_l11_i0_0",
     "lia/m501/04_mobile/m501_04_p01_i0_0", "lia/m501/04_mobile/m501_04_f12_i0_0", "lia/m501/04_mobile/m501_04_l11_i0_0",
@@ -391,7 +391,7 @@ def add_subworlds(session, verbose):
     "lia/m503/03_mobile/m503_03_p01_i0_0", "lia/m503/03_mobile/m503_03_f12_i0_0", "lia/m503/03_mobile/m503_03_l11_i0_0",
     "lia/m503/04_mobile/m503_04_p01_i0_0", "lia/m503/04_mobile/m503_04_f12_i0_0", "lia/m503/04_mobile/m503_04_l11_i0_0",
     "lia/m503/05_mobile/m503_05_p01_i0_0", "lia/m503/05_mobile/m503_05_f12_i0_0", "lia/m503/05_mobile/m503_05_l11_i0_0",
-    "lia/m503/06_mobile/m503_06_p01_i0_0", "lia/m503/06_mobile/m503_06_f12_i0_0", "lia/m503/06_mobile/m503_06_l11_i0_0", 
+    "lia/m503/06_mobile/m503_06_p01_i0_0", "lia/m503/06_mobile/m503_06_f12_i0_0", "lia/m503/06_mobile/m503_06_l11_i0_0",
     "lia/m503/07_mobile/m503_07_p01_i0_0", "lia/m503/07_mobile/m503_07_f07_i0_0", "lia/m503/07_mobile/m503_07_l06_i0_0",
     "lia/m503/08_mobile/m503_08_p01_i0_0", "lia/m503/08_mobile/m503_08_f07_i0_0", "lia/m503/08_mobile/m503_08_l06_i0_0",
     "lia/m503/09_mobile/m503_09_p01_i0_0", "lia/m503/09_mobile/m503_09_f07_i0_0", "lia/m503/09_mobile/m503_09_l06_i0_0",
@@ -770,7 +770,7 @@ def add_protocols(session, verbose):
 def create_tables(args):
   """Creates all necessary tables (only to be used at the first time)"""
 
-  from bob.db.utils import create_engine_try_nolock
+  from bob.db.base.utils import create_engine_try_nolock
 
   engine = create_engine_try_nolock(args.type, args.files[0], echo=(args.verbose > 2))
   Base.metadata.create_all(engine)
@@ -781,7 +781,7 @@ def create_tables(args):
 def create(args):
   """Creates or re-creates this database"""
 
-  from bob.db.utils import session_try_nolock
+  from bob.db.base.utils import session_try_nolock
 
   dbfile = args.files[0]
 

xbob/db/mobio/driver.py → bob/db/mobio/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"""
@@ -40,7 +40,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:
@@ -68,7 +68,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:
@@ -87,7 +87,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)
@@ -105,7 +105,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):
 

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

@@ -20,13 +20,13 @@
 """
 
 import os, numpy
-import bob.db.utils
+import bob.db.base.utils
 from sqlalchemy import Table, Column, Integer, String, ForeignKey, or_, and_, not_
-from bob.db.sqlalchemy_migration import Enum, relationship
+from bob.db.base.sqlalchemy_migration import Enum, relationship
 from sqlalchemy.orm import backref
 from sqlalchemy.ext.declarative import declarative_base
 
-import xbob.db.verification.utils
+import bob.db.verification.utils
 
 Base = declarative_base()
 
@@ -120,7 +120,7 @@ class TModel(Base):
   def __repr__(self):
     return "TModel('%s', '%s')" % (self.mid, self.protocol_id)
 
-class File(Base, xbob.db.verification.utils.File):
+class File(Base, bob.db.verification.utils.File):
   """Generic file container"""
 
   __tablename__ = 'file'
@@ -152,7 +152,7 @@ class File(Base, xbob.db.verification.utils.File):
 
   def __init__(self, client_id, path, session_id, speech_type, shot_id, environment, device, channel_id):
     # call base class constructor
-    xbob.db.verification.utils.File.__init__(self, client_id = client_id, path = path)
+    bob.db.verification.utils.File.__init__(self, client_id = client_id, path = path)
 
     # fill the remaining bits of the file information
     self.session_id = session_id

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

@@ -22,15 +22,15 @@ MOBIO database in the most obvious ways.
 
 import os
 import six
-from bob.db import utils
+from bob.db.base import utils
 from .models import *
 from .driver import Interface
 
-import xbob.db.verification.utils
+import bob.db.verification.utils
 
 SQLITE_FILE = Interface().files()[0]
 
-class Database(xbob.db.verification.utils.SQLiteDatabase, xbob.db.verification.utils.ZTDatabase):
+class Database(bob.db.verification.utils.SQLiteDatabase, bob.db.verification.utils.ZTDatabase):
   """The dataset class opens and maintains a connection opened to the Database.
 
   It provides many different ways to probe for the characteristics of the data
@@ -39,8 +39,8 @@ class Database(xbob.db.verification.utils.SQLiteDatabase, xbob.db.verification.u
 
   def __init__(self, original_directory = None, original_extension = None, annotation_directory = None, annotation_extension = '.pos'):
     # call base class constructors to open a session to the database
-    xbob.db.verification.utils.SQLiteDatabase.__init__(self, SQLITE_FILE, File)
-    xbob.db.verification.utils.ZTDatabase.__init__(self, original_directory=original_directory, original_extension=original_extension)
+    bob.db.verification.utils.SQLiteDatabase.__init__(self, SQLITE_FILE, File)
+    bob.db.verification.utils.ZTDatabase.__init__(self, original_directory=original_directory, original_extension=original_extension)
 
     self.annotation_directory = annotation_directory
     self.annotation_extension = annotation_extension
@@ -335,7 +335,7 @@ class Database(xbob.db.verification.utils.SQLiteDatabase, xbob.db.verification.u
     """
     return [tmodel.mid for tmodel in self.tmodels(protocol, groups, subworld, gender)]
 
-  def get_client_id_from_model_id(self, model_id):
+  def get_client_id_from_model_id(self, model_id, **kwargs):
     """Returns the client_id attached to the given model_id
 
     Keyword Parameters:
@@ -606,7 +606,7 @@ class Database(xbob.db.verification.utils.SQLiteDatabase, xbob.db.verification.u
     annotation_file = query.first().make_path(self.annotation_directory, self.annotation_extension)
 
     # return the annotations as read from file
-    return xbob.db.verification.utils.read_annotation_file(annotation_file, 'eyecenter')
+    return bob.db.verification.utils.read_annotation_file(annotation_file, 'eyecenter')
 
   def protocol_names(self):
     """Returns all registered protocol names"""

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>
+; Fri Aug 29 14:07:33 CEST 2014
 
 [buildout]
 parts = scripts
-develop = .
-eggs = xbob.db.mobio
+eggs = bob.db.mobio
+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

docs/conf.py → doc/conf.py

@@ -4,16 +4,16 @@
 # Mon 13 Aug 2012 12:38:15 CEST
 #
 # Copyright (C) 2011-2012 Idiap Research Institute, Martigny, Switzerland
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, version 3 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -40,7 +40,6 @@ extensions = [
   'sphinx.ext.autosummary',
   'sphinx.ext.doctest',
   'sphinx.ext.intersphinx',
-  'bob.sphinxext.plot', # ours add source copying to install directory
   ]
 
 # The viewcode extension appeared only on Sphinx >= 1.0.0
@@ -77,7 +76,7 @@ copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
 # built documents.
 #
 # The short X.Y version.
-from xbob.db.mobio.driver import Interface
+from bob.db.mobio.driver import Interface
 version = Interface().version()
 # The full version, including alpha/beta/rc tags.
 release = version
@@ -151,7 +150,7 @@ html_favicon = ''
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -248,7 +247,7 @@ man_pages = [
 ]
 
 
-# We want to remove all private (i.e. _. or __.__) members 
+# We want to remove all private (i.e. _. or __.__) members
 # that are not in the list of accepted functions
 accepted_private_functions = ['__call__']
 
@@ -263,10 +262,10 @@ def member_function_test(app, what, name, obj, skip, options):
       # test if the method is documented
       if not hasattr(obj, '__doc__') or not obj.__doc__:
         return True
-  
+
   # Skips selected members in auto-generated documentation. Unfortunately, old
   # versions of Boost.Python will not generate a __self__ member for static
-  # methods and that screws-up Sphinx processing. 
+  # methods and that screws-up Sphinx processing.
   if sphinx.__version__ < "1.0":
     # We have to remove objects that do not have a __self__ attribute set
     import types
@@ -276,7 +275,7 @@ def member_function_test(app, what, name, obj, skip, options):
         return True
 
     return False
-  
+
 # Default processing flags for sphinx
 autoclass_content = 'both'
 autodoc_member_order = 'bysource'

doc/guide.rst

+.. vim: set fileencoding=utf-8 :
+.. @author: Manuel Guenther <Manuel.Guenther@idiap.ch>
+.. @date:   Thu Dec  6 12:28:25 CET 2012
+
+==============
+ User's Guide
+==============
+
+.. todo::
+   Write users guide.

doc/index.rst

+.. vim: set fileencoding=utf-8 :
+.. @author: Manuel Guenther <Manuel.Guenther@idiap.ch>
+.. @date:   Tue Aug 26 09:42:18 CEST 2014
+
+=======================================
+ MOBIO Database Verification Protocols
+=======================================
+
+.. todolist::
+
+Documentation
+-------------
+
+.. toctree::
+   :maxdepth: 2
+
+   guide
+   py_api
+
+Indices and tables
+------------------
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

docs/index.rst → doc/py_api.rst

 .. vim: set fileencoding=utf-8 :
 .. Laurent El Shafey <laurent.el-shafey@idiap.ch>
-.. Mon 13 Aug 2012 12:36:40 CEST 
+.. Mon 13 Aug 2012 12:36:40 CEST
 
 ================
  MOBIO Database
 ================
 
-.. automodule:: xbob.db.mobio
+.. automodule:: bob.db.mobio

setup.py

@@ -22,14 +22,14 @@ from setuptools import setup, find_packages
 # parameters that define our package.
 setup(
 
-    name='xbob.db.mobio',
-    version='1.2.2',
+    name='bob.db.mobio',
+    version='2.0.0a0',
     description='MOBIO Database Access API for Bob',
-    url='https://pypi.python.org/pypi/xbob.db.mobio',
+    url='https://pypi.python.org/pypi/bob.db.mobio',
     license='GPLv3',
     author='Laurent El Shafey',
     author_email='laurent.el-shafey@idiap.ch',
-    keywords='face recognition, speaker recognition, bob, xbob, xbob.db, mobio',
+    keywords='face recognition, speaker recognition, bob, bob.db, mobio',
     long_description=open('README.rst').read(),
 
     # This line is required for any distutils based packaging.
@@ -40,33 +40,33 @@ setup(
     install_requires=[
       'setuptools',
       'six',  # py2/3 compatibility library
-      'bob',  # base signal proc./machine learning library
-      'xbob.db.verification.utils>=1.0.0' # 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 = {
       # bob database declaration
       'bob.db': [
-        'mobio = xbob.db.mobio.driver:Interface',
-        ],
+        'mobio = bob.db.mobio.driver:Interface',
+      ],
 
       # bob unittest declaration
       'bob.test': [
-        'mobio = xbob.db.mobio.test:MobioDatabaseTest',
-        ],
+        'mobio = bob.db.mobio.test',
+      ],
       # scripts
       'console_scripts': [
-        'generate_filelist = xbob.db.mobio.generate_filelist:main',
-        ],
+        'generate_filelist = bob.db.mobio.generate_filelist:main',
+      ],
       },
 
     classifiers = [
-      'Development Status :: 5 - Production/Stable',
+      'Development Status :: 4 - Beta',
       'Environment :: Console',
       'Intended Audience :: Developers',
       'Intended Audience :: Education',