From 135fdcca985431cadcf6d76f88fc0812d966dd44 Mon Sep 17 00:00:00 2001
From: Elie Khoury <elie.khoury@idiap.ch>
Date: Fri, 23 Aug 2013 17:18:09 +0200
Subject: [PATCH] rename to xbob.db.voxforge
---
README.rst | 8 ++++----
buildout.cfg | 2 +-
download_and_untar.sh | 2 +-
setup.py | 8 ++++----
xbob/db/{subvoxforge => voxforge}/__init__.py | 0
xbob/db/{subvoxforge => voxforge}/driver.py | 6 +++---
.../db/{subvoxforge => voxforge}/lists/dev/for_models.lst | 0
.../db/{subvoxforge => voxforge}/lists/dev/for_probes.lst | 0
.../{subvoxforge => voxforge}/lists/eval/for_models.lst | 0
.../{subvoxforge => voxforge}/lists/eval/for_probes.lst | 0
.../{subvoxforge => voxforge}/lists/list_of_tgz_files.lst | 0
.../lists/norm/train_optional_world_1.lst | 0
.../lists/norm/train_optional_world_2.lst | 0
.../{subvoxforge => voxforge}/lists/norm/train_world.lst | 0
xbob/db/{subvoxforge => voxforge}/query.py | 0
xbob/db/{subvoxforge => voxforge}/test.py | 0
16 files changed, 13 insertions(+), 13 deletions(-)
rename xbob/db/{subvoxforge => voxforge}/__init__.py (100%)
rename xbob/db/{subvoxforge => voxforge}/driver.py (97%)
rename xbob/db/{subvoxforge => voxforge}/lists/dev/for_models.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/lists/dev/for_probes.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/lists/eval/for_models.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/lists/eval/for_probes.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/lists/list_of_tgz_files.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/lists/norm/train_optional_world_1.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/lists/norm/train_optional_world_2.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/lists/norm/train_world.lst (100%)
rename xbob/db/{subvoxforge => voxforge}/query.py (100%)
rename xbob/db/{subvoxforge => voxforge}/test.py (100%)
diff --git a/README.rst b/README.rst
index 0113033..468a63c 100644
--- a/README.rst
+++ b/README.rst
@@ -42,9 +42,9 @@ Installation
Just download this package and uncompressed it locally::
- $ wget http://pypi.python.org/packages/source/x/xbob.subvoxforge/xbob.db.subvoxforge-0.0.1.zip
- $ unzip xbob.db.subvoxforge-0.0.1.zip
- $ cd xbob.db.subvoxforge
+ $ wget http://pypi.python.org/packages/source/x/xbob.voxforge/xbob.db.voxforge-0.0.1.zip
+ $ unzip xbob.db.voxforge-0.0.1.zip
+ $ cd xbob.db.voxforge
Use buildout to bootstrap and have a working environment ready for
experiments::
@@ -65,4 +65,4 @@ The data can be downloaded from its original URL (on Voxforge) and extracted by
.. _Voxforge: http://www.voxforge.org/
.. _xbob.speaker_recognition: https://github.com/bioidiap/xbob.speaker_recognition
.. _NIST SRE 2012 evaluation: http://www.nist.gov/itl/iad/mig/sre12.cfm
-.. _download_and_untar.sh: https://github.com/bioidiap/xbob.db.subvoxforge/blob/master/download_and_untar.sh
+.. _download_and_untar.sh: https://github.com/bioidiap/xbob.db.voxforge/blob/master/download_and_untar.sh
diff --git a/buildout.cfg b/buildout.cfg
index a447864..3757c85 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -7,7 +7,7 @@ parts = scripts
develop = .
eggs = bob>=1.2.0
xbob.db.verification.filelist
- xbob.db.subvoxforge
+ xbob.db.voxforge
newest = false
; Look at this directory to find bob
diff --git a/download_and_untar.sh b/download_and_untar.sh
index 9ad95f4..d1f0388 100755
--- a/download_and_untar.sh
+++ b/download_and_untar.sh
@@ -39,5 +39,5 @@ while read filename; do
mv $basefilename $directory/.
rm $filename
fi
-done < xbob/db/subvoxforge/lists/list_of_tgz_files.lst # where the list of files is stored
+done < xbob/db/voxforge/lists/list_of_tgz_files.lst # where the list of files is stored
diff --git a/setup.py b/setup.py
index ef27242..7a84b6f 100644
--- a/setup.py
+++ b/setup.py
@@ -21,10 +21,10 @@ from setuptools import setup, find_packages
setup(
- name='xbob.db.subvoxforge',
+ name='xbob.db.voxforge',
version='0.0.1a0',
description='Speaker verification protocol on a subset of the VoxForge database',
- url='http://pypi.python.org/pypi/xbob.db.subvoxforge',
+ url='http://pypi.python.org/pypi/xbob.db.voxforge',
license='GPLv3',
author='Elie Khoury',
author_email='Elie.Khoury@idiap.ch',
@@ -48,12 +48,12 @@ setup(
entry_points = {
# declare database to bob
'bob.db': [
- 'subvoxforge = xbob.db.subvoxforge.driver:Interface',
+ 'voxforge = xbob.db.voxforge.driver:Interface',
],
# declare tests to bob
'bob.test': [
- 'subvoxforge = xbob.db.subvoxforge.test:SubvoxforgeDatabaseTest',
+ 'voxforge = xbob.db.voxforge.test:voxforgeDatabaseTest',
],
},
diff --git a/xbob/db/subvoxforge/__init__.py b/xbob/db/voxforge/__init__.py
similarity index 100%
rename from xbob/db/subvoxforge/__init__.py
rename to xbob/db/voxforge/__init__.py
diff --git a/xbob/db/subvoxforge/driver.py b/xbob/db/voxforge/driver.py
similarity index 97%
rename from xbob/db/subvoxforge/driver.py
rename to xbob/db/voxforge/driver.py
index 7e9ddcd..e3e7b12 100644
--- a/xbob/db/subvoxforge/driver.py
+++ b/xbob/db/voxforge/driver.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""Commands the Subvoxforge database can respond to.
+"""Commands the Voxforge database can respond to.
"""
import os
@@ -77,7 +77,7 @@ def checkfiles(args):
class Interface(BaseInterface):
def name(self):
- return 'subvoxforge'
+ return 'voxforge'
def version(self):
import pkg_resources # part of setuptools
@@ -94,7 +94,7 @@ class Interface(BaseInterface):
from . import __doc__ as docs
subparsers = self.setup_parser(parser,
- "Subvoxforge database", docs)
+ "Voxforge database", docs)
import argparse
diff --git a/xbob/db/subvoxforge/lists/dev/for_models.lst b/xbob/db/voxforge/lists/dev/for_models.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/dev/for_models.lst
rename to xbob/db/voxforge/lists/dev/for_models.lst
diff --git a/xbob/db/subvoxforge/lists/dev/for_probes.lst b/xbob/db/voxforge/lists/dev/for_probes.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/dev/for_probes.lst
rename to xbob/db/voxforge/lists/dev/for_probes.lst
diff --git a/xbob/db/subvoxforge/lists/eval/for_models.lst b/xbob/db/voxforge/lists/eval/for_models.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/eval/for_models.lst
rename to xbob/db/voxforge/lists/eval/for_models.lst
diff --git a/xbob/db/subvoxforge/lists/eval/for_probes.lst b/xbob/db/voxforge/lists/eval/for_probes.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/eval/for_probes.lst
rename to xbob/db/voxforge/lists/eval/for_probes.lst
diff --git a/xbob/db/subvoxforge/lists/list_of_tgz_files.lst b/xbob/db/voxforge/lists/list_of_tgz_files.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/list_of_tgz_files.lst
rename to xbob/db/voxforge/lists/list_of_tgz_files.lst
diff --git a/xbob/db/subvoxforge/lists/norm/train_optional_world_1.lst b/xbob/db/voxforge/lists/norm/train_optional_world_1.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/norm/train_optional_world_1.lst
rename to xbob/db/voxforge/lists/norm/train_optional_world_1.lst
diff --git a/xbob/db/subvoxforge/lists/norm/train_optional_world_2.lst b/xbob/db/voxforge/lists/norm/train_optional_world_2.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/norm/train_optional_world_2.lst
rename to xbob/db/voxforge/lists/norm/train_optional_world_2.lst
diff --git a/xbob/db/subvoxforge/lists/norm/train_world.lst b/xbob/db/voxforge/lists/norm/train_world.lst
similarity index 100%
rename from xbob/db/subvoxforge/lists/norm/train_world.lst
rename to xbob/db/voxforge/lists/norm/train_world.lst
diff --git a/xbob/db/subvoxforge/query.py b/xbob/db/voxforge/query.py
similarity index 100%
rename from xbob/db/subvoxforge/query.py
rename to xbob/db/voxforge/query.py
diff --git a/xbob/db/subvoxforge/test.py b/xbob/db/voxforge/test.py
similarity index 100%
rename from xbob/db/subvoxforge/test.py
rename to xbob/db/voxforge/test.py
--
GitLab