Merge branch 'revert-9d6d567a' into 'master'

Revert "Merge branch 'p1' into 'master'"

This reverts merge request !46

See merge request !49

develop.cfg

@@ -33,19 +33,19 @@ verbose = true
 newest = false
 
 [sources]
-bob.extension = git https://gitlab.idiap.ch/bob/bob.extension
-bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz
-bob.core = git https://gitlab.idiap.ch/bob/bob.core
-bob.io.base = git https://gitlab.idiap.ch/bob/bob.io.base
-bob.sp = git https://gitlab.idiap.ch/bob/bob.sp
-bob.math = git https://gitlab.idiap.ch/bob/bob.math
-bob.measure = git https://gitlab.idiap.ch/bob/bob.measure
-bob.db.base = git https://gitlab.idiap.ch/bob/bob.db.base
-bob.io.image = git https://gitlab.idiap.ch/bob/bob.io.image
-bob.learn.activation = git https://gitlab.idiap.ch/bob/bob.learn.activation
-bob.learn.linear = git https://gitlab.idiap.ch/bob/bob.learn.linear
-bob.learn.em = git https://gitlab.idiap.ch/bob/bob.learn.em
-bob.db.atnt = git https://gitlab.idiap.ch/bob/bob.db.atnt
+bob.extension = git git@gitlab.idiap.ch:bob/bob.extension
+bob.blitz = git git@gitlab.idiap.ch:bob/bob.blitz
+bob.core = git git@gitlab.idiap.ch:bob/bob.core
+bob.io.base = git git@gitlab.idiap.ch:bob/bob.io.base
+bob.sp = git git@gitlab.idiap.ch:bob/bob.sp
+bob.math = git git@gitlab.idiap.ch:bob/bob.math
+bob.measure = git git@gitlab.idiap.ch:bob/bob.measure
+bob.db.base = git git@gitlab.idiap.ch:bob/bob.db.base
+bob.io.image = git git@gitlab.idiap.ch:bob/bob.io.image
+bob.learn.activation = git git@gitlab.idiap.ch:bob/bob.learn.activation
+bob.learn.linear = git git@gitlab.idiap.ch:bob/bob.learn.linear
+bob.learn.em = git git@gitlab.idiap.ch:bob/bob.learn.em
+bob.db.atnt = git git@gitlab.idiap.ch:bob/bob.db.atnt
 
 [scripts]
 recipe = bob.buildout:scripts

doc/conf.py

@@ -30,29 +30,9 @@ extensions = [
 import sphinx
 if sphinx.__version__ >= "1.4.1":
     extensions.append('sphinx.ext.imgmath')
-    imgmath_image_format = 'svg'
 else:
     extensions.append('sphinx.ext.pngmath')
 
-# Be picky about warnings
-nitpicky = True
-
-# Ignores stuff we can't easily resolve on other project's sphinx manuals
-nitpick_ignore = []
-
-# Allows the user to override warnings from a separate file
-if os.path.exists('nitpick-exceptions.txt'):
-    for line in open('nitpick-exceptions.txt'):
-        if line.strip() == "" or line.startswith("#"):
-            continue
-        dtype, target = line.split(None, 1)
-        target = target.strip()
-        try: # python 2.x
-            target = unicode(target)
-        except NameError:
-            pass
-        nitpick_ignore.append((dtype, target))
-
 # Always includes todos
 todo_include_todos = True
 
@@ -237,7 +217,7 @@ autodoc_default_flags = [
 
 # For inter-documentation mapping:
 from bob.extension.utils import link_documentation, load_requirements
-sphinx_requirements = "extra-intersphinx.txt"
+sphinx_requirements = "./extra-intersphinx.txt"
 if os.path.exists(sphinx_requirements):
     intersphinx_mapping = link_documentation(additional_packages=load_requirements(sphinx_requirements))
 else: