From a033ac3e9cb14b02ffb2ec3970abe169dada4152 Mon Sep 17 00:00:00 2001
From: Amir Mohammadi <183.amir@gmail.com>
Date: Fri, 23 Dec 2016 10:15:11 +0100
Subject: [PATCH] remove traces of voxforge, please install bob.db.voxforge to
 use voxforge

---
 MANIFEST.in                        |  2 +-
 bob/bio/spear/database/__init__.py |  2 --
 bob/bio/spear/database/database.py | 12 +++---------
 databases.txt                      |  1 -
 4 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 databases.txt

diff --git a/MANIFEST.in b/MANIFEST.in
index ea6cbbd..bd9eaaa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README.rst bootstrap-buildout.py buildout.cfg develop.cfg COPYING version.txt requirements.txt databases.txt
+include README.rst bootstrap-buildout.py buildout.cfg develop.cfg COPYING version.txt requirements.txt
 recursive-include doc *.py *.rst
 recursive-include bob/bio/spear/test/data *.hdf5 *.wav
 recursive-include bob/bio/spear/config/database *.py *.lst
diff --git a/bob/bio/spear/database/__init__.py b/bob/bio/spear/database/__init__.py
index a668dc7..b4ceac8 100644
--- a/bob/bio/spear/database/__init__.py
+++ b/bob/bio/spear/database/__init__.py
@@ -21,7 +21,6 @@
 
 from .database import AudioBioFile
 from .mobio import MobioBioDatabase
-from .voxforge import VoxforgeBioDatabase
 from .asvspoof import ASVspoofBioDatabase
 from .avspoof import AVspoofBioDatabase
 from .voicepa import VoicePABioDatabase
@@ -43,7 +42,6 @@ def __appropriate__(*args):
 __appropriate__(
     AudioBioFile,
     MobioBioDatabase,
-    VoxforgeBioDatabase,
     ASVspoofBioDatabase,
     AVspoofBioDatabase,
     VoicePABioDatabase,
diff --git a/bob/bio/spear/database/database.py b/bob/bio/spear/database/database.py
index a6b9fbe..9b69063 100644
--- a/bob/bio/spear/database/database.py
+++ b/bob/bio/spear/database/database.py
@@ -3,10 +3,6 @@
 # Tiago de Freitas Pereira <tiago.pereira@idiap.ch>
 # Wed 20 July 14:43:22 CEST 2016
 
-"""
-  Verification API for bob.db.voxforge
-"""
-
 from bob.bio.base.database.file import BioFile
 import scipy
 import numpy
@@ -20,10 +16,8 @@ class AudioBioFile(BioFile):
         """
         super(AudioBioFile, self).__init__(client_id=client_id, path=path, file_id=file_id)
 
-
-    def load(self, directory=None, extension='.wav'):        
+    def load(self, directory=None, extension='.wav'):
         rate, audio = scipy.io.wavfile.read(self.make_path(directory, extension))
         # We consider there is only 1 channel in the audio file => data[0]
-        data= numpy.cast['float'](audio)
-        return rate, data    
-
+        data = numpy.cast['float'](audio)
+        return rate, data
diff --git a/databases.txt b/databases.txt
deleted file mode 100644
index 4ea252f..0000000
--- a/databases.txt
+++ /dev/null
@@ -1 +0,0 @@
-bob.db.voxforge
-- 
GitLab