Merge pull request #6 from bioidiap/refactoring_2016

Refactoring 2016

.travis.yml

@@ -7,19 +7,19 @@ matrix:
     - secure: Yfaf3JfZ7QWuEqOmExFD81KD0SDiAIB84x122zCYpcHCyqqAjWQw2v7+YBBR3F3m0sdMhrVuj/gBkmccEU/M3KLYR8jm9DiPfeenW2mdJwUBdcmM+9DCeYtnkZx8DYo3Uxpxi0WkvXmED6l6mkWHyPVSi3que9h1t3aOv/zt+2I=
     - BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master
     - BOB_UPLOAD_WHEEL="--universal"
-  - python: 3.3
   - python: 3.4
   - python: 3.5
 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 texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
 - pip install --upgrade pip
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy coverage
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls
+- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy coverage coveralls
+#- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls
 install:
 - python bootstrap-buildout.py
-- ./bin/buildout buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout=
+- ./bin/buildout
+#- ./bin/buildout buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout=
 script:
 - ./bin/python -c 'import pkg_resources; from bob.db.voxforge import get_config; print(get_config())'
 - ./bin/coverage run --source=bob.db.voxforge ./bin/nosetests -sv

bob/db/voxforge/__init__.py

@@ -23,7 +23,7 @@
 """
 
 from .query import Database
-from bob.db.verification.filelist.models import File, Client
+from bob.db.bio_filelist.models import File, Client
 
 def get_config():
   """Returns a string containing the configuration information.

bob/db/voxforge/query.py

@@ -17,9 +17,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import bob.db.verification.filelist
+import bob.db.bio_filelist
 
-class Database(bob.db.verification.filelist.Database):
+class Database(bob.db.bio_filelist.Database):
   """Wrapper class for the subVoxforge database for speaker recognition (http://www.voxforge.org/).
   this class defines a simple protocol for training, dev and and by splitting the audio files of the database in three main parts.
   """
@@ -28,5 +28,5 @@ def __init__(self, original_directory = None, original_extension = None):
     # call base class constructor
     from pkg_resources import resource_filename
     lists = resource_filename(__name__, 'lists')
-    bob.db.verification.filelist.Database.__init__(self, lists, original_directory = original_directory, original_extension = original_extension)
+    bob.db.bio_filelist.Database.__init__(self, lists, original_directory = original_directory, original_extension = original_extension)
 

buildout.cfg

@@ -7,16 +7,18 @@ parts = scripts
 eggs = bob.db.voxforge
 extensions = bob.buildout
              mr.developer
-auto-checkout = *
+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
-          src/bob.db.verification.filelist
+          src/bob.db.bio_filelist
           .
 
+
+
 ; options for bob.buildout extension
 debug = true
 verbose = true
@@ -28,8 +30,7 @@ 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
-bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist
+bob.db.bio_filelist = git https://github.com/bioidiap/bob.db.bio_filelist
 
 [scripts]
 recipe = bob.buildout:scripts

requirements.txt

@@ -1,4 +1,3 @@
 setuptools
 bob.db.base
-bob.db.verification.utils
-bob.db.verification.filelist
+bob.db.bio_filelist