Merge branch 'fixing-builds' into 'master'

Fixing builds: tests and conda recipe

See merge request !50

bob/pad/face/test/test.py

@@ -248,8 +248,8 @@ def test_video_face_crop():
     assert len(faces) == 3
     assert faces[0][1].shape == (3, 64, 64)
     assert faces[-1][1].shape == (3, 64, 64)
-    assert np.sum(faces[0][1]) == 1251500
-    assert np.sum(faces[-1][1]) == 1251500
+    assert np.sum(faces[0][1]) == 1238664
+    assert np.sum(faces[-1][1]) == 1238664
 
 
 #==============================================================================

conda/meta.yaml

@@ -27,6 +27,7 @@ requirements:
     - bob.bio.base
     - bob.io.base
     - bob.ip.base
+    - scikit-learn
     - bob.pad.base
     - bob.bio.face
     - bob.bio.video
@@ -40,6 +41,9 @@ requirements:
     - six
     - sphinx
     - numpy
+    - scikit-learn
+    - bob.ip.dlib
+    - bob.ip.facelandmarks
 
 test:
   imports:
@@ -57,9 +61,10 @@ test:
     - sphinx
     - sphinx_rtd_theme
     - gridtk
-    - scikit-learn
-    - bob.ip.dlib
-    - bob.ip.facelandmarks
+    - bob.db.replay
+    - bob.db.replaymobile
+    - bob.db.msu_mfsd_mod
+    - bob.db.mobio
 
 about:
   home: https://www.idiap.ch/software/bob/

doc/api.rst

@@ -64,7 +64,7 @@ Feature Extractors
 Matching Algorithms
 ------------------------------
 
-.. automodule:: bob.pad.face.algorithm
+.. automodule:: bob.pad.base.algorithm
 
 
 Utilities