From a7aac8334b08ede4f0d7cde9731679ff87238796 Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira Date: Mon, 18 Jul 2016 12:40:41 +0200 Subject: [PATCH 1/6] Refactoring 2016 --- buildout.cfg | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/buildout.cfg b/buildout.cfg index a0ed121..15ad307 100644 --- a/buildout.cfg +++ b/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 . + + ; options for bob.buildout extension debug = true verbose = true @@ -27,9 +29,8 @@ 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 -bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist +bob.db.base = git https://github.com/bioidiap/bob.db.base branch=refactoring_2016 +bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist branch=refactoring_2016 [scripts] recipe = bob.buildout:scripts From ad87f4ac00b401e25a51a057fee770905c3b14c9 Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira Date: Tue, 19 Jul 2016 17:30:09 +0200 Subject: [PATCH 2/6] Changed from bob.db.verification.filelist to bob.db.bio_filelist --- bob/db/voxforge/query.py | 6 +++--- buildout.cfg | 4 ++-- requirements.txt | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bob/db/voxforge/query.py b/bob/db/voxforge/query.py index a55250b..938b4a2 100644 --- a/bob/db/voxforge/query.py +++ b/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 . -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) diff --git a/buildout.cfg b/buildout.cfg index 15ad307..68467ec 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -14,7 +14,7 @@ develop = src/bob.extension src/bob.core src/bob.io.base src/bob.db.base - src/bob.db.verification.filelist + src/bob.db.bio_filelist . @@ -30,7 +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 branch=refactoring_2016 -bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist branch=refactoring_2016 +bob.db.bio_filelist = git https://github.com/bioidiap/bob.db.bio_filelist [scripts] recipe = bob.buildout:scripts diff --git a/requirements.txt b/requirements.txt index 80ae08f..e3d2396 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ setuptools bob.db.base -bob.db.verification.utils -bob.db.verification.filelist +bob.db.bio_filelist From 5405739215776515f0b28bb1ffc4fcf21780d661 Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira Date: Tue, 19 Jul 2016 17:39:55 +0200 Subject: [PATCH 3/6] Forcing using mr.developer --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5633bf..80d0611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ 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: @@ -19,7 +18,8 @@ before_install: - 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 From 5b2a52a3820f1dee7def9bac7e76b353621552db Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira Date: Tue, 19 Jul 2016 17:53:03 +0200 Subject: [PATCH 4/6] Patch for travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80d0611..1c29ffb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ before_install: - 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 From 3b18e1f22528f5194ba148810e1aa9579864d838 Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira Date: Tue, 19 Jul 2016 22:23:52 +0200 Subject: [PATCH 5/6] Removing verification utils --- bob/db/voxforge/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bob/db/voxforge/__init__.py b/bob/db/voxforge/__init__.py index a15224e..d678489 100644 --- a/bob/db/voxforge/__init__.py +++ b/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. From 8e11553602af8a046baaf177d3eebc2b682bd5e2 Mon Sep 17 00:00:00 2001 From: Amir Mohammadi <183.amir@gmail.com> Date: Thu, 4 Aug 2016 10:54:28 +0200 Subject: [PATCH 6/6] refactoring_2016 is now merged. --- buildout.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildout.cfg b/buildout.cfg index 68467ec..e752471 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -29,7 +29,7 @@ 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 branch=refactoring_2016 +bob.db.base = git https://github.com/bioidiap/bob.db.base bob.db.bio_filelist = git https://github.com/bioidiap/bob.db.bio_filelist [scripts]