Merge branch 'msumfsdmod' into 'master'

[replay] improve the score files by adding attack type information

See merge request !33

bob/bio/face/database/replay.py

@@ -124,7 +124,7 @@ class ReplayBioDatabase(BioDatabase):
                 retval.append(ReplayBioFile(f))
             else:
                 temp = ReplayBioFile(f)
-                temp.client_id = 'attack'
+                temp.client_id = 'attack/{}'.format(f.get_attack().attack_device)
                 retval.append(temp)
         return retval
 

doc/conf.py

@@ -25,6 +25,7 @@ extensions = [
     'sphinx.ext.intersphinx',
     'sphinx.ext.napoleon',
     'sphinx.ext.viewcode',
+    #'matplotlib.sphinxext.plot_directive'
     ]
 
 import sphinx
@@ -238,9 +239,12 @@ autodoc_default_flags = [
 from bob.extension.utils import link_documentation, load_requirements
 sphinx_requirements = "extra-intersphinx.txt"
 if os.path.exists(sphinx_requirements):
-    intersphinx_mapping = link_documentation(additional_packages=load_requirements(sphinx_requirements))
+  intersphinx_mapping = link_documentation(
+      additional_packages=['python','numpy'] + \
+          load_requirements(sphinx_requirements)
+          )
 else:
-    intersphinx_mapping = link_documentation()
+  intersphinx_mapping = link_documentation()
 
 
 # We want to remove all private (i.e. _. or __.__) members