updated requirements

README.rst

@@ -2,12 +2,26 @@
 .. Pavel Korshunov <pavel.korshunov@idiap.ch>
 .. Thu 23 Jun 13:43:22 2016
 
+.. image:: http://img.shields.io/badge/docs-stable-yellow.png
+   :target: http://pythonhosted.org/bob.pad.voice/index.html
+.. image:: http://img.shields.io/badge/docs-latest-orange.png
+   :target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.pad.voice/master/index.html
+.. image:: https://gitlab.idiap.ch/bob/bob.pad.voice/badges/master/build.svg
+   :target: https://gitlab.idiap.ch/bob/bob.pad.voice/commits/master
+.. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
+   :target: https://gitlab.idiap.ch/bob/bob.pad.voice
+.. image:: http://img.shields.io/pypi/v/bob.pad.voice.png
+   :target: https://pypi.python.org/pypi/bob.pad.voice
+.. image:: http://img.shields.io/pypi/dm/bob.pad.voice.png
+   :target: https://pypi.python.org/pypi/bob.pad.voice
 
 =================================================
 Presentation Attack Detection in Voice Biometrics
 =================================================
 
-This package is an extension to the ``bob.pad.base`` package, which provides the basic presentation attack detection (PAD) framework.
+This package is part of the signal-processing and machine learning toolbox
+Bob_. This package is an extension to the ``bob.pad.base`` package, which provides the basic presentation attack
+detection (PAD) framework.
 
 The ``bob.pad.voice`` contains additional functionality to run PAD experiments using speech databases.
 Wrappers for speech databases are also included in this package.
@@ -15,13 +29,22 @@ Wrappers for speech databases are also included in this package.
 
 Installation
 ------------
-To install this package -- alone or together with other `Packages of Bob <https://github.com/idiap/bob/wiki/Packages>`_ -- please read the `Installation Instructions <https://github.com/idiap/bob/wiki/Installation>`_.
-For Bob_ to be able to work properly, some dependent packages are required to be installed.
-Please make sure that you have read the `Dependencies <https://github.com/idiap/bob/wiki/Dependencies>`_ for your operating system.
 
-Documentation
--------------
-For further documentation on this package, please read the `Documentation <http://pythonhosted.org/bob.empty.package/index.html>`_.
-For a list of tutorials on this or the other packages of Bob_, or information on submitting issues, asking questions and starting discussions, please visit its website.
+Follow our `installation`_ instructions. Then, using the Python interpreter
+provided by the distribution, bootstrap and buildout this package::
 
+  $ python bootstrap-buildout.py
+  $ ./bin/buildout
+
+
+Contact
+-------
+
+For questions or reporting issues to this software package, contact our
+development `mailing list`_.
+
+
+.. Place your references here:
 .. _bob: https://www.idiap.ch/software/bob
+.. _installation: https://gitlab.idiap.ch/bob/bob/wikis/Installation
+.. _mailing list: https://groups.google.com/forum/?fromgroups#!forum/bob-devel
\ No newline at end of file

bob/pad/voice/algorithm/__init__.py

 from .gmm_algorithm import GmmAlgorithm
 from .logregr_algorithm import LogRegrAlgorithm
 
+# to fix sphinx warnings of not able to find classes, when path is shortened
+GmmAlgorithm.__module__ = "bob.pad.voice.algorithm"
+LogRegrAlgorithm.__module__ = "bob.pad.voice.algorithm"
+
+# gets sphinx autodoc done right - don't remove it
+def __appropriate__(*args):
+  """Says object was actually declared here, and not in the import module.
+  Fixing sphinx warnings of not being able to find classes, when path is shortened.
+  Parameters:
+
+    *args: An iterable of objects to modify
+
+  Resolves `Sphinx referencing issues
+  <https://github.com/sphinx-doc/sphinx/issues/3048>`
+  """
+
+  for obj in args: obj.__module__ = __name__
+
+__appropriate__(
+    GmmAlgorithm,
+    LogRegrAlgorithm,
+    )
+__all__ = [_ for _ in dir() if not _.startswith('_')]

bob/pad/voice/algorithm/dummy_algorithm.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# @author: Pavel Korshunov <pavel.korshunov@idiap.ch>
+# @date: Wed 19 Oct 23:43:22 2016
 
 from bob.pad.base.algorithm import Algorithm
 

bob/pad/voice/algorithm/gmm_algorithm.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# @author: Pavel Korshunov <pavel.korshunov@idiap.ch>
+# @date: Wed 19 Oct 23:43:22 2016
+
 import bob.io.base
 
 import numpy

bob/pad/voice/algorithm/histdistance_algorithm.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# @author: Pavel Korshunov <pavel.korshunov@idiap.ch>
+# @date: Wed 19 Oct 23:43:22 2016
+
+
 import bob.io.base
 
 import numpy

bob/pad/voice/algorithm/logregr_algorithm.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# @author: Pavel Korshunov <pavel.korshunov@idiap.ch>
+# @date: Wed 19 Oct 23:43:22 2016
+
 import bob.io.base
 
 import numpy

bob/pad/voice/database/__init__.py

@@ -6,4 +6,25 @@ from .replaymobile import ReplayMobilePadDatabase
 from .voicepa import VoicePAPadDatabase
 
 # gets sphinx autodoc done right - don't remove it
+def __appropriate__(*args):
+  """Says object was actually declared here, and not in the import module.
+  Fixing sphinx warnings of not being able to find classes, when path is shortened.
+  Parameters:
+
+    *args: An iterable of objects to modify
+
+  Resolves `Sphinx referencing issues
+  <https://github.com/sphinx-doc/sphinx/issues/3048>`
+  """
+
+  for obj in args: obj.__module__ = __name__
+
+__appropriate__(
+    PadVoiceFile,
+    ASVspoofPadDatabase,
+    AVspoofPadDatabase,
+    ReplayPadDatabase,
+    ReplayMobilePadDatabase,
+    VoicePAPadDatabase,
+    )
 __all__ = [_ for _ in dir() if not _.startswith('_')]

bob/pad/voice/extractor/__init__.py

+from .lbps import LBPs
+from .ratios import Ratios
 from .vectors_ratios import VectorsRatios
 from .glcms import GLCMs
 from .spectrogram_extended import SpectrogramExtended
-from .lbps import LBPs
 from .lbp_histograms import LBPHistograms
-from .ratios import Ratios
+
+# gets sphinx autodoc done right - don't remove it
+def __appropriate__(*args):
+  """Says object was actually declared here, and not in the import module.
+  Fixing sphinx warnings of not being able to find classes, when path is shortened.
+  Parameters:
+
+    *args: An iterable of objects to modify
+
+  Resolves `Sphinx referencing issues
+  <https://github.com/sphinx-doc/sphinx/issues/3048>`
+  """
+
+  for obj in args: obj.__module__ = __name__
+
+__appropriate__(
+    Ratios,
+    LBPs,
+    VectorsRatios,
+    GLCMs,
+    SpectrogramExtended,
+    LBPHistograms,
+    )
+__all__ = [_ for _ in dir() if not _.startswith('_')]

bob/pad/voice/extractor/glcms.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# Pavel Korshunov <pavel.korshunov@idiap.ch>
+# Tue 17 May 15:43:22 CEST 2016
+
 import numpy
 import bob.io.base
 import bob.ip.base

bob/pad/voice/extractor/lbp_histograms.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# Pavel Korshunov <pavel.korshunov@idiap.ch>
+# Tue 17 May 15:43:22 CEST 2016
+
 import numpy
 import bob.io.base
 import bob.ip.base
 
 import bob.sp
 
-from .lbps import LBPs
+from bob.pad.voice.extractor import LBPs
 
 import logging
 

bob/pad/voice/extractor/lbps.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# Pavel Korshunov <pavel.korshunov@idiap.ch>
+# Tue 17 May 15:43:22 CEST 2016
+
 import numpy
 import bob.io.base
 import bob.ip.base

bob/pad/voice/extractor/ratios.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# Pavel Korshunov <pavel.korshunov@idiap.ch>
+# Tue 17 May 15:43:22 CEST 2016
+
 import numpy
 import bob.io.base
 

bob/pad/voice/extractor/spectrogram_extended.py

@@ -3,20 +3,6 @@
 # Pavel Korshunov <pavel.korshunov@idiap.ch>
 # Mon  6 Aug 15:12:22 CEST 2015
 #
-# Copyright (C) 2011-2012 Idiap Research Institute, Martigny, Switzerland
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 
 
 from __future__ import print_function

bob/pad/voice/extractor/vectors_ratios.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# Pavel Korshunov <pavel.korshunov@idiap.ch>
+# Tue 17 May 15:43:22 CEST 2016
+
 import numpy
 
-from .ratios import Ratios
+from bob.pad.voice.extractor import Ratios
 import math
 
 import logging

bob/pad/voice/test/dummy/database.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+# Pavel Korshunov <pavel.korshunov@idiap.ch>
+# Tue 17 May 15:43:22 CEST 2016
+
 import sys
 
 import bob.pad.base.database

bob/pad/voice/test/test_databases.py

@@ -3,19 +3,6 @@
 # @author: Pavel Korshunov <pavel.korshunov@idiap.ch>
 # @date: Thu Apr 21 16:41:21 CEST 2016
 #
-# Copyright (C) 2011-2012 Idiap Research Institute, Martigny, Switzerland
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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 os

bob/pad/voice/test/test_spoofspeech.py

@@ -3,19 +3,7 @@
 # @author: Pavel Korshunov <pavel.korshunov@idiap.ch>
 # @date: Thu Apr 28 16:41:21 CEST 2016
 #
-# Copyright (C) 2011-2012 Idiap Research Institute, Martigny, Switzerland
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 
 from __future__ import print_function

bob/pad/voice/utils/extraction.py

@@ -3,19 +3,7 @@
 # Pavel Korshunov <Pavel.Korshunov@idiap.ch>
 # Tue  22 Sep 17:21:35 CEST 2015
 #
-# Copyright (C) 2012-2015 Idiap Research Institute, Martigny, Switzerland
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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 numpy

bob/pad/voice/utils/scores.py

@@ -3,19 +3,6 @@
 # Pavel Korshunov <pavel.korshunov@idiap.ch>
 # Mon 8 Oct 14:09:22 CEST 2015
 #
-# Copyright (C) 2012-2015 Idiap Research Institute, Martigny, Switzerland
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the ipyplotied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
 

develop.cfg

@@ -17,6 +17,7 @@ eggs =  bob.pad.voice
         bob.db.asvspoof
         bob.db.avspoof
         bob.db.voicepa
+        bob.extension
         gridtk
 
 extensions = bob.buildout
@@ -32,6 +33,7 @@ develop = src/bob.bio.spear
          src/bob.bio.base
          src/bob.db.base
          src/bob.ap
+         src/bob.extension
          .
          
 ; options for bob.buildout
@@ -49,6 +51,7 @@ bob.bio.base = git git@gitlab.idiap.ch:bob/bob.bio.base.git
 bob.pad.base = git git@gitlab.idiap.ch:bob/bob.pad.base.git
 bob.ap = git git@gitlab.idiap.ch:bob/bob.ap.git
 bob.db.voicepa = git git@gitlab.idiap.ch:bob/bob.db.voicepa.git
+bob.extension = git git@gitlab.idiap.ch:bob/bob.extension.git
 
 [scripts]
 recipe = bob.buildout:scripts

doc/conf.py

@@ -243,7 +243,6 @@ if os.path.exists(sphinx_requirements):
 else:
     intersphinx_mapping = link_documentation()
 
-
 # We want to remove all private (i.e. _. or __.__) members
 # that are not in the list of accepted functions
 accepted_private_functions = ['__array__']

doc/extra-intersphinx.txt

+python
+numpy
+bob.bio.spear
+gridtk
+bob.db.base
+bob.db.avspoof
\ No newline at end of file

doc/index.rst

@@ -10,5 +10,20 @@ Presentation Attack Detection in Voice Biometrics
 
 This package is an extension of the ``bob.pad.base`` presentation attack detection (PAD) framework package for voice biometrics.
 
+==================================
+Tools implemented in bob.pad.voice
+==================================
 
+Extractors
+----------
+.. automodule:: bob.pad.voice.extractor
 
+Algorithms
+----------
+
+.. automodule:: bob.pad.voice.algorithm
+
+Databases
+---------
+
+.. automodule:: bob.pad.voice.database
\ No newline at end of file

doc/nitpick-exceptions.txt

+py:exc ValueError

requirements.txt

@@ -9,3 +9,4 @@ bob.db.base
 bob.db.avspoof
 bob.db.asvspoof
 bob.db.voicepa
+bob.io.base

setup.py

@@ -49,13 +49,13 @@ setup(
     # information before releasing code publicly.
     name='bob.pad.voice',
     version=open("version.txt").read().rstrip(),
-    description='Package extends bob.pad.base for voice biometrics',
+    description='Package extends bob.pad.base for attack detection in speech',
 
     url='https://gitlab.idiap.ch/bob/bob.pad.voice',
     license='GPLv3',
     author='Pavel Korshunov',
-    author_email='<andre.anjos@idiap.ch>',
-    keywords="presentation attack detection, voice biometrics, speech",
+    author_email='<pavel.korshunov@idiap.ch>',
+    keywords="presentation attack detection, voice biometrics, framework",
 
     # If you have a better, long description of your package, place it on the
     # 'doc' directory and then hook it here

version.txt

-1.0.0b
\ No newline at end of file
+1.0.3b0
\ No newline at end of file