Merge branch 'removed-caspel' into 'master'

Updated Capeal database

See merge request !90

bob/bio/face/database/caspeal.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-# Tiago de Freitas Pereira <tiago.pereira@idiap.ch>
-# Sat 20 Aug 15:43:10 CEST 2016
-
-"""
-  CASPEAL database implementation of bob.bio.base.database.Database interface.
-  It is an extension of an SQL-based database interface, which directly talks to CASPEAL database, for
-  verification experiments (good to use in bob.bio.base framework).
-"""
-
-from .database import FaceBioFile
-from bob.bio.base.database import BioDatabase
-
-
-class CaspealBioFile(FaceBioFile):
-
-    def __init__(self, f):
-        super(CaspealBioFile, self).__init__(client_id=f.client_id, path=f.path, file_id=f.id)
-        self._f = f
-
-
-class CaspealBioDatabase(BioDatabase):
-    """
-    Caspeal database implementation of :py:class:`bob.bio.base.database.BioDatabase` interface.
-    It is an extension of an SQL-based database interface, which directly talks to Caspeal database, for
-    verification experiments (good to use in bob.bio.base framework).
-    """
-
-    def __init__(
-            self,
-            original_directory=None,
-            original_extension='.tif',
-            **kwargs
-    ):
-        from bob.db.caspeal.query import Database as LowLevelDatabase
-        self._db = LowLevelDatabase(original_directory, original_extension)
-
-        # call base class constructors to open a session to the database
-        super(CaspealBioDatabase, self).__init__(
-            name='caspeal',
-            original_directory=original_directory,
-            original_extension=original_extension,
-            **kwargs)
-
-    @property
-    def original_directory(self):
-        return self._db.original_directory
-
-    @original_directory.setter
-    def original_directory(self, value):
-        self._db.original_directory = value
-
-    def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
-        return self._db.model_ids(groups=groups, protocol=protocol)
-
-    def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs):
-        retval = self._db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs)
-        return [CaspealBioFile(f) for f in retval]
-
-    def annotations(self, myfile):
-        return self._db.annotations(myfile._f)

conda/meta.yaml

@@ -72,7 +72,6 @@ test:
     - sphinx_rtd_theme
     - bob.db.arface
     - bob.db.atnt
-    - bob.db.caspeal
     - bob.db.frgc
     - bob.db.gbu
     - bob.db.ijbc