Remove cuhk_cufs. Fixes #18

bob/bio/face/database/__init__.py

@@ -14,7 +14,6 @@ from .multipie import MultipieBioDatabase
 from .ijba import IJBABioDatabase
 from .xm2vts import XM2VTSBioDatabase
 from .frgc import FRGCBioDatabase
-from .cuhk_cufs import CUHK_CUFSBioDatabase
 from .scface import SCFaceBioDatabase
 from .replaymobile import ReplayMobileBioDatabase
 from .msu_mfsd_mod import MsuMfsdModBioDatabase
@@ -50,7 +49,6 @@ __appropriate__(
   IJBABioDatabase,
   XM2VTSBioDatabase,
   FRGCBioDatabase,
-  CUHK_CUFSBioDatabase,
   SCFaceBioDatabase,
   ReplayMobileBioDatabase,
   MsuMfsdModBioDatabase,

bob/bio/face/database/cuhk_cufs.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
-
-"""
-  CUHK_CUFS database implementation of bob.bio.base.database.ZTDatabase interface.
-  It is an extension of an SQL-based database interface, which directly talks to CUHK_CUFS database, for
-  verification experiments (good to use in bob.bio.base framework).
-"""
-
-from .database import FaceBioFile
-from bob.bio.base.database import ZTBioDatabase
-
-
-class CUHK_CUFSBioFile(FaceBioFile):
-
-    def __init__(self, f):
-        super(CUHK_CUFSBioFile, self).__init__(client_id=f.client_id, path=f.path, file_id=f.id)
-        self._f = f
-
-
-class CUHK_CUFSBioDatabase(ZTBioDatabase):
-    """
-    CUHK_CUFS 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 CUHK_CUFS database, for
-    verification experiments (good to use in bob.bio.base framework).
-    """
-
-    def __init__(
-            self,
-            original_directory=None,
-            original_extension=None,
-            arface_directory="",
-            xm2vts_directory="",
-            **kwargs
-    ):
-        # call base class constructors to open a session to the database
-        super(CUHK_CUFSBioDatabase, self).__init__(
-            name='cuhk_cufs',
-            original_directory=original_directory,
-            original_extension=original_extension,
-            arface_directory=arface_directory,
-            xm2vts_directory=xm2vts_directory,
-            **kwargs)
-
-        from bob.db.cuhk_cufs.query import Database as LowLevelDatabase
-        self._db = LowLevelDatabase(original_directory, original_extension, arface_directory, xm2vts_directory)
-
-    def model_ids_with_protocol(self, groups=None, protocol="search_split1_p2s", **kwargs):
-        return self._db.model_ids(groups=groups, protocol=protocol)
-
-    def tmodel_ids_with_protocol(self, protocol="search_split1_p2s", groups=None, **kwargs):
-        return self._db.tmodel_ids(protocol=protocol, groups=groups, **kwargs)
-
-    def objects(self, groups=None, protocol="search_split1_p2s", purposes=None, model_ids=None, **kwargs):
-        retval = self._db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs)
-        return [CUHK_CUFSBioFile(f) for f in retval]
-
-    def tobjects(self, groups=None, protocol="search_split1_p2s", model_ids=None, **kwargs):
-        retval = self._db.tobjects(groups=groups, protocol=protocol, model_ids=model_ids, **kwargs)
-        return [CUHK_CUFSBioFile(f) for f in retval]
-
-    def zobjects(self, groups=None, protocol="search_split1_p2s", **kwargs):
-        retval = self._db.zobjects(groups=groups, protocol=protocol, **kwargs)
-        return [CUHK_CUFSBioFile(f) for f in retval]
-
-    def annotations(self, myfile):
-        return self._db.annotations(myfile._f)

bob/bio/face/test/test_databases.py

@@ -126,21 +126,6 @@ def test_caspeal():
 #        raise SkipTest(
 #            "The database could not be opened, probably the original directory is wrong. Here is the error: '%s'" % e)
 
-@db_available('cuhk_cufs')
-def test_cuhk_cufs():
-    database = bob.bio.base.load_resource(
-        'cuhk_cufs', 'database', preferred_package='bob.bio.face')
-    try:
-        check_database(database)
-    except IOError as e:
-        raise SkipTest(
-            "The database could not queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)
-    try:
-        _check_annotations(database)
-    except IOError as e:
-        raise SkipTest(
-            "The annotations could not be queried; probably the annotation files are missing. Here is the error: '%s'" % e)
-
 
 @db_available('gbu')
 def test_gbu():

develop.cfg

@@ -27,7 +27,6 @@ eggs = bob.extension
        bob.db.arface
        bob.db.banca
        bob.db.caspeal
-       bob.db.cuhk_cufs
        bob.db.frgc
        bob.db.gbu
        bob.db.lfw
@@ -69,7 +68,6 @@ develop = src/bob.extension
           src/bob.db.arface
           src/bob.db.banca
           src/bob.db.caspeal
-          src/bob.db.cuhk_cufs
           src/bob.db.frgc
           src/bob.db.gbu
           src/bob.db.lfw
@@ -115,7 +113,6 @@ bob.db.atnt = git https://gitlab.idiap.ch/bob/bob.db.atnt
 bob.db.arface = git https://gitlab.idiap.ch/bob/bob.db.arface
 bob.db.banca = git https://gitlab.idiap.ch/bob/bob.db.banca
 bob.db.caspeal = git https://gitlab.idiap.ch/bob/bob.db.caspeal
-bob.db.cuhk_cufs = git https://gitlab.idiap.ch/bob/bob.db.cuhk_cufs
 bob.db.frgc = git https://gitlab.idiap.ch/bob/bob.db.frgc
 bob.db.gbu = git https://gitlab.idiap.ch/bob/bob.db.gbu
 bob.db.lfw = git https://gitlab.idiap.ch/bob/bob.db.lfw

doc/implemented.rst

@@ -26,7 +26,6 @@ Databases
    bob.bio.face.database.XM2VTSBioDatabase
    bob.bio.face.database.FRGCBioDatabase
    bob.bio.face.database.SCFaceBioDatabase
-   bob.bio.face.database.CUHK_CUFSBioDatabase
 
 Image Preprocessors
 ~~~~~~~~~~~~~~~~~~~

test-requirements.txt

@@ -3,7 +3,6 @@ bob.db.arface
 bob.db.atnt
 bob.db.banca
 bob.db.caspeal
-bob.db.cuhk_cufs
 bob.db.frgc
 bob.db.gbu
 bob.db.ijba