Revert "Made package independent of bob.bio.face"

This reverts commit 2d1082d4.

MANIFEST.in

 include README.rst bootstrap-buildout.py buildout.cfg develop.cfg buildout-before-patch.cfg patch/bob.bio.csu.patch LICENSE.txt version.txt requirements.txt
 recursive-include doc *.py *.rst
-recursive-include bob/bio/csu/test/data *.hdf5 *.pos *.jpg
+recursive-include bob/bio/csu/test/data *.hdf5

bob/bio/csu/test/data/testimage.pos

-reye 131 176
-leye 222 170

bob/bio/csu/test/test_algorithms.py

@@ -26,9 +26,9 @@ import pkg_resources
 regenerate_refs = False
 
 import bob.bio.base
+import bob.bio.face
 import facerec2010
 
-
 from .test_extractors import _compare_lda_face_records
 
 def _compare_pca_face_records(f1, f2):

bob/bio/csu/test/test_extractors.py

@@ -26,18 +26,10 @@ import pkg_resources
 regenerate_refs = False
 
 import bob.bio.base
-import bob.io.base.test_utils
+import bob.bio.face
 import facerec2010
 
-def _compare(data, reference, write_function = bob.bio.base.save, read_function = bob.bio.base.load, atol = 1e-5, rtol = 1e-8):
-  # write reference?
-  if regenerate_refs:
-    write_function(data, reference)
-
-  # compare reference
-  reference = read_function(reference)
-  assert numpy.allclose(data, reference, atol=atol, rtol=rtol)
-
+from bob.bio.face.test.test_extractors import _compare
 
 def _random_training_set(shape, count = 50, minimum = 0, maximum = 1, as_int = False, seed = 42):
   # generate a random sequence of features

bob/bio/csu/test/test_preprocessors.py

@@ -29,23 +29,13 @@ import pkg_resources
 regenerate_refs = False
 
 import bob.bio.base
-import bob.db.verification.utils
+import bob.bio.face
 
+from bob.bio.face.test.test_preprocessors import _annotation, _compare
 
-def _compare(data, reference, write_function = bob.bio.base.save, read_function = bob.bio.base.load, atol = 1e-5, rtol = 1e-8):
-  # write reference?
-  if regenerate_refs:
-    write_function(data, reference)
-
-  # compare reference
-  reference = read_function(reference)
-  assert numpy.allclose(data, reference, atol=atol, rtol=rtol)
 
 def _image(preprocessor):
-  return preprocessor.read_original_data(pkg_resources.resource_filename('bob.bio.csu.test', 'data/testimage.jpg'))
-
-def _annotation():
-  return bob.db.verification.utils.read_annotation_file(pkg_resources.resource_filename('bob.bio.csu.test', 'data/testimage.pos'), 'named')
+  return preprocessor.read_original_data(pkg_resources.resource_filename('bob.bio.face.test', 'data/testimage.jpg'))
 
 
 def test_lrpca():

buildout.cfg

@@ -6,6 +6,7 @@
 parts = scripts
 eggs = PythonFaceEvaluation
        bob.bio.base
+       bob.bio.face
        bob.bio.csu
        gridtk
        
@@ -14,6 +15,7 @@ extensions = bob.buildout
 auto-checkout = *
 develop = ${buildout:csu-dir}/PythonFaceEvaluation
           src/bob.bio.base
+          src/bob.bio.face
           .
 
 csu-dir = [PATH_TO_YOUR_CSU_COPY]
@@ -25,7 +27,7 @@ newest = false
 
 [sources]
 bob.bio.base = git https://github.com/bioidiap/bob.bio.base
+bob.bio.face = git https://github.com/bioidiap/bob.bio.face
 
 [scripts]
 recipe = bob.buildout:scripts
-dependent-scrpts = true

develop.cfg

@@ -7,6 +7,7 @@ parts = scripts
 
 ; required packages: the facereclib, the original code and our wrapper package
 eggs =  bob.bio.base
+        bob.bio.face
         PythonFaceEvaluation
         bob.bio.csu
 
@@ -33,13 +34,16 @@ develop = src/bob.extension
           src/bob.db.verification.filelist
           src/bob.db.atnt
           src/bob.bio.base
+          src/bob.learn.boosting
+          src/bob.ip.facedetect
+          src/bob.ip.flandmark
           ${buildout:csu-dir}/PythonFaceEvaluation
           .
 
 csu-dir = [PATH_TO_YOUR_CSU_COPY]
 
 ; options for bob.buildout extension
-debug = true
+debug = false
 verbose = true
 newest = false
 
@@ -64,6 +68,9 @@ bob.db.verification.utils = git https://github.com/bioidiap/bob.db.verification.
 bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist
 bob.db.atnt = git https://github.com/bioidiap/bob.db.atnt
 bob.bio.base = git https://github.com/bioidiap/bob.bio.base
+bob.learn.boosting = git https://github.com/bioidiap/bob.learn.boosting
+bob.ip.facedetect = git https://github.com/bioidiap/bob.ip.facedetect
+bob.ip.flandmark = git https://github.com/bioidiap/bob.ip.flandmark
 
 [scripts]
 recipe = bob.buildout:scripts

doc/conf.py

@@ -130,12 +130,12 @@ if sphinx.__version__ >= "1.0":
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = 'img/logo.png'
+html_logo = ''
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'img/favicon.ico'
+html_favicon = ''
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -243,7 +243,7 @@ autodoc_default_flags = ['members', 'undoc-members', 'inherited-members', 'show-
 
 # For inter-documentation mapping:
 from bob.extension.utils import link_documentation
-intersphinx_mapping = link_documentation()
+intersphinx_mapping = link_documentation(['python', 'bob.io.base', 'bob.bio.base'])
 
 
 def setup(app):

requirements.txt

@@ -14,3 +14,4 @@ bob.db.base
 bob.db.verification.utils
 bob.db.verification.filelist
 bob.bio.base
+bob.bio.face # for test purposes